Skip to content

Commit 726143d

Browse files
algoriddlefacebook-github-bot
authored andcommitted
install libraft for cmake build (facebookresearch#2968)
Summary: Pull Request resolved: facebookresearch#2968 Reviewed By: mlomeli1, mdouze Differential Revision: D47677660 Pulled By: algoriddle fbshipit-source-id: 8fad8323ea3c0a264149c76fc9519d9c63346d00
1 parent 821a401 commit 726143d

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

.circleci/config.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,17 @@ jobs:
178178
- run:
179179
name: Set up environment
180180
command: |
181+
conda config --set solver libmamba
181182
conda update -y -q conda
182-
conda install -y -q pkgs/main::python=3.10 cmake=3.23.1 make swig mkl=2023 mkl-devel=2023 numpy scipy pytest gxx_linux-64 sysroot_linux-64=2.17 -c pkgs/main -c conda-forge
183+
conda install -y -q pkgs/main::python=3.10 cmake make swig mkl=2023 mkl-devel=2023 numpy scipy pytest gxx_linux-64 sysroot_linux-64 -c pkgs/main -c conda-forge
184+
- when:
185+
condition:
186+
equal: [ "ON", << parameters.raft >> ]
187+
steps:
188+
- run:
189+
name: Install libraft
190+
command: |
191+
conda install -y -q libraft cudatoolkit=11.4 -c rapidsai-nightly -c nvidia -c pkgs/main -c conda-forge
183192
- run:
184193
name: Build all targets
185194
no_output_timeout: 30m

conda/faiss-gpu/meta.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ outputs:
4040
- {{ compiler('cxx') }}
4141
- sysroot_linux-64 =2.17 # [linux64]
4242
- llvm-openmp # [osx]
43-
- cmake =3.23.1
43+
- cmake >=3.23.1
4444
- make # [not win]
4545
- mkl-devel =2023 # [x86_64]
4646
host:
@@ -71,7 +71,7 @@ outputs:
7171
- {{ compiler('cxx') }}
7272
- sysroot_linux-64 =2.17 # [linux64]
7373
- swig
74-
- cmake =3.23.1
74+
- cmake >=3.23.1
7575
- make # [not win]
7676
host:
7777
- python {{ python }}

conda/faiss/meta.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ outputs:
3939
- {{ compiler('cxx') }}
4040
- sysroot_linux-64 =2.17 # [linux64]
4141
- llvm-openmp # [osx]
42-
- cmake =3.23.1
42+
- cmake >=3.23.1
4343
- make # [not win]
4444
- mkl-devel =2023 # [x86_64]
4545
host:
@@ -69,7 +69,7 @@ outputs:
6969
- {{ compiler('cxx') }}
7070
- sysroot_linux-64 =2.17 # [linux64]
7171
- swig
72-
- cmake =3.23.1
72+
- cmake >=3.23.1
7373
- make # [not win]
7474
host:
7575
- python {{ python }}

0 commit comments

Comments
 (0)