From c16932c1ddb00d5972974af1da34d7630b7c2f05 Mon Sep 17 00:00:00 2001 From: Gergely Szilvasy Date: Tue, 9 May 2023 04:31:09 -0700 Subject: [PATCH 1/7] try to pin mkl --- conda/faiss-gpu/meta.yaml | 2 ++ conda/faiss/meta.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/conda/faiss-gpu/meta.yaml b/conda/faiss-gpu/meta.yaml index 5d6fc2d290..dd709b26c9 100644 --- a/conda/faiss-gpu/meta.yaml +++ b/conda/faiss-gpu/meta.yaml @@ -50,6 +50,7 @@ outputs: test: requires: - conda-build + - mkl =2021 commands: - test -f $PREFIX/lib/libfaiss.so # [linux] - test -f $PREFIX/lib/libfaiss.dylib # [osx] @@ -80,6 +81,7 @@ outputs: - numpy - scipy - pytorch + - mkl =2021 commands: - python -X faulthandler -m unittest discover -v -s tests/ -p "test_*" - python -X faulthandler -m unittest discover -v -s tests/ -p "torch_*" diff --git a/conda/faiss/meta.yaml b/conda/faiss/meta.yaml index ba32878cad..adb841c56a 100644 --- a/conda/faiss/meta.yaml +++ b/conda/faiss/meta.yaml @@ -49,6 +49,7 @@ outputs: test: requires: - conda-build + - mkl =2021 commands: - test -f $PREFIX/lib/libfaiss$SHLIB_EXT # [not win] - test -f $PREFIX/lib/libfaiss_avx2$SHLIB_EXT # [x86_64 and not win] @@ -81,6 +82,7 @@ outputs: - numpy - scipy - pytorch + - mkl =2021 commands: - python -X faulthandler -m unittest discover -v -s tests/ -p "test_*" - python -X faulthandler -m unittest discover -v -s tests/ -p "torch_*" From bac70b2c02b0965d387b6357619fd148a0f55f7f Mon Sep 17 00:00:00 2001 From: Gergely Szilvasy Date: Tue, 9 May 2023 06:59:53 -0700 Subject: [PATCH 2/7] take #2 --- conda/faiss-gpu/meta.yaml | 7 ++----- conda/faiss/meta.yaml | 7 +++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/conda/faiss-gpu/meta.yaml b/conda/faiss-gpu/meta.yaml index dd709b26c9..ac92f2769f 100644 --- a/conda/faiss-gpu/meta.yaml +++ b/conda/faiss-gpu/meta.yaml @@ -40,17 +40,15 @@ outputs: - llvm-openmp # [osx] - cmake =3.23.1 - make # [not win] - - mkl-devel =2021 - host: - mkl =2021 + - mkl-devel =2021 - cudatoolkit {{ cudatoolkit }} run: - - mkl >=2021 + - mkl =2021 - {{ pin_compatible('cudatoolkit', max_pin='x.x') }} test: requires: - conda-build - - mkl =2021 commands: - test -f $PREFIX/lib/libfaiss.so # [linux] - test -f $PREFIX/lib/libfaiss.dylib # [osx] @@ -81,7 +79,6 @@ outputs: - numpy - scipy - pytorch - - mkl =2021 commands: - python -X faulthandler -m unittest discover -v -s tests/ -p "test_*" - python -X faulthandler -m unittest discover -v -s tests/ -p "torch_*" diff --git a/conda/faiss/meta.yaml b/conda/faiss/meta.yaml index adb841c56a..2bee30615f 100644 --- a/conda/faiss/meta.yaml +++ b/conda/faiss/meta.yaml @@ -40,12 +40,12 @@ outputs: - llvm-openmp # [osx] - cmake =3.23.1 - make # [not win] + - mkl =2021 # [x86_64] - mkl-devel =2021 # [x86_64] - openblas # [not x86_64] - host: - - mkl =2021 # [x86_64] run: - - mkl >=2021 # [win] + - mkl =2021 # [x86_64] + - openblas # [not x86_64] test: requires: - conda-build @@ -82,7 +82,6 @@ outputs: - numpy - scipy - pytorch - - mkl =2021 commands: - python -X faulthandler -m unittest discover -v -s tests/ -p "test_*" - python -X faulthandler -m unittest discover -v -s tests/ -p "torch_*" From fc22600a458e1039c5149cf54a3d8e74f8c48d70 Mon Sep 17 00:00:00 2001 From: Gergely Szilvasy Date: Tue, 9 May 2023 08:14:09 -0700 Subject: [PATCH 3/7] try 2023 --- .circleci/config.yml | 2 +- conda/faiss-gpu/meta.yaml | 7 ++++--- conda/faiss/meta.yaml | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) 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 ac92f2769f..2192d1b311 100644 --- a/conda/faiss-gpu/meta.yaml +++ b/conda/faiss-gpu/meta.yaml @@ -40,11 +40,12 @@ outputs: - llvm-openmp # [osx] - cmake =3.23.1 - make # [not win] - - mkl =2021 - - mkl-devel =2021 + - mkl-devel =2023 + host: + - 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 2bee30615f..1c97207d6b 100644 --- a/conda/faiss/meta.yaml +++ b/conda/faiss/meta.yaml @@ -40,16 +40,16 @@ outputs: - llvm-openmp # [osx] - cmake =3.23.1 - make # [not win] - - mkl =2021 # [x86_64] - - mkl-devel =2021 # [x86_64] + - mkl-devel =2023 # [x86_64] - openblas # [not x86_64] + host: + - mkl =2023 # [x86_64] run: - - mkl =2021 # [x86_64] + - mkl =2023 # [x86_64] - openblas # [not x86_64] test: requires: - conda-build - - mkl =2021 commands: - test -f $PREFIX/lib/libfaiss$SHLIB_EXT # [not win] - test -f $PREFIX/lib/libfaiss_avx2$SHLIB_EXT # [x86_64 and not win] From a6760fa360c1d8960affb4de0291110318cf4c83 Mon Sep 17 00:00:00 2001 From: Gergely Szilvasy Date: Tue, 9 May 2023 08:57:54 -0700 Subject: [PATCH 4/7] osx openmp + openblas consisntecy --- conda/faiss-gpu/meta.yaml | 1 - conda/faiss/meta.yaml | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/conda/faiss-gpu/meta.yaml b/conda/faiss-gpu/meta.yaml index 2192d1b311..9e80d23fd5 100644 --- a/conda/faiss-gpu/meta.yaml +++ b/conda/faiss-gpu/meta.yaml @@ -37,7 +37,6 @@ outputs: build: - {{ compiler('cxx') }} - sysroot_linux-64 =2.17 # [linux64] - - llvm-openmp # [osx] - cmake =3.23.1 - make # [not win] - mkl-devel =2023 diff --git a/conda/faiss/meta.yaml b/conda/faiss/meta.yaml index 1c97207d6b..3c0ac9781d 100644 --- a/conda/faiss/meta.yaml +++ b/conda/faiss/meta.yaml @@ -37,13 +37,12 @@ outputs: build: - {{ compiler('cxx') }} - sysroot_linux-64 =2.17 # [linux64] - - llvm-openmp # [osx] - cmake =3.23.1 - make # [not win] - mkl-devel =2023 # [x86_64] - - openblas # [not x86_64] host: - mkl =2023 # [x86_64] + - openblas # [not x86_64] run: - mkl =2023 # [x86_64] - openblas # [not x86_64] From ea3eb58653caa5d8aae5f28a156c7c1c780c2129 Mon Sep 17 00:00:00 2001 From: Gergely Szilvasy Date: Tue, 9 May 2023 09:24:02 -0700 Subject: [PATCH 5/7] try 2021 again --- .circleci/config.yml | 2 +- conda/faiss-gpu/meta.yaml | 7 ++++--- conda/faiss/meta.yaml | 7 ++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c7d8d03230..9596386685 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=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 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 - run: name: Build all targets no_output_timeout: 30m diff --git a/conda/faiss-gpu/meta.yaml b/conda/faiss-gpu/meta.yaml index 9e80d23fd5..d15576f39d 100644 --- a/conda/faiss-gpu/meta.yaml +++ b/conda/faiss-gpu/meta.yaml @@ -37,14 +37,15 @@ outputs: build: - {{ compiler('cxx') }} - sysroot_linux-64 =2.17 # [linux64] + - llvm-openmp # [osx] - cmake =3.23.1 - make # [not win] - - mkl-devel =2023 + - mkl-devel =2021 host: - - mkl =2023 + - mkl =2021 - cudatoolkit {{ cudatoolkit }} run: - - mkl =2023 + - mkl =2021 - {{ pin_compatible('cudatoolkit', max_pin='x.x') }} test: requires: diff --git a/conda/faiss/meta.yaml b/conda/faiss/meta.yaml index 3c0ac9781d..fad8e41e62 100644 --- a/conda/faiss/meta.yaml +++ b/conda/faiss/meta.yaml @@ -37,14 +37,15 @@ outputs: build: - {{ compiler('cxx') }} - sysroot_linux-64 =2.17 # [linux64] + - llvm-openmp # [osx] - cmake =3.23.1 - make # [not win] - - mkl-devel =2023 # [x86_64] + - mkl-devel =2021 # [x86_64] host: - - mkl =2023 # [x86_64] + - mkl =2021 # [x86_64] - openblas # [not x86_64] run: - - mkl =2023 # [x86_64] + - mkl =2021 # [x86_64] - openblas # [not x86_64] test: requires: From c0405050572ec91952d50e3dd5ebc55ebb2e70d0 Mon Sep 17 00:00:00 2001 From: Gergely Szilvasy Date: Tue, 9 May 2023 10:21:38 -0700 Subject: [PATCH 6/7] intel channel --- .circleci/config.yml | 8 ++++---- conda/faiss-gpu/meta.yaml | 6 +++--- conda/faiss/meta.yaml | 7 +++---- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9596386685..2a860eb5a4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -112,7 +112,7 @@ jobs: no_output_timeout: 30m command: | cd conda - conda build faiss --python 3.10 -c pytorch -c pkgs/main -c conda-forge + conda build faiss --python 3.10 -c pytorch -c intel -c pkgs/main -c conda-forge - when: condition: and: @@ -124,7 +124,7 @@ jobs: no_output_timeout: 30m command: | cd conda - conda build faiss --user pytorch --label <> -c pytorch -c pkgs/main -c conda-forge + conda build faiss --user pytorch --label <> -c pytorch -c intel -c pkgs/main -c conda-forge - when: condition: and: @@ -138,7 +138,7 @@ jobs: sudo update-alternatives --set cuda /usr/local/cuda-<> cd conda conda build faiss-gpu --variants '{ "cudatoolkit": "<>", "c_compiler_version": "<>", "cxx_compiler_version": "<>" }' \ - --user pytorch --label <> -c pytorch -c nvidia -c pkgs/main -c conda-forge + --user pytorch --label <> -c pytorch -c nvidia -c intel -c pkgs/main -c conda-forge build_cmake: parameters: @@ -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 intel -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 d15576f39d..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 fad8e41e62..3c0ac9781d 100644 --- a/conda/faiss/meta.yaml +++ b/conda/faiss/meta.yaml @@ -37,15 +37,14 @@ 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] + - mkl-devel =2023 # [x86_64] host: - - mkl =2021 # [x86_64] + - mkl =2023 # [x86_64] - openblas # [not x86_64] run: - - mkl =2021 # [x86_64] + - mkl =2023 # [x86_64] - openblas # [not x86_64] test: requires: From 2766e44610726ff95400c94401e1942933742ff3 Mon Sep 17 00:00:00 2001 From: Gergely Szilvasy Date: Tue, 9 May 2023 11:09:48 -0700 Subject: [PATCH 7/7] w/o -c intel --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2a860eb5a4..c7d8d03230 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -112,7 +112,7 @@ jobs: no_output_timeout: 30m command: | cd conda - conda build faiss --python 3.10 -c pytorch -c intel -c pkgs/main -c conda-forge + conda build faiss --python 3.10 -c pytorch -c pkgs/main -c conda-forge - when: condition: and: @@ -124,7 +124,7 @@ jobs: no_output_timeout: 30m command: | cd conda - conda build faiss --user pytorch --label <> -c pytorch -c intel -c pkgs/main -c conda-forge + conda build faiss --user pytorch --label <> -c pytorch -c pkgs/main -c conda-forge - when: condition: and: @@ -138,7 +138,7 @@ jobs: sudo update-alternatives --set cuda /usr/local/cuda-<> cd conda conda build faiss-gpu --variants '{ "cudatoolkit": "<>", "c_compiler_version": "<>", "cxx_compiler_version": "<>" }' \ - --user pytorch --label <> -c pytorch -c nvidia -c intel -c pkgs/main -c conda-forge + --user pytorch --label <> -c pytorch -c nvidia -c pkgs/main -c conda-forge build_cmake: parameters: @@ -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=2023 mkl-devel=2023 numpy scipy pytest gxx_linux-64 sysroot_linux-64=2.17 -c intel -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