From f5cd7d009f38b815d5b58cc479bea631ba01873d Mon Sep 17 00:00:00 2001 From: Tarang Jain Date: Tue, 10 Dec 2024 14:57:35 -0800 Subject: [PATCH] Resolve Packaging Issues (#4044) Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/4044 Reviewed By: junjieqi, ramilbakhshyiev Differential Revision: D67034775 Pulled By: asadoughi fbshipit-source-id: 6e1edbecd0526a01d2deb6d4609b469f0ed6e9fd --- .github/actions/build_conda/action.yml | 4 ++-- conda/faiss-gpu-cuvs/meta.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/build_conda/action.yml b/.github/actions/build_conda/action.yml index 7dff484f2a..bf84a38496 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 rapidsai -c rapidsai-nightly -c conda-forge -c nvidia/label/cuda-${{ inputs.cuda }} -c nvidia + -c pytorch -c rapidsai -c rapidsai-nightly -c conda-forge - 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 rapidsai -c rapidsai-nightly -c conda-forge -c nvidia/label/cuda-${{ inputs.cuda }} -c nvidia + --user pytorch --label ${{ inputs.label }} -c pytorch -c rapidsai -c rapidsai-nightly -c conda-forge diff --git a/conda/faiss-gpu-cuvs/meta.yaml b/conda/faiss-gpu-cuvs/meta.yaml index d37ac56a3c..e32099085e 100644 --- a/conda/faiss-gpu-cuvs/meta.yaml +++ b/conda/faiss-gpu-cuvs/meta.yaml @@ -59,7 +59,7 @@ outputs: - mkl =2023 # [x86_64] - openblas # [not x86_64] - libcuvs =24.08 - - cuda-version {{ cuda_constraints }} + - cuda-version {{ cudatoolkit }} run: - _openmp_mutex =4.5=2_kmp_llvm # [x86_64] - mkl =2023 # [x86_64]