Skip to content

fix liburing version in ubuntu 22.04 since it is not enough to build folly #801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahmadelyoussef wants to merge 1 commit into
base: v2-beta
Choose a base branch
from
Open

fix liburing version in ubuntu 22.04 since it is not enough to build folly #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions packages/tao_bench/install_tao_bench_aarch64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,23 @@ if ! [ -f "/usr/local/bin/cmake" ]; then
ln -s /usr/bin/cmake /usr/local/bin/cmake
fi

# Folly requires APIs newer than Ubuntu 22.04's liburing 2.1; pin 2.12 for reproducible builds.
LIBURING_VERSION="2.12"
if [ "$LINUX_DIST_ID" = "ubuntu" ] && ! PKG_CONFIG_LIBDIR="${TAO_BENCH_DEPS}/lib/pkgconfig" \
pkg-config --atleast-version="${LIBURING_VERSION}" liburing; then
LIBURING_ROOT="${TAO_BENCH_ROOT}/liburing-${LIBURING_VERSION}"
if ! [ -d "${LIBURING_ROOT}" ]; then
git clone --branch "liburing-${LIBURING_VERSION}" --depth 1 \
https://github.com/axboe/liburing.git "${LIBURING_ROOT}"
fi
pushd "${LIBURING_ROOT}"
./configure --prefix="${TAO_BENCH_DEPS}"
make -j"${NUM_BUILD_JOBS}"
make liburing.pc
make install
popd
fi

# Install openssl
if ! [ -d "openssl" ]; then
git clone --branch "${OPENSSL_BRANCH}" --depth 1 https://github.com/openssl/openssl.git
Expand Down Expand Up @@ -129,6 +146,8 @@ sed -i 's/FOLLY_ALWAYS_INLINE//g' "${TAO_BENCH_ROOT}/folly/folly/experimental/sy
# Remove boost.log and boost.python from the build — they fail on aarch64 with GCC 14
# (log: build failure; python: incompatible with NumPy 2.0) and neither is needed by folly
sed -i '/^--with-log$/d;/^--with-python$/d' build/fbcode_builder/manifests/boost
CMAKE_PREFIX_PATH="${TAO_BENCH_DEPS}" \
PKG_CONFIG_PATH="${TAO_BENCH_DEPS}/lib/pkgconfig" \
OPENSSL_ROOT_DIR="${TAO_BENCH_DEPS}" ./build/fbcode_builder/getdeps.py --allow-system-packages build \
--extra-cmake-defines '{"CMAKE_LIBRARY_ARCHITECTURE": "aarch64"}' \
--scratch-path "${FOLLY_BUILD_ROOT}"
Expand Down
19 changes: 19 additions & 0 deletions packages/tao_bench/install_tao_bench_x86_64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,23 @@ if ! [ -f "/usr/local/bin/cmake" ]; then
ln -s /usr/bin/cmake /usr/local/bin/cmake
fi

# Folly requires APIs newer than Ubuntu 22.04's liburing 2.1; pin 2.12 for reproducible builds.
LIBURING_VERSION="2.12"
if [ "$LINUX_DIST_ID" = "ubuntu" ] && ! PKG_CONFIG_LIBDIR="${TAO_BENCH_DEPS}/lib/pkgconfig" \
pkg-config --atleast-version="${LIBURING_VERSION}" liburing; then
LIBURING_ROOT="${TAO_BENCH_ROOT}/liburing-${LIBURING_VERSION}"
if ! [ -d "${LIBURING_ROOT}" ]; then
git clone --branch "liburing-${LIBURING_VERSION}" --depth 1 \
https://github.com/axboe/liburing.git "${LIBURING_ROOT}"
fi
pushd "${LIBURING_ROOT}"
./configure --prefix="${TAO_BENCH_DEPS}"
make -j"${NUM_BUILD_JOBS}"
make liburing.pc
make install
popd
fi

# Install openssl
if ! [ -d "openssl" ]; then
git clone --branch "${OPENSSL_BRANCH}" --depth 1 https://github.com/openssl/openssl.git
Expand Down Expand Up @@ -121,6 +138,8 @@ pushd folly
git checkout v2024.06.24.00
git apply "${BENCHPRESS_ROOT}/packages/tao_bench/folly_zlib_uri.patch"
sed -i 's/FOLLY_ALWAYS_INLINE//g' "${TAO_BENCH_ROOT}/folly/folly/experimental/symbolizer/StackTrace.cpp"
CMAKE_PREFIX_PATH="${TAO_BENCH_DEPS}" \
PKG_CONFIG_PATH="${TAO_BENCH_DEPS}/lib/pkgconfig" \
OPENSSL_ROOT_DIR="${TAO_BENCH_DEPS}" ./build/fbcode_builder/getdeps.py --allow-system-packages build \
--scratch-path "${FOLLY_BUILD_ROOT}"
popd
Expand Down
Loading