From 103fac551ddc032bd31964f4ef9b69cfc248f1da Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 20:04:50 +0000 Subject: [PATCH 01/11] Rebuild for cuda for ppc64le and aarch64 --- .../migrations/cuda_112_ppc64le_aarch64.yaml | 41 +++++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/cuda_112_ppc64le_aarch64.yaml diff --git a/.ci_support/migrations/cuda_112_ppc64le_aarch64.yaml b/.ci_support/migrations/cuda_112_ppc64le_aarch64.yaml new file mode 100644 index 00000000..675a3815 --- /dev/null +++ b/.ci_support/migrations/cuda_112_ppc64le_aarch64.yaml @@ -0,0 +1,41 @@ +migrator_ts: 1645421738 +__migrator: + kind: + version + migration_number: + 1 + build_number: + 1 + paused: false + override_cbc_keys: + - cuda_compiler_stub + operation: key_add + check_solvable: false + primary_key: cuda_compiler_version + wait_for_migrators: + - aarch64 and ppc64le addition + exclude_pinned_pkgs: False + commit_message: "Rebuild for cuda for ppc64le and aarch64" + +arm_variant_type: # [aarch64] + - sbsa # [aarch64] + +c_compiler_version: # [ppc64le or aarch64] + - 10 # [ppc64le or aarch64] +cxx_compiler_version: # [ppc64le or aarch64] + - 10 # [ppc64le or aarch64] +fortran_compiler_version: # [ppc64le or aarch64] + - 10 # [ppc64le or aarch64] + +cuda_compiler_version: # [ppc64le or aarch64] + - 11.2 # [ppc64le or aarch64] + +cudnn: # [ppc64le or aarch64] + - 8 # [ppc64le or aarch64] + +cdt_name: # [ppc64le or aarch64] + - cos7 # [ppc64le or aarch64] + +docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux") and (ppc64le or aarch64)] + - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] + - quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 98507c2e..dfeb2a89 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -92,7 +92,7 @@ source: - patches/0006-add-bigobj-to-swigfaiss-compile-options-on-windows.patch build: - number: 3 + number: 4 skip: true # [linux and cuda_compiler_version == "10.2"] # always crashes skip: true # [win and cuda_compiler_version in ("11.0", "11.1")] From 3c17d8ab1d78207d4586ace86463e0aea077cf02 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 20:07:10 +0000 Subject: [PATCH 02/11] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and conda-forge-pinning 2023.01.04.13.03.46 --- ...ler_version11.2cxx_compiler_version10.yaml | 47 +++++++++++++++++++ ...er_versionNonecxx_compiler_version11.yaml} | 0 ...ler_version11.2cxx_compiler_version10.yaml | 43 +++++++++++++++++ ...er_versionNonecxx_compiler_version11.yaml} | 0 .travis.yml | 14 +++++- README.md | 22 +++++++-- 6 files changed, 120 insertions(+), 6 deletions(-) create mode 100644 .ci_support/linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10.yaml rename .ci_support/{linux_aarch64_.yaml => linux_aarch64_cuda_compiler_versionNonecxx_compiler_version11.yaml} (100%) create mode 100644 .ci_support/linux_ppc64le_cuda_compiler_version11.2cxx_compiler_version10.yaml rename .ci_support/{linux_ppc64le_.yaml => linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version11.yaml} (100%) diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10.yaml new file mode 100644 index 00000000..cebd79e8 --- /dev/null +++ b/.ci_support/linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10.yaml @@ -0,0 +1,47 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.2' +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 +libblas: +- 3.9 *netlib +liblapack: +- 3.9 *netlib +numpy: +- '1.21' +- '1.23' +- '1.20' +- '1.20' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +- 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython +target_platform: +- linux-aarch64 +zip_keys: +- - cxx_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image +- - python + - numpy diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_cuda_compiler_versionNonecxx_compiler_version11.yaml similarity index 100% rename from .ci_support/linux_aarch64_.yaml rename to .ci_support/linux_aarch64_cuda_compiler_versionNonecxx_compiler_version11.yaml diff --git a/.ci_support/linux_ppc64le_cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_ppc64le_cuda_compiler_version11.2cxx_compiler_version10.yaml new file mode 100644 index 00000000..d049dbff --- /dev/null +++ b/.ci_support/linux_ppc64le_cuda_compiler_version11.2cxx_compiler_version10.yaml @@ -0,0 +1,43 @@ +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.2' +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 +libblas: +- 3.9 *netlib +liblapack: +- 3.9 *netlib +numpy: +- '1.21' +- '1.23' +- '1.20' +- '1.20' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +- 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython +target_platform: +- linux-ppc64le +zip_keys: +- - cxx_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image +- - python + - numpy diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version11.yaml similarity index 100% rename from .ci_support/linux_ppc64le_.yaml rename to .ci_support/linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version11.yaml diff --git a/.travis.yml b/.travis.yml index 58a72eb8..1241c8ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,12 +7,22 @@ language: generic matrix: include: - - env: CONFIG=linux_aarch64_ UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - env: CONFIG=linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 os: linux arch: arm64 dist: focal - - env: CONFIG=linux_ppc64le_ UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_aarch64_cuda_compiler_versionNonecxx_compiler_version11 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_ppc64le_cuda_compiler_version11.2cxx_compiler_version10 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version11 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le dist: focal diff --git a/README.md b/README.md index 15126ff9..451a0c9f 100644 --- a/README.md +++ b/README.md @@ -79,17 +79,31 @@ Current build status - linux_aarch64 + linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10 - variant + variant - linux_ppc64le + linux_aarch64_cuda_compiler_versionNonecxx_compiler_version11 - variant + variant + + + + linux_ppc64le_cuda_compiler_version11.2cxx_compiler_version10 + + + variant + + + + linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version11 + + + variant From c2edc96077222ab030a1e3b93e15e8db079be96e Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 9 Jan 2023 16:29:41 -0600 Subject: [PATCH 03/11] Update CUDA arches for CUDA 11.8 / sm_90 support. --- recipe/build-lib.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/recipe/build-lib.sh b/recipe/build-lib.sh index 526fd5bd..52671b01 100644 --- a/recipe/build-lib.sh +++ b/recipe/build-lib.sh @@ -11,9 +11,21 @@ if [ ${cuda_compiler_version} != "None" ]; then # docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#ptxas-options-gpu-name # docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#gpu-feature-list - # the following are all the x86-relevant gpu arches; for building aarch64-packages, add: 53, 62, 72 - ARCHES=(52 60 61 70) - if [ $(version2int $cuda_compiler_version) -ge $(version2int "11.1") ]; then + + if [ "$(uname -m)" = "aarch64" ]; then + # For building aarch64-packages, add arches 53, 62, 72 + ARCHES=(52 53 60 61 62 70 72) + else + # Architectures for x86_64 + ARCHES=(52 60 61 70) + fi + + if [ $(version2int $cuda_compiler_version) -ge $(version2int "11.8") ]; then + # Hopper support for H100 (sm_90) needs cuda >= 11.8 + LATEST_ARCH=90 + # ARCHES does not contain LATEST_ARCH; see usage below + ARCHES=( "${ARCHES[@]}" 75 80 86) + elif [ $(version2int $cuda_compiler_version) -ge $(version2int "11.1") ]; then # Ampere support for GeForce 30 (sm_86) needs cuda >= 11.1 LATEST_ARCH=86 # ARCHES does not contain LATEST_ARCH; see usage below From 97108386599766cadc161ce9482e464106ba7925 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 9 Jan 2023 16:31:51 -0600 Subject: [PATCH 04/11] Update build number. --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 98507c2e..dfeb2a89 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -92,7 +92,7 @@ source: - patches/0006-add-bigobj-to-swigfaiss-compile-options-on-windows.patch build: - number: 3 + number: 4 skip: true # [linux and cuda_compiler_version == "10.2"] # always crashes skip: true # [win and cuda_compiler_version in ("11.0", "11.1")] From 4a66f0e0e9860d4b0da9aa6e9dd0784a556bf5e6 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 11 Jan 2023 15:16:51 +0000 Subject: [PATCH 05/11] Add conda_build_config.yaml. --- recipe/conda_build_config.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 00000000..250d02ee --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,16 @@ +c_compiler_version: + - 10 +cxx_compiler_version: + - 10 +cuda_compiler_version: + - 11.8 +fortran_compiler_version: + - 10 +cudnn: + - 8 +cdt_name: + - cos7 +docker_image: + - quay.io/condaforge/linux-anvil-cuda:11.8 # [linux64] + - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 # [linux and ppc64le] + - quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 # [linux and aarch64] From 3d203740fa1db0f17e67c64ed59e46bff67dedaf Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 11 Jan 2023 15:19:58 +0000 Subject: [PATCH 06/11] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and conda-forge-pinning 2023.01.07.12.45.19 --- .azure-pipelines/azure-pipelines-linux.yml | 18 +---- .azure-pipelines/azure-pipelines-win.yml | 10 +-- ...compiler_version10.yaml => linux_64_.yaml} | 4 +- ...iler_version11.0cxx_compiler_version9.yaml | 43 ------------ ...ler_version11.2cxx_compiler_version10.yaml | 43 ------------ ...ler_versionNonecxx_compiler_version11.yaml | 43 ------------ ...ux_aarch64_cuda_compiler_version11.2.yaml} | 16 ----- ...ux_aarch64_cuda_compiler_version11.8.yaml} | 22 +------ ...ux_ppc64le_cuda_compiler_version11.2.yaml} | 16 ----- ...ux_ppc64le_cuda_compiler_version11.8.yaml} | 22 +------ .ci_support/osx_64_.yaml | 6 +- ...compiler_version11.2.yaml => win_64_.yaml} | 6 +- .../win_64_cuda_compiler_version10.2.yaml | 33 ---------- .../win_64_cuda_compiler_versionNone.yaml | 33 ---------- .travis.yml | 8 +-- README.md | 66 +++++-------------- 16 files changed, 41 insertions(+), 348 deletions(-) rename .ci_support/{linux_64_cuda_compiler_version11.1cxx_compiler_version10.yaml => linux_64_.yaml} (91%) delete mode 100644 .ci_support/linux_64_cuda_compiler_version11.0cxx_compiler_version9.yaml delete mode 100644 .ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10.yaml delete mode 100644 .ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version11.yaml rename .ci_support/{linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10.yaml => linux_aarch64_cuda_compiler_version11.2.yaml} (69%) rename .ci_support/{linux_aarch64_cuda_compiler_versionNonecxx_compiler_version11.yaml => linux_aarch64_cuda_compiler_version11.8.yaml} (61%) rename .ci_support/{linux_ppc64le_cuda_compiler_version11.2cxx_compiler_version10.yaml => linux_ppc64le_cuda_compiler_version11.2.yaml} (67%) rename .ci_support/{linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version11.yaml => linux_ppc64le_cuda_compiler_version11.8.yaml} (57%) rename .ci_support/{win_64_cuda_compiler_version11.2.yaml => win_64_.yaml} (88%) delete mode 100644 .ci_support/win_64_cuda_compiler_version10.2.yaml delete mode 100644 .ci_support/win_64_cuda_compiler_versionNone.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index c3e36d4b..a97e523b 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,22 +8,10 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_cuda_compiler_version11.0cxx_compiler_version9: - CONFIG: linux_64_cuda_compiler_version11.0cxx_compiler_version9 + linux_64_: + CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 - linux_64_cuda_compiler_version11.1cxx_compiler_version10: - CONFIG: linux_64_cuda_compiler_version11.1cxx_compiler_version10 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.1 - linux_64_cuda_compiler_version11.2cxx_compiler_version10: - CONFIG: linux_64_cuda_compiler_version11.2cxx_compiler_version10 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_cuda_compiler_versionNonecxx_compiler_version11: - CONFIG: linux_64_cuda_compiler_versionNonecxx_compiler_version11 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 1f309833..a192c0b8 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,14 +8,8 @@ jobs: vmImage: windows-2019 strategy: matrix: - win_64_cuda_compiler_version10.2: - CONFIG: win_64_cuda_compiler_version10.2 - UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_version11.2: - CONFIG: win_64_cuda_compiler_version11.2 - UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_versionNone: - CONFIG: win_64_cuda_compiler_versionNone + win_64_: + CONFIG: win_64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_cuda_compiler_version11.1cxx_compiler_version10.yaml b/.ci_support/linux_64_.yaml similarity index 91% rename from .ci_support/linux_64_cuda_compiler_version11.1cxx_compiler_version10.yaml rename to .ci_support/linux_64_.yaml index 6cc1a9d9..9909fc7a 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.1cxx_compiler_version10.yaml +++ b/.ci_support/linux_64_.yaml @@ -7,13 +7,13 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.1' +- '11.8' cxx_compiler: - gxx cxx_compiler_version: - '10' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.1 +- quay.io/condaforge/linux-anvil-cuda:11.8 libblas: - 3.9 *netlib liblapack: diff --git a/.ci_support/linux_64_cuda_compiler_version11.0cxx_compiler_version9.yaml b/.ci_support/linux_64_cuda_compiler_version11.0cxx_compiler_version9.yaml deleted file mode 100644 index 7eefee4c..00000000 --- a/.ci_support/linux_64_cuda_compiler_version11.0cxx_compiler_version9.yaml +++ /dev/null @@ -1,43 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.0' -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.0 -libblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -numpy: -- '1.21' -- '1.23' -- '1.20' -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.8.* *_cpython -- 3.9.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - cxx_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10.yaml deleted file mode 100644 index 4908fc37..00000000 --- a/.ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10.yaml +++ /dev/null @@ -1,43 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.2' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 -libblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -numpy: -- '1.21' -- '1.23' -- '1.20' -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.8.* *_cpython -- 3.9.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - cxx_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version11.yaml b/.ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version11.yaml deleted file mode 100644 index c1b75d1b..00000000 --- a/.ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version11.yaml +++ /dev/null @@ -1,43 +0,0 @@ -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- None -cxx_compiler: -- gxx -cxx_compiler_version: -- '11' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -libblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -numpy: -- '1.21' -- '1.23' -- '1.20' -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.8.* *_cpython -- 3.9.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - cxx_compiler_version - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml similarity index 69% rename from .ci_support/linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_aarch64_cuda_compiler_version11.2.yaml index cebd79e8..951bc19e 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml @@ -22,20 +22,6 @@ libblas: - 3.9 *netlib liblapack: - 3.9 *netlib -numpy: -- '1.21' -- '1.23' -- '1.20' -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.8.* *_cpython -- 3.9.* *_cpython target_platform: - linux-aarch64 zip_keys: @@ -43,5 +29,3 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image -- - python - - numpy diff --git a/.ci_support/linux_aarch64_cuda_compiler_versionNonecxx_compiler_version11.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.8.yaml similarity index 61% rename from .ci_support/linux_aarch64_cuda_compiler_versionNonecxx_compiler_version11.yaml rename to .ci_support/linux_aarch64_cuda_compiler_version11.8.yaml index 7467bc0a..a37b6e71 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_versionNonecxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_version11.8.yaml @@ -11,31 +11,17 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- None +- '11.8' cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '10' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 libblas: - 3.9 *netlib liblapack: - 3.9 *netlib -numpy: -- '1.21' -- '1.23' -- '1.20' -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.8.* *_cpython -- 3.9.* *_cpython target_platform: - linux-aarch64 zip_keys: @@ -43,5 +29,3 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml similarity index 67% rename from .ci_support/linux_ppc64le_cuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml index d049dbff..c73728e8 100644 --- a/.ci_support/linux_ppc64le_cuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml @@ -18,20 +18,6 @@ libblas: - 3.9 *netlib liblapack: - 3.9 *netlib -numpy: -- '1.21' -- '1.23' -- '1.20' -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.8.* *_cpython -- 3.9.* *_cpython target_platform: - linux-ppc64le zip_keys: @@ -39,5 +25,3 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_cuda_compiler_version11.8.yaml similarity index 57% rename from .ci_support/linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version11.yaml rename to .ci_support/linux_ppc64le_cuda_compiler_version11.8.yaml index d0f60e38..518ed5a3 100644 --- a/.ci_support/linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_cuda_compiler_version11.8.yaml @@ -7,31 +7,17 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- None +- '11.8' cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '10' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 libblas: - 3.9 *netlib liblapack: - 3.9 *netlib -numpy: -- '1.21' -- '1.23' -- '1.20' -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.8.* *_cpython -- 3.9.* *_cpython target_platform: - linux-ppc64le zip_keys: @@ -39,5 +25,3 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image -- - python - - numpy diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index a577f451..a9b1a835 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,15 +1,17 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +cdt_name: +- cos7 channel_sources: - conda-forge channel_targets: - conda-forge main cuda_compiler_version: -- None +- '11.8' cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '10' libblas: - 3.9 *netlib liblapack: diff --git a/.ci_support/win_64_cuda_compiler_version11.2.yaml b/.ci_support/win_64_.yaml similarity index 88% rename from .ci_support/win_64_cuda_compiler_version11.2.yaml rename to .ci_support/win_64_.yaml index 444531a5..b96f7893 100644 --- a/.ci_support/win_64_cuda_compiler_version11.2.yaml +++ b/.ci_support/win_64_.yaml @@ -1,3 +1,5 @@ +cdt_name: +- cos7 channel_sources: - conda-forge channel_targets: @@ -5,9 +7,11 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.2' +- '11.8' cxx_compiler: - vs2019 +cxx_compiler_version: +- '10' libblas: - 3.9 *netlib liblapack: diff --git a/.ci_support/win_64_cuda_compiler_version10.2.yaml b/.ci_support/win_64_cuda_compiler_version10.2.yaml deleted file mode 100644 index 299bc979..00000000 --- a/.ci_support/win_64_cuda_compiler_version10.2.yaml +++ /dev/null @@ -1,33 +0,0 @@ -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '10.2' -cxx_compiler: -- vs2019 -libblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -numpy: -- '1.21' -- '1.23' -- '1.20' -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.8.* *_cpython -- 3.9.* *_cpython -target_platform: -- win-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml deleted file mode 100644 index d41d0316..00000000 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ /dev/null @@ -1,33 +0,0 @@ -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- None -cxx_compiler: -- vs2019 -libblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -numpy: -- '1.21' -- '1.23' -- '1.20' -- '1.20' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.8.* *_cpython -- 3.9.* *_cpython -target_platform: -- win-64 -zip_keys: -- - python - - numpy diff --git a/.travis.yml b/.travis.yml index 1241c8ca..649f4f53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,22 +7,22 @@ language: generic matrix: include: - - env: CONFIG=linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 + - env: CONFIG=linux_aarch64_cuda_compiler_version11.2 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 os: linux arch: arm64 dist: focal - - env: CONFIG=linux_aarch64_cuda_compiler_versionNonecxx_compiler_version11 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - env: CONFIG=linux_aarch64_cuda_compiler_version11.8 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 os: linux arch: arm64 dist: focal - - env: CONFIG=linux_ppc64le_cuda_compiler_version11.2cxx_compiler_version10 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 + - env: CONFIG=linux_ppc64le_cuda_compiler_version11.2 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 os: linux arch: ppc64le dist: focal - - env: CONFIG=linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version11 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_cuda_compiler_version11.8 UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 os: linux arch: ppc64le dist: focal diff --git a/README.md b/README.md index 451a0c9f..950e7c08 100644 --- a/README.md +++ b/README.md @@ -51,59 +51,38 @@ Current build status - + - + - + - + - + - - - - - - - - - @@ -114,24 +93,10 @@ Current build status - - - - - - - + @@ -148,7 +113,6 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | | [![Conda Recipe](https://img.shields.io/badge/recipe-faiss-green.svg)](https://anaconda.org/conda-forge/faiss) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/faiss.svg)](https://anaconda.org/conda-forge/faiss) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/faiss.svg)](https://anaconda.org/conda-forge/faiss) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/faiss.svg)](https://anaconda.org/conda-forge/faiss) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-faiss--cpu-green.svg)](https://anaconda.org/conda-forge/faiss-cpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/faiss-cpu.svg)](https://anaconda.org/conda-forge/faiss-cpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/faiss-cpu.svg)](https://anaconda.org/conda-forge/faiss-cpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/faiss-cpu.svg)](https://anaconda.org/conda-forge/faiss-cpu) | | [![Conda Recipe](https://img.shields.io/badge/recipe-faiss--gpu-green.svg)](https://anaconda.org/conda-forge/faiss-gpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/faiss-gpu.svg)](https://anaconda.org/conda-forge/faiss-gpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/faiss-gpu.svg)](https://anaconda.org/conda-forge/faiss-gpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/faiss-gpu.svg)](https://anaconda.org/conda-forge/faiss-gpu) | | [![Conda Recipe](https://img.shields.io/badge/recipe-faiss--proc-green.svg)](https://anaconda.org/conda-forge/faiss-proc) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/faiss-proc.svg)](https://anaconda.org/conda-forge/faiss-proc) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/faiss-proc.svg)](https://anaconda.org/conda-forge/faiss-proc) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/faiss-proc.svg)](https://anaconda.org/conda-forge/faiss-proc) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libfaiss-green.svg)](https://anaconda.org/conda-forge/libfaiss) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libfaiss.svg)](https://anaconda.org/conda-forge/libfaiss) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libfaiss.svg)](https://anaconda.org/conda-forge/libfaiss) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libfaiss.svg)](https://anaconda.org/conda-forge/libfaiss) | @@ -164,16 +128,16 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `faiss, faiss-cpu, faiss-gpu, faiss-proc, libfaiss, libfaiss-avx2` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `faiss, faiss-gpu, faiss-proc, libfaiss, libfaiss-avx2` can be installed with `conda`: ``` -conda install faiss faiss-cpu faiss-gpu faiss-proc libfaiss libfaiss-avx2 +conda install faiss faiss-gpu faiss-proc libfaiss libfaiss-avx2 ``` or with `mamba`: ``` -mamba install faiss faiss-cpu faiss-gpu faiss-proc libfaiss libfaiss-avx2 +mamba install faiss faiss-gpu faiss-proc libfaiss libfaiss-avx2 ``` It is possible to list all of the versions of `faiss` available on your platform with `conda`: From 64aa38ca3754d42b4e72121c4a59092f9ddfd8b4 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 11 Jan 2023 15:34:04 +0000 Subject: [PATCH 07/11] Add numpy pinning. --- recipe/conda_build_config.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 250d02ee..26d16385 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -14,3 +14,23 @@ docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 # [linux64] - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 # [linux and ppc64le] - quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 # [linux and aarch64] +python: + # part of a zip_keys: python, python_impl, numpy + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython +python_impl: + # part of a zip_keys: python, python_impl, numpy + - cpython + - cpython + - cpython +numpy: + # part of a zip_keys: python, python_impl, numpy + - 1.20 + - 1.20 + - 1.21 +zip_keys: + - + - python + - numpy + - python_impl From e91b9b9a510486e07c15808a6be236eb6113be74 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 11 Jan 2023 15:50:10 +0000 Subject: [PATCH 08/11] Only use CUDA images with cuda builds. --- recipe/conda_build_config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 26d16385..0e8040b3 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -11,9 +11,9 @@ cudnn: cdt_name: - cos7 docker_image: - - quay.io/condaforge/linux-anvil-cuda:11.8 # [linux64] - - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 # [linux and ppc64le] - - quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 # [linux and aarch64] + - quay.io/condaforge/linux-anvil-cuda:11.8 # [linux64 and cuda_compiler_version != "None"] + - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 # [linux and ppc64le and cuda_compiler_version != "None"] + - quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 # [linux and aarch64 and cuda_compiler_version != "None"] python: # part of a zip_keys: python, python_impl, numpy - 3.8.* *_cpython From 7ce2bb5cd02be447e6203615e2eabf091f0e468b Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 11 Jan 2023 16:12:49 +0000 Subject: [PATCH 09/11] Manually set up .ci_support files. --- ...er_version11.2cxx_compiler_version10.yaml} | 0 ...ler_versionNonecxx_compiler_version11.yaml | 43 +++++++++++++++++++ ...er_version11.8cxx_compiler_version10.yaml} | 16 +++++++ ...er_versionNonecxx_compiler_version11.yaml} | 22 ++++++++-- ...er_version11.8cxx_compiler_version10.yaml} | 16 +++++++ ...er_versionNonecxx_compiler_version11.yaml} | 22 ++++++++-- .ci_support/osx_64_.yaml | 6 +-- ... => win_64_cuda_compiler_version10.2.yaml} | 6 +-- .../win_64_cuda_compiler_version11.2.yaml | 33 ++++++++++++++ .../win_64_cuda_compiler_versionNone.yaml | 33 ++++++++++++++ 10 files changed, 182 insertions(+), 15 deletions(-) rename .ci_support/{linux_64_.yaml => linux_64_cuda_compiler_version11.2cxx_compiler_version10.yaml} (100%) create mode 100644 .ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version11.yaml rename .ci_support/{linux_aarch64_cuda_compiler_version11.8.yaml => linux_aarch64_cuda_compiler_version11.8cxx_compiler_version10.yaml} (69%) rename .ci_support/{linux_aarch64_cuda_compiler_version11.2.yaml => linux_aarch64_cuda_compiler_versionNonecxx_compiler_version11.yaml} (61%) rename .ci_support/{linux_ppc64le_cuda_compiler_version11.8.yaml => linux_ppc64le_cuda_compiler_version11.8cxx_compiler_version10.yaml} (67%) rename .ci_support/{linux_ppc64le_cuda_compiler_version11.2.yaml => linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version11.yaml} (57%) rename .ci_support/{win_64_.yaml => win_64_cuda_compiler_version10.2.yaml} (88%) create mode 100644 .ci_support/win_64_cuda_compiler_version11.2.yaml create mode 100644 .ci_support/win_64_cuda_compiler_versionNone.yaml diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10.yaml similarity index 100% rename from .ci_support/linux_64_.yaml rename to .ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10.yaml diff --git a/.ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version11.yaml b/.ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version11.yaml new file mode 100644 index 00000000..c1b75d1b --- /dev/null +++ b/.ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version11.yaml @@ -0,0 +1,43 @@ +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- None +cxx_compiler: +- gxx +cxx_compiler_version: +- '11' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +libblas: +- 3.9 *netlib +liblapack: +- 3.9 *netlib +numpy: +- '1.21' +- '1.23' +- '1.20' +- '1.20' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +- 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - cxx_compiler_version + - cuda_compiler_version + - cdt_name + - docker_image +- - python + - numpy diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.8.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.8cxx_compiler_version10.yaml similarity index 69% rename from .ci_support/linux_aarch64_cuda_compiler_version11.8.yaml rename to .ci_support/linux_aarch64_cuda_compiler_version11.8cxx_compiler_version10.yaml index a37b6e71..304591c8 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_version11.8.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_version11.8cxx_compiler_version10.yaml @@ -22,6 +22,20 @@ libblas: - 3.9 *netlib liblapack: - 3.9 *netlib +numpy: +- '1.21' +- '1.23' +- '1.20' +- '1.20' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +- 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython target_platform: - linux-aarch64 zip_keys: @@ -29,3 +43,5 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - python + - numpy diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml b/.ci_support/linux_aarch64_cuda_compiler_versionNonecxx_compiler_version11.yaml similarity index 61% rename from .ci_support/linux_aarch64_cuda_compiler_version11.2.yaml rename to .ci_support/linux_aarch64_cuda_compiler_versionNonecxx_compiler_version11.yaml index 951bc19e..7467bc0a 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_versionNonecxx_compiler_version11.yaml @@ -11,17 +11,31 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.2' +- None cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: -- quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 +- quay.io/condaforge/linux-anvil-aarch64 libblas: - 3.9 *netlib liblapack: - 3.9 *netlib +numpy: +- '1.21' +- '1.23' +- '1.20' +- '1.20' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +- 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython target_platform: - linux-aarch64 zip_keys: @@ -29,3 +43,5 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - python + - numpy diff --git a/.ci_support/linux_ppc64le_cuda_compiler_version11.8.yaml b/.ci_support/linux_ppc64le_cuda_compiler_version11.8cxx_compiler_version10.yaml similarity index 67% rename from .ci_support/linux_ppc64le_cuda_compiler_version11.8.yaml rename to .ci_support/linux_ppc64le_cuda_compiler_version11.8cxx_compiler_version10.yaml index 518ed5a3..4d80084b 100644 --- a/.ci_support/linux_ppc64le_cuda_compiler_version11.8.yaml +++ b/.ci_support/linux_ppc64le_cuda_compiler_version11.8cxx_compiler_version10.yaml @@ -18,6 +18,20 @@ libblas: - 3.9 *netlib liblapack: - 3.9 *netlib +numpy: +- '1.21' +- '1.23' +- '1.20' +- '1.20' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +- 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython target_platform: - linux-ppc64le zip_keys: @@ -25,3 +39,5 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - python + - numpy diff --git a/.ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml b/.ci_support/linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version11.yaml similarity index 57% rename from .ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml rename to .ci_support/linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version11.yaml index c73728e8..d0f60e38 100644 --- a/.ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml +++ b/.ci_support/linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version11.yaml @@ -7,17 +7,31 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.2' +- None cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 +- quay.io/condaforge/linux-anvil-ppc64le libblas: - 3.9 *netlib liblapack: - 3.9 *netlib +numpy: +- '1.21' +- '1.23' +- '1.20' +- '1.20' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +- 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython target_platform: - linux-ppc64le zip_keys: @@ -25,3 +39,5 @@ zip_keys: - cuda_compiler_version - cdt_name - docker_image +- - python + - numpy diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index a9b1a835..a577f451 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,17 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -cdt_name: -- cos7 channel_sources: - conda-forge channel_targets: - conda-forge main cuda_compiler_version: -- '11.8' +- None cxx_compiler: - clangxx cxx_compiler_version: -- '10' +- '14' libblas: - 3.9 *netlib liblapack: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_cuda_compiler_version10.2.yaml similarity index 88% rename from .ci_support/win_64_.yaml rename to .ci_support/win_64_cuda_compiler_version10.2.yaml index b96f7893..299bc979 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_cuda_compiler_version10.2.yaml @@ -1,5 +1,3 @@ -cdt_name: -- cos7 channel_sources: - conda-forge channel_targets: @@ -7,11 +5,9 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.8' +- '10.2' cxx_compiler: - vs2019 -cxx_compiler_version: -- '10' libblas: - 3.9 *netlib liblapack: diff --git a/.ci_support/win_64_cuda_compiler_version11.2.yaml b/.ci_support/win_64_cuda_compiler_version11.2.yaml new file mode 100644 index 00000000..444531a5 --- /dev/null +++ b/.ci_support/win_64_cuda_compiler_version11.2.yaml @@ -0,0 +1,33 @@ +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.2' +cxx_compiler: +- vs2019 +libblas: +- 3.9 *netlib +liblapack: +- 3.9 *netlib +numpy: +- '1.21' +- '1.23' +- '1.20' +- '1.20' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +- 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml new file mode 100644 index 00000000..d41d0316 --- /dev/null +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -0,0 +1,33 @@ +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- None +cxx_compiler: +- vs2019 +libblas: +- 3.9 *netlib +liblapack: +- 3.9 *netlib +numpy: +- '1.21' +- '1.23' +- '1.20' +- '1.20' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +- 3.11.* *_cpython +- 3.8.* *_cpython +- 3.9.* *_cpython +target_platform: +- win-64 +zip_keys: +- - python + - numpy From 779cba93255c3556a45258e489da72dbf5294db5 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 11 Jan 2023 09:45:57 -0800 Subject: [PATCH 10/11] Fix CUDA version in manually edited .ci_support files. --- ...linux_64_cuda_compiler_version11.8cxx_compiler_version10.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .ci_support/{linux_64_cuda_compiler_version11.2cxx_compiler_version10.yaml => linux_64_cuda_compiler_version11.8cxx_compiler_version10.yaml} (100%) diff --git a/.ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_64_cuda_compiler_version11.8cxx_compiler_version10.yaml similarity index 100% rename from .ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_64_cuda_compiler_version11.8cxx_compiler_version10.yaml From fadd5ce5f4d65047a94491dc8046263d7adb59cc Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 11 Jan 2023 09:49:02 -0800 Subject: [PATCH 11/11] Remove python/numpy from conda build config. --- recipe/conda_build_config.yaml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 0e8040b3..bdc5fc66 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -14,23 +14,3 @@ docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 # [linux64 and cuda_compiler_version != "None"] - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 # [linux and ppc64le and cuda_compiler_version != "None"] - quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 # [linux and aarch64 and cuda_compiler_version != "None"] -python: - # part of a zip_keys: python, python_impl, numpy - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython -python_impl: - # part of a zip_keys: python, python_impl, numpy - - cpython - - cpython - - cpython -numpy: - # part of a zip_keys: python, python_impl, numpy - - 1.20 - - 1.20 - - 1.21 -zip_keys: - - - - python - - numpy - - python_impl
VariantStatus
linux_64_cuda_compiler_version11.0cxx_compiler_version9linux_64 - variant + variant
linux_64_cuda_compiler_version11.1cxx_compiler_version10linux_aarch64_cuda_compiler_version11.2 - variant + variant
linux_64_cuda_compiler_version11.2cxx_compiler_version10linux_aarch64_cuda_compiler_version11.8 - variant + variant
linux_64_cuda_compiler_versionNonecxx_compiler_version11linux_ppc64le_cuda_compiler_version11.2 - variant + variant
linux_aarch64_cuda_compiler_version11.2cxx_compiler_version10linux_ppc64le_cuda_compiler_version11.8 - variant - -
linux_aarch64_cuda_compiler_versionNonecxx_compiler_version11 - - variant - -
linux_ppc64le_cuda_compiler_version11.2cxx_compiler_version10 - - variant - -
linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version11 - - variant + variant
win_64_cuda_compiler_version10.2 - - variant - -
win_64_cuda_compiler_version11.2 - - variant - -
win_64_cuda_compiler_versionNonewin_64 - variant + variant