diff --git a/.github/actions/build_conda/action.yml b/.github/actions/build_conda/action.yml index edbafb7b81..7dff484f2a 100644 --- a/.github/actions/build_conda/action.yml +++ b/.github/actions/build_conda/action.yml @@ -80,7 +80,7 @@ runs: working-directory: conda run: | conda build faiss-gpu-cuvs --variants '{ "cudatoolkit": "${{ inputs.cuda }}" }' \ - -c pytorch -c nvidia/label/cuda-${{ inputs.cuda }} -c nvidia -c rapidsai -c rapidsai-nightly -c conda-forge + -c pytorch -c rapidsai -c rapidsai-nightly -c conda-forge -c nvidia/label/cuda-${{ inputs.cuda }} -c nvidia - name: Conda build (GPU w/ cuVS) w/ anaconda upload if: inputs.label != '' && inputs.cuda != '' && inputs.cuvs != '' shell: ${{ steps.choose_shell.outputs.shell }} @@ -89,4 +89,4 @@ runs: PACKAGE_TYPE: ${{ inputs.label }} run: | conda build faiss-gpu-cuvs --variants '{ "cudatoolkit": "${{ inputs.cuda }}" }' \ - --user pytorch --label ${{ inputs.label }} -c pytorch -c nvidia/label/cuda-${{ inputs.cuda }} -c nvidia -c rapidsai -c rapidsai-nightly -c conda-forge + --user pytorch --label ${{ inputs.label }} -c pytorch -c rapidsai -c rapidsai-nightly -c conda-forge -c nvidia/label/cuda-${{ inputs.cuda }} -c nvidia diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ac1387c438..4d38b583d6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -238,8 +238,8 @@ jobs: with: label: main cuda: "12.1.1" - linux-x86_64-GPU-CUVS-packages-CUDA12-1-1: - name: Linux x86_64 GPU w/ cuVS packages (CUDA 12.1.1) + linux-x86_64-GPU-CUVS-packages-CUDA12-4-0: + name: Linux x86_64 GPU w/ cuVS packages (CUDA 12.4.0) if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') runs-on: 4-core-ubuntu-gpu-t4 env: @@ -257,7 +257,7 @@ jobs: with: label: main cuvs: "ON" - cuda: "12.1.1" + cuda: "12.4.0" windows-x86_64-packages: name: Windows x86_64 packages if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index c3929683b8..ef1e8d2357 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -73,8 +73,8 @@ jobs: with: label: nightly cuda: "12.1.1" - linux-x86_64-GPU-CUVS-CUDA12-1-1-nightly: - name: Linux x86_64 GPU w/ cuVS nightlies (CUDA 12.1.1) + linux-x86_64-GPU-CUVS-CUDA12-4-0-nightly: + name: Linux x86_64 GPU w/ cuVS nightlies (CUDA 12.4.0) runs-on: 4-core-ubuntu-gpu-t4 env: CUDA_ARCHS: "70-real;72-real;75-real;80;86-real" @@ -90,7 +90,7 @@ jobs: with: label: nightly cuvs: "ON" - cuda: "12.1.1" + cuda: "12.4.0" windows-x86_64-nightly: name: Windows x86_64 nightlies runs-on: windows-2019 diff --git a/conda/faiss-gpu-cuvs/meta.yaml b/conda/faiss-gpu-cuvs/meta.yaml index 6c43d19a7c..d37ac56a3c 100644 --- a/conda/faiss-gpu-cuvs/meta.yaml +++ b/conda/faiss-gpu-cuvs/meta.yaml @@ -9,7 +9,7 @@ {% if cudatoolkit == '11.8.0' %} {% set cuda_constraints=">=11.8,<12" %} {% set libcublas_constraints=">=11.11,<12" %} -{% elif cudatoolkit == '12.1.1' %} +{% elif cudatoolkit == '12.4.0' %} {% set cuda_constraints=">=12.1,<13" %} {% set libcublas_constraints=">=12.1,<13" %} {% endif %} @@ -48,7 +48,7 @@ outputs: - {{ compiler('cxx') }} - sysroot_linux-64 # [linux64] - llvm-openmp # [osx] - - cmake >=3.24.0 + - cmake >=3.26.4 - make # [not win] - _openmp_mutex =4.5=2_kmp_llvm # [x86_64] - mkl =2023 # [x86_64]