From 0f2dcc11455f504e2d9abf3c18fa44d7ca0c9bea Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 9 Sep 2024 21:54:22 +0000 Subject: [PATCH 1/3] Rebuild for python 3.13 --- .ci_support/migrations/python313.yaml | 46 +++++++++++++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/python313.yaml diff --git a/.ci_support/migrations/python313.yaml b/.ci_support/migrations/python313.yaml new file mode 100644 index 00000000..f9389e3b --- /dev/null +++ b/.ci_support/migrations/python313.yaml @@ -0,0 +1,46 @@ +migrator_ts: 1724712607 +__migrator: + commit_message: Rebuild for python 3.13 + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.11.* *_cpython + - 3.12.* *_cpython + - 3.13.* *_cp313 # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: false + longterm: true + pr_limit: 20 + max_solver_attempts: 3 # this will make the bot retry "not solvable" stuff 12 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + # see https://github.com/conda-forge/scipy-feedstock/pull/283 + - scipy + exclude_pinned_pkgs: false + additional_zip_keys: + - channel_sources + +python: +- 3.13.* *_cp313 +channel_sources: +- conda-forge/label/python_rc,conda-forge +# additional entries to add for zip_keys +numpy: +- 2 +python_impl: +- cpython diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c288ad25..b8dfd91a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -63,7 +63,7 @@ source: - patches/0011-don-t-rely-on-luck-for-initialization-order-on-win-C.patch # [win and cuda_compiler_version != "None"] build: - number: 1 + number: 2 requirements: build: From e30260c36282410628423f01cb70bec7de263400 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 9 Sep 2024 21:57:04 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.1, and conda-forge-pinning 2024.09.09.18.43.05 --- .azure-pipelines/azure-pipelines-linux.yml | 8 +- ...er_versionNonecxx_compiler_version13.yaml} | 11 ++- ...ler_version12.0cxx_compiler_version12.yaml | 9 +- ...ler_version11.8cxx_compiler_version11.yaml | 9 +- ...ler_versionNonecxx_compiler_version12.yaml | 9 +- ...ler_version11.8cxx_compiler_version11.yaml | 9 +- ...ler_version12.0cxx_compiler_version12.yaml | 9 +- ...er_versionNonecxx_compiler_version13.yaml} | 11 ++- ...ler_version12.0cxx_compiler_version12.yaml | 9 +- ...ler_version11.8cxx_compiler_version11.yaml | 9 +- .ci_support/migrations/cuda120.yaml | 90 ------------------- .ci_support/osx_64_.yaml | 17 ++-- .ci_support/osx_arm64_.yaml | 17 ++-- ...compilerNonecuda_compiler_versionNone.yaml | 9 +- ...lercuda-nvcccuda_compiler_version12.0.yaml | 9 +- ...compilernvcccuda_compiler_version11.8.yaml | 9 +- README.md | 8 +- build-locally.py | 5 +- 18 files changed, 116 insertions(+), 141 deletions(-) rename .ci_support/{linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml => linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml} (83%) rename .ci_support/{linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml => linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml} (84%) delete mode 100644 .ci_support/migrations/cuda120.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 7f54c567..3f261c81 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,8 +8,8 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: - CONFIG: linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 + linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13: + CONFIG: linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12: @@ -32,8 +32,8 @@ jobs: CONFIG: linux_aarch64_c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-alma-x86_64:8 - linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: - CONFIG: linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 + linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13: + CONFIG: linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12: diff --git a/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml similarity index 83% rename from .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml rename to .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml index 30bf45f4..21c36052 100644 --- a/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml @@ -6,6 +6,10 @@ cdt_name: - cos7 channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -15,7 +19,7 @@ cuda_compiler_version: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libblas: @@ -26,7 +30,7 @@ numpy: - '1.22' - '1.23' - '1.26' -- '1.22' +- '2' - '1.22' pin_run_as_build: python: @@ -36,7 +40,7 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython +- 3.13.* *_cp313 - 3.9.* *_cpython target_platform: - linux-64 @@ -49,3 +53,4 @@ zip_keys: - docker_image - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index 146cac52..a1ac08e9 100644 --- a/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -6,6 +6,10 @@ cdt_name: - cos7 channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -26,7 +30,7 @@ numpy: - '1.22' - '1.23' - '1.26' -- '1.22' +- '2' - '1.22' pin_run_as_build: python: @@ -36,7 +40,7 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython +- 3.13.* *_cp313 - 3.9.* *_cpython target_platform: - linux-64 @@ -49,3 +53,4 @@ zip_keys: - docker_image - - python - numpy + - channel_sources diff --git a/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 7db218b3..ed57dec4 100644 --- a/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -6,6 +6,10 @@ cdt_name: - cos7 channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -26,7 +30,7 @@ numpy: - '1.22' - '1.23' - '1.26' -- '1.22' +- '2' - '1.22' pin_run_as_build: python: @@ -36,7 +40,7 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython +- 3.13.* *_cp313 - 3.9.* *_cpython target_platform: - linux-64 @@ -49,3 +53,4 @@ zip_keys: - docker_image - - python - numpy + - channel_sources diff --git a/.ci_support/linux_aarch64_c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index ab2da58b..1ba9d700 100644 --- a/.ci_support/linux_aarch64_c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -10,6 +10,10 @@ cdt_name: - cos7 channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -30,7 +34,7 @@ numpy: - '1.22' - '1.23' - '1.26' -- '1.22' +- '2' - '1.22' pin_run_as_build: python: @@ -40,7 +44,7 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython +- 3.13.* *_cp313 - 3.9.* *_cpython target_platform: - linux-aarch64 @@ -53,3 +57,4 @@ zip_keys: - docker_image - - python - numpy + - channel_sources diff --git a/.ci_support/linux_aarch64_c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index f570a723..70febd24 100644 --- a/.ci_support/linux_aarch64_c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -10,6 +10,10 @@ cdt_name: - cos7 channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -30,7 +34,7 @@ numpy: - '1.22' - '1.23' - '1.26' -- '1.22' +- '2' - '1.22' pin_run_as_build: python: @@ -40,7 +44,7 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython +- 3.13.* *_cp313 - 3.9.* *_cpython target_platform: - linux-aarch64 @@ -53,3 +57,4 @@ zip_keys: - docker_image - - python - numpy + - channel_sources diff --git a/.ci_support/linux_aarch64_c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index 750078e6..b348f99b 100644 --- a/.ci_support/linux_aarch64_c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -10,6 +10,10 @@ cdt_name: - cos7 channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -30,7 +34,7 @@ numpy: - '1.22' - '1.23' - '1.26' -- '1.22' +- '2' - '1.22' pin_run_as_build: python: @@ -40,7 +44,7 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython +- 3.13.* *_cp313 - 3.9.* *_cpython target_platform: - linux-aarch64 @@ -53,3 +57,4 @@ zip_keys: - docker_image - - python - numpy + - channel_sources diff --git a/.ci_support/linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml similarity index 84% rename from .ci_support/linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml rename to .ci_support/linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml index c4175862..4f43cbc1 100644 --- a/.ci_support/linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml @@ -6,6 +6,10 @@ cdt_name: - cos7 channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -15,7 +19,7 @@ cuda_compiler_version: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libblas: @@ -26,7 +30,7 @@ numpy: - '1.22' - '1.23' - '1.26' -- '1.22' +- '2' - '1.22' pin_run_as_build: python: @@ -36,7 +40,7 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython +- 3.13.* *_cp313 - 3.9.* *_cpython target_platform: - linux-ppc64le @@ -49,3 +53,4 @@ zip_keys: - docker_image - - python - numpy + - channel_sources diff --git a/.ci_support/linux_ppc64le_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index d74a31b6..7946ec49 100644 --- a/.ci_support/linux_ppc64le_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_ppc64le_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -6,6 +6,10 @@ cdt_name: - cos7 channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -26,7 +30,7 @@ numpy: - '1.22' - '1.23' - '1.26' -- '1.22' +- '2' - '1.22' pin_run_as_build: python: @@ -36,7 +40,7 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython +- 3.13.* *_cp313 - 3.9.* *_cpython target_platform: - linux-ppc64le @@ -49,3 +53,4 @@ zip_keys: - docker_image - - python - numpy + - channel_sources diff --git a/.ci_support/linux_ppc64le_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index dea8f3f1..6865db5f 100644 --- a/.ci_support/linux_ppc64le_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -6,6 +6,10 @@ cdt_name: - cos7 channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -26,7 +30,7 @@ numpy: - '1.22' - '1.23' - '1.26' -- '1.22' +- '2' - '1.22' pin_run_as_build: python: @@ -36,7 +40,7 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython +- 3.13.* *_cp313 - 3.9.* *_cpython target_platform: - linux-ppc64le @@ -49,3 +53,4 @@ zip_keys: - docker_image - - python - numpy + - channel_sources diff --git a/.ci_support/migrations/cuda120.yaml b/.ci_support/migrations/cuda120.yaml deleted file mode 100644 index abfb9cb8..00000000 --- a/.ci_support/migrations/cuda120.yaml +++ /dev/null @@ -1,90 +0,0 @@ -migrator_ts: 1682985063 -__migrator: - kind: - version - migration_number: - 3 - build_number: - 1 - paused: false - override_cbc_keys: - - cuda_compiler_stub - operation: key_add - check_solvable: false - primary_key: cuda_compiler_version - ordering: - cxx_compiler_version: - - 9 - - 8 - - 7 - c_compiler_version: - - 9 - - 8 - - 7 - fortran_compiler_version: - - 9 - - 8 - - 7 - docker_image: - - quay.io/condaforge/linux-anvil-comp7 # [os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-aarch64 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - - quay.io/condaforge/linux-anvil-ppc64le # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-armv7l # [os.environ.get("BUILD_PLATFORM") == "linux-armv7l"] - - quay.io/condaforge/linux-anvil-cuda:9.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:10.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:10.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:10.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - # case: native compilation (build == target) - - 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"] - # case: cross-compilation (build != target) - - quay.io/condaforge/linux-anvil-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - # case: non-CUDA builds - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - cuda_compiler_version: - - None - - 10.2 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.0 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.1 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.2 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12.0 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - commit_message: | - Rebuild for CUDA 12 w/arch + Windows support - - The transition to CUDA 12 SDK includes new packages for all CUDA libraries and - build tools. Notably, the cudatoolkit package no longer exists, and packages - should depend directly on the specific CUDA libraries (libcublas, libcusolver, - etc) as needed. For an in-depth overview of the changes and to report problems - [see this issue]( https://github.com/conda-forge/conda-forge.github.io/issues/1963 ). - Please feel free to raise any issues encountered there. Thank you! :pray: - -cuda_compiler: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - cuda-nvcc # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cuda_compiler_version: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12.0 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -c_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cxx_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -fortran_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cdt_name: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - cos7 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux-") and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - # case: native compilation (build == target) - - quay.io/condaforge/linux-anvil-ppc64le # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-aarch64 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - # case: cross-compilation (build != target) - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 04905f54..7fcad2a4 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -8,6 +8,10 @@ c_stdlib_version: - '10.13' channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -17,20 +21,16 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' -libblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib +- '17' llvm_openmp: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 numpy: - '1.22' - '1.23' - '1.26' -- '1.22' +- '2' - '1.22' pin_run_as_build: python: @@ -40,10 +40,11 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython +- 3.13.* *_cp313 - 3.9.* *_cpython target_platform: - osx-64 zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index d4f24dfd..040d2fc3 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -8,6 +8,10 @@ c_stdlib_version: - '11.0' channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -17,20 +21,16 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' -libblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib +- '17' llvm_openmp: -- '16' +- '17' macos_machine: - arm64-apple-darwin20.0.0 numpy: - '1.22' - '1.23' - '1.26' -- '1.22' +- '2' - '1.22' pin_run_as_build: python: @@ -40,10 +40,11 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython +- 3.13.* *_cp313 - 3.9.* *_cpython target_platform: - osx-arm64 zip_keys: - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml index 0a5298eb..cf4102ff 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml @@ -2,6 +2,10 @@ c_stdlib: - vs channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -18,7 +22,7 @@ numpy: - '1.22' - '1.23' - '1.26' -- '1.22' +- '2' - '1.22' pin_run_as_build: python: @@ -28,7 +32,7 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython +- 3.13.* *_cp313 - 3.9.* *_cpython target_platform: - win-64 @@ -37,3 +41,4 @@ zip_keys: - cuda_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml index cfeaed6d..ffed7665 100644 --- a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml @@ -2,6 +2,10 @@ c_stdlib: - vs channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -18,7 +22,7 @@ numpy: - '1.22' - '1.23' - '1.26' -- '1.22' +- '2' - '1.22' pin_run_as_build: python: @@ -28,7 +32,7 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython +- 3.13.* *_cp313 - 3.9.* *_cpython target_platform: - win-64 @@ -37,3 +41,4 @@ zip_keys: - cuda_compiler_version - - python - numpy + - channel_sources diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml index b7ac21c1..e4d8f192 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml @@ -2,6 +2,10 @@ c_stdlib: - vs channel_sources: - conda-forge +- conda-forge +- conda-forge +- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -18,7 +22,7 @@ numpy: - '1.22' - '1.23' - '1.26' -- '1.22' +- '2' - '1.22' pin_run_as_build: python: @@ -28,7 +32,7 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython +- 3.13.* *_cp313 - 3.9.* *_cpython target_platform: - win-64 @@ -37,3 +41,4 @@ zip_keys: - cuda_compiler_version - - python - numpy + - channel_sources diff --git a/README.md b/README.md index f5c832b2..3c4b5e05 100644 --- a/README.md +++ b/README.md @@ -44,10 +44,10 @@ Current build status - + @@ -86,10 +86,10 @@ Current build status - + diff --git a/build-locally.py b/build-locally.py index d78427b5..8ac9b846 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,8 +1,11 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob import os import platform From aefa091951a0f9c3eeb5bb81d47b88571fc753a2 Mon Sep 17 00:00:00 2001 From: h-vetinari Date: Tue, 10 Sep 2024 07:51:26 +0200 Subject: [PATCH 3/3] Add setuptools --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b8dfd91a..043510ae 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -169,6 +169,7 @@ outputs: host: - python - pip + - setuptools - numpy - libfaiss ={{ version }}=*_{{ faiss_proc_type }} - libgomp # [linux]
VariantStatus
linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13 - variant + variant
linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12linux_ppc64le_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13 - variant + variant