Update FBOS to v2024.07.01

facebookincubator · Sep 26, 2024 · bb20560 · bb20560
1 parent c3c93bf
commit bb20560
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 34 deletions.
diff --git a/CMake/resolve_dependency_modules/README.md b/CMake/resolve_dependency_modules/README.md
@@ -32,12 +32,11 @@ by Velox. See details on bundling below.
 | re2               | 2021-04-01      | Yes      |
 | fmt               | 10.1.1          | Yes      |
 | simdjson          | 3.9.3           | Yes      |
-| fast_float        | v6.1.6          | Yes      |
-| 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       |
+| folly             | v2024.07.01.00  | Yes      |
+| fizz              | v2024.07.01.00  | No       |
+| wangle            | v2024.07.01.00  | No       |
+| mvfst             | v2024.07.01.00  | No       |
+| fbthrift          | v2024.07.01.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
@@ -14,9 +14,9 @@
 project(Folly)
 cmake_minimum_required(VERSION 3.14)
 
-set(VELOX_FOLLY_BUILD_VERSION v2024.09.16.00)
+set(VELOX_FOLLY_BUILD_VERSION v2024.07.01.00)
 set(VELOX_FOLLY_BUILD_SHA256_CHECKSUM
-    0a375f2f3e15a2679b4d21fa1064986830a52f59c74d82b3bda1aeeea4e77da0)
+    e78584ab7ba9a687285f2849bc0141e2422a5c808ad6ab3558c83d85975e25ed)
 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
@@ -39,11 +39,10 @@ USE_CLANG="${USE_CLANG:-false}"
 export INSTALL_PREFIX=${INSTALL_PREFIX:-"/usr/local"}
 DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)/deps-download}
 
-FB_OS_VERSION="v2024.09.16.00"
+FB_OS_VERSION="v2024.07.01.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 "$@"
@@ -210,12 +209,6 @@ 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_dir fast_float
-}
-
 function install_velox_deps {
   run_and_time install_velox_deps_from_dnf
   run_and_time install_conda
@@ -226,7 +219,6 @@ 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
@@ -42,7 +42,7 @@ BUILD_DUCKDB="${BUILD_DUCKDB:-true}"
 DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)}
 MACOS_VELOX_DEPS="bison flex gflags glog googletest icu4c libevent libsodium lz4 lzo openssl protobuf@21 snappy xz zstd"
 MACOS_BUILD_DEPS="ninja cmake"
-FB_OS_VERSION="v2024.09.16.00"
+FB_OS_VERSION="v2024.07.01.00"
 FMT_VERSION="10.1.1"
 
 function update_brew {
@@ -142,12 +142,6 @@ function install_re2 {
   cmake_install_dir re2 -DRE2_BUILD_TESTING=OFF
 }
 
-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_dir fast_float
-}
-
 function install_duckdb {
   if $BUILD_DUCKDB ; then
     echo 'Building DuckDB'
@@ -162,7 +156,6 @@ function install_velox_deps {
   run_and_time install_double_conversion
   run_and_time install_re2
   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-ubuntu.sh b/scripts/setup-ubuntu.sh
@@ -54,11 +54,10 @@ function install_clang15 {
   ${SUDO} apt install ${CLANG_PACKAGE_LIST} -y
 }
 
-FB_OS_VERSION="v2024.09.16.00"
+FB_OS_VERSION="v2024.07.01.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 {
@@ -223,17 +222,10 @@ 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_dir 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