move cuda arch to env var in build.yml and set label and env var

robandpdx-org · Mar 27, 2024 · 3cc4dde · 3cc4dde
1 parent 413b728
commit 3cc4dde
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/.github/actions/build_conda/action.yml b/.github/actions/build_conda/action.yml
@@ -13,10 +13,6 @@ inputs:
     description: "raft"
     default: ""
     required: false
-  cuda_archs:
-    description: "cuda_archs"
-    default: ""
-    required: false
   compiler_version:
     description: "compiler_version"
     default: ""
@@ -49,6 +45,8 @@ runs:
     - name: Enable anaconda uploads
       if: inputs.label != ''
       shell: ${{ steps.choose_shell.outputs.shell }}
+      env:
+        PACKAGE_TYPE: inputs.label
       run: |
         conda install -y -q anaconda-client
         conda config --set anaconda_upload yes
@@ -62,6 +60,8 @@ runs:
       if: inputs.label != '' && inputs.cuda == ''
       shell: ${{ steps.choose_shell.outputs.shell }}
       working-directory: conda
+      env:
+        PACKAGE_TYPE: inputs.label
       run: |
         conda build faiss --user pytorch --label ${{ inputs.label }} -c pytorch
     - name: Conda build (GPU)
@@ -75,6 +75,8 @@ runs:
       if: inputs.label != '' && inputs.cuda != '' && inputs.raft == ''
       shell: ${{ steps.choose_shell.outputs.shell }}
       working-directory: conda
+      env:
+        PACKAGE_TYPE: inputs.label
       run: |
         conda build faiss-gpu --variants '{ "cudatoolkit": "${{ inputs.cuda }}", "c_compiler_version": "${{ inputs.compiler_version }}", "cxx_compiler_version": "${{ inputs.compiler_version }}" }' \
             --user pytorch --label ${{ inputs.label }} -c pytorch -c nvidia/label/cuda-${{ inputs.cuda }} -c nvidia
@@ -89,6 +91,8 @@ runs:
       if: inputs.label != '' && inputs.cuda != '' && inputs.raft != ''
       shell: ${{ steps.choose_shell.outputs.shell }}
       working-directory: conda
+      env:
+        PACKAGE_TYPE: inputs.label
       run: |
         conda build faiss-gpu-raft --variants '{ "cudatoolkit": "${{ inputs.cuda }}", "c_compiler_version": "${{ inputs.compiler_version }}", "cxx_compiler_version": "${{ inputs.compiler_version }}" }' \
             --user pytorch --label ${{ inputs.label }} -c pytorch -c nvidia/label/cuda-${{ inputs.cuda }} -c nvidia -c rapidsai -c rapidsai-nightly -c conda-forge
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -102,18 +102,21 @@ jobs:
   linux-x86_64-GPU-packages-CUDA-11-4-4:
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     runs-on: 4-core-gpu
+    env:
+      CUDA_ARCHS: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
     steps:
       - name: Checkout
         uses: actions/[email protected]
       - uses: ./.github/actions/build_conda
         with:
           label: main
           cuda: "11.4.4"
-          cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
           compiler_version: "11.2"
   linux-x86_64-GPU-RAFT-packages-CUDA11-8-0:
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     runs-on: 4-core-gpu
+    env:
+      CUDA_ARCHS: "70-real;72-real;75-real;80;86-real"
     steps:
       - name: Checkout
         uses: actions/[email protected]
@@ -122,23 +125,25 @@ jobs:
           label: main
           raft: "ON"
           cuda: "11.8.0"
-          cuda_archs: "70-real;72-real;75-real;80;86-real"
           compiler_version: "11.2"
   linux-x86_64-GPU-packages-CUDA-12-1-1:
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     runs-on: 4-core-gpu
+    env:
+      CUDA_ARCHS: "70-real;72-real;75-real;80;86-real"
     steps:
       - name: Checkout
         uses: actions/[email protected]
       - uses: ./.github/actions/build_conda
         with:
           label: main
           cuda: "12.1.1"
-          cuda_archs: "70-real;72-real;75-real;80;86-real"
           compiler_version: "11.2"
   linux-x86_64-GPU-RAFT-packages-CUDA12-1-1:
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     runs-on: 4-core-gpu
+    env:
+      CUDA_ARCHS: "70-real;72-real;75-real;80;86-real"
     steps:
       - name: Checkout
         uses: actions/[email protected]
@@ -147,7 +152,6 @@ jobs:
           label: main
           raft: "ON"
           cuda: "12.1.1"
-          cuda_archs: "70-real;72-real;75-real;80;86-real"
           compiler_version: "11.2"
   windows-x86_64-packages:
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')