From 52d1864e0f96267c0cef49b7b07e378e8f3e0533 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <121827174+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 24 Feb 2024 18:56:46 +0000 Subject: [PATCH 01/16] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index ba0f53f..cb570f3 100644 --- a/README.md +++ b/README.md @@ -359,3 +359,6 @@ Feedstock Maintainers * [@hmaarrfk](https://github.com/hmaarrfk/) * [@nehaljwani](https://github.com/nehaljwani/) + + + From 8203af095f9c4aea29f46b5002423c5391e26eff Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 24 Feb 2024 13:57:36 -0500 Subject: [PATCH 02/16] Rebuild for increased compatibility --- recipe/meta.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cdcd9f7..f863f6f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -3,9 +3,6 @@ # torchvision requires that CUDA major and minor versions match with pytorch # https://github.com/pytorch/vision/blob/fa99a5360fbcd1683311d57a76fcc0e7323a4c1e/torchvision/extension.py#L79C1-L85C1 {% set torch_proc_type = "cuda" ~ cuda_compiler_version | replace('.', '') if cuda_compiler_version != "None" else "cpu" %} -# Upstream has specific compatability ranges for pytorch and python which are -# updated every 0.x release. https://github.com/pytorch/vision#installation -{% set compatible_pytorch = "2.1" %} {% if cuda_compiler_version in (None, "None", True, False) %} {% set cuda_major = 0 %} @@ -24,7 +21,7 @@ source: - 0001-Monkeypatch-TORCH_LIB_PATH.patch build: - number: 2 + number: 3 skip: true # [win] # no CUDA-enabled pytorch on aarch yet skip: true # [cuda_compiler_version != "None" and aarch64] @@ -62,7 +59,7 @@ outputs: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] - - pytorch ={{ compatible_pytorch }}={{ torch_proc_type }}* # [build_platform != target_platform] + - pytorch ={{ pytorch }}.*={{ torch_proc_type }}* # [build_platform != target_platform] host: - python - pip @@ -83,11 +80,11 @@ outputs: - numpy # exclude 8.3.0 and 8.3.1 specifically due to pytorch/vision#4146, python-pillow/Pillow#5571 - pillow >=5.3.0,!=8.3.0,!=8.3.1 - - pytorch ={{ compatible_pytorch }}={{ torch_proc_type }}* + - pytorch ={{ pytorch }}.*={{ torch_proc_type }}* - requests run: - python - - pytorch ={{ compatible_pytorch }}={{ torch_proc_type }}* + - pytorch ={{ pytorch }}.*={{ torch_proc_type }}* - {{ pin_compatible('cudnn') }} # [cuda_compiler_version != "None"] - {{ pin_compatible('numpy') }} - pillow >=5.3.0,!=8.3.0,!=8.3.1 From 673f65abade3208f1fd95eef2be9c47f866e4e69 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 24 Feb 2024 18:59:22 +0000 Subject: [PATCH 03/16] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.30.4, and conda-forge-pinning 2024.02.23.21.25.19 --- .azure-pipelines/azure-pipelines-linux.yml | 16 +-- ...sion10numpy1.22python3.10.____cpython.yaml | 2 + ...rsion10numpy1.22python3.8.____cpython.yaml | 2 + ...rsion10numpy1.22python3.9.____cpython.yaml | 2 + ...sion10numpy1.23python3.11.____cpython.yaml | 2 + ...sion11numpy1.22python3.10.____cpython.yaml | 2 + ...rsion11numpy1.22python3.8.____cpython.yaml | 2 + ...rsion11numpy1.22python3.9.____cpython.yaml | 2 + ...sion11numpy1.23python3.11.____cpython.yaml | 2 + ...sion12numpy1.22python3.10.____cpython.yaml | 2 + ...rsion12numpy1.22python3.8.____cpython.yaml | 2 + ...rsion12numpy1.22python3.9.____cpython.yaml | 2 + ...sion12numpy1.23python3.11.____cpython.yaml | 2 + ...sion12numpy1.22python3.10.____cpython.yaml | 2 + ...rsion12numpy1.22python3.8.____cpython.yaml | 2 + ...rsion12numpy1.22python3.9.____cpython.yaml | 2 + ...sion12numpy1.23python3.11.____cpython.yaml | 2 + ...ion12numpy1.22python3.10.____cpython.yaml} | 4 +- ...sion12numpy1.22python3.8.____cpython.yaml} | 4 +- ...sion12numpy1.22python3.9.____cpython.yaml} | 4 +- ...ion12numpy1.23python3.11.____cpython.yaml} | 4 +- .ci_support/migrations/cuda118.yaml | 99 ------------------- .ci_support/migrations/libjpeg_turbo3.yaml | 7 -- .ci_support/migrations/pytorch21.yaml | 7 -- ...sx_64_numpy1.22python3.10.____cpython.yaml | 2 + ...osx_64_numpy1.22python3.8.____cpython.yaml | 2 + ...osx_64_numpy1.22python3.9.____cpython.yaml | 2 + ...sx_64_numpy1.23python3.11.____cpython.yaml | 2 + ...arm64_numpy1.22python3.10.____cpython.yaml | 2 + ..._arm64_numpy1.22python3.8.____cpython.yaml | 2 + ..._arm64_numpy1.22python3.9.____cpython.yaml | 2 + ...arm64_numpy1.23python3.11.____cpython.yaml | 2 + .gitignore | 25 ++++- .scripts/build_steps.sh | 6 -- .scripts/run_docker_build.sh | 6 ++ README.md | 19 ++-- 36 files changed, 105 insertions(+), 144 deletions(-) rename .ci_support/{linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml => linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml} (96%) rename .ci_support/{linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml => linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml} (96%) rename .ci_support/{linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml => linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml} (96%) rename .ci_support/{linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml => linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml} (96%) delete mode 100644 .ci_support/migrations/cuda118.yaml delete mode 100644 .ci_support/migrations/libjpeg_turbo3.yaml delete mode 100644 .ci_support/migrations/pytorch21.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index bd490a8..1eb72e9 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -72,20 +72,20 @@ jobs: : CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - ? linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython - : CONFIG: linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython + ? linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython + : CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - ? linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython - : CONFIG: linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython + ? linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython + : CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - ? linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython - : CONFIG: linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython + ? linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython + : CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - ? linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython - : CONFIG: linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython + ? linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython + : CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml index 64f2f0f..ee5be56 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml @@ -32,6 +32,8 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +pytorch: +- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml index c5de34b..9c2f3f0 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml @@ -32,6 +32,8 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +pytorch: +- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml index 3dadf0d..336b851 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml @@ -32,6 +32,8 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +pytorch: +- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml index 63d0110..45e69b1 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml @@ -32,6 +32,8 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython +pytorch: +- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml index 5d8c48a..a4dde39 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml @@ -32,6 +32,8 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +pytorch: +- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml index 3ac8ab9..308f5e4 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml @@ -32,6 +32,8 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +pytorch: +- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml index 85a3827..9758007 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml @@ -32,6 +32,8 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +pytorch: +- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml index 8a42a7d..0ac715a 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml @@ -32,6 +32,8 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython +pytorch: +- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml index 6413f03..9930ce4 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -32,6 +32,8 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +pytorch: +- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml index e5a77a0..0ecec8d 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml @@ -32,6 +32,8 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +pytorch: +- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml index 1d7c245..8d9a5a4 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -32,6 +32,8 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +pytorch: +- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml index b408f29..075982a 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -32,6 +32,8 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython +pytorch: +- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml index 343fe38..7233508 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -32,6 +32,8 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +pytorch: +- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml index fd13375..ca83047 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml @@ -32,6 +32,8 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +pytorch: +- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml index 225b654..4665d91 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -32,6 +32,8 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +pytorch: +- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml index 7026369..cd811be 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -32,6 +32,8 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython +pytorch: +- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml similarity index 96% rename from .ci_support/linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml index 7f098f3..7d608bd 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -13,7 +13,7 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- nvcc +- None cuda_compiler_version: - None cxx_compiler: @@ -34,6 +34,8 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +pytorch: +- '2.1' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml similarity index 96% rename from .ci_support/linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml index 1629071..80069bf 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml @@ -13,7 +13,7 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- nvcc +- None cuda_compiler_version: - None cxx_compiler: @@ -34,6 +34,8 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +pytorch: +- '2.1' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml similarity index 96% rename from .ci_support/linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml index 421dbdc..05c9ab3 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -13,7 +13,7 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- nvcc +- None cuda_compiler_version: - None cxx_compiler: @@ -34,6 +34,8 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +pytorch: +- '2.1' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml similarity index 96% rename from .ci_support/linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml index 428879c..7845da6 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -13,7 +13,7 @@ channel_sources: channel_targets: - conda-forge main cuda_compiler: -- nvcc +- None cuda_compiler_version: - None cxx_compiler: @@ -34,6 +34,8 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython +pytorch: +- '2.1' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/migrations/cuda118.yaml b/.ci_support/migrations/cuda118.yaml deleted file mode 100644 index fdd298b..0000000 --- a/.ci_support/migrations/cuda118.yaml +++ /dev/null @@ -1,99 +0,0 @@ -migrator_ts: 1692828152 -__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 - ordering: - cxx_compiler_version: - - 9 - - 8 - - 7 - c_compiler_version: - - 9 - - 8 - - 7 - fortran_compiler_version: - - 9 - - 8 - - 7 - docker_image: - # Native builds - - 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"] - - # Legacy CUDAs - - 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"] - - # CUDA 11.2 - - quay.io/condaforge/linux-anvil-cuda:11.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - # CUDA 11.2 arch: 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"] - # CUDA 11.2 arch: 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"] - - # CUDA 11.8 - - quay.io/condaforge/linux-anvil-cuda:11.8 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - # CUDA 11.8 arch: 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"] - # CUDA 11.8 arch: 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"] - - # Native CentOS 7 image - - 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 win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.0 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.1 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.2 # [(linux or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.8 # [(linux or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12.0 # [(linux or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - commit_message: | - Rebuild for CUDA 11.8 w/arch support - -cuda_compiler: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 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"] - - 11.8 # [(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"] - - 11 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cxx_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -fortran_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11 # [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-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"] diff --git a/.ci_support/migrations/libjpeg_turbo3.yaml b/.ci_support/migrations/libjpeg_turbo3.yaml deleted file mode 100644 index b4e2468..0000000 --- a/.ci_support/migrations/libjpeg_turbo3.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libjpeg_turbo: -- '3' -migrator_ts: 1693842343.429878 diff --git a/.ci_support/migrations/pytorch21.yaml b/.ci_support/migrations/pytorch21.yaml deleted file mode 100644 index bb91f52..0000000 --- a/.ci_support/migrations/pytorch21.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -migrator_ts: 1699325293.519726 -pytorch: -- '2.1' diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index b9ecfdc..723d66e 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -30,6 +30,8 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +pytorch: +- '2.1' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index 7fee5c0..08184f7 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -30,6 +30,8 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +pytorch: +- '2.1' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 62120c7..a55e9d3 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -30,6 +30,8 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +pytorch: +- '2.1' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 3d02090..be1432a 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -30,6 +30,8 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython +pytorch: +- '2.1' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index ae01a64..eeea142 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -30,6 +30,8 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython +pytorch: +- '2.1' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index a6715e9..543a278 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -30,6 +30,8 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython +pytorch: +- '2.1' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 7dd890d..ac17905 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -30,6 +30,8 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython +pytorch: +- '2.1' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 1a48bf5..435b2e6 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -30,6 +30,8 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython +pytorch: +- '2.1' target_platform: - osx-arm64 zip_keys: diff --git a/.gitignore b/.gitignore index c89ecb7..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** -build_artifacts +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index eba1dfd..beda247 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -57,12 +57,6 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi -if [[ "${sha:-}" == "" ]]; then - pushd ${FEEDSTOCK_ROOT} - sha=$(git rev-parse HEAD) - popd -fi - if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index b70ef01..00f377a 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted diff --git a/README.md b/README.md index cb570f3..51d5bdc 100644 --- a/README.md +++ b/README.md @@ -143,31 +143,31 @@ Current build status - linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython + linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython - variant + variant - linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython + linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython - variant + variant - linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython + linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython - variant + variant - linux_aarch64_c_compiler_version12cuda_compilernvcccuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython + linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython - variant + variant @@ -359,6 +359,3 @@ Feedstock Maintainers * [@hmaarrfk](https://github.com/hmaarrfk/) * [@nehaljwani](https://github.com/nehaljwani/) - - - From dd5dee7cf504730d277345006c6a0ff6d2f96231 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 24 Feb 2024 15:46:24 -0500 Subject: [PATCH 04/16] Skip two more tests --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f863f6f..11a3060 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -164,6 +164,9 @@ outputs: {% set tests_to_skip = tests_to_skip + " or test_batched_vs_single" %} # 2023/11 Draw boxes test broken by pillow 1.10.0, but is non-critical and the test is patched upstream (pytorch/vision#8051) {% set tests_to_skip = tests_to_skip + " or test_draw_boxes" %} + # 2024/02 These tests assert warnings and in PyTorch 2.1.2 the number of warnings increased + # causing them to fail + {% set tests_to_skip = tests_to_skip + " or test_pretrained_pos or test_equivalent_behavior_weights" %} - pytest --verbose -k "not ({{ tests_to_skip }})" --durations=50 test/ # [not aarch64] - pytest -k "not ({{ tests_to_skip }})" --durations=50 test/ # [aarch64 and (build_platform == target_platform)] From d82233d488656a50ba949d679c3dba2e932621a9 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 24 Feb 2024 16:10:18 -0500 Subject: [PATCH 05/16] Remove split recipe stuffs. Build for python 3.12 --- recipe/{build-torch.bat => bld.bat} | 0 recipe/{build-torch.sh => build.sh} | 0 recipe/meta.yaml | 256 +++++++++++++--------------- 3 files changed, 123 insertions(+), 133 deletions(-) rename recipe/{build-torch.bat => bld.bat} (100%) rename recipe/{build-torch.sh => build.sh} (100%) diff --git a/recipe/build-torch.bat b/recipe/bld.bat similarity index 100% rename from recipe/build-torch.bat rename to recipe/bld.bat diff --git a/recipe/build-torch.sh b/recipe/build.sh similarity index 100% rename from recipe/build-torch.sh rename to recipe/build.sh diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 11a3060..282e6b6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,7 @@ {% endif %} package: - name: torchvision-split + name: torchvision version: {{ version }} source: @@ -21,6 +21,8 @@ source: - 0001-Monkeypatch-TORCH_LIB_PATH.patch build: + string: cpu_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version == "None"] + string: cuda{{ cuda_compiler_version | replace('.', '') }}py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version != "None"] number: 3 skip: true # [win] # no CUDA-enabled pytorch on aarch yet @@ -28,7 +30,6 @@ build: # Upstream has specific compatability ranges for pytorch and python which are # updated every 0.x release. https://github.com/pytorch/vision#installation skip: true # [py < 38] - skip: true # [py > 311] rpaths: - lib/ # PyTorch libs are in site-packages intead of with other shared objects @@ -36,139 +37,128 @@ build: requirements: build: + - {{ compiler('c') }} - {{ compiler('cxx') }} + - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] + {% if cuda_major >= 12 %} + - libcublas-dev # [build_platform != target_platform] + - libcusolver-dev # [build_platform != target_platform] + - libcusparse-dev # [build_platform != target_platform] + {% endif %} + - sysroot_linux-64 ==2.17 # [linux64] + - python # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] + - numpy # [build_platform != target_platform] + - pytorch ={{ pytorch }}.*={{ torch_proc_type }}* # [build_platform != target_platform] + host: + - python + - pip + - setuptools + - cudnn # [cuda_compiler_version != "None"] + {% if cuda_major >= 12 %} + - libcublas-dev + - libcusolver-dev + - libcusparse-dev + {% endif %} + # split off image/video into separate outputs? + - libjpeg-turbo + - libpng + # Specify lgpl version of ffmpeg so that there are + # no quesitons about the license of the resulting binary + # hmaarrfk: 2022/07, I think that torchvision just has bugs with ffmpeg + # - ffmpeg {{ ffmpeg }}=lgpl_* + - numpy + # exclude 8.3.0 and 8.3.1 specifically due to pytorch/vision#4146, python-pillow/Pillow#5571 + - pillow >=5.3.0,!=8.3.0,!=8.3.1 + - pytorch ={{ pytorch }}.*={{ torch_proc_type }}* + - requests + run: + - python + - pytorch ={{ pytorch }}.*={{ torch_proc_type }}* + - {{ pin_compatible('cudnn') }} # [cuda_compiler_version != "None"] + - {{ pin_compatible('numpy') }} + - pillow >=5.3.0,!=8.3.0,!=8.3.1 + - requests -outputs: - - name: torchvision - script: build-torch.sh # [not win] - script: build-torch.bat # [win] - build: - string: cpu_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version == "None"] - string: cuda{{ cuda_compiler_version | replace('.', '') }}py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version != "None"] - requirements: - build: - - {{ compiler('c') }} - - {{ compiler('cxx') }} - - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] - {% if cuda_major >= 12 %} - - libcublas-dev # [build_platform != target_platform] - - libcusolver-dev # [build_platform != target_platform] - - libcusparse-dev # [build_platform != target_platform] - {% endif %} - - sysroot_linux-64 ==2.17 # [linux64] - - python # [build_platform != target_platform] - - cross-python_{{ target_platform }} # [build_platform != target_platform] - - numpy # [build_platform != target_platform] - - pytorch ={{ pytorch }}.*={{ torch_proc_type }}* # [build_platform != target_platform] - host: - - python - - pip - - setuptools - - cudnn # [cuda_compiler_version != "None"] - {% if cuda_major >= 12 %} - - libcublas-dev - - libcusolver-dev - - libcusparse-dev - {% endif %} - # split off image/video into separate outputs? - - libjpeg-turbo - - libpng - # Specify lgpl version of ffmpeg so that there are - # no quesitons about the license of the resulting binary - # hmaarrfk: 2022/07, I think that torchvision just has bugs with ffmpeg - # - ffmpeg {{ ffmpeg }}=lgpl_* - - numpy - # exclude 8.3.0 and 8.3.1 specifically due to pytorch/vision#4146, python-pillow/Pillow#5571 - - pillow >=5.3.0,!=8.3.0,!=8.3.1 - - pytorch ={{ pytorch }}.*={{ torch_proc_type }}* - - requests - run: - - python - - pytorch ={{ pytorch }}.*={{ torch_proc_type }}* - - {{ pin_compatible('cudnn') }} # [cuda_compiler_version != "None"] - - {{ pin_compatible('numpy') }} - - pillow >=5.3.0,!=8.3.0,!=8.3.1 - - requests - - test: - requires: - - pytest - - av - - requests - - scipy - - pytest-mock - source_files: - - test - - references - imports: - - torchvision - - torchvision.datasets - - torchvision.models - - torchvision.transforms - - torchvision.utils - commands: - # skip test_url_is_accessible instead of hitting 20+ servers per run, since - # each server might be occasionally unresponsive and end up failing our CI - {% set tests_to_skip = "test_url_is_accessible" %} - # spurious failure because upstream skip (Image.__version__ >= "7") does not trigger for Pillow "10" - {% set tests_to_skip = tests_to_skip + " or (test_transforms and test_adjust_saturation)" %} - # osx warns with nnpack if there is no AVX2, see conda-forge/pytorch-cpu-feedstock#56 - {% set tests_to_skip = tests_to_skip + " or test_adjust_sharpness" %} # [osx] - # 2021/10/28 hmaarrfk: I am able to run it locally on a large machine. - # It seems to fail around testing of vgg - # This test seems to just destroy the memory of the system. - {% set tests_to_skip = tests_to_skip + " or test_forward_backward" %} - {% set tests_to_skip = tests_to_skip + " or test_jit_forward_backward" %} - # 2022/01/21 hmaarrfk (test_frame_reading) - # They indicate that there can be a 1% error in their test. - # However, this test seems to causing the CIs to fail when this - # case is hit. For example the last CI failed with - # - # > assert mean_delta.item() < 2.5 - # E assert 2.502098560333252 < 2.5 - {% set tests_to_skip = tests_to_skip + " or test_frame_reading" %} - # Random perspective tests can fail if the perspective is too sharp - # https://github.com/conda-forge/torchvision-feedstock/issues/38 - {% set tests_to_skip = tests_to_skip + " or test_randomperspective_fill" %} - # Tolerance on the test_frozenbatchnorm2d_eps test seems to be too strict - {% set tests_to_skip = tests_to_skip + " or test_frozenbatchnorm2d_eps" %} - {% set tests_to_skip = tests_to_skip + " or test_random_apply" %} - # 2022/03/29 hmaarrfk - # It seems that this test can cause segmentation faults on the CIs. - {% set tests_to_skip = tests_to_skip + " or test_write_video_with_audio" %} - {% set tests_to_skip = tests_to_skip + " or test_video_clips_custom_fps" %} - # 2022/07 hmaarrfk really large memory tests. Fail on CIs - {% set tests_to_skip = tests_to_skip + " or test_memory_efficient_densenet" %} - {% set tests_to_skip = tests_to_skip + " or test_resnet_dilation" %} - {% set tests_to_skip = tests_to_skip + " or test_mobilenet_v2_residual_setting" %} - {% set tests_to_skip = tests_to_skip + " or test_mobilenet_norm_layer" %} - {% set tests_to_skip = tests_to_skip + " or test_inception_v3_eval" %} - {% set tests_to_skip = tests_to_skip + " or test_fasterrcnn_double" %} - {% set tests_to_skip = tests_to_skip + " or test_googlenet_eval" %} - {% set tests_to_skip = tests_to_skip + " or test_fasterrcnn_switch_devices" %} - {% set tests_to_skip = tests_to_skip + " or test_mobilenet_v2_residual_setting" %} - {% set tests_to_skip = tests_to_skip + " or test_vitc_models" %} - {% set tests_to_skip = tests_to_skip + " or test_classification_model" %} - {% set tests_to_skip = tests_to_skip + " or test_segmentation_model" %} - {% set tests_to_skip = tests_to_skip + " or test_detection_model" %} - {% set tests_to_skip = tests_to_skip + " or test_detection_model_validation" %} - {% set tests_to_skip = tests_to_skip + " or test_video_model" %} - {% set tests_to_skip = tests_to_skip + " or test_quantized_classification_model" %} - {% set tests_to_skip = tests_to_skip + " or test_detection_model_trainable_backbone_layers" %} - {% set tests_to_skip = tests_to_skip + " or test_raft" %} - {% set tests_to_skip = tests_to_skip + " or test_build_fx_feature_extractor" %} - # 2023/01 These tests fail on newer numpy with module 'numpy' has no attribute 'int' - {% set tests_to_skip = tests_to_skip + " or test_transformation_range" %} - {% set tests_to_skip = tests_to_skip + " or test_transformation_discrete" %} - # 2023/05 The gaussian blur tests are known to be flaky due to some non-determinism on CUDA (see pytorch/vision#6755) - {% set tests_to_skip = tests_to_skip + " or test_batched_vs_single" %} - # 2023/11 Draw boxes test broken by pillow 1.10.0, but is non-critical and the test is patched upstream (pytorch/vision#8051) - {% set tests_to_skip = tests_to_skip + " or test_draw_boxes" %} - # 2024/02 These tests assert warnings and in PyTorch 2.1.2 the number of warnings increased - # causing them to fail - {% set tests_to_skip = tests_to_skip + " or test_pretrained_pos or test_equivalent_behavior_weights" %} - - pytest --verbose -k "not ({{ tests_to_skip }})" --durations=50 test/ # [not aarch64] - - pytest -k "not ({{ tests_to_skip }})" --durations=50 test/ # [aarch64 and (build_platform == target_platform)] +test: + requires: + - pytest + - av + - requests + - scipy + - pytest-mock + source_files: + - test + - references + imports: + - torchvision + - torchvision.datasets + - torchvision.models + - torchvision.transforms + - torchvision.utils + commands: + # skip test_url_is_accessible instead of hitting 20+ servers per run, since + # each server might be occasionally unresponsive and end up failing our CI + {% set tests_to_skip = "test_url_is_accessible" %} + # spurious failure because upstream skip (Image.__version__ >= "7") does not trigger for Pillow "10" + {% set tests_to_skip = tests_to_skip + " or (test_transforms and test_adjust_saturation)" %} + # osx warns with nnpack if there is no AVX2, see conda-forge/pytorch-cpu-feedstock#56 + {% set tests_to_skip = tests_to_skip + " or test_adjust_sharpness" %} # [osx] + # 2021/10/28 hmaarrfk: I am able to run it locally on a large machine. + # It seems to fail around testing of vgg + # This test seems to just destroy the memory of the system. + {% set tests_to_skip = tests_to_skip + " or test_forward_backward" %} + {% set tests_to_skip = tests_to_skip + " or test_jit_forward_backward" %} + # 2022/01/21 hmaarrfk (test_frame_reading) + # They indicate that there can be a 1% error in their test. + # However, this test seems to causing the CIs to fail when this + # case is hit. For example the last CI failed with + # + # > assert mean_delta.item() < 2.5 + # E assert 2.502098560333252 < 2.5 + {% set tests_to_skip = tests_to_skip + " or test_frame_reading" %} + # Random perspective tests can fail if the perspective is too sharp + # https://github.com/conda-forge/torchvision-feedstock/issues/38 + {% set tests_to_skip = tests_to_skip + " or test_randomperspective_fill" %} + # Tolerance on the test_frozenbatchnorm2d_eps test seems to be too strict + {% set tests_to_skip = tests_to_skip + " or test_frozenbatchnorm2d_eps" %} + {% set tests_to_skip = tests_to_skip + " or test_random_apply" %} + # 2022/03/29 hmaarrfk + # It seems that this test can cause segmentation faults on the CIs. + {% set tests_to_skip = tests_to_skip + " or test_write_video_with_audio" %} + {% set tests_to_skip = tests_to_skip + " or test_video_clips_custom_fps" %} + # 2022/07 hmaarrfk really large memory tests. Fail on CIs + {% set tests_to_skip = tests_to_skip + " or test_memory_efficient_densenet" %} + {% set tests_to_skip = tests_to_skip + " or test_resnet_dilation" %} + {% set tests_to_skip = tests_to_skip + " or test_mobilenet_v2_residual_setting" %} + {% set tests_to_skip = tests_to_skip + " or test_mobilenet_norm_layer" %} + {% set tests_to_skip = tests_to_skip + " or test_inception_v3_eval" %} + {% set tests_to_skip = tests_to_skip + " or test_fasterrcnn_double" %} + {% set tests_to_skip = tests_to_skip + " or test_googlenet_eval" %} + {% set tests_to_skip = tests_to_skip + " or test_fasterrcnn_switch_devices" %} + {% set tests_to_skip = tests_to_skip + " or test_mobilenet_v2_residual_setting" %} + {% set tests_to_skip = tests_to_skip + " or test_vitc_models" %} + {% set tests_to_skip = tests_to_skip + " or test_classification_model" %} + {% set tests_to_skip = tests_to_skip + " or test_segmentation_model" %} + {% set tests_to_skip = tests_to_skip + " or test_detection_model" %} + {% set tests_to_skip = tests_to_skip + " or test_detection_model_validation" %} + {% set tests_to_skip = tests_to_skip + " or test_video_model" %} + {% set tests_to_skip = tests_to_skip + " or test_quantized_classification_model" %} + {% set tests_to_skip = tests_to_skip + " or test_detection_model_trainable_backbone_layers" %} + {% set tests_to_skip = tests_to_skip + " or test_raft" %} + {% set tests_to_skip = tests_to_skip + " or test_build_fx_feature_extractor" %} + # 2023/01 These tests fail on newer numpy with module 'numpy' has no attribute 'int' + {% set tests_to_skip = tests_to_skip + " or test_transformation_range" %} + {% set tests_to_skip = tests_to_skip + " or test_transformation_discrete" %} + # 2023/05 The gaussian blur tests are known to be flaky due to some non-determinism on CUDA (see pytorch/vision#6755) + {% set tests_to_skip = tests_to_skip + " or test_batched_vs_single" %} + # 2023/11 Draw boxes test broken by pillow 1.10.0, but is non-critical and the test is patched upstream (pytorch/vision#8051) + {% set tests_to_skip = tests_to_skip + " or test_draw_boxes" %} + # 2024/02 These tests assert warnings and in PyTorch 2.1.2 the number of warnings increased + # causing them to fail + {% set tests_to_skip = tests_to_skip + " or test_pretrained_pos or test_equivalent_behavior_weights" %} + - pytest --verbose -k "not ({{ tests_to_skip }})" --durations=50 test/ # [not aarch64] + - pytest -k "not ({{ tests_to_skip }})" --durations=50 test/ # [aarch64 and (build_platform == target_platform)] about: home: http://pytorch.org/ From ff05e04c8f3f064cf4cc9bca5770616b21339335 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 24 Feb 2024 16:14:39 -0500 Subject: [PATCH 06/16] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.30.4, and conda-forge-pinning 2024.02.23.21.25.19 --- ....2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml | 2 -- ...1.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml | 2 -- ...1.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml | 2 -- ....2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml | 2 -- ....8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml | 2 -- ...1.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml | 2 -- ...1.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml | 2 -- ....8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml | 2 -- ...necxx_compiler_version12numpy1.22python3.10.____cpython.yaml | 2 -- ...onecxx_compiler_version12numpy1.22python3.8.____cpython.yaml | 2 -- ...onecxx_compiler_version12numpy1.22python3.9.____cpython.yaml | 2 -- ...necxx_compiler_version12numpy1.23python3.11.____cpython.yaml | 2 -- ....0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml | 2 -- ...2.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml | 2 -- ...2.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml | 2 -- ....0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml | 2 -- ...necxx_compiler_version12numpy1.22python3.10.____cpython.yaml | 2 -- ...onecxx_compiler_version12numpy1.22python3.8.____cpython.yaml | 2 -- ...onecxx_compiler_version12numpy1.22python3.9.____cpython.yaml | 2 -- ...necxx_compiler_version12numpy1.23python3.11.____cpython.yaml | 2 -- .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml | 2 -- .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml | 2 -- .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml | 2 -- .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml | 2 -- .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml | 2 -- .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml | 2 -- .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml | 2 -- .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml | 2 -- 28 files changed, 56 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml index ee5be56..64f2f0f 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml @@ -32,8 +32,6 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython -pytorch: -- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml index 9c2f3f0..c5de34b 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml @@ -32,8 +32,6 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython -pytorch: -- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml index 336b851..3dadf0d 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml @@ -32,8 +32,6 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython -pytorch: -- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml index 45e69b1..63d0110 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml @@ -32,8 +32,6 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython -pytorch: -- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml index a4dde39..5d8c48a 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml @@ -32,8 +32,6 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython -pytorch: -- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml index 308f5e4..3ac8ab9 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml @@ -32,8 +32,6 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython -pytorch: -- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml index 9758007..85a3827 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml @@ -32,8 +32,6 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython -pytorch: -- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml index 0ac715a..8a42a7d 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml @@ -32,8 +32,6 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython -pytorch: -- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml index 9930ce4..6413f03 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -32,8 +32,6 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython -pytorch: -- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml index 0ecec8d..e5a77a0 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml @@ -32,8 +32,6 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython -pytorch: -- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml index 8d9a5a4..1d7c245 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -32,8 +32,6 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython -pytorch: -- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml index 075982a..b408f29 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -32,8 +32,6 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython -pytorch: -- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml index 7233508..343fe38 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -32,8 +32,6 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython -pytorch: -- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml index ca83047..fd13375 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml @@ -32,8 +32,6 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython -pytorch: -- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml index 4665d91..225b654 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -32,8 +32,6 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython -pytorch: -- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml index cd811be..7026369 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -32,8 +32,6 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython -pytorch: -- '2.1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml index 7d608bd..dce4728 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -34,8 +34,6 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython -pytorch: -- '2.1' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml index 80069bf..87e5d38 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml @@ -34,8 +34,6 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython -pytorch: -- '2.1' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml index 05c9ab3..db4a632 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -34,8 +34,6 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython -pytorch: -- '2.1' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml index 7845da6..586ff38 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -34,8 +34,6 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython -pytorch: -- '2.1' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 723d66e..b9ecfdc 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -30,8 +30,6 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython -pytorch: -- '2.1' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index 08184f7..7fee5c0 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -30,8 +30,6 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython -pytorch: -- '2.1' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index a55e9d3..62120c7 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -30,8 +30,6 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython -pytorch: -- '2.1' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index be1432a..3d02090 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -30,8 +30,6 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython -pytorch: -- '2.1' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index eeea142..ae01a64 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -30,8 +30,6 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython -pytorch: -- '2.1' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index 543a278..a6715e9 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -30,8 +30,6 @@ pin_run_as_build: max_pin: x.x python: - 3.8.* *_cpython -pytorch: -- '2.1' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index ac17905..7dd890d 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -30,8 +30,6 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython -pytorch: -- '2.1' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 435b2e6..1a48bf5 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -30,8 +30,6 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython -pytorch: -- '2.1' target_platform: - osx-arm64 zip_keys: From 3e233d47bdb3a9e075fe15ab382bc016628daf00 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 24 Feb 2024 16:14:49 -0500 Subject: [PATCH 07/16] Add back compatible pytorch --- recipe/meta.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 282e6b6..9b67e91 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -3,6 +3,9 @@ # torchvision requires that CUDA major and minor versions match with pytorch # https://github.com/pytorch/vision/blob/fa99a5360fbcd1683311d57a76fcc0e7323a4c1e/torchvision/extension.py#L79C1-L85C1 {% set torch_proc_type = "cuda" ~ cuda_compiler_version | replace('.', '') if cuda_compiler_version != "None" else "cpu" %} +# Upstream has specific compatability ranges for pytorch and python which are +# updated every 0.x release. https://github.com/pytorch/vision#installation +{% set compatible_pytorch = "2.1" %} {% if cuda_compiler_version in (None, "None", True, False) %} {% set cuda_major = 0 %} @@ -30,10 +33,6 @@ build: # Upstream has specific compatability ranges for pytorch and python which are # updated every 0.x release. https://github.com/pytorch/vision#installation skip: true # [py < 38] - rpaths: - - lib/ - # PyTorch libs are in site-packages intead of with other shared objects - - {{ SP_DIR }}/torch/lib/ requirements: build: @@ -49,7 +48,7 @@ requirements: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] - - pytorch ={{ pytorch }}.*={{ torch_proc_type }}* # [build_platform != target_platform] + - pytorch ={{ compatible_pytorch }}.*={{ torch_proc_type }}* # [build_platform != target_platform] host: - python - pip @@ -70,11 +69,11 @@ requirements: - numpy # exclude 8.3.0 and 8.3.1 specifically due to pytorch/vision#4146, python-pillow/Pillow#5571 - pillow >=5.3.0,!=8.3.0,!=8.3.1 - - pytorch ={{ pytorch }}.*={{ torch_proc_type }}* + - pytorch ={{ compatible_pytorch }}.*={{ torch_proc_type }}* - requests run: - python - - pytorch ={{ pytorch }}.*={{ torch_proc_type }}* + - pytorch ={{ compatible_pytorch }}.*={{ torch_proc_type }}* - {{ pin_compatible('cudnn') }} # [cuda_compiler_version != "None"] - {{ pin_compatible('numpy') }} - pillow >=5.3.0,!=8.3.0,!=8.3.1 From cc83f4208fb8dfa09a4cdb0f439696622f8cd3a8 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 24 Feb 2024 16:20:07 -0500 Subject: [PATCH 08/16] Add python 3.12 migration --- .ci_support/migrations/python312.yaml | 38 +++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .ci_support/migrations/python312.yaml diff --git a/.ci_support/migrations/python312.yaml b/.ci_support/migrations/python312.yaml new file mode 100644 index 0000000..b39b1bb --- /dev/null +++ b/.ci_support/migrations/python312.yaml @@ -0,0 +1,38 @@ +migrator_ts: 1695046563 +__migrator: + 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 # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: false + longterm: True + pr_limit: 30 + max_solver_attempts: 6 # this will make the bot retry "not solvable" stuff 6 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false + +python: + - 3.12.* *_cpython +# additional entries to add for zip_keys +numpy: + - 1.26 +python_impl: + - cpython From ad4b6c02afc109c631346ce5ea78ec9c376a71b6 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 24 Feb 2024 16:22:50 -0500 Subject: [PATCH 09/16] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.30.4, and conda-forge-pinning 2024.02.23.21.25.19 --- .azure-pipelines/azure-pipelines-linux.yml | 20 ++++++++ .azure-pipelines/azure-pipelines-osx.yml | 6 +++ ...sion10numpy1.26python3.12.____cpython.yaml | 45 +++++++++++++++++ ...sion11numpy1.26python3.12.____cpython.yaml | 45 +++++++++++++++++ ...sion12numpy1.26python3.12.____cpython.yaml | 45 +++++++++++++++++ ...sion12numpy1.26python3.12.____cpython.yaml | 45 +++++++++++++++++ ...sion12numpy1.26python3.12.____cpython.yaml | 47 ++++++++++++++++++ ...sx_64_numpy1.26python3.12.____cpython.yaml | 39 +++++++++++++++ ...arm64_numpy1.26python3.12.____cpython.yaml | 39 +++++++++++++++ README.md | 49 +++++++++++++++++++ 10 files changed, 380 insertions(+) create mode 100644 .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.26python3.12.____cpython.yaml create mode 100644 .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.26python3.12.____cpython.yaml create mode 100644 .ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml create mode 100644 .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml create mode 100644 .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml create mode 100644 .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml create mode 100644 .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 1eb72e9..70454c7 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -24,6 +24,10 @@ jobs: : CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 + ? linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.26python3.12.____cpython + : CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 ? linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -40,6 +44,10 @@ jobs: : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 + ? linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.26python3.12.____cpython + : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 ? linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython : CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -56,6 +64,10 @@ jobs: : CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + ? linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython + : CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 ? linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython : CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -72,6 +84,10 @@ jobs: : CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + ? linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython + : CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 ? linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython : CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -88,6 +104,10 @@ jobs: : CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + ? linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython + : CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 2e1f707..fc75a05 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -20,6 +20,9 @@ jobs: osx_64_numpy1.23python3.11.____cpython: CONFIG: osx_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' + osx_64_numpy1.26python3.12.____cpython: + CONFIG: osx_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' osx_arm64_numpy1.22python3.10.____cpython: CONFIG: osx_arm64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -32,6 +35,9 @@ jobs: osx_arm64_numpy1.23python3.11.____cpython: CONFIG: osx_arm64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.26python3.12.____cpython: + CONFIG: osx_arm64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..fc09f07 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,45 @@ +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.2' +cudnn: +- '8' +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-cuda:11.2 +libjpeg_turbo: +- '3' +libpng: +- '1.6' +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - cdt_name + - docker_image +- - python + - numpy diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..0d629e5 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,45 @@ +c_compiler: +- gcc +c_compiler_version: +- '11' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.8' +cudnn: +- '8' +cxx_compiler: +- gxx +cxx_compiler_version: +- '11' +docker_image: +- quay.io/condaforge/linux-anvil-cuda:11.8 +libjpeg_turbo: +- '3' +libpng: +- '1.6' +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - cdt_name + - docker_image +- - python + - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..1a9dac3 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,45 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cudnn: +- '8' +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +libjpeg_turbo: +- '3' +libpng: +- '1.6' +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - cdt_name + - docker_image +- - python + - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..6854cc1 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,45 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cudnn: +- '8' +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +libjpeg_turbo: +- '3' +libpng: +- '1.6' +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - cdt_name + - docker_image +- - python + - numpy diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..38ba73c --- /dev/null +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,47 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +libjpeg_turbo: +- '3' +libpng: +- '1.6' +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - cdt_name + - docker_image +- - python + - numpy diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..6bee5c2 --- /dev/null +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,39 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +libjpeg_turbo: +- '3' +libpng: +- '1.6' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..fad8e7a --- /dev/null +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,39 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +libjpeg_turbo: +- '3' +libpng: +- '1.6' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/README.md b/README.md index 51d5bdc..924afa2 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,13 @@ Current build status variant + + linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.26python3.12.____cpython + + + variant + + linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython @@ -86,6 +93,13 @@ Current build status variant + + linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.26python3.12.____cpython + + + variant + + linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython @@ -114,6 +128,13 @@ Current build status variant + + linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython + + + variant + + linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython @@ -142,6 +163,13 @@ Current build status variant + + linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython + + + variant + + linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython @@ -170,6 +198,13 @@ Current build status variant + + linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython + + + variant + + osx_64_numpy1.22python3.10.____cpython @@ -198,6 +233,13 @@ Current build status variant + + osx_64_numpy1.26python3.12.____cpython + + + variant + + osx_arm64_numpy1.22python3.10.____cpython @@ -226,6 +268,13 @@ Current build status variant + + osx_arm64_numpy1.26python3.12.____cpython + + + variant + + From d942607ad7e16e31d9beb92c273c6bce89a3dc02 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 24 Feb 2024 22:56:32 -0500 Subject: [PATCH 10/16] Remove usage of distutils --- recipe/8280-remove_distutils.patch | 36 ++++++++++++++++++++++++++++++ recipe/meta.yaml | 1 + 2 files changed, 37 insertions(+) create mode 100644 recipe/8280-remove_distutils.patch diff --git a/recipe/8280-remove_distutils.patch b/recipe/8280-remove_distutils.patch new file mode 100644 index 0000000..f8725f7 --- /dev/null +++ b/recipe/8280-remove_distutils.patch @@ -0,0 +1,36 @@ +From f7c60f74c063435a2fb2e5993b4cf2c32cf88fc5 Mon Sep 17 00:00:00 2001 +From: Tobias Fischer +Date: Sun, 25 Feb 2024 12:43:25 +1000 +Subject: [PATCH] Remove deprecated distutils usage + +--- + test/test_datasets_download.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/test_datasets_download.py b/test/test_datasets_download.py +index cf0211dbb1e..71aeb9ea774 100644 +--- a/test/test_datasets_download.py ++++ b/test/test_datasets_download.py +@@ -1,12 +1,12 @@ + import contextlib + import itertools ++import shutil + import tempfile + import time + import traceback + import unittest.mock + import warnings + from datetime import datetime +-from distutils import dir_util + from os import path + from urllib.error import HTTPError, URLError + from urllib.parse import urlparse +@@ -180,7 +180,7 @@ def collect_urls(dataset_cls, *args, **kwargs): + @pytest.fixture(scope="module", autouse=True) + def root(): + yield ROOT +- dir_util.remove_tree(ROOT) ++ shutil.rmtree(ROOT) + + + def places365(): diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9b67e91..3530856 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,6 +22,7 @@ source: sha256: d31fe52e4540750c8d372b0f38f1bfa81d8261193f2c2c06577332831d203c50 patches: - 0001-Monkeypatch-TORCH_LIB_PATH.patch + - 8280-remove_distutils.patch build: string: cpu_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version == "None"] From 75050fb1d7af7f220dc4293edf397fa5f6aebd85 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 25 Feb 2024 09:04:36 -0500 Subject: [PATCH 11/16] Add a patch for python 3.12 --- ...se_integer_division_for_range_inputs.patch | 74 +++++++++++++++++++ recipe/meta.yaml | 6 +- 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 recipe/8119-use_integer_division_for_range_inputs.patch diff --git a/recipe/8119-use_integer_division_for_range_inputs.patch b/recipe/8119-use_integer_division_for_range_inputs.patch new file mode 100644 index 0000000..07312bf --- /dev/null +++ b/recipe/8119-use_integer_division_for_range_inputs.patch @@ -0,0 +1,74 @@ +From d922c581576eb5f19af7ac730d1bdbb68b8a591e Mon Sep 17 00:00:00 2001 +From: Mark Harfouche +Date: Wed, 15 Nov 2023 23:06:08 -0500 +Subject: [PATCH] Help make test dependent on randint compatible with python + 3.12 + +--- + test/test_transforms.py | 8 ++++---- + test/test_transforms_video.py | 12 ++++++------ + 2 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/test/test_transforms.py b/test/test_transforms.py +index 4440942f7cf..e87a8cd28bc 100644 +--- a/test/test_transforms.py ++++ b/test/test_transforms.py +@@ -1613,8 +1613,8 @@ def test_augmix(fill, severity, mixture_width, chain_depth, all_ops, grayscale): + def test_random_crop(): + height = random.randint(10, 32) * 2 + width = random.randint(10, 32) * 2 +- oheight = random.randint(5, (height - 2) / 2) * 2 +- owidth = random.randint(5, (width - 2) / 2) * 2 ++ oheight = random.randint(5, (height - 2) // 2) * 2 ++ owidth = random.randint(5, (width - 2) // 2) * 2 + img = torch.ones(3, height, width, dtype=torch.uint8) + result = transforms.Compose( + [ +@@ -1663,8 +1663,8 @@ def test_random_crop(): + def test_center_crop(): + height = random.randint(10, 32) * 2 + width = random.randint(10, 32) * 2 +- oheight = random.randint(5, (height - 2) / 2) * 2 +- owidth = random.randint(5, (width - 2) / 2) * 2 ++ oheight = random.randint(5, (height - 2) // 2) * 2 ++ owidth = random.randint(5, (width - 2) // 2) * 2 + + img = torch.ones(3, height, width, dtype=torch.uint8) + oh1 = (height - oheight) // 2 +diff --git a/test/test_transforms_video.py b/test/test_transforms_video.py +index 21594868f09..4ad57e6a98e 100644 +--- a/test/test_transforms_video.py ++++ b/test/test_transforms_video.py +@@ -23,8 +23,8 @@ def test_random_crop_video(self): + numFrames = random.randint(4, 128) + height = random.randint(10, 32) * 2 + width = random.randint(10, 32) * 2 +- oheight = random.randint(5, (height - 2) / 2) * 2 +- owidth = random.randint(5, (width - 2) / 2) * 2 ++ oheight = random.randint(5, (height - 2) // 2) * 2 ++ owidth = random.randint(5, (width - 2) // 2) * 2 + clip = torch.randint(0, 256, (numFrames, height, width, 3), dtype=torch.uint8) + result = Compose( + [ +@@ -41,8 +41,8 @@ def test_random_resized_crop_video(self): + numFrames = random.randint(4, 128) + height = random.randint(10, 32) * 2 + width = random.randint(10, 32) * 2 +- oheight = random.randint(5, (height - 2) / 2) * 2 +- owidth = random.randint(5, (width - 2) / 2) * 2 ++ oheight = random.randint(5, (height - 2) // 2) * 2 ++ owidth = random.randint(5, (width - 2) // 2) * 2 + clip = torch.randint(0, 256, (numFrames, height, width, 3), dtype=torch.uint8) + result = Compose( + [ +@@ -59,8 +59,8 @@ def test_center_crop_video(self): + numFrames = random.randint(4, 128) + height = random.randint(10, 32) * 2 + width = random.randint(10, 32) * 2 +- oheight = random.randint(5, (height - 2) / 2) * 2 +- owidth = random.randint(5, (width - 2) / 2) * 2 ++ oheight = random.randint(5, (height - 2) // 2) * 2 ++ owidth = random.randint(5, (width - 2) // 2) * 2 + + clip = torch.ones((numFrames, height, width, 3), dtype=torch.uint8) * 255 + oh1 = (height - oheight) // 2 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3530856..8795719 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,8 +21,12 @@ source: url: https://github.com/pytorch/vision/archive/v{{ version }}.tar.gz sha256: d31fe52e4540750c8d372b0f38f1bfa81d8261193f2c2c06577332831d203c50 patches: - - 0001-Monkeypatch-TORCH_LIB_PATH.patch + # - 0001-Monkeypatch-TORCH_LIB_PATH.patch + # https://github.com/pytorch/vision/pull/8280 - 8280-remove_distutils.patch + # Test only patch below + # https://github.com/pytorch/vision/pull/8119 + - 8119-use_integer_division_for_range_inputs.patch build: string: cpu_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version == "None"] From 031d8707f7d8609558e6d2a8a6ebc194ce157689 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 25 Feb 2024 09:26:39 -0500 Subject: [PATCH 12/16] Update meta.yaml --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8795719..3a84e3f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,7 +21,8 @@ source: url: https://github.com/pytorch/vision/archive/v{{ version }}.tar.gz sha256: d31fe52e4540750c8d372b0f38f1bfa81d8261193f2c2c06577332831d203c50 patches: - # - 0001-Monkeypatch-TORCH_LIB_PATH.patch + # seems to be necessary for aarch??? + - 0001-Monkeypatch-TORCH_LIB_PATH.patch # https://github.com/pytorch/vision/pull/8280 - 8280-remove_distutils.patch # Test only patch below @@ -88,7 +89,6 @@ test: requires: - pytest - av - - requests - scipy - pytest-mock source_files: From 528b853980ab1f7a3f2df97b825cce8741ecb7bc Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 25 Feb 2024 09:58:15 -0500 Subject: [PATCH 13/16] Add pytest.ini to test files --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3a84e3f..cabe153 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -94,6 +94,7 @@ test: source_files: - test - references + - pytest.ini imports: - torchvision - torchvision.datasets From 448bb0191db737d7955a862352632df4cc808919 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 25 Feb 2024 12:45:23 -0500 Subject: [PATCH 14/16] Ignore python 3.12 deprecation warningt pus --- .../ignore_python312_deprecation_warnings.patch | 16 ++++++++++++++++ recipe/meta.yaml | 1 + 2 files changed, 17 insertions(+) create mode 100644 recipe/ignore_python312_deprecation_warnings.patch diff --git a/recipe/ignore_python312_deprecation_warnings.patch b/recipe/ignore_python312_deprecation_warnings.patch new file mode 100644 index 0000000..a691c3e --- /dev/null +++ b/recipe/ignore_python312_deprecation_warnings.patch @@ -0,0 +1,16 @@ +diff --git a/test/test_transforms_v2_refactored.py b/test/test_transforms_v2_refactored.py +index e18beb35a4..142e3f2d43 100644 +--- a/test/test_transforms_v2_refactored.py ++++ b/test/test_transforms_v2_refactored.py +@@ -416,7 +416,10 @@ def reference_affine_bounding_boxes_helper(bounding_boxes, *, affine_matrix, new + + + # turns all warnings into errors for this module +-pytestmark = pytest.mark.filterwarnings("error") ++pytestmark = [ ++ pytest.mark.filterwarnings("error"), ++ pytest.mark.filterwarnings("ignore::DeprecationWarning"), ++] + + + class TestResize: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cabe153..8fce57a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,6 +28,7 @@ source: # Test only patch below # https://github.com/pytorch/vision/pull/8119 - 8119-use_integer_division_for_range_inputs.patch + - ignore_python312_deprecation_warnings.patch build: string: cpu_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version == "None"] From 2ef1c5dc122b0f5146bb45e312ae8e1ab5766cd4 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 25 Feb 2024 15:48:59 -0500 Subject: [PATCH 15/16] add host dependency on libtorch --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8fce57a..037b883 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -76,6 +76,7 @@ requirements: - numpy # exclude 8.3.0 and 8.3.1 specifically due to pytorch/vision#4146, python-pillow/Pillow#5571 - pillow >=5.3.0,!=8.3.0,!=8.3.1 + - libtorch - pytorch ={{ compatible_pytorch }}.*={{ torch_proc_type }}* - requests run: From 4d4871aabbc492fa592b132e486246f1861018f1 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 25 Feb 2024 15:52:13 -0500 Subject: [PATCH 16/16] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.30.4, and conda-forge-pinning 2024.02.23.21.25.19 --- ....2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml | 2 ++ ...1.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml | 2 ++ ...1.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml | 2 ++ ....2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml | 2 ++ ....2cxx_compiler_version10numpy1.26python3.12.____cpython.yaml | 2 ++ ....8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml | 2 ++ ...1.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml | 2 ++ ...1.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml | 2 ++ ....8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml | 2 ++ ....8cxx_compiler_version11numpy1.26python3.12.____cpython.yaml | 2 ++ ...necxx_compiler_version12numpy1.22python3.10.____cpython.yaml | 2 ++ ...onecxx_compiler_version12numpy1.22python3.8.____cpython.yaml | 2 ++ ...onecxx_compiler_version12numpy1.22python3.9.____cpython.yaml | 2 ++ ...necxx_compiler_version12numpy1.23python3.11.____cpython.yaml | 2 ++ ...necxx_compiler_version12numpy1.26python3.12.____cpython.yaml | 2 ++ ....0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml | 2 ++ ...2.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml | 2 ++ ...2.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml | 2 ++ ....0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml | 2 ++ ....0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml | 2 ++ ...necxx_compiler_version12numpy1.22python3.10.____cpython.yaml | 2 ++ ...onecxx_compiler_version12numpy1.22python3.8.____cpython.yaml | 2 ++ ...onecxx_compiler_version12numpy1.22python3.9.____cpython.yaml | 2 ++ ...necxx_compiler_version12numpy1.23python3.11.____cpython.yaml | 2 ++ ...necxx_compiler_version12numpy1.26python3.12.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml | 2 ++ 35 files changed, 70 insertions(+) diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml index 64f2f0f..88e7727 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml index c5de34b..10df234 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml index 3dadf0d..827de2b 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml index 63d0110..86e57d2 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.26python3.12.____cpython.yaml index fc09f07..b53baa5 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.26python3.12.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.26' pin_run_as_build: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml index 5d8c48a..afb52a9 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml index 3ac8ab9..c0e6daa 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml index 85a3827..defe2ea 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml index 8a42a7d..e1fd36b 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.26python3.12.____cpython.yaml index 0d629e5..1428120 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.26python3.12.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.26' pin_run_as_build: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml index 6413f03..b90b619 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml index e5a77a0..1467224 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml index 1d7c245..d21d91f 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml index b408f29..381d8c0 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml index 1a9dac3..06869bc 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.26' pin_run_as_build: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml index 343fe38..c84855b 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml index fd13375..39a9328 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml index 225b654..0fb705b 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml index 7026369..d4fdeae 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml index 6854cc1..ba978cf 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml @@ -24,6 +24,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.26' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml index dce4728..8330790 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -26,6 +26,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml index 87e5d38..3b13900 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml @@ -26,6 +26,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml index db4a632..52cf958 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -26,6 +26,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml index 586ff38..b155007 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -26,6 +26,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml index 38ba73c..7bb4542 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml @@ -26,6 +26,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' numpy: - '1.26' pin_run_as_build: diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index b9ecfdc..196b7bb 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -20,6 +20,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index 7fee5c0..c316749 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -20,6 +20,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 62120c7..6a1cf81 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -20,6 +20,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 3d02090..efa273b 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -20,6 +20,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index 6bee5c2..de81bc4 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -20,6 +20,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index ae01a64..7299e60 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -20,6 +20,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index a6715e9..a956664 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -20,6 +20,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 7dd890d..6b95cf4 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -20,6 +20,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 1a48bf5..455d83c 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -20,6 +20,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index fad8e7a..20b80c6 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -20,6 +20,8 @@ libjpeg_turbo: - '3' libpng: - '1.6' +libtorch: +- '2.1' macos_machine: - arm64-apple-darwin20.0.0 numpy: