Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions conda/faiss-gpu/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions conda/faiss/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down