Revert "Upgrade FBOS dependencies to 2024.09.16.00 (#11018)"

This reverts commit 6d1fbf0.
facebookincubator · Sep 26, 2024 · a7336ed · a7336ed
1 parent 362267b
commit a7336ed
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 85 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.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       |
 | libstemmer        | 2.2.0           | Yes      |
 | DuckDB (testing)  | 0.8.1           | Yes      |
 | cpr (testing)     | 1.10.15         | Yes      |

diff --git a/CMake/resolve_dependency_modules/fast_float.cmake b/CMake/resolve_dependency_modules/fast_float.cmake
diff --git a/CMake/resolve_dependency_modules/folly/CMakeLists.txt b/CMake/resolve_dependency_modules/folly/CMakeLists.txt
@@ -14,15 +14,13 @@
 project(Folly)
 cmake_minimum_required(VERSION 3.14)
 
-set(VELOX_FOLLY_BUILD_VERSION v2024.09.16.00)
+set(VELOX_FOLLY_BUILD_VERSION v2024.05.20.00)
 set(VELOX_FOLLY_BUILD_SHA256_CHECKSUM
-    0a375f2f3e15a2679b4d21fa1064986830a52f59c74d82b3bda1aeeea4e77da0)
+    f4a450e59f0b74d1b0b4e5c55ae38e820166c95d02f8a8a298e54a49a90aa057)
 set(VELOX_FOLLY_SOURCE_URL
     "https://github.com/facebook/folly/releases/download/${VELOX_FOLLY_BUILD_VERSION}/folly-${VELOX_FOLLY_BUILD_VERSION}.tar.gz"
 )
 
-set(fast_float_SOURCE BUNDLED)
-resolve_dependency(fast_float)
 resolve_dependency_url(FOLLY)
 
 message(STATUS "Building Folly from source")

diff --git a/CMake/resolve_dependency_modules/folly/folly-gflags-glog.patch b/CMake/resolve_dependency_modules/folly/folly-gflags-glog.patch
@@ -13,10 +13,10 @@
 # limitations under the License.
 --- a/CMake/folly-deps.cmake
 +++ b/CMake/folly-deps.cmake
-@@ -55,19 +55,23 @@ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
- find_package(FastFloat MODULE REQUIRED)
- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${FASTFLOAT_INCLUDE_DIR})
-
+@@ -52,19 +52,20 @@ find_package(DoubleConversion MODULE REQUIRED)
+ list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
+ 
 -find_package(Gflags MODULE)
 -set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND})
 -if(LIBGFLAGS_FOUND)
@@ -27,14 +27,12 @@
 +find_package(gflags)
 +set(FOLLY_HAVE_LIBGFLAGS ${gflags_FOUND})
 +if(gflags_FOUND)
-+ list(APPEND FOLLY_LINK_LIBRARIES ${gflags_LIBRARY})
-+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${gflags_INCLUDE_DIR})
-+ set(FOLLY_LIBGFLAGS_LIBRARY ${gflags_LIBRARY})
-+ set(FOLLY_LIBGFLAGS_INCLUDE ${gflags_INCLUDE_DIR})
-+ message(STATUS "gflags_INCLUDE_DIR: ${gflags_INCLUDE_DIR}")
-+ message(STATUS "gflags_LIBRARY: ${gflags_LIBRARY}")
++  list(APPEND FOLLY_LINK_LIBRARIES ${gflags_LIBRARY})
++  list(APPEND FOLLY_INCLUDE_DIRECTORIES ${gflags_INCLUDE_DIR})
++  set(FOLLY_LIBGFLAGS_LIBRARY ${gflags_LIBRARY})
++  set(FOLLY_LIBGFLAGS_INCLUDE ${gflags_INCLUDE_DIR})
  endif()
-
+ 
 -find_package(Glog MODULE)
 -set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
 -list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY})
@@ -43,8 +41,7 @@
 +set(FOLLY_HAVE_LIBGLOG ${glog_FOUND})
 +list(APPEND FOLLY_LINK_LIBRARIES ${glog_LIBRARY})
 +list(APPEND FOLLY_INCLUDE_DIRECTORIES ${glog_INCLUDE_DIR})
-+message(STATUS "glog_INCLUDE_DIR: ${glog_INCLUDE_DIR}")
-+message(STATUS "glog_LIBRARY: ${glog_LIBRARY}")
-
++message(STATUS "glog_INCLUDE_DIR: ${gflags_LINRARY}")
+
  find_package(LibEvent MODULE REQUIRED)
  list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIB})
diff --git a/scripts/setup-centos9.sh b/scripts/setup-centos9.sh
@@ -31,19 +31,18 @@ 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}"
 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.05.20.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.05.20.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.05.20.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