Fix CI

facebookincubator · Jun 25, 2024 · 05873c2 · 05873c2
1 parent 2a01741
commit 05873c2
Show file tree

Hide file tree

Showing 7 changed files with 195 additions and 716 deletions.
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -79,7 +79,7 @@ jobs:
             source scripts/setup-centos9.sh
             install_cuda ${CUDA_VERSION}
           fi
-          source scripts/setup-centos8.sh && install_grpc
+          source scripts/setup-centos9.sh && install_grpc
 
       - uses: assignUser/stash/restore@v1
         with:

diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
@@ -200,7 +200,7 @@ jobs:
         env:
           EXTRA_CMAKE_FLAGS: "-DVELOX_ENABLE_ARROW=ON -DVELOX_BUILD_PYTHON_PACKAGE=ON ${{ inputs.extraCMakeFlags }}"
         run: |
-          source scripts/setup-centos8.sh && install_grpc
+          source scripts/setup-centos9.sh && install_grpc
           EXTRA_CMAKE_FLAGS="-DPYTHON_EXECUTABLE=$(which python3) $EXTRA_CMAKE_FLAGS"
           make debug
 

diff --git a/CMake/Findgrpc.cmake b/CMake/Findgrpc.cmake
diff --git a/scripts/setup-centos9.sh b/scripts/setup-centos9.sh
@@ -231,6 +231,60 @@ function install_velox_deps {
   run_and_time install_duckdb
 }
 
