diff --git a/.circleci/config.yml b/.circleci/config.yml index 9596386685..c7d8d03230 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -176,7 +176,7 @@ jobs: name: Set up environment command: | conda update -y -q conda - conda install -y -q cmake=3.23.1 make swig mkl=2021 mkl-devel=2021 numpy scipy pytest gxx_linux-64 sysroot_linux-64=2.17 -c pkgs/main -c conda-forge + conda install -y -q 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 - run: name: Build all targets no_output_timeout: 30m diff --git a/conda/faiss-gpu/meta.yaml b/conda/faiss-gpu/meta.yaml index 5d6fc2d290..2192d1b311 100644 --- a/conda/faiss-gpu/meta.yaml +++ b/conda/faiss-gpu/meta.yaml @@ -40,12 +40,12 @@ outputs: - llvm-openmp # [osx] - cmake =3.23.1 - make # [not win] - - mkl-devel =2021 + - mkl-devel =2023 host: - - mkl =2021 + - mkl =2023 - cudatoolkit {{ cudatoolkit }} run: - - mkl >=2021 + - mkl =2023 - {{ pin_compatible('cudatoolkit', max_pin='x.x') }} test: requires: diff --git a/conda/faiss/meta.yaml b/conda/faiss/meta.yaml index ba32878cad..3c0ac9781d 100644 --- a/conda/faiss/meta.yaml +++ b/conda/faiss/meta.yaml @@ -37,15 +37,15 @@ outputs: build: - {{ compiler('cxx') }} - sysroot_linux-64 =2.17 # [linux64] - - llvm-openmp # [osx] - cmake =3.23.1 - make # [not win] - - mkl-devel =2021 # [x86_64] - - openblas # [not x86_64] + - mkl-devel =2023 # [x86_64] host: - - mkl =2021 # [x86_64] + - mkl =2023 # [x86_64] + - openblas # [not x86_64] run: - - mkl >=2021 # [win] + - mkl =2023 # [x86_64] + - openblas # [not x86_64] test: requires: - conda-build