Skip to content

Commit 530fe73

Browse files
YifanYuan3facebook-github-bot
authored andcommitted
update fbthrift version to include new optimizations and avoid build errors (#194)
Summary: Pull Request resolved: #194 as titled Reviewed By: ahmadelyoussef Differential Revision: D79776495 fbshipit-source-id: f61c23199a6d0a85c3f3e81d8e889aa916ecc60a
1 parent a23ddbe commit 530fe73

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

packages/wdl_bench/0001-folly.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ index 44ba37edd..6ba5a69f1 100644
55
@@ -566,8 +566,8 @@ install(
66
COMPONENT dev
77
)
8-
8+
99
-option(BUILD_TESTS "If enabled, compile the tests." OFF)
1010
-option(BUILD_BENCHMARKS "If enabled, compile the benchmarks." OFF)
1111
+option(BUILD_TESTS "If enabled, compile the tests." ON)
@@ -45,7 +45,7 @@ index 44ba37edd..6ba5a69f1 100644
4545
+
4646
+ DIRECTORY test/function_benchmark/
4747
+ BENCHMARK function_benchmark SOURCES main.cpp benchmark_impl.cpp test_functions.cpp
48-
48+
4949
DIRECTORY synchronization/detail/test/
5050
TEST synchronization_detail_hardware_test SOURCES HardwareTest.cpp
5151
@@ -1139,6 +1146,8 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
@@ -72,7 +72,7 @@ index 44ba37edd..6ba5a69f1 100644
7272
+ BENCHMARK lt_hash_benchmark SOURCES LtHashBenchmark.cpp
7373
)
7474
endif()
75-
75+
7676
diff --git a/folly/concurrency/test/ConcurrentHashMapBench.cpp b/folly/concurrency/test/ConcurrentHashMapBench.cpp
7777
index 770c47ed0..e1e5bf097 100644
7878
--- a/folly/concurrency/test/ConcurrentHashMapBench.cpp
@@ -91,11 +91,11 @@ index 2c207a551..bd577ed98 100644
9191
--- a/folly/lang/Hint-inl.h
9292
+++ b/folly/lang/Hint-inl.h
9393
@@ -115,7 +115,7 @@ FOLLY_ALWAYS_INLINE void compiler_must_not_elide(T const& t, std::true_type) {
94-
94+
9595
template <typename T>
9696
FOLLY_ALWAYS_INLINE void compiler_must_not_predict(T& t, std::false_type) {
9797
- asm volatile("" : "+r"(t));
9898
+ //asm volatile("" : "+r"(t));
9999
}
100-
100+
101101
template <typename T>

packages/wdl_bench/install_wdl_bench.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ declare -A REPOS=(
1616

1717
declare -A TAGS=(
1818
['folly']='v2025.05.12.00'
19-
['fbthrift']='v2025.05.12.00'
19+
['fbthrift']='v2025.08.18.00'
2020
['lzbench']='d138844ea56b36ff1c1c43b259c866069deb64ad'
2121
['openssl']='openssl-3.3.1'
2222
)
@@ -112,7 +112,7 @@ build_fbthrift()
112112

113113
sudo ./build/fbcode_builder/getdeps.py install-system-deps --recursive fbthrift
114114

115-
python3 ./build/fbcode_builder/getdeps.py --allow-system-packages build fbthrift --scratch-path "${WDL_BUILD}"
115+
python3 ./build/fbcode_builder/getdeps.py --allow-system-packages build fbthrift --scratch-path "${WDL_BUILD}" --extra-cmake-defines='{"enable_tests": "1"}'
116116

117117
popd || exit
118118
}

0 commit comments

Comments
 (0)