From 404344c80c66db554ebeb6348dabc53bd18db79b Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Wed, 10 Jul 2024 15:16:24 +0200 Subject: [PATCH 1/4] Revert "ci(grpc): disable ABSEIL tests (#2759)" This reverts commit cbb93bd8ec54305648cfd944d49e09fd9c1a2501. --- .github/workflows/release.yaml | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fa6d84b5c9d6..6a7682d47f62 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -51,17 +51,9 @@ jobs: if: steps.cache-grpc.outputs.cache-hit != 'true' run: | - git clone --recurse-submodules -b ${{ env.GRPC_VERSION }} --depth 1 --shallow-submodules https://github.com/grpc/grpc - GRPC_DIR=$PWD/grpc - echo "include(FetchContent)" >> $GRPC_DIR/CMakeLists.txt - echo "FetchContent_Declare(" >> $GRPC_DIR/CMakeLists.txt - echo " googletest" >> $GRPC_DIR/CMakeLists.txt - echo " URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip" >> $GRPC_DIR/CMakeLists.txt - echo ")" >> $GRPC_DIR/CMakeLists.txt - echo "FetchContent_MakeAvailable(googletest)" >> $GRPC_DIR/CMakeLists.txt - + git clone --recurse-submodules -b ${{ env.GRPC_VERSION }} --depth 1 --shallow-submodules https://github.com/grpc/grpc && \ cd grpc && mkdir -p cmake/build && cd cmake/build && cmake -DgRPC_INSTALL=ON \ - -DgRPC_BUILD_TESTS=OFF -DABSL_BUILD_TESTING=OFF \ + -DgRPC_BUILD_TESTS=OFF \ ../.. && sudo make --jobs 5 --output-sync=target - name: Install gRPC run: | @@ -86,20 +78,11 @@ jobs: echo "set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)" >> $CMAKE_CROSS_TOOLCHAIN GRPC_DIR=$PWD/grpc - # http://google.github.io/googletest/quickstart-cmake.html - # Seems otherwise cross-arch fails to find it - echo "include(FetchContent)" >> $GRPC_DIR/third_party/abseil-cpp/absl/container/CMakeLists.txt - echo "FetchContent_Declare(" >> $GRPC_DIR/third_party/abseil-cpp/absl/container/CMakeLists.txt - echo " googletest" >> $GRPC_DIR/third_party/abseil-cpp/absl/container/CMakeLists.txt - echo " URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip" >> $GRPC_DIR/third_party/abseil-cpp/absl/container/CMakeLists.txt - echo ")" >> $GRPC_DIR/third_party/abseil-cpp/absl/container/CMakeLists.txt - echo "FetchContent_MakeAvailable(googletest)" >> $GRPC_DIR/third_party/abseil-cpp/absl/container/CMakeLists.txt - cd grpc && cd cmake/build && sudo make --jobs 5 --output-sync=target install && \ GRPC_CROSS_BUILD_DIR=$GRPC_DIR/cmake/cross_build && \ mkdir -p $GRPC_CROSS_BUILD_DIR && \ cd $GRPC_CROSS_BUILD_DIR && \ - cmake -DABSL_BUILD_TESTING=OFF -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CROSS_TOOLCHAIN \ + cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CROSS_TOOLCHAIN \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$CROSS_TOOLCHAIN/grpc_install \ ../.. && \ @@ -215,7 +198,7 @@ jobs: run: | git clone --recurse-submodules -b ${{ env.GRPC_VERSION }} --depth 1 --shallow-submodules https://github.com/grpc/grpc && \ cd grpc && mkdir -p cmake/build && cd cmake/build && cmake -DgRPC_INSTALL=ON \ - -DgRPC_BUILD_TESTS=OFF -DABSL_BUILD_TESTING=OFF \ + -DgRPC_BUILD_TESTS=OFF \ ../.. && sudo make --jobs 5 --output-sync=target - name: Install gRPC run: | From a00c07c93d7090fa0b41feca24e24a5f3c10a9b8 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Wed, 10 Jul 2024 15:16:34 +0200 Subject: [PATCH 2/4] Revert "fix: arm builds via disabling abseil tests (#2758)" This reverts commit 8d046de287eaf85f8b80816175363fbbcacfd73a. --- .github/workflows/release.yaml | 9 +++++++++ Makefile | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 6a7682d47f62..86d609210588 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -78,6 +78,15 @@ jobs: echo "set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)" >> $CMAKE_CROSS_TOOLCHAIN GRPC_DIR=$PWD/grpc + # http://google.github.io/googletest/quickstart-cmake.html + # Seems otherwise cross-arch fails to find it + echo "include(FetchContent)" >> $GRPC_DIR/CMakeLists.txt + echo "FetchContent_Declare(" >> $GRPC_DIR/CMakeLists.txt + echo " googletest" >> $GRPC_DIR/CMakeLists.txt + echo " URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip" >> $GRPC_DIR/CMakeLists.txt + echo ")" >> $GRPC_DIR/CMakeLists.txt + echo "FetchContent_MakeAvailable(googletest)" >> $GRPC_DIR/CMakeLists.txt + cd grpc && cd cmake/build && sudo make --jobs 5 --output-sync=target install && \ GRPC_CROSS_BUILD_DIR=$GRPC_DIR/cmake/cross_build && \ mkdir -p $GRPC_CROSS_BUILD_DIR && \ diff --git a/Makefile b/Makefile index 2a4df26a5ce7..65151a6f6549 100644 --- a/Makefile +++ b/Makefile @@ -701,7 +701,6 @@ backend/cpp/llama/llama.cpp: INSTALLED_PACKAGES=$(CURDIR)/backend/cpp/grpc/installed_packages INSTALLED_LIB_CMAKE=$(INSTALLED_PACKAGES)/lib/cmake ADDED_CMAKE_ARGS=-Dabsl_DIR=${INSTALLED_LIB_CMAKE}/absl \ - -DABSL_BUILD_TESTING=OFF \ -DProtobuf_DIR=${INSTALLED_LIB_CMAKE}/protobuf \ -Dutf8_range_DIR=${INSTALLED_LIB_CMAKE}/utf8_range \ -DgRPC_DIR=${INSTALLED_LIB_CMAKE}/grpc \ From 67898557d00255e8bea5456091207258bf4c124b Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Wed, 10 Jul 2024 15:16:44 +0200 Subject: [PATCH 3/4] Revert "ci(arm64): fix gRPC build by adding googletest to CMakefile (#2754)" This reverts commit 401ee553f428c03a3a2650e2c8b34b23c1ca6854. --- .github/workflows/release.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 86d609210588..b8cc9305baf7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -77,16 +77,6 @@ jobs: echo "set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)" >> $CMAKE_CROSS_TOOLCHAIN && \ echo "set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)" >> $CMAKE_CROSS_TOOLCHAIN GRPC_DIR=$PWD/grpc - - # http://google.github.io/googletest/quickstart-cmake.html - # Seems otherwise cross-arch fails to find it - echo "include(FetchContent)" >> $GRPC_DIR/CMakeLists.txt - echo "FetchContent_Declare(" >> $GRPC_DIR/CMakeLists.txt - echo " googletest" >> $GRPC_DIR/CMakeLists.txt - echo " URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip" >> $GRPC_DIR/CMakeLists.txt - echo ")" >> $GRPC_DIR/CMakeLists.txt - echo "FetchContent_MakeAvailable(googletest)" >> $GRPC_DIR/CMakeLists.txt - cd grpc && cd cmake/build && sudo make --jobs 5 --output-sync=target install && \ GRPC_CROSS_BUILD_DIR=$GRPC_DIR/cmake/cross_build && \ mkdir -p $GRPC_CROSS_BUILD_DIR && \ From f5b9da8855bb5ddc2c1848cd5dea082f78e0e28b Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Wed, 10 Jul 2024 15:18:56 +0200 Subject: [PATCH 4/4] ci(gmock): install libgmock-dev Signed-off-by: Ettore Di Giacinto --- .github/workflows/release.yaml | 4 ++-- .github/workflows/test.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b8cc9305baf7..3aa8736a4944 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -32,7 +32,7 @@ jobs: run: | sudo apt-get update sudo apt-get install build-essential ffmpeg protobuf-compiler ccache gawk - sudo apt-get install -qy binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu g++-aarch64-linux-gnu + sudo apt-get install -qy binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libgmock-dev - name: Install CUDA Dependencies run: | curl -O https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/cross-linux-aarch64/cuda-keyring_1.1-1_all.deb @@ -146,7 +146,7 @@ jobs: - name: Dependencies run: | sudo apt-get update - sudo apt-get install -y wget curl build-essential ffmpeg protobuf-compiler ccache gawk cmake + sudo apt-get install -y wget curl build-essential ffmpeg protobuf-compiler ccache gawk cmake libgmock-dev - name: Intel Dependencies run: | wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0d102563470e..a7023933cc01 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -71,6 +71,7 @@ jobs: run: | sudo apt-get update sudo apt-get install build-essential curl ffmpeg + sudo apt-get install -y libgmock-dev curl https://repo.anaconda.com/pkgs/misc/gpgkeys/anaconda.asc | gpg --dearmor > conda.gpg && \ sudo install -o root -g root -m 644 conda.gpg /usr/share/keyrings/conda-archive-keyring.gpg && \ gpg --keyring /usr/share/keyrings/conda-archive-keyring.gpg --no-default-keyring --fingerprint 34161F5BF5EB1D4BFBBB8F0A8AEB4F8B29D82806 && \