Merge gpu build into adapters

rivosinc · Apr 3, 2024 · e017dc4 · e017dc4
1 parent 2c7159d
commit e017dc4
Showing 1 changed file with 6 additions and 67 deletions.
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -57,6 +57,9 @@ jobs:
       VELOX_DEPENDENCY_SOURCE: SYSTEM
       simdjson_SOURCE: BUNDLED
       xsimd_SOURCE: BUNDLED
+    strategy:
+      matrix:
+        cuda-version: ["11.8", "12.4"]
     steps:
       - uses: actions/checkout@v4
 
@@ -77,6 +80,8 @@ jobs:
       - name: Make Release Build
         env:
           MAKEFLAGS: 'NUM_THREADS=8 MAX_HIGH_MEM_JOBS=4 MAX_LINK_JOBS=4'
+          CUDA_ARCHITECTURES: 60
+          CUDA_COMPILER: /usr/local/cuda-${{ matrix.cuda-version }}/bin/nvcc
         run: |
           EXTRA_CMAKE_FLAGS=(
             "-DVELOX_ENABLE_BENCHMARKS=ON"
@@ -88,6 +93,7 @@ jobs:
             "-DVELOX_ENABLE_ABFS=ON"
             "-DVELOX_ENABLE_SUBSTRAIT=ON"
             "-DVELOX_ENABLE_REMOTE_FUNCTIONS=ON"
+            "-DVELOX_ENABLE_GPU=ON"
           )
           make release EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS[*]}"
     
@@ -163,70 +169,3 @@ jobs:
         run: |
           cd _build/debug && ctest -j 8 --output-on-failure --no-tests=error
 
-  gpu:
-    runs-on: 8-core
-    name: "Linux release with GPU support"
-    container: ghcr.io/facebookincubator/velox-dev:adapters
-    defaults:
-      run:
-        shell: bash
-    env:
-      CCACHE_DIR: "/__w/velox/velox/.ccache"
-      VELOX_DEPENDENCY_SOURCE: SYSTEM
-      simdjson_SOURCE: BUNDLED
-      xsimd_SOURCE: BUNDLED
-    strategy:
-      matrix:
-        cuda-version: ["11.8", "12.4"]
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Fix git permissions
-        # Usually actions/checkout does this but as we run in a container
-        # it doesn't work
-        run: git config --global --add safe.directory /__w/velox/velox
-
-      - uses: assignUser/stash/restore@v1
-        with:
-          path: '${{ env.CCACHE_DIR }}'
-          key: ccache-linux-adapters
-
-      - name: "Zero Ccache Statistics"
-        run: |
-          ccache -sz
-
-      - name: Install CUDA
-        run: |
-          # Allows to install arbitrary cuda-version whithout needing to update
-          # docker container before. It simplifies testing new/different versions
-          if ! yum list installed cuda-nvcc-$(echo ${{ matrix.cuda-version }} | tr '.' '-') 1>/dev/null; then
-            source scripts/setup-centos8.sh
-            install_cuda ${{ matrix.cuda-version }}
-          fi
-
-      - name: Make Release Build
-        env:
-          MAKEFLAGS: 'NUM_THREADS=8 MAX_HIGH_MEM_JOBS=4 MAX_LINK_JOBS=4'
-          CUDA_ARCHITECTURES: 60
-          CUDA_COMPILER: /usr/local/cuda-${{ matrix.cuda-version }}/bin/nvcc
-        run: |
-          EXTRA_CMAKE_FLAGS=(
-            "-DVELOX_ENABLE_BENCHMARKS=ON"
-            "-DVELOX_ENABLE_ARROW=ON"
-            "-DVELOX_ENABLE_PARQUET=ON"
-            "-DVELOX_ENABLE_HDFS=ON"
-            "-DVELOX_ENABLE_S3=ON"
-            "-DVELOX_ENABLE_GCS=ON"
-            "-DVELOX_ENABLE_ABFS=ON"
-            "-DVELOX_ENABLE_SUBSTRAIT=ON"
-            "-DVELOX_ENABLE_REMOTE_FUNCTIONS=ON"
-          )
-          make gpu EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS[*]}"
-
-      - name: Ccache after
-        run: ccache -s
-
-      - uses: assignUser/stash/save@v1
-        with:
-          path: '${{ env.CCACHE_DIR }}'
-          key: ccache-linux-adapters