From e353f184d529b0d245edd22919b274ceb06774d1 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <121827174+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 12:08:50 +0000 Subject: [PATCH 1/6] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 274ae6742..615a201de 100644 --- a/README.md +++ b/README.md @@ -327,3 +327,6 @@ Feedstock Maintainers * [@hmaarrfk](https://github.com/hmaarrfk/) * [@sodre](https://github.com/sodre/) + + + From b57078a01d1e8e040022b0e54b429cf9bd4b9c96 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 12:11:42 +0000 Subject: [PATCH 2/6] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.40.1, and conda-forge-pinning 2024.09.19.10.49.54 --- .azure-pipelines/azure-pipelines-osx.yml | 57 ++++------ ...ler_version11.8cxx_compiler_version11.yaml | 2 - ...ler_version12.0cxx_compiler_version12.yaml | 2 - ...ler_versionNonecxx_compiler_version13.yaml | 2 - ...ler_version11.8cxx_compiler_version11.yaml | 2 - ...ler_version12.0cxx_compiler_version12.yaml | 2 - ...ler_versionNonecxx_compiler_version13.yaml | 2 - ...ler_version12.0cxx_compiler_version12.yaml | 2 - ...ler_versionNonecxx_compiler_version13.yaml | 2 - .ci_support/migrations/cuda120.yaml | 106 ------------------ ...genericnumpy1.22python3.8.____cpython.yaml | 59 ---------- ...as_implgenericpython3.10.____cpython.yaml} | 0 ...as_implgenericpython3.11.____cpython.yaml} | 0 ...as_implgenericpython3.12.____cpython.yaml} | 0 ...las_implgenericpython3.9.____cpython.yaml} | 0 ...implmklnumpy1.22python3.8.____cpython.yaml | 59 ---------- ...4_blas_implmklpython3.10.____cpython.yaml} | 0 ...4_blas_implmklpython3.11.____cpython.yaml} | 0 ...4_blas_implmklpython3.12.____cpython.yaml} | 0 ...64_blas_implmklpython3.9.____cpython.yaml} | 0 ..._arm64_numpy1.22python3.8.____cpython.yaml | 59 ---------- ... => osx_arm64_python3.10.____cpython.yaml} | 0 ... => osx_arm64_python3.11.____cpython.yaml} | 0 ... => osx_arm64_python3.12.____cpython.yaml} | 0 ...l => osx_arm64_python3.9.____cpython.yaml} | 0 .scripts/build_steps.sh | 2 + README.md | 72 ++++-------- build-locally.py | 5 +- 28 files changed, 54 insertions(+), 381 deletions(-) delete mode 100644 .ci_support/migrations/cuda120.yaml delete mode 100644 .ci_support/osx_64_blas_implgenericnumpy1.22python3.8.____cpython.yaml rename .ci_support/{osx_64_blas_implgenericnumpy2.0python3.10.____cpython.yaml => osx_64_blas_implgenericpython3.10.____cpython.yaml} (100%) rename .ci_support/{osx_64_blas_implgenericnumpy2.0python3.11.____cpython.yaml => osx_64_blas_implgenericpython3.11.____cpython.yaml} (100%) rename .ci_support/{osx_64_blas_implgenericnumpy2.0python3.12.____cpython.yaml => osx_64_blas_implgenericpython3.12.____cpython.yaml} (100%) rename .ci_support/{osx_64_blas_implgenericnumpy2.0python3.9.____cpython.yaml => osx_64_blas_implgenericpython3.9.____cpython.yaml} (100%) delete mode 100644 .ci_support/osx_64_blas_implmklnumpy1.22python3.8.____cpython.yaml rename .ci_support/{osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml => osx_64_blas_implmklpython3.10.____cpython.yaml} (100%) rename .ci_support/{osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml => osx_64_blas_implmklpython3.11.____cpython.yaml} (100%) rename .ci_support/{osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml => osx_64_blas_implmklpython3.12.____cpython.yaml} (100%) rename .ci_support/{osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml => osx_64_blas_implmklpython3.9.____cpython.yaml} (100%) delete mode 100644 .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml rename .ci_support/{osx_arm64_numpy2.0python3.10.____cpython.yaml => osx_arm64_python3.10.____cpython.yaml} (100%) rename .ci_support/{osx_arm64_numpy2.0python3.11.____cpython.yaml => osx_arm64_python3.11.____cpython.yaml} (100%) rename .ci_support/{osx_arm64_numpy2.0python3.12.____cpython.yaml => osx_arm64_python3.12.____cpython.yaml} (100%) rename .ci_support/{osx_arm64_numpy2.0python3.9.____cpython.yaml => osx_arm64_python3.9.____cpython.yaml} (100%) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 432c35c8c..dc706a8ea 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,50 +8,41 @@ jobs: vmImage: macos-12 strategy: matrix: - osx_64_blas_implgenericnumpy1.22python3.8.____cpython: - CONFIG: osx_64_blas_implgenericnumpy1.22python3.8.____cpython + osx_64_blas_implgenericpython3.10.____cpython: + CONFIG: osx_64_blas_implgenericpython3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_blas_implgenericnumpy2.0python3.10.____cpython: - CONFIG: osx_64_blas_implgenericnumpy2.0python3.10.____cpython + osx_64_blas_implgenericpython3.11.____cpython: + CONFIG: osx_64_blas_implgenericpython3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_blas_implgenericnumpy2.0python3.11.____cpython: - CONFIG: osx_64_blas_implgenericnumpy2.0python3.11.____cpython + osx_64_blas_implgenericpython3.12.____cpython: + CONFIG: osx_64_blas_implgenericpython3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_blas_implgenericnumpy2.0python3.12.____cpython: - CONFIG: osx_64_blas_implgenericnumpy2.0python3.12.____cpython + osx_64_blas_implgenericpython3.9.____cpython: + CONFIG: osx_64_blas_implgenericpython3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_64_blas_implgenericnumpy2.0python3.9.____cpython: - CONFIG: osx_64_blas_implgenericnumpy2.0python3.9.____cpython + osx_64_blas_implmklpython3.10.____cpython: + CONFIG: osx_64_blas_implmklpython3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_blas_implmklnumpy1.22python3.8.____cpython: - CONFIG: osx_64_blas_implmklnumpy1.22python3.8.____cpython + osx_64_blas_implmklpython3.11.____cpython: + CONFIG: osx_64_blas_implmklpython3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_blas_implmklnumpy2.0python3.10.____cpython: - CONFIG: osx_64_blas_implmklnumpy2.0python3.10.____cpython + osx_64_blas_implmklpython3.12.____cpython: + CONFIG: osx_64_blas_implmklpython3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_blas_implmklnumpy2.0python3.11.____cpython: - CONFIG: osx_64_blas_implmklnumpy2.0python3.11.____cpython + osx_64_blas_implmklpython3.9.____cpython: + CONFIG: osx_64_blas_implmklpython3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_64_blas_implmklnumpy2.0python3.12.____cpython: - CONFIG: osx_64_blas_implmklnumpy2.0python3.12.____cpython + osx_arm64_python3.10.____cpython: + CONFIG: osx_arm64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_blas_implmklnumpy2.0python3.9.____cpython: - CONFIG: osx_64_blas_implmklnumpy2.0python3.9.____cpython + osx_arm64_python3.11.____cpython: + CONFIG: osx_arm64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.8.____cpython: - CONFIG: osx_arm64_numpy1.22python3.8.____cpython + osx_arm64_python3.12.____cpython: + CONFIG: osx_arm64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.10.____cpython: - CONFIG: osx_arm64_numpy2.0python3.10.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.11.____cpython: - CONFIG: osx_arm64_numpy2.0python3.11.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.12.____cpython: - CONFIG: osx_arm64_numpy2.0python3.12.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.9.____cpython: - CONFIG: osx_arm64_numpy2.0python3.9.____cpython + osx_arm64_python3.9.____cpython: + CONFIG: osx_arm64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_64_blas_implgenericc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_blas_implgenericc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 1220e228e..4ae467cb4 100644 --- a/.ci_support/linux_64_blas_implgenericc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_blas_implgenericc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -46,7 +46,6 @@ numpy: - '2.0' - '2.0' - '2.0' -- '1.22' - '2.0' pin_run_as_build: python: @@ -56,7 +55,6 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython - 3.9.* *_cpython pytorch: - '2.3' diff --git a/.ci_support/linux_64_blas_implgenericc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_blas_implgenericc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index 03c5cb1a9..0dcde386b 100644 --- a/.ci_support/linux_64_blas_implgenericc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_64_blas_implgenericc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -46,7 +46,6 @@ numpy: - '2.0' - '2.0' - '2.0' -- '1.22' - '2.0' pin_run_as_build: python: @@ -56,7 +55,6 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython - 3.9.* *_cpython pytorch: - '2.3' diff --git a/.ci_support/linux_64_blas_implgenericc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_64_blas_implgenericc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml index 3a6d4bd2b..758230ae1 100644 --- a/.ci_support/linux_64_blas_implgenericc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_64_blas_implgenericc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml @@ -46,7 +46,6 @@ numpy: - '2.0' - '2.0' - '2.0' -- '1.22' - '2.0' pin_run_as_build: python: @@ -56,7 +55,6 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython - 3.9.* *_cpython pytorch: - '2.3' diff --git a/.ci_support/linux_64_blas_implmklc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_blas_implmklc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index a12a0a6ce..7ad6f90a5 100644 --- a/.ci_support/linux_64_blas_implmklc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_blas_implmklc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -46,7 +46,6 @@ numpy: - '2.0' - '2.0' - '2.0' -- '1.22' - '2.0' pin_run_as_build: python: @@ -56,7 +55,6 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython - 3.9.* *_cpython pytorch: - '2.3' diff --git a/.ci_support/linux_64_blas_implmklc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_blas_implmklc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index f44dd8f47..44518468f 100644 --- a/.ci_support/linux_64_blas_implmklc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_64_blas_implmklc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -46,7 +46,6 @@ numpy: - '2.0' - '2.0' - '2.0' -- '1.22' - '2.0' pin_run_as_build: python: @@ -56,7 +55,6 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython - 3.9.* *_cpython pytorch: - '2.3' diff --git a/.ci_support/linux_64_blas_implmklc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_64_blas_implmklc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml index 1b2f19cc5..76685eae1 100644 --- a/.ci_support/linux_64_blas_implmklc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_64_blas_implmklc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml @@ -46,7 +46,6 @@ numpy: - '2.0' - '2.0' - '2.0' -- '1.22' - '2.0' pin_run_as_build: python: @@ -56,7 +55,6 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython - 3.9.* *_cpython pytorch: - '2.3' diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index c49624a5a..41e88553b 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -50,7 +50,6 @@ numpy: - '2.0' - '2.0' - '2.0' -- '1.22' - '2.0' pin_run_as_build: python: @@ -60,7 +59,6 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython - 3.9.* *_cpython pytorch: - '2.3' diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml index 2f9668436..ff6203967 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml @@ -50,7 +50,6 @@ numpy: - '2.0' - '2.0' - '2.0' -- '1.22' - '2.0' pin_run_as_build: python: @@ -60,7 +59,6 @@ python: - 3.10.* *_cpython - 3.11.* *_cpython - 3.12.* *_cpython -- 3.8.* *_cpython - 3.9.* *_cpython pytorch: - '2.3' diff --git a/.ci_support/migrations/cuda120.yaml b/.ci_support/migrations/cuda120.yaml deleted file mode 100644 index 9f23a0b31..000000000 --- a/.ci_support/migrations/cuda120.yaml +++ /dev/null @@ -1,106 +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"] - - # case: CUDA 11.2 - - 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: CUDA 11.8 - - quay.io/condaforge/linux-anvil-cuda:11.8 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - # case: native compilation (build == target) - - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - # case: cross-compilation (build != target) - - quay.io/condaforge/linux-anvil-cuda:11.8 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.8 # [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"] - - 11.8 # [(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"] - -c_stdlib_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 2.17 # [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_blas_implgenericnumpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_blas_implgenericnumpy1.22python3.8.____cpython.yaml deleted file mode 100644 index e242c5294..000000000 --- a/.ci_support/osx_64_blas_implgenericnumpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,59 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.15' -MACOSX_SDK_VERSION: -- '12.3' -blas_impl: -- generic -c_compiler: -- clang -c_compiler_version: -- '17' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '17' -libabseil: -- '20240116' -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 4.25.3 -llvm_openmp: -- '17' -macos_machine: -- x86_64-apple-darwin13.4.0 -megabuild: -- 'false' -mkl: -- '2023' -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -pytorch: -- '2.3' -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implgenericpython3.10.____cpython.yaml similarity index 100% rename from .ci_support/osx_64_blas_implgenericnumpy2.0python3.10.____cpython.yaml rename to .ci_support/osx_64_blas_implgenericpython3.10.____cpython.yaml diff --git a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implgenericpython3.11.____cpython.yaml similarity index 100% rename from .ci_support/osx_64_blas_implgenericnumpy2.0python3.11.____cpython.yaml rename to .ci_support/osx_64_blas_implgenericpython3.11.____cpython.yaml diff --git a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implgenericpython3.12.____cpython.yaml similarity index 100% rename from .ci_support/osx_64_blas_implgenericnumpy2.0python3.12.____cpython.yaml rename to .ci_support/osx_64_blas_implgenericpython3.12.____cpython.yaml diff --git a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implgenericpython3.9.____cpython.yaml similarity index 100% rename from .ci_support/osx_64_blas_implgenericnumpy2.0python3.9.____cpython.yaml rename to .ci_support/osx_64_blas_implgenericpython3.9.____cpython.yaml diff --git a/.ci_support/osx_64_blas_implmklnumpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy1.22python3.8.____cpython.yaml deleted file mode 100644 index 196fe3e37..000000000 --- a/.ci_support/osx_64_blas_implmklnumpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,59 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.15' -MACOSX_SDK_VERSION: -- '12.3' -blas_impl: -- mkl -c_compiler: -- clang -c_compiler_version: -- '17' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '17' -libabseil: -- '20240116' -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 4.25.3 -llvm_openmp: -- '17' -macos_machine: -- x86_64-apple-darwin13.4.0 -megabuild: -- 'false' -mkl: -- '2023' -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -pytorch: -- '2.3' -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implmklpython3.10.____cpython.yaml similarity index 100% rename from .ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml rename to .ci_support/osx_64_blas_implmklpython3.10.____cpython.yaml diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implmklpython3.11.____cpython.yaml similarity index 100% rename from .ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml rename to .ci_support/osx_64_blas_implmklpython3.11.____cpython.yaml diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implmklpython3.12.____cpython.yaml similarity index 100% rename from .ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml rename to .ci_support/osx_64_blas_implmklpython3.12.____cpython.yaml diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implmklpython3.9.____cpython.yaml similarity index 100% rename from .ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml rename to .ci_support/osx_64_blas_implmklpython3.9.____cpython.yaml diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index a1ddce135..000000000 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,59 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '12.3' -blas_impl: -- generic -c_compiler: -- clang -c_compiler_version: -- '17' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '17' -libabseil: -- '20240116' -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 4.25.3 -llvm_openmp: -- '17' -macos_machine: -- arm64-apple-darwin20.0.0 -megabuild: -- 'false' -mkl: -- '2023' -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -pytorch: -- '2.3' -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml similarity index 100% rename from .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml rename to .ci_support/osx_arm64_python3.10.____cpython.yaml diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml similarity index 100% rename from .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml rename to .ci_support/osx_arm64_python3.11.____cpython.yaml diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml similarity index 100% rename from .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml rename to .ci_support/osx_arm64_python3.12.____cpython.yaml diff --git a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml similarity index 100% rename from .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml rename to .ci_support/osx_arm64_python3.9.____cpython.yaml diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 50dc94e6a..8a527a4f7 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,8 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/README.md b/README.md index 615a201de..175af001b 100644 --- a/README.md +++ b/README.md @@ -85,108 +85,87 @@ Current build status - osx_64_blas_implgenericnumpy1.22python3.8.____cpython + osx_64_blas_implgenericpython3.10.____cpython - variant + variant - osx_64_blas_implgenericnumpy2.0python3.10.____cpython + osx_64_blas_implgenericpython3.11.____cpython - variant + variant - osx_64_blas_implgenericnumpy2.0python3.11.____cpython + osx_64_blas_implgenericpython3.12.____cpython - variant + variant - osx_64_blas_implgenericnumpy2.0python3.12.____cpython + osx_64_blas_implgenericpython3.9.____cpython - variant + variant - osx_64_blas_implgenericnumpy2.0python3.9.____cpython + osx_64_blas_implmklpython3.10.____cpython - variant + variant - osx_64_blas_implmklnumpy1.22python3.8.____cpython + osx_64_blas_implmklpython3.11.____cpython - variant + variant - osx_64_blas_implmklnumpy2.0python3.10.____cpython + osx_64_blas_implmklpython3.12.____cpython - variant + variant - osx_64_blas_implmklnumpy2.0python3.11.____cpython + osx_64_blas_implmklpython3.9.____cpython - variant + variant - osx_64_blas_implmklnumpy2.0python3.12.____cpython + osx_arm64_python3.10.____cpython - variant + variant - osx_64_blas_implmklnumpy2.0python3.9.____cpython + osx_arm64_python3.11.____cpython - variant + variant - osx_arm64_numpy1.22python3.8.____cpython + osx_arm64_python3.12.____cpython - variant + variant - osx_arm64_numpy2.0python3.10.____cpython + osx_arm64_python3.9.____cpython - variant - - - - osx_arm64_numpy2.0python3.11.____cpython - - - variant - - - - osx_arm64_numpy2.0python3.12.____cpython - - - variant - - - - osx_arm64_numpy2.0python3.9.____cpython - - - variant + variant @@ -327,6 +306,3 @@ Feedstock Maintainers * [@hmaarrfk](https://github.com/hmaarrfk/) * [@sodre](https://github.com/sodre/) - - - diff --git a/build-locally.py b/build-locally.py index d78427b5b..6788aea66 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 609eb740cfeb2972651111f8323a86fe51d90150 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 19 Sep 2024 08:14:51 -0400 Subject: [PATCH 3/6] Update to 2.4.1 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 53e4c833b..20b759b31 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ -{% set version = "2.4.0" %} -{% set build = 1 %} +{% set version = "2.4.1" %} +{% set build = 0 %} {% if cuda_compiler_version != "None" %} {% set build = build + 200 %} From 6760c682a6278fdbcf8585559f9050298ca46d4c Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 19 Sep 2024 08:15:08 -0400 Subject: [PATCH 4/6] Update meta.yaml --- recipe/meta.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 20b759b31..d574dcca8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -34,10 +34,6 @@ source: # https://gist.github.com/andreigh/f78f631e0039f0af410b269acbb0c8dc - patches/0002-Use-new-nvtoolset.patch # [cuda_compiler_version == "12.0"] - # Remove in 2.4.1+ - # https://github.com/pytorch/pytorch/pull/133177 - - patches/133177_remove_qnnpack.patch - build: number: {{ build }} string: cuda{{ cuda_compiler_version | replace('.', '') }}_h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version != "None"] From a84a037ba83be8d762b8e3be82986139b407b12a Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 19 Sep 2024 08:25:51 -0400 Subject: [PATCH 5/6] Update sha --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d574dcca8..4dd2c49f1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,7 +21,7 @@ package: source: url: https://github.com/pytorch/pytorch/releases/download/v{{ version }}/pytorch-v{{ version }}.tar.gz - sha256: a890d4342149adbc6c8b116a9afe437fe347527a9ecc0650086cdec82ecdcfb7 + sha256: 39666a43c0c10f5fd46c1a7ca95dc74d3bc39de2678b70066481cbf02e58384f patches: # The patch below is probably OK for other versions too, but it is untested with them # https://github.com/conda-forge/pytorch-cpu-feedstock/pull/203#issuecomment-1797352452 From 4427b83131a123ca15551a0745eb09c4c7c6cc8c Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 19 Sep 2024 08:28:16 -0400 Subject: [PATCH 6/6] Delete recipe/patches/133177_remove_qnnpack.patch --- recipe/patches/133177_remove_qnnpack.patch | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 recipe/patches/133177_remove_qnnpack.patch diff --git a/recipe/patches/133177_remove_qnnpack.patch b/recipe/patches/133177_remove_qnnpack.patch deleted file mode 100644 index c740ae33e..000000000 --- a/recipe/patches/133177_remove_qnnpack.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/setup.py b/setup.py -index 9ec41cd37cd..5d1952b67b0 100644 ---- a/setup.py -+++ b/setup.py -@@ -68,9 +68,6 @@ - # USE_NNPACK=0 - # disables NNPACK build - # --# USE_QNNPACK=0 --# disables QNNPACK build (quantized 8-bit operators) --# - # USE_DISTRIBUTED=0 - # disables distributed (c10d, gloo, mpi, etc.) build - # -@@ -366,7 +363,6 @@ def get_submodule_folders(): - "cpuinfo", - "onnx", - "foxi", -- "QNNPACK", - "fbgemm", - "cutlass", - ]