From cde32f53bd5c7e7dd845c07fad7431a026753c3e Mon Sep 17 00:00:00 2001 From: Gergely Szilvasy Date: Wed, 7 Jun 2023 02:22:51 -0700 Subject: [PATCH 01/11] bump numpy min to 1.17 --- conda/faiss-gpu/meta.yaml | 4 ++-- conda/faiss/meta.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conda/faiss-gpu/meta.yaml b/conda/faiss-gpu/meta.yaml index 39e4060a20..c823d46a7e 100644 --- a/conda/faiss-gpu/meta.yaml +++ b/conda/faiss-gpu/meta.yaml @@ -75,11 +75,11 @@ outputs: - make # [not win] host: - python {{ python }} - - numpy >=1.16,<2 + - numpy >=1.17,<2 - {{ pin_subpackage('libfaiss', exact=True) }} run: - python {{ python }} - - numpy >=1.16,<2 + - numpy >=1.17,<2 - {{ pin_subpackage('libfaiss', exact=True) }} test: requires: diff --git a/conda/faiss/meta.yaml b/conda/faiss/meta.yaml index 31b785eb9b..98e400e434 100644 --- a/conda/faiss/meta.yaml +++ b/conda/faiss/meta.yaml @@ -73,11 +73,11 @@ outputs: - make # [not win] host: - python {{ python }} - - numpy >=1.16,<2 + - numpy >=1.17,<2 - {{ pin_subpackage('libfaiss', exact=True) }} run: - python {{ python }} - - numpy >=1.16,<2 + - numpy >=1.17,<2 - {{ pin_subpackage('libfaiss', exact=True) }} test: requires: From 049a9e5c8fbecdb7f88fecf54bc01de25d67c763 Mon Sep 17 00:00:00 2001 From: Gergely Szilvasy Date: Wed, 7 Jun 2023 02:46:25 -0700 Subject: [PATCH 02/11] test the nightly --- .circleci/config.yml | 118 +------------------------------------------ 1 file changed, 1 insertion(+), 117 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c7d8d03230..1bdadc1542 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -244,124 +244,8 @@ workflows: version: 2 build: jobs: - - format: - name: Format - - build_cmake: - name: Linux x86_64 (cmake) - exec: linux-x86_64-cpu - - build_cmake: - name: Linux x86_64 AVX2 (cmake) - exec: linux-x86_64-cpu - opt_level: "avx2" - - build_cmake: - name: Linux x86_64 GPU (cmake) - exec: linux-x86_64-gpu - gpu: "ON" - requires: - - Linux x86_64 (cmake) - - build_conda: - name: Linux x86_64 (conda) - exec: linux-x86_64-cpu - - build_conda: - name: OSX x86_64 (conda) - exec: macosx-x86_64-cpu - - build_conda: - name: Windows x86_64 (conda) - exec: windows-x86_64-cpu - - build_conda: - name: Linux arm64 (conda) - exec: linux-arm64-cpu - - build_conda: - name: Linux x86_64 packages - exec: linux-x86_64-cpu - label: main - filters: - tags: - only: /^v.*/ - branches: - ignore: /.*/ - - build_conda: - name: Linux x86_64 GPU packages (CUDA 11.4) - exec: linux-x86_64-gpu - label: main - cuda: "11.4" - cuda_archs: "60;61;70;72;75;80;86" - compiler_version: "11.2" - filters: - tags: - only: /^v.*/ - branches: - ignore: /.*/ - - build_conda: - name: Windows x86_64 packages - exec: windows-x86_64-cpu - label: main - filters: - tags: - only: /^v.*/ - branches: - ignore: /.*/ - - build_conda: - name: OSX x86_64 packages - exec: macosx-x86_64-cpu - label: main - filters: - tags: - only: /^v.*/ - branches: - ignore: /.*/ - - build_conda: - name: OSX arm64 packages - exec: macosx-arm64-cpu - label: main - filters: - tags: - only: /^v.*/ - branches: - ignore: /.*/ - - build_conda: - name: Linux arm64 packages - exec: linux-arm64-cpu - label: main - filters: - tags: - only: /^v.*/ - branches: - ignore: /.*/ - - nightly: - triggers: - - schedule: - cron: "0 0 * * *" - filters: - branches: - only: - - main - jobs: - - build_conda: - name: Linux x86_64 nightlies - exec: linux-x86_64-cpu - label: nightly - - build_conda: - name: Linux x86_64 GPU nightlies (CUDA 11.4) - exec: linux-x86_64-gpu - cuda: "11.4" - cuda_archs: "60;61;70;72;75;80;86" - compiler_version: "11.2" - label: nightly - - build_conda: - name: Windows x86_64 nightlies - exec: windows-x86_64-cpu - label: nightly - build_conda: name: OSX x86_64 nightlies exec: macosx-x86_64-cpu label: nightly - - build_conda: - name: OSX arm64 nightlies - exec: macosx-arm64-cpu - label: nightly - - build_conda: - name: Linux arm64 nightlies - exec: linux-arm64-cpu - label: nightly + From d0545f05e2005091a770e159137dbd2ebffc9530 Mon Sep 17 00:00:00 2001 From: Gergely Szilvasy Date: Wed, 7 Jun 2023 04:20:55 -0700 Subject: [PATCH 03/11] 1.19? --- conda/faiss-gpu/meta.yaml | 4 ++-- conda/faiss/meta.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conda/faiss-gpu/meta.yaml b/conda/faiss-gpu/meta.yaml index c823d46a7e..a3daa44bc9 100644 --- a/conda/faiss-gpu/meta.yaml +++ b/conda/faiss-gpu/meta.yaml @@ -75,11 +75,11 @@ outputs: - make # [not win] host: - python {{ python }} - - numpy >=1.17,<2 + - numpy >=1.19,<2 - {{ pin_subpackage('libfaiss', exact=True) }} run: - python {{ python }} - - numpy >=1.17,<2 + - numpy >=1.19,<2 - {{ pin_subpackage('libfaiss', exact=True) }} test: requires: diff --git a/conda/faiss/meta.yaml b/conda/faiss/meta.yaml index 98e400e434..988bd57d5c 100644 --- a/conda/faiss/meta.yaml +++ b/conda/faiss/meta.yaml @@ -73,11 +73,11 @@ outputs: - make # [not win] host: - python {{ python }} - - numpy >=1.17,<2 + - numpy >=1.19,<2 - {{ pin_subpackage('libfaiss', exact=True) }} run: - python {{ python }} - - numpy >=1.17,<2 + - numpy >=1.19,<2 - {{ pin_subpackage('libfaiss', exact=True) }} test: requires: From 79bc5d5fc6f03cc42378f488a660e5a30f817a2e Mon Sep 17 00:00:00 2001 From: Gergely Szilvasy Date: Wed, 7 Jun 2023 06:48:57 -0700 Subject: [PATCH 04/11] nuke conda-bld from build script --- conda/faiss/build-lib-osx.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conda/faiss/build-lib-osx.sh b/conda/faiss/build-lib-osx.sh index a30de2d000..db75b1c5b6 100755 --- a/conda/faiss/build-lib-osx.sh +++ b/conda/faiss/build-lib-osx.sh @@ -4,6 +4,9 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +echo Removing /Users/distiller/miniconda/conda-bld +rm -rf /Users/distiller/miniconda/conda-bld + set -e From fcc3698316a811c29de22e75f4787c4be97cfca2 Mon Sep 17 00:00:00 2001 From: Gergely Szilvasy Date: Wed, 7 Jun 2023 07:04:50 -0700 Subject: [PATCH 05/11] rebuild osx repo cache --- conda/faiss/build-lib-osx.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conda/faiss/build-lib-osx.sh b/conda/faiss/build-lib-osx.sh index db75b1c5b6..3ecdb0bac7 100755 --- a/conda/faiss/build-lib-osx.sh +++ b/conda/faiss/build-lib-osx.sh @@ -4,8 +4,10 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. -echo Removing /Users/distiller/miniconda/conda-bld -rm -rf /Users/distiller/miniconda/conda-bld +echo Fixing /Users/distiller/miniconda/conda-bld +rm -fr /Users/distiller/miniconda/conda-bld/osx-64/.cache +rm -f /Users/distiller/miniconda/conda-bld/osx-64/*repodata* +conda index /Users/distiller/miniconda/conda-bld set -e From 4f077e7ce51da1e2645c2f0f551d667280bfd746 Mon Sep 17 00:00:00 2001 From: Gergely Szilvasy Date: Wed, 7 Jun 2023 07:51:43 -0700 Subject: [PATCH 06/11] moving it to pkg build --- conda/faiss/build-lib-osx.sh | 5 ----- conda/faiss/build-pkg-osx.sh | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda/faiss/build-lib-osx.sh b/conda/faiss/build-lib-osx.sh index 3ecdb0bac7..a30de2d000 100755 --- a/conda/faiss/build-lib-osx.sh +++ b/conda/faiss/build-lib-osx.sh @@ -4,11 +4,6 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. -echo Fixing /Users/distiller/miniconda/conda-bld -rm -fr /Users/distiller/miniconda/conda-bld/osx-64/.cache -rm -f /Users/distiller/miniconda/conda-bld/osx-64/*repodata* -conda index /Users/distiller/miniconda/conda-bld - set -e diff --git a/conda/faiss/build-pkg-osx.sh b/conda/faiss/build-pkg-osx.sh index 15016face9..70d08b8662 100755 --- a/conda/faiss/build-pkg-osx.sh +++ b/conda/faiss/build-pkg-osx.sh @@ -4,6 +4,11 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +echo Fixing /Users/distiller/miniconda/conda-bld +rm -fr /Users/distiller/miniconda/conda-bld/osx-64/.cache +rm -f /Users/distiller/miniconda/conda-bld/osx-64/*repodata* +conda index /Users/distiller/miniconda/conda-bld + set -e From 4ce39dc29ece83f863bb9b7baaba17b8373bf67f Mon Sep 17 00:00:00 2001 From: Gergely Szilvasy Date: Wed, 7 Jun 2023 08:56:53 -0700 Subject: [PATCH 07/11] build separately for each python version --- .circleci/config.yml | 4 +++- conda/faiss/build-pkg-osx.sh | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1bdadc1542..d16dfd847d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -124,7 +124,9 @@ 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 --python 3.8 --user pytorch --label <> -c pytorch -c pkgs/main -c conda-forge + conda build faiss --python 3.9 --user pytorch --label <> -c pytorch -c pkgs/main -c conda-forge + conda build faiss --python 3.10 --user pytorch --label <> -c pytorch -c pkgs/main -c conda-forge - when: condition: and: diff --git a/conda/faiss/build-pkg-osx.sh b/conda/faiss/build-pkg-osx.sh index 70d08b8662..7bfe88359e 100755 --- a/conda/faiss/build-pkg-osx.sh +++ b/conda/faiss/build-pkg-osx.sh @@ -4,10 +4,12 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. -echo Fixing /Users/distiller/miniconda/conda-bld -rm -fr /Users/distiller/miniconda/conda-bld/osx-64/.cache -rm -f /Users/distiller/miniconda/conda-bld/osx-64/*repodata* -conda index /Users/distiller/miniconda/conda-bld +# echo Fixing /Users/distiller/miniconda/conda-bld +# rm -fr /Users/distiller/miniconda/conda-bld/osx-64/.cache +# rm -f /Users/distiller/miniconda/conda-bld/osx-64/*repodata* +# rm -fr /Users/distiller/miniconda/conda-bld/noarch/.cache +# rm -f /Users/distiller/miniconda/conda-bld/noarch/*repodata* +# conda index /Users/distiller/miniconda/conda-bld set -e From 7720dbe402645fcc2b9d4a523f1539682c50de36 Mon Sep 17 00:00:00 2001 From: Gergely Szilvasy Date: Fri, 16 Jun 2023 06:04:39 -0700 Subject: [PATCH 08/11] build py3.8 only --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b9eec4a705..5843786b69 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -125,8 +125,6 @@ jobs: command: | cd conda conda build faiss --python 3.8 --user pytorch --label <> -c pytorch -c pkgs/main -c conda-forge - conda build faiss --python 3.9 --user pytorch --label <> -c pytorch -c pkgs/main -c conda-forge - conda build faiss --python 3.10 --user pytorch --label <> -c pytorch -c pkgs/main -c conda-forge - when: condition: and: From a5a92a7cb2b2e1930127b5d5474a3704f7da120f Mon Sep 17 00:00:00 2001 From: Gergely Szilvasy Date: Fri, 16 Jun 2023 06:27:21 -0700 Subject: [PATCH 09/11] 3.10? --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5843786b69..5f969441ab 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -124,7 +124,7 @@ jobs: no_output_timeout: 30m command: | cd conda - conda build faiss --python 3.8 --user pytorch --label <> -c pytorch -c pkgs/main -c conda-forge + conda build faiss --python 3.10 --user pytorch --label <> -c pytorch -c pkgs/main -c conda-forge - when: condition: and: From b49a5dd3b3abe7589eaf3e9ec74f9276e121cbba Mon Sep 17 00:00:00 2001 From: Gergely Szilvasy Date: Fri, 16 Jun 2023 07:16:05 -0700 Subject: [PATCH 10/11] try to drop py3.8 only --- .circleci/config.yml | 2 +- conda/conda_build_config.yaml | 2 +- conda/faiss/build-pkg-osx.sh | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5f969441ab..e2cffda80c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -124,7 +124,7 @@ jobs: no_output_timeout: 30m command: | cd conda - conda build faiss --python 3.10 --user pytorch --label <> -c pytorch -c pkgs/main -c conda-forge + conda build faiss --user pytorch --label <> -c pytorch -c pkgs/main -c conda-forge - when: condition: and: diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml index da95e8086f..2a005ccea6 100644 --- a/conda/conda_build_config.yaml +++ b/conda/conda_build_config.yaml @@ -1,4 +1,4 @@ python: - - 3.8 + - 3.8 # [not x86_64 or not osx] - 3.9 - 3.10 diff --git a/conda/faiss/build-pkg-osx.sh b/conda/faiss/build-pkg-osx.sh index 7bfe88359e..15016face9 100755 --- a/conda/faiss/build-pkg-osx.sh +++ b/conda/faiss/build-pkg-osx.sh @@ -4,13 +4,6 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. -# echo Fixing /Users/distiller/miniconda/conda-bld -# rm -fr /Users/distiller/miniconda/conda-bld/osx-64/.cache -# rm -f /Users/distiller/miniconda/conda-bld/osx-64/*repodata* -# rm -fr /Users/distiller/miniconda/conda-bld/noarch/.cache -# rm -f /Users/distiller/miniconda/conda-bld/noarch/*repodata* -# conda index /Users/distiller/miniconda/conda-bld - set -e From 8c7f30d2e4fbf2c729e06f50425ec5e2fae64b55 Mon Sep 17 00:00:00 2001 From: Gergely Szilvasy Date: Fri, 16 Jun 2023 09:14:00 -0700 Subject: [PATCH 11/11] restore config.yml --- .circleci/config.yml | 125 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e2cffda80c..f5eb52cdaf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -248,8 +248,131 @@ workflows: version: 2 build: jobs: + - format: + name: Format + - build_cmake: + name: Linux x86_64 (cmake) + exec: linux-x86_64-cpu + - build_cmake: + name: Linux x86_64 AVX2 (cmake) + exec: linux-x86_64-cpu + opt_level: "avx2" + - build_cmake: + name: Linux x86_64 GPU (cmake) + exec: linux-x86_64-gpu + gpu: "ON" + requires: + - Linux x86_64 (cmake) + - build_cmake: + name: Linux x86_64 GPU w/ RAFT (cmake) + exec: linux-x86_64-gpu + gpu: "ON" + raft: "ON" + requires: + - Linux x86_64 (cmake) + - build_conda: + name: Linux x86_64 (conda) + exec: linux-x86_64-cpu + - build_conda: + name: OSX x86_64 (conda) + exec: macosx-x86_64-cpu + - build_conda: + name: Windows x86_64 (conda) + exec: windows-x86_64-cpu + - build_conda: + name: Linux arm64 (conda) + exec: linux-arm64-cpu + - build_conda: + name: Linux x86_64 packages + exec: linux-x86_64-cpu + label: main + filters: + tags: + only: /^v.*/ + branches: + ignore: /.*/ + - build_conda: + name: Linux x86_64 GPU packages (CUDA 11.4) + exec: linux-x86_64-gpu + label: main + cuda: "11.4" + cuda_archs: "60;61;70;72;75;80;86" + compiler_version: "11.2" + filters: + tags: + only: /^v.*/ + branches: + ignore: /.*/ + - build_conda: + name: Windows x86_64 packages + exec: windows-x86_64-cpu + label: main + filters: + tags: + only: /^v.*/ + branches: + ignore: /.*/ + - build_conda: + name: OSX x86_64 packages + exec: macosx-x86_64-cpu + label: main + filters: + tags: + only: /^v.*/ + branches: + ignore: /.*/ + - build_conda: + name: OSX arm64 packages + exec: macosx-arm64-cpu + label: main + filters: + tags: + only: /^v.*/ + branches: + ignore: /.*/ + - build_conda: + name: Linux arm64 packages + exec: linux-arm64-cpu + label: main + filters: + tags: + only: /^v.*/ + branches: + ignore: /.*/ + + nightly: + triggers: + - schedule: + cron: "0 0 * * *" + filters: + branches: + only: + - main + jobs: + - build_conda: + name: Linux x86_64 nightlies + exec: linux-x86_64-cpu + label: nightly + - build_conda: + name: Linux x86_64 GPU nightlies (CUDA 11.4) + exec: linux-x86_64-gpu + cuda: "11.4" + cuda_archs: "60;61;70;72;75;80;86" + compiler_version: "11.2" + label: nightly + - build_conda: + name: Windows x86_64 nightlies + exec: windows-x86_64-cpu + label: nightly - build_conda: name: OSX x86_64 nightlies exec: macosx-x86_64-cpu label: nightly - + - build_conda: + name: OSX arm64 nightlies + exec: macosx-arm64-cpu + label: nightly + - build_conda: + name: Linux arm64 nightlies + exec: linux-arm64-cpu + label: nightly