From 3e0de344ad6d32d334ba69b4388e80bb8f19ce86 Mon Sep 17 00:00:00 2001 From: Christian Zentgraf Date: Tue, 17 Sep 2024 12:40:20 -0400 Subject: [PATCH] Upgrade FBOS dependencies to 2024.09.16.00 --- CMake/resolve_dependency_modules/README.md | 11 ++++++----- .../resolve_dependency_modules/folly/CMakeLists.txt | 4 ++-- scripts/setup-centos9.sh | 12 ++++++++++-- scripts/setup-macos.sh | 4 ++-- scripts/setup-ubuntu.sh | 10 +++++++++- 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/CMake/resolve_dependency_modules/README.md b/CMake/resolve_dependency_modules/README.md index ce766cb17bcd7..45164bd30e9b9 100644 --- a/CMake/resolve_dependency_modules/README.md +++ b/CMake/resolve_dependency_modules/README.md @@ -32,11 +32,12 @@ by Velox. See details on bundling below. | re2 | 2021-04-01 | Yes | | fmt | 10.1.1 | Yes | | simdjson | 3.9.3 | Yes | -| folly | v2024.05.20.00 | Yes | -| fizz | v2024.05.20.00 | No | -| wangle | v2024.05.20.00 | No | -| mvfst | v2024.05.20.00 | No | -| fbthrift | v2024.05.20.00 | No | +| fast_float | v6.1.6 | No | +| folly | v2024.09.16.00 | Yes | +| fizz | v2024.09.16.00 | No | +| wangle | v2024.09.16.00 | No | +| mvfst | v2024.09.16.00 | No | +| fbthrift | v2024.09.16.00 | No | | libstemmer | 2.2.0 | Yes | | DuckDB (testing) | 0.8.1 | Yes | | cpr (testing) | 1.10.15 | Yes | diff --git a/CMake/resolve_dependency_modules/folly/CMakeLists.txt b/CMake/resolve_dependency_modules/folly/CMakeLists.txt index df7a489384ee7..55b15d5c861bc 100644 --- a/CMake/resolve_dependency_modules/folly/CMakeLists.txt +++ b/CMake/resolve_dependency_modules/folly/CMakeLists.txt @@ -14,9 +14,9 @@ project(Folly) cmake_minimum_required(VERSION 3.14) -set(VELOX_FOLLY_BUILD_VERSION v2024.05.20.00) +set(VELOX_FOLLY_BUILD_VERSION v2024.09.16.00) set(VELOX_FOLLY_BUILD_SHA256_CHECKSUM - f4a450e59f0b74d1b0b4e5c55ae38e820166c95d02f8a8a298e54a49a90aa057) + 0a375f2f3e15a2679b4d21fa1064986830a52f59c74d82b3bda1aeeea4e77da0) set(VELOX_FOLLY_SOURCE_URL "https://github.com/facebook/folly/releases/download/${VELOX_FOLLY_BUILD_VERSION}/folly-${VELOX_FOLLY_BUILD_VERSION}.tar.gz" ) diff --git a/scripts/setup-centos9.sh b/scripts/setup-centos9.sh index 825d2d29e32a0..80616a941c53a 100755 --- a/scripts/setup-centos9.sh +++ b/scripts/setup-centos9.sh @@ -31,16 +31,17 @@ set -efx -o pipefail SCRIPTDIR=$(dirname "${BASH_SOURCE[0]}") source $SCRIPTDIR/setup-helper-functions.sh NPROC=$(getconf _NPROCESSORS_ONLN) -export CXXFLAGS=$(get_cxx_flags) # Used by boost. +export CXXFLAGS=$(get_cxx_flags) # Used by boost. export CFLAGS=${CXXFLAGS//"-std=c++17"/} # Used by LZO. CMAKE_BUILD_TYPE="${BUILD_TYPE:-Release}" BUILD_DUCKDB="${BUILD_DUCKDB:-true}" USE_CLANG="${USE_CLANG:-false}" -FB_OS_VERSION="v2024.05.20.00" +FB_OS_VERSION="v2024.09.16.00" FMT_VERSION="10.1.1" BOOST_VERSION="boost-1.84.0" ARROW_VERSION="15.0.0" +FAST_FLOAT_VERSION="v6.1.6" function dnf_install { dnf install -y -q --setopt=install_weak_deps=False "$@" @@ -208,6 +209,12 @@ function install_cuda { dnf install -y cuda-nvcc-$(echo $1 | tr '.' '-') cuda-cudart-devel-$(echo $1 | tr '.' '-') } +function install_fast_float { + # Dependency of folly. + wget_and_untar https://github.com/fastfloat/fast_float/archive/refs/tags/${FAST_FLOAT_VERSION}.tar.gz fast_float + cmake_install fast_float +} + function install_velox_deps { run_and_time install_velox_deps_from_dnf run_and_time install_conda @@ -218,6 +225,7 @@ function install_velox_deps { run_and_time install_boost run_and_time install_protobuf run_and_time install_fmt + run_and_time install_fast_float run_and_time install_folly run_and_time install_fizz run_and_time install_wangle diff --git a/scripts/setup-macos.sh b/scripts/setup-macos.sh index 91b56cd7a1af3..3da7fea62fe8f 100755 --- a/scripts/setup-macos.sh +++ b/scripts/setup-macos.sh @@ -35,9 +35,9 @@ PYTHON_VENV=${PYHTON_VENV:-"${SCRIPTDIR}/../.venv"} NPROC=$(getconf _NPROCESSORS_ONLN) DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)} -MACOS_VELOX_DEPS="bison boost double-conversion flex gflags glog googletest icu4c libevent libsodium lz4 lzo openssl protobuf@21 simdjson snappy thrift xz xsimd zstd" +MACOS_VELOX_DEPS="bison boost double-conversion fast_float flex gflags glog googletest icu4c libevent libsodium lz4 lzo openssl protobuf@21 simdjson snappy thrift xz xsimd zstd" MACOS_BUILD_DEPS="ninja cmake" -FB_OS_VERSION="v2024.05.20.00" +FB_OS_VERSION="v2024.09.16.00" FMT_VERSION="10.1.1" function update_brew { diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index e40bba1d99232..f892ed036aa4a 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -53,10 +53,11 @@ function install_clang15 { ${SUDO} apt install ${CLANG_PACKAGE_LIST} -y } -FB_OS_VERSION="v2024.05.20.00" +FB_OS_VERSION="v2024.09.16.00" FMT_VERSION="10.1.1" BOOST_VERSION="boost-1.84.0" ARROW_VERSION="15.0.0" +FAST_FLOAT_VERSION="v6.1.6" # Install packages required for build. function install_build_prerequisites { @@ -222,10 +223,17 @@ function install_cuda { $SUDO apt install -y cuda-nvcc-$(echo $1 | tr '.' '-') cuda-cudart-dev-$(echo $1 | tr '.' '-') } +function install_fast_float { + # Dependency of folly. + wget_and_untar https://github.com/fastfloat/fast_float/archive/refs/tags/${FAST_FLOAT_VERSION}.tar.gz fast_float + cmake_install fast_float +} + function install_velox_deps { run_and_time install_velox_deps_from_apt run_and_time install_fmt run_and_time install_boost + run_and_time install_fast_float run_and_time install_folly run_and_time install_fizz run_and_time install_wangle