+function install_grpc {
+  # abseil-cpp
+  github_checkout abseil/abseil-cpp 20240116.2 --depth 1
+  cmake_install \
+    -DABSL_BUILD_TESTING=OFF \
+    -DCMAKE_CXX_STANDARD=17 \
+    -DABSL_PROPAGATE_CXX_STD=ON \
+    -DABSL_ENABLE_INSTALL=ON
+
+  # protobuf
+  github_checkout protocolbuffers/protobuf v21.8 --depth 1
+  cmake_install \
+    -Dprotobuf_BUILD_TESTS=OFF
+
+  # c-ares
+  github_checkout c-ares/c-ares cares-1_17_2 --depth 1
+  cmake_install \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCARES_STATIC=ON \
+    -DCARES_INSTALL=ON
+
+  # grpc
+  github_checkout grpc/grpc v1.48.1 --depth 1
+  cmake_install \
+    -DgRPC_BUILD_TESTS=OFF \
+    -DgRPC_ABSL_PROVIDER=package \
+    -DgRPC_ZLIB_PROVIDER=package \
+    -DgRPC_CARES_PROVIDER=package \
+    -DgRPC_RE2_PROVIDER=package \
+    -DgRPC_SSL_PROVIDER=package \
+    -DgRPC_PROTOBUF_PROVIDER=package \
+    -DgRPC_INSTALL=ON
+}
+
+# function install_grpc {
+#   git clone https://github.com/grpc/grpc.git --branch v1.50.0 --single-branch
+#   (
+#     cd grpc
+#     git submodule update --init
+#     mkdir -p cmake/build
+#     cd cmake/build
+#     cmake ../.. -DgRPC_INSTALL=ON              \
+#               -DCMAKE_BUILD_TYPE=Release       \
+#               -DgRPC_ABSL_PROVIDER=module      \
+#               -DgRPC_CARES_PROVIDER=module     \
+#               -DgRPC_PROTOBUF_PROVIDER=module  \
+#               -DgRPC_RE2_PROVIDER=package      \
+#               -DgRPC_SSL_PROVIDER=package      \
+#               -DgRPC_ZLIB_PROVIDER=package
+#     make "-j$(nproc)"
+#     $SUDO make install
+#   )
+# }
+
 (return 2> /dev/null) && return # If script was sourced, don't run commands.
 
 (

diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh
@@ -169,25 +169,59 @@ function install_cuda {
 }
 
 function install_grpc {
-  git clone https://github.com/grpc/grpc.git --branch v1.50.0 --single-branch
-  (
-    cd grpc
-    git submodule update --init
-    mkdir -p cmake/build
-    cd cmake/build
-    cmake ../.. -DgRPC_INSTALL=ON              \
-              -DCMAKE_BUILD_TYPE=Release       \
-              -DgRPC_ABSL_PROVIDER=module      \
-              -DgRPC_CARES_PROVIDER=module     \
-              -DgRPC_PROTOBUF_PROVIDER=module  \
-              -DgRPC_RE2_PROVIDER=package      \
-              -DgRPC_SSL_PROVIDER=package      \
-              -DgRPC_ZLIB_PROVIDER=package
-    make "-j$(nproc)"
-    $SUDO make install
-  )
+  # abseil-cpp
+  github_checkout abseil/abseil-cpp 20240116.2 --depth 1
+  cmake_install \
+    -DABSL_BUILD_TESTING=OFF \
+    -DCMAKE_CXX_STANDARD=17 \
+    -DABSL_PROPAGATE_CXX_STD=ON \
+    -DABSL_ENABLE_INSTALL=ON
+
+  # protobuf
+  github_checkout protocolbuffers/protobuf v21.8 --depth 1
+  cmake_install \
+    -Dprotobuf_BUILD_TESTS=OFF
+
+  # c-ares
+  github_checkout c-ares/c-ares cares-1_17_2 --depth 1
+  cmake_install \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCARES_STATIC=ON \
+    -DCARES_INSTALL=ON
+
+  # grpc
+  github_checkout grpc/grpc v1.48.1 --depth 1
+  cmake_install \
+    -DgRPC_BUILD_TESTS=OFF \
+    -DgRPC_ABSL_PROVIDER=package \
+    -DgRPC_ZLIB_PROVIDER=package \
+    -DgRPC_CARES_PROVIDER=package \
+    -DgRPC_RE2_PROVIDER=package \
+    -DgRPC_SSL_PROVIDER=package \
+    -DgRPC_PROTOBUF_PROVIDER=package \
+    -DgRPC_INSTALL=ON
 }
 
+# function install_grpc {
+#   git clone https://github.com/grpc/grpc.git --branch v1.50.0 --single-branch
+#   (
+#     cd grpc
+#     git submodule update --init
+#     mkdir -p cmake/build
+#     cd cmake/build
+#     cmake ../.. -DgRPC_INSTALL=ON              \
+#               -DCMAKE_BUILD_TYPE=Release       \
+#               -DgRPC_ABSL_PROVIDER=module      \
+#               -DgRPC_CARES_PROVIDER=module     \
+#               -DgRPC_PROTOBUF_PROVIDER=module  \
+#               -DgRPC_RE2_PROVIDER=package      \
+#               -DgRPC_SSL_PROVIDER=package      \
+#               -DgRPC_ZLIB_PROVIDER=package
+#     make "-j$(nproc)"
+#     $SUDO make install
+#   )
+# }
+
 function install_velox_deps {
   run_and_time install_velox_deps_from_apt
   run_and_time install_fmt

diff --git a/velox/functions/sparksql/fuzzer/CMakeLists.txt b/velox/functions/sparksql/fuzzer/CMakeLists.txt
@@ -119,7 +119,6 @@ target_link_libraries(
   absl::absl_symbolize
   absl::absl_demangle_internal
   absl::absl_flags_parse
-  absl::absl_flags
   absl::absl_cord_internal
   absl::absl_bad_optional_access
   absl::absl_throw_delegate
@@ -131,6 +130,7 @@ target_link_libraries(
   absl::absl_random_internal_randen_hwaes
   absl::absl_random_internal_randen_slow
   absl::absl_graphcycles_internal
+  absl::absl_kernel_timeout_internal
   absl::absl_base
   absl::absl_malloc_internal
   absl::absl_examine_stack
@@ -144,6 +144,9 @@ target_link_libraries(
   absl::absl_raw_logging_internal
   absl::absl_str_format_internal
   absl::absl_strerror
+  absl::absl_crc_cord_state
+  absl::absl_crc32c
+  absl::absl_crc_internal
   absl::absl_strings
   absl::absl_strings_internal
   absl::absl_raw_hash_set

diff --git a/velox/functions/sparksql/fuzzer/tests/CMakeLists.txt b/velox/functions/sparksql/fuzzer/tests/CMakeLists.txt
@@ -80,7 +80,6 @@ target_link_libraries(
   absl::absl_symbolize
   absl::absl_demangle_internal
   absl::absl_flags_parse
-  absl::absl_flags
   absl::absl_cord_internal
   absl::absl_bad_optional_access
   absl::absl_throw_delegate
@@ -92,6 +91,7 @@ target_link_libraries(
   absl::absl_random_internal_randen_hwaes
   absl::absl_random_internal_randen_slow
   absl::absl_graphcycles_internal
+  absl::absl_kernel_timeout_internal
   absl::absl_base
   absl::absl_malloc_internal
   absl::absl_examine_stack
@@ -105,6 +105,9 @@ target_link_libraries(
   absl::absl_raw_logging_internal
   absl::absl_str_format_internal
   absl::absl_strerror
+  absl::absl_crc_cord_state
+  absl::absl_crc32c
+  absl::absl_crc_internal
   absl::absl_strings
   absl::absl_strings_internal
   absl::absl_raw_hash_set