Skip to content

Commit

Permalink
Revert "Upgrade FBOS dependencies to 2024.09.16.00 (#11018)" (#11079)
Browse files Browse the repository at this point in the history
Summary:
This reverts commit 6d1fbf0.

I validated locally that reverting this commit fixes the velox_functions_remote_client_test failure.
Resolves #11071

Pull Request resolved: #11079

Reviewed By: kgpai

Differential Revision: D63323399

Pulled By: pedroerp

fbshipit-source-id: a239066f542e3b4867add87a5418c81b7fd3020f
  • Loading branch information
majetideepak authored and facebook-github-bot committed Sep 27, 2024
1 parent 28a8979 commit 20b335b
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 84 deletions.
11 changes: 5 additions & 6 deletions CMake/resolve_dependency_modules/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
34 changes: 0 additions & 34 deletions CMake/resolve_dependency_modules/fast_float.cmake

This file was deleted.

6 changes: 2 additions & 4 deletions CMake/resolve_dependency_modules/folly/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
25 changes: 11 additions & 14 deletions CMake/resolve_dependency_modules/folly/folly-gflags-glog.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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})
Expand All @@ -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})
10 changes: 1 addition & 9 deletions scripts/setup-centos9.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.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"
STEMMER_VERSION="2.2.0"

function dnf_install {
Expand Down Expand Up @@ -222,12 +221,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
Expand All @@ -238,7 +231,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
Expand Down
9 changes: 1 addition & 8 deletions scripts/setup-macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
FAST_FLOAT_VERSION="v6.1.6"
STEMMER_VERSION="2.2.0"
Expand Down Expand Up @@ -144,12 +144,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'
Expand All @@ -175,7 +169,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
Expand Down
10 changes: 1 addition & 9 deletions scripts/setup-ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
STEMMER_VERSION="2.2.0"

# Install packages required for build.
Expand Down Expand Up @@ -235,17 +234,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
Expand Down

0 comments on commit 20b335b

Please sign in to comment.