diff --git a/.circleci/config.yml b/.circleci/config.yml index acf7026d08..976d090ac8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -178,8 +178,17 @@ jobs: - run: name: Set up environment command: | + conda config --set solver libmamba conda update -y -q conda - 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 + 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 + - when: + condition: + equal: [ "ON", << parameters.raft >> ] + steps: + - run: + name: Install libraft + command: | + conda install -y -q libraft cudatoolkit=11.4 -c rapidsai-nightly -c nvidia -c pkgs/main -c conda-forge - run: name: Build all targets no_output_timeout: 30m diff --git a/conda/faiss-gpu/meta.yaml b/conda/faiss-gpu/meta.yaml index a3daa44bc9..034ff30120 100644 --- a/conda/faiss-gpu/meta.yaml +++ b/conda/faiss-gpu/meta.yaml @@ -40,7 +40,7 @@ outputs: - {{ compiler('cxx') }} - sysroot_linux-64 =2.17 # [linux64] - llvm-openmp # [osx] - - cmake =3.23.1 + - cmake >=3.23.1 - make # [not win] - mkl-devel =2023 # [x86_64] host: @@ -71,7 +71,7 @@ outputs: - {{ compiler('cxx') }} - sysroot_linux-64 =2.17 # [linux64] - swig - - cmake =3.23.1 + - cmake >=3.23.1 - make # [not win] host: - python {{ python }} diff --git a/conda/faiss/meta.yaml b/conda/faiss/meta.yaml index 988bd57d5c..0e430785b9 100644 --- a/conda/faiss/meta.yaml +++ b/conda/faiss/meta.yaml @@ -39,7 +39,7 @@ outputs: - {{ compiler('cxx') }} - sysroot_linux-64 =2.17 # [linux64] - llvm-openmp # [osx] - - cmake =3.23.1 + - cmake >=3.23.1 - make # [not win] - mkl-devel =2023 # [x86_64] host: @@ -69,7 +69,7 @@ outputs: - {{ compiler('cxx') }} - sysroot_linux-64 =2.17 # [linux64] - swig - - cmake =3.23.1 + - cmake >=3.23.1 - make # [not win] host: - python {{ python }}