Skip to content

Commit d1ae64e

Browse files
tarang-jainfacebook-github-bot
authored andcommitted
Updates to faiss-gpu-cuvs nightly pkg (facebookresearch#4032)
Summary: Attempt to resolve existing issues in faiss-gpu-cuvs conda package (changes to conda build github actions). Pull Request resolved: facebookresearch#4032 Reviewed By: junjieqi Differential Revision: D66427909 Pulled By: asadoughi fbshipit-source-id: f2b61219ed62bf8487974a8c9feecc7d1faa6618
1 parent f31f06a commit d1ae64e

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

.github/actions/build_conda/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ runs:
8080
working-directory: conda
8181
run: |
8282
conda build faiss-gpu-cuvs --variants '{ "cudatoolkit": "${{ inputs.cuda }}" }' \
83-
-c pytorch -c nvidia/label/cuda-${{ inputs.cuda }} -c nvidia -c rapidsai -c rapidsai-nightly -c conda-forge
83+
-c pytorch -c rapidsai -c rapidsai-nightly -c conda-forge -c nvidia/label/cuda-${{ inputs.cuda }} -c nvidia
8484
- name: Conda build (GPU w/ cuVS) w/ anaconda upload
8585
if: inputs.label != '' && inputs.cuda != '' && inputs.cuvs != ''
8686
shell: ${{ steps.choose_shell.outputs.shell }}
@@ -89,4 +89,4 @@ runs:
8989
PACKAGE_TYPE: ${{ inputs.label }}
9090
run: |
9191
conda build faiss-gpu-cuvs --variants '{ "cudatoolkit": "${{ inputs.cuda }}" }' \
92-
--user pytorch --label ${{ inputs.label }} -c pytorch -c nvidia/label/cuda-${{ inputs.cuda }} -c nvidia -c rapidsai -c rapidsai-nightly -c conda-forge
92+
--user pytorch --label ${{ inputs.label }} -c pytorch -c rapidsai -c rapidsai-nightly -c conda-forge -c nvidia/label/cuda-${{ inputs.cuda }} -c nvidia

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ jobs:
238238
with:
239239
label: main
240240
cuda: "12.1.1"
241-
linux-x86_64-GPU-CUVS-packages-CUDA12-1-1:
242-
name: Linux x86_64 GPU w/ cuVS packages (CUDA 12.1.1)
241+
linux-x86_64-GPU-CUVS-packages-CUDA12-4-0:
242+
name: Linux x86_64 GPU w/ cuVS packages (CUDA 12.4.0)
243243
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
244244
runs-on: 4-core-ubuntu-gpu-t4
245245
env:
@@ -257,7 +257,7 @@ jobs:
257257
with:
258258
label: main
259259
cuvs: "ON"
260-
cuda: "12.1.1"
260+
cuda: "12.4.0"
261261
windows-x86_64-packages:
262262
name: Windows x86_64 packages
263263
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')

.github/workflows/nightly.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ jobs:
7373
with:
7474
label: nightly
7575
cuda: "12.1.1"
76-
linux-x86_64-GPU-CUVS-CUDA12-1-1-nightly:
77-
name: Linux x86_64 GPU w/ cuVS nightlies (CUDA 12.1.1)
76+
linux-x86_64-GPU-CUVS-CUDA12-4-0-nightly:
77+
name: Linux x86_64 GPU w/ cuVS nightlies (CUDA 12.4.0)
7878
runs-on: 4-core-ubuntu-gpu-t4
7979
env:
8080
CUDA_ARCHS: "70-real;72-real;75-real;80;86-real"
@@ -90,7 +90,7 @@ jobs:
9090
with:
9191
label: nightly
9292
cuvs: "ON"
93-
cuda: "12.1.1"
93+
cuda: "12.4.0"
9494
windows-x86_64-nightly:
9595
name: Windows x86_64 nightlies
9696
runs-on: windows-2019

conda/faiss-gpu-cuvs/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{% if cudatoolkit == '11.8.0' %}
1010
{% set cuda_constraints=">=11.8,<12" %}
1111
{% set libcublas_constraints=">=11.11,<12" %}
12-
{% elif cudatoolkit == '12.1.1' %}
12+
{% elif cudatoolkit == '12.4.0' %}
1313
{% set cuda_constraints=">=12.1,<13" %}
1414
{% set libcublas_constraints=">=12.1,<13" %}
1515
{% endif %}
@@ -48,7 +48,7 @@ outputs:
4848
- {{ compiler('cxx') }}
4949
- sysroot_linux-64 # [linux64]
5050
- llvm-openmp # [osx]
51-
- cmake >=3.24.0
51+
- cmake >=3.26.4
5252
- make # [not win]
5353
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64]
5454
- mkl =2023 # [x86_64]

0 commit comments

Comments
 (0)