Fix AdSim OSS build (#213)

Summary:
Pull Request resolved: #213

Fix AdSim's OSS build:
- Keep AdSim build artifacts in benchmarks/adsim/build folder
- Prevent fb303 from building mvfst again (since it's already built in fbthrift)
- Update ThriftLibrary.cmake to match the current version of fbthrift codegen output

Differential Revision: D81974904

fbshipit-source-id: 58e94f337abf80e890e571b08bfecdca08ba678c

Author: excelle08

packages/adsim/build-deps.sh

@@ -46,6 +46,7 @@ build_dependency() {
     local dep_name="$1"
     local repo_url="$2"
     local version="$3"
+    local extra_build_args="$4"
 
     echo "Building ${dep_name}..."
 
@@ -77,7 +78,10 @@ build_dependency() {
       build "${dep_name}" --src-dir ${ADSIM_DEPS_DIR}/${dep_name} \
       --install-prefix="${ADSIM_STAGING_DIR}" \
       --install-dir="${ADSIM_STAGING_DIR}" \
-      --verbose
+      --verbose \
+      $extra_build_args
+
+    install_status="$?"
 
     echo "python3 "${ADSIM_DEPS_DIR}/${dep_name}/build/fbcode_builder/getdeps.py" \
       --scratch-path="${ADSIM_STAGING_DIR}/getdeps-scratch" \
@@ -86,16 +90,22 @@ build_dependency() {
       build "${dep_name}" --src-dir ${ADSIM_DEPS_DIR}/${dep_name} \
       --install-prefix="${ADSIM_STAGING_DIR}" \
       --install-dir="${ADSIM_STAGING_DIR}" \
-      --verbose"
+      --verbose \
+      $extra_build_args"
     popd || exit
 
-    echo "${dep_name} build completed successfully"
+    if [ "$install_status" -eq 0 ]; then
+        echo "${dep_name} build completed successfully"
+    else
+        echo "${dep_name} build failed!"
+        exit $install_status
+    fi
 }
 
 # Build core Facebook C++ libraries: async runtime, RPC framework, monitoring
 build_dependency "folly" "https://github.com/facebook/folly.git" "${FOLLY_VERSION}"
 build_dependency "fbthrift" "https://github.com/facebook/fbthrift.git" "${FBTHRIFT_VERSION}"
-build_dependency "fb303" "https://github.com/facebook/fb303.git" "${FB303_VERSION}"
+build_dependency "fb303" "https://github.com/facebook/fb303.git" "${FB303_VERSION}" "--no-deps"
 
 # Build FBGEMM (Facebook General Matrix Multiplication) for ML workload simulation
 ./install_fbgemm.sh

packages/adsim/install_adsim.sh

@@ -38,7 +38,7 @@ BENCHPRESS_ROOT="$(readlink -f "$BPKGS_ADSIM_ROOT/../..")"
 BENCHMARKS_DIR="${BENCHPRESS_ROOT}/benchmarks/adsim"
 
 # Temporary directory for intermediate build artifacts
-BUILD_DIR="${BENCHPRESS_ROOT}/build"
+BUILD_DIR="${BENCHMARKS_DIR}/build"
 
 ################################################################################
 # Setup Functions

packages/adsim/src/CMake/ThriftLibrary.cmake

@@ -229,9 +229,8 @@ macro(thrift_generate
     ${output_path}/gen-${language}/${source_file_name}_constants.cpp
     ${output_path}/gen-${language}/${source_file_name}_data.cpp
     ${output_path}/gen-${language}/${source_file_name}_types.cpp
-    ${output_path}/gen-${language}/${source_file_name}_types_binary.cpp
     ${output_path}/gen-${language}/${source_file_name}_types_compact.cpp
-    ${output_path}/gen-${language}/${source_file_name}_types_serialization.cpp
+    ${output_path}/gen-${language}/${source_file_name}_types_binary.cpp
   )
   if("${options}" MATCHES "layouts")
     set("${target_file_name}-${language}-SOURCES"