Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f89710d
Merge pull request #1 from facebookresearch/main
tarang-jain Jun 18, 2024
65d6ebe
Merge branch 'main' of https://github.com/facebookresearch/faiss
tarang-jain Oct 7, 2024
cdcda1a
Merge branch 'main' of https://github.com/facebookresearch/faiss
tarang-jain Oct 18, 2024
61d5629
Merge branch 'main' of https://github.com/facebookresearch/faiss
tarang-jain Nov 16, 2024
51796e5
updates to conda build
tarang-jain Nov 18, 2024
661af9c
Merge branch 'main' into build-conda
tarang-jain Nov 19, 2024
475d859
update nightly build instructions
tarang-jain Nov 19, 2024
3f5be4e
Merge branch 'main' of https://github.com/facebookresearch/faiss into…
tarang-jain Nov 19, 2024
5b22f74
Merge branch 'build-conda' of https://github.com/tarang-jain/faiss in…
tarang-jain Nov 19, 2024
9984189
cudatoolkit key
tarang-jain Nov 24, 2024
b319281
Merge branch 'main' of https://github.com/facebookresearch/faiss into…
tarang-jain Nov 24, 2024
8c60145
ignore: test cuVS w/ CUDA 12.4 `conda build` in PR CI
Nov 26, 2024
b58bb94
point to system installed nvcc
tarang-jain Dec 2, 2024
411e02f
Merge branch 'main' of https://github.com/facebookresearch/faiss into…
tarang-jain Dec 2, 2024
3a40edb
Merge branch 'test_cuvs_conda_ci' of https://github.com/facebookresea…
tarang-jain Dec 2, 2024
9d8f92e
rm nvidia for cuda-nvcc
tarang-jain Dec 6, 2024
d7d4673
rm conflicts
tarang-jain Dec 6, 2024
ad1d694
Merge branch 'main' into build-conda
tarang-jain Dec 10, 2024
91f7879
update workflows
tarang-jain Dec 10, 2024
7f56dec
Merge branch 'main' of https://github.com/facebookresearch/faiss into…
tarang-jain Dec 10, 2024
48487b1
Merge branch 'build-conda' of https://github.com/tarang-jain/faiss in…
tarang-jain Dec 10, 2024
d6129b4
rm which nvcc
tarang-jain Dec 10, 2024
bd2d4ce
pin host cuda-version to cudatoolkit
tarang-jain Dec 10, 2024
a70c8ce
Merge branch 'main' into build-conda
tarang-jain Dec 10, 2024
bdb2a15
rm conda bld CI test
tarang-jain Dec 10, 2024
4701989
Merge branch 'build-conda' of https://github.com/tarang-jain/faiss in…
tarang-jain Dec 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/build_conda/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
2 changes: 1 addition & 1 deletion conda/faiss-gpu-cuvs/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down