diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 8d0fa0c9..f6892f1c 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,84 +8,84 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - ? linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython - : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython + linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython: + CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - ? linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.10.____cpython - : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.10.____cpython + linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython: + CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.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_version11numpy2.0python3.11.____cpython - : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.11.____cpython + linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython: + CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - ? linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.12.____cpython - : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.12.____cpython + linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython: + CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.9.____cpython: - CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.9.____cpython + linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython: + CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____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.8.____cpython - : CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython + linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython: + CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - ? linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.10.____cpython - : CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.10.____cpython + linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython: + CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - ? linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.11.____cpython - : CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.11.____cpython + linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython: + CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - ? linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.12.____cpython - : CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.12.____cpython + linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython: + CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython: - CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython + linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython: + CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____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.8.____cpython - : CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython + linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython: + CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____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_version12numpy2.0python3.10.____cpython - : CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.10.____cpython + linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython: + CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.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_version12numpy2.0python3.11.____cpython - : CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.11.____cpython + linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython: + CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.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_version12numpy2.0python3.12.____cpython - : CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.12.____cpython + linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.8.____cpython: + CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.8.____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_version12numpy2.0python3.9.____cpython - : CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.9.____cpython + linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython: + CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____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.8.____cpython - : CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython + linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython: + CONFIG: linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - ? linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.10.____cpython - : CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.10.____cpython + linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython: + CONFIG: linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - ? linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.11.____cpython - : CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.11.____cpython + linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython: + CONFIG: linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - ? linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.12.____cpython - : CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.12.____cpython + linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.8.____cpython: + CONFIG: linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - ? linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython - : CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython + linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython: + CONFIG: linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 15c55512..79030d57 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,35 +8,35 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_numpy1.22python3.8.____cpython: - CONFIG: osx_64_numpy1.22python3.8.____cpython + osx_64_python3.10.____cpython: + CONFIG: osx_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy2.0python3.10.____cpython: - CONFIG: osx_64_numpy2.0python3.10.____cpython + osx_64_python3.11.____cpython: + CONFIG: osx_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy2.0python3.11.____cpython: - CONFIG: osx_64_numpy2.0python3.11.____cpython + osx_64_python3.12.____cpython: + CONFIG: osx_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy2.0python3.12.____cpython: - CONFIG: osx_64_numpy2.0python3.12.____cpython + osx_64_python3.8.____cpython: + CONFIG: osx_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy2.0python3.9.____cpython: - CONFIG: osx_64_numpy2.0python3.9.____cpython + osx_64_python3.9.____cpython: + CONFIG: osx_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.8.____cpython: - CONFIG: osx_arm64_numpy1.22python3.8.____cpython + osx_arm64_python3.10.____cpython: + CONFIG: osx_arm64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.10.____cpython: - CONFIG: osx_arm64_numpy2.0python3.10.____cpython + osx_arm64_python3.11.____cpython: + CONFIG: osx_arm64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.11.____cpython: - CONFIG: osx_arm64_numpy2.0python3.11.____cpython + osx_arm64_python3.12.____cpython: + CONFIG: osx_arm64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.12.____cpython: - CONFIG: osx_arm64_numpy2.0python3.12.____cpython + osx_arm64_python3.8.____cpython: + CONFIG: osx_arm64_python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy2.0python3.9.____cpython: - CONFIG: osx_arm64_numpy2.0python3.9.____cpython + osx_arm64_python3.9.____cpython: + CONFIG: osx_arm64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml index 35ebdf04..e4e53e6a 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -24,14 +24,12 @@ cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -48,5 +46,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.11.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml index d3051b3b..b7f7f42b 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -24,14 +24,12 @@ cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -48,5 +46,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.12.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml index ee0a89b4..9ab9696a 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -24,14 +24,12 @@ cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -48,5 +46,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy 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_version11python3.8.____cpython.yaml similarity index 86% rename from .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml index 463212fd..520bdbc1 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_version11python3.8.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -24,14 +24,12 @@ cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '1.22' pin_run_as_build: python: min_pin: x.x @@ -48,5 +46,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml index 1d6e3a4d..2f767f02 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -24,14 +24,12 @@ cxx_compiler_version: - '11' docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -48,5 +46,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml index ada8f283..3291c74b 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -24,14 +24,12 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -48,5 +46,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.11.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml index 778fc9ed..b609fcbb 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -24,14 +24,12 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -48,5 +46,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.12.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml index 43905d0c..3c6849c3 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -24,14 +24,12 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -48,5 +46,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy 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_version12python3.8.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml index 5069e870..220460dc 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_version12python3.8.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -24,14 +24,12 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '1.22' pin_run_as_build: python: min_pin: x.x @@ -48,5 +46,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml similarity index 87% rename from .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml index 3da5cf6a..bb3e58ee 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -24,14 +24,12 @@ cxx_compiler_version: - '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -48,5 +46,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml similarity index 85% rename from .ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml index ed0f42e8..22439664 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -21,17 +21,15 @@ cudnn: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -48,5 +46,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml similarity index 85% rename from .ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.11.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml index 754b2a0c..37f2cdf0 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -21,17 +21,15 @@ cudnn: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -48,5 +46,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml similarity index 85% rename from .ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.12.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml index ec3b3118..77d8a583 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -21,17 +21,15 @@ cudnn: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -48,5 +46,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy 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_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.8.____cpython.yaml similarity index 85% rename from .ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.8.____cpython.yaml index d3f4ae57..28353cf9 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_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.8.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -21,17 +21,15 @@ cudnn: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '1.22' pin_run_as_build: python: min_pin: x.x @@ -48,5 +46,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml similarity index 85% rename from .ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml index 714733a0..e42eaa04 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -21,17 +21,15 @@ cudnn: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -48,5 +46,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.10.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml similarity index 86% rename from .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml index b36a7260..66c84677 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -23,17 +23,15 @@ cuda_compiler_version: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -50,5 +48,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.11.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml similarity index 86% rename from .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.11.____cpython.yaml rename to .ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml index b07a8bab..b3248d08 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -23,17 +23,15 @@ cuda_compiler_version: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -50,5 +48,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.12.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml similarity index 86% rename from .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.12.____cpython.yaml rename to .ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml index c4227a8a..7aa4b37e 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -23,17 +23,15 @@ cuda_compiler_version: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -50,5 +48,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy 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_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.8.____cpython.yaml similarity index 86% rename from .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.8.____cpython.yaml index de07e08e..e4a3c1f8 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_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.8.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -23,17 +23,15 @@ cuda_compiler_version: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '1.22' pin_run_as_build: python: min_pin: x.x @@ -50,5 +48,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml similarity index 86% rename from .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml index 27a97c22..d505e229 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -13,7 +13,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -23,17 +23,15 @@ cuda_compiler_version: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -50,5 +48,3 @@ zip_keys: - cuda_compiler - cuda_compiler_version - docker_image -- - python - - numpy diff --git a/.ci_support/migrations/pytorch23.yaml b/.ci_support/migrations/pytorch23.yaml deleted file mode 100644 index c6c744fb..00000000 --- a/.ci_support/migrations/pytorch23.yaml +++ /dev/null @@ -1,11 +0,0 @@ -__migrator: - kind: version - commit_message: "Rebuild for pytorch 2.3" - migration_number: 1 - bump_number: 1 - -libtorch: - - '2.3' -pytorch: - - '2.3' -migrator_ts: 1715797797.926 diff --git a/.ci_support/migrations/pytorch24.yaml b/.ci_support/migrations/pytorch24.yaml new file mode 100644 index 00000000..a075d247 --- /dev/null +++ b/.ci_support/migrations/pytorch24.yaml @@ -0,0 +1,11 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for pytorch 2.4 + kind: version + migration_number: 1 + paused: False +libtorch: +- '2.4' +migrator_ts: 1724386221.5909793 +pytorch: +- '2.4' diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml similarity index 79% rename from .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml rename to .ci_support/osx_64_python3.10.____cpython.yaml index 8303f405..1c4c5bce 100644 --- a/.ci_support/osx_64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -1,17 +1,17 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.13' +- '10.15' MACOSX_SDK_VERSION: -- '10.13' +- '10.15' c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.13' +- '10.15' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -21,17 +21,15 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -43,5 +41,3 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml similarity index 79% rename from .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml rename to .ci_support/osx_64_python3.11.____cpython.yaml index 8f9c61a6..33fb4092 100644 --- a/.ci_support/osx_64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -1,17 +1,17 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.13' +- '10.15' MACOSX_SDK_VERSION: -- '10.13' +- '10.15' c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.13' +- '10.15' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -21,17 +21,15 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -43,5 +41,3 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml similarity index 79% rename from .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml rename to .ci_support/osx_64_python3.12.____cpython.yaml index bf4e4b37..4254d427 100644 --- a/.ci_support/osx_64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -1,17 +1,17 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.13' +- '10.15' MACOSX_SDK_VERSION: -- '10.13' +- '10.15' c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.13' +- '10.15' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -21,17 +21,15 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -43,5 +41,3 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml similarity index 79% rename from .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/osx_64_python3.8.____cpython.yaml index 55993cdc..e7232e9a 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -1,17 +1,17 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.13' +- '10.15' MACOSX_SDK_VERSION: -- '10.13' +- '10.15' c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.13' +- '10.15' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -21,17 +21,15 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '1.22' pin_run_as_build: python: min_pin: x.x @@ -43,5 +41,3 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml similarity index 79% rename from .ci_support/osx_64_numpy2.0python3.9.____cpython.yaml rename to .ci_support/osx_64_python3.9.____cpython.yaml index 714f34c0..581b99b1 100644 --- a/.ci_support/osx_64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -1,17 +1,17 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.13' +- '10.15' MACOSX_SDK_VERSION: -- '10.13' +- '10.15' c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.13' +- '10.15' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -21,17 +21,15 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -43,5 +41,3 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml similarity index 84% rename from .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml rename to .ci_support/osx_arm64_python3.10.____cpython.yaml index d17e582c..9037a2ad 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -5,13 +5,13 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -21,17 +21,15 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' macos_machine: - arm64-apple-darwin20.0.0 -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -43,5 +41,3 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml similarity index 84% rename from .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml rename to .ci_support/osx_arm64_python3.11.____cpython.yaml index 7e075518..28a58059 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -5,13 +5,13 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -21,17 +21,15 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' macos_machine: - arm64-apple-darwin20.0.0 -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -43,5 +41,3 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml similarity index 84% rename from .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml rename to .ci_support/osx_arm64_python3.12.____cpython.yaml index 3851b3a3..08f3e4d0 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -5,13 +5,13 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -21,17 +21,15 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' macos_machine: - arm64-apple-darwin20.0.0 -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -43,5 +41,3 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml similarity index 83% rename from .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/osx_arm64_python3.8.____cpython.yaml index 0dd3bb10..fc687e6c 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -5,13 +5,13 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -21,17 +21,15 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' macos_machine: - arm64-apple-darwin20.0.0 -numpy: -- '1.22' pin_run_as_build: python: min_pin: x.x @@ -43,5 +41,3 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml similarity index 84% rename from .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml rename to .ci_support/osx_arm64_python3.9.____cpython.yaml index 7717a94c..16a26d4d 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -5,13 +5,13 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -21,17 +21,15 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' +giflib: +- '5.2' libjpeg_turbo: - '3' libpng: - '1.6' -libtorch: -- '2.3' macos_machine: - arm64-apple-darwin20.0.0 -numpy: -- '2.0' pin_run_as_build: python: min_pin: x.x @@ -43,5 +41,3 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - python - - numpy diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 899ba03c..ba4b251c 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,6 +72,12 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 07dff219..420f051c 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -11,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} @@ -85,6 +85,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/README.md b/README.md index 3cbc472f..517fb1a0 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,6 @@ Summary: Image and video datasets and models for torch deep learning Development: https://github.com/pytorch/vision -Documentation: http://pytorch.org/docs/master/torchvision - Current build status ==================== @@ -31,213 +29,213 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/build-locally.py b/build-locally.py index e0d408d0..d78427b5 100755 --- a/build-locally.py +++ b/build-locally.py @@ -3,11 +3,11 @@ # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): diff --git a/recipe/build.sh b/recipe/build.sh index 077a2b82..f2a0f615 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -24,6 +24,9 @@ fi # remove pyproject.toml rm -f pyproject.toml +# https://github.com/pytorch/vision/pull/8406/files#r1730151047 +rm -rf torchvision/csrc/io/image/cpu/giflib + # hmaarrfk I found that it was pretty buggy: # https://github.com/conda-forge/torchvision-feedstock/pull/60 export TORCHVISION_USE_FFMPEG=0 diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 4cafd481..d152b51e 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,2 +1,2 @@ -c_stdlib_version: # [linux] - - 2.17 # [linux] +c_stdlib_version: # [osx and x86_64] + - 10.15 # [osx and x86_64] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3430df28..b1f60541 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,11 +1,12 @@ -{% set version = "0.18.1" %} +{% set tests_to_skip = "test_url_is_accessible" %} +{% set version = "0.19.0" %} # see github.com/conda-forge/conda-forge.github.io/issues/1059 for naming discussion # 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.3" %} +{% set compatible_pytorch = "2.4" %} {% if cuda_compiler_version in (None, "None", True, False) %} {% set cuda_major = 0 %} @@ -19,17 +20,26 @@ package: source: url: https://github.com/pytorch/vision/archive/refs/tags/v{{ version }}.tar.gz - sha256: 347d472a9ceecc44e0bee1eda140d63cfaffc74a54ec07d4b98da7698ce75516 + sha256: 4c499d0a412b5a21d55ac3c0a37e80ecd7e1f002f2a7b6b3b38a2de2544acbb6 patches: # seems to be necessary for aarch??? - patches/0001-Monkeypatch-TORCH_LIB_PATH.patch - # backport https://github.com/pytorch/vision/pull/8463 for numpy 2.0 compat - - patches/0002-Make-adjust_hue-work-with-numpy-2.0-8463.patch + # Our newer conda-forge clang compilers complain about this for OSX + # https://github.com/pytorch/vision/pull/8406/files#r1730151047 + - patches/0002-Unvendor-giflib.patch + - patches/0003-Support-nvjpeg-at-conda-forge.patch + + # 2024/08 hmaarrfk + # known flaky test https://github.com/pytorch/vision/blob/9e78fe29e0851b10eb8fba0b88cc521ad67cf322/test/test_image.py#L840 + - patches/0004-Skip-OSS-CI-tests-as-well-in-conda-forge-azure.patch + + # https://github.com/pytorch/vision/issues/8609 + - patches/no_strict_transforms_warning.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: 1 + number: 0 skip: true # [win] # no CUDA-enabled pytorch on aarch yet skip: true # [cuda_compiler_version != "None" and aarch64] @@ -44,13 +54,15 @@ requirements: - libcublas-dev # [build_platform != target_platform] - libcusolver-dev # [build_platform != target_platform] - libcusparse-dev # [build_platform != target_platform] + - libnvjpeg-dev # [build_platform != target_platform] {% endif %} - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - - numpy # [build_platform != target_platform] + # - numpy # [build_platform != target_platform] - pytorch ={{ compatible_pytorch }}.*={{ torch_proc_type }}* # [build_platform != target_platform] host: - python + # - numpy - pip - setuptools - cudnn # [cuda_compiler_version != "None"] @@ -58,18 +70,19 @@ requirements: - libcublas-dev - libcusolver-dev - libcusparse-dev + - libnvjpeg-dev {% endif %} - # split off image/video into separate outputs? - libjpeg-turbo - libpng + # https://github.com/pytorch/vision/pull/8406/files#r1730151047 + - giflib # 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 - - libtorch + - libtorch ={{ compatible_pytorch }}.*={{ torch_proc_type }}* - pytorch ={{ compatible_pytorch }}.*={{ torch_proc_type }}* - requests run: @@ -77,11 +90,17 @@ requirements: - pytorch ={{ compatible_pytorch }}.*={{ torch_proc_type }}* - {{ pin_compatible('cudnn') }} # [cuda_compiler_version != "None"] - pillow >=5.3.0,!=8.3.0,!=8.3.1 - - requests + # They don't really document it, but it seems that they want a minimum version + # https://github.com/pytorch/vision/blob/v0.19.0/packaging/torchvision/meta.yaml#L26 + - numpy >=1.23.5 + # While their conda package depends on requests, it seems it is only used for some test + # scripts and not the runtime + # - requests test: requires: - pytest + - requests - av - expecttest - scipy @@ -167,7 +186,6 @@ about: license_file: LICENSE summary: Image and video datasets and models for torch deep learning dev_url: https://github.com/pytorch/vision - doc_url: http://pytorch.org/docs/master/torchvision extra: recipe-maintainers: diff --git a/recipe/patches/0002-Make-adjust_hue-work-with-numpy-2.0-8463.patch b/recipe/patches/0002-Make-adjust_hue-work-with-numpy-2.0-8463.patch deleted file mode 100644 index 5618811a..00000000 --- a/recipe/patches/0002-Make-adjust_hue-work-with-numpy-2.0-8463.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3fafce2baa5694475c8fa5e64d147574be7886d0 Mon Sep 17 00:00:00 2001 -From: Nicolas Hug -Date: Mon, 3 Jun 2024 12:14:03 +0100 -Subject: [PATCH 2/2] Make adjust_hue() work with numpy 2.0 (#8463) - ---- - torchvision/transforms/_functional_pil.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/torchvision/transforms/_functional_pil.py b/torchvision/transforms/_functional_pil.py -index 27784822..527879bb 100644 ---- a/torchvision/transforms/_functional_pil.py -+++ b/torchvision/transforms/_functional_pil.py -@@ -109,9 +109,9 @@ def adjust_hue(img: Image.Image, hue_factor: float) -> Image.Image: - h, s, v = img.convert("HSV").split() - - np_h = np.array(h, dtype=np.uint8) -- # uint8 addition take cares of rotation across boundaries -- with np.errstate(over="ignore"): -- np_h += np.uint8(hue_factor * 255) -+ # This will over/underflow, as desired -+ np_h += np.array(hue_factor * 255).astype(np.uint8) -+ - h = Image.fromarray(np_h, "L") - - img = Image.merge("HSV", (h, s, v)).convert(input_mode) diff --git a/recipe/patches/0002-Unvendor-giflib.patch b/recipe/patches/0002-Unvendor-giflib.patch new file mode 100644 index 00000000..ea595832 --- /dev/null +++ b/recipe/patches/0002-Unvendor-giflib.patch @@ -0,0 +1,41 @@ +From 358e56f66880c9d7d7acb9af20dcb4ad1059d722 Mon Sep 17 00:00:00 2001 +From: Mark Harfouche +Date: Sat, 24 Aug 2024 18:37:36 -0400 +Subject: [PATCH 2/4] Unvendor giflib + +--- + setup.py | 3 ++- + torchvision/csrc/io/image/cpu/decode_gif.cpp | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index c0c1050f78..89ba2f1704 100644 +--- a/setup.py ++++ b/setup.py +@@ -331,9 +331,10 @@ def get_extensions(): + image_src = ( + glob.glob(os.path.join(image_path, "*.cpp")) + + glob.glob(os.path.join(image_path, "cpu", "*.cpp")) +- + glob.glob(os.path.join(image_path, "cpu", "giflib", "*.c")) + ) + ++ image_link_flags.append("gif") ++ + if is_rocm_pytorch: + image_src += glob.glob(os.path.join(image_path, "hip", "*.cpp")) + # we need to exclude this in favor of the hipified source +diff --git a/torchvision/csrc/io/image/cpu/decode_gif.cpp b/torchvision/csrc/io/image/cpu/decode_gif.cpp +index 183d42e86a..b806f3359c 100644 +--- a/torchvision/csrc/io/image/cpu/decode_gif.cpp ++++ b/torchvision/csrc/io/image/cpu/decode_gif.cpp +@@ -1,6 +1,6 @@ + #include "decode_gif.h" + #include +-#include "giflib/gif_lib.h" ++#include + + namespace vision { + namespace image { +-- +2.46.0 + diff --git a/recipe/patches/0003-Support-nvjpeg-at-conda-forge.patch b/recipe/patches/0003-Support-nvjpeg-at-conda-forge.patch new file mode 100644 index 00000000..f908ec87 --- /dev/null +++ b/recipe/patches/0003-Support-nvjpeg-at-conda-forge.patch @@ -0,0 +1,33 @@ +From b8d4e24d0f6e04028d16ecd8aedc17e47aa18adf Mon Sep 17 00:00:00 2001 +From: Mark Harfouche +Date: Sat, 24 Aug 2024 18:38:27 -0400 +Subject: [PATCH 3/4] Support nvjpeg at conda-forge + +--- + setup.py | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/setup.py b/setup.py +index 89ba2f1704..bcf05d4367 100644 +--- a/setup.py ++++ b/setup.py +@@ -311,13 +311,9 @@ def get_extensions(): + print("Building torchvision without JPEG image support") + image_macros += [("JPEG_FOUND", str(int(use_jpeg)))] + +- # Locating nvjpeg +- # Should be included in CUDA_HOME for CUDA >= 10.1, which is the minimum version we have in the CI +- nvjpeg_found = ( +- extension is CUDAExtension +- and CUDA_HOME is not None +- and os.path.exists(os.path.join(CUDA_HOME, "include", "nvjpeg.h")) +- ) ++ # conda-forge supports cross compilation of nvjpeg whic isn't ++ # Really supported upstream ++ nvjpeg_found = torch.cuda.is_available() or force_cuda + + use_nvjpeg = use_nvjpeg and nvjpeg_found + if use_nvjpeg: +-- +2.46.0 + diff --git a/recipe/patches/0004-Skip-OSS-CI-tests-as-well-in-conda-forge-azure.patch b/recipe/patches/0004-Skip-OSS-CI-tests-as-well-in-conda-forge-azure.patch new file mode 100644 index 00000000..981877df --- /dev/null +++ b/recipe/patches/0004-Skip-OSS-CI-tests-as-well-in-conda-forge-azure.patch @@ -0,0 +1,25 @@ +From 789ab85e11606669c5e4a81830c5a034b713a07c Mon Sep 17 00:00:00 2001 +From: Mark Harfouche +Date: Sun, 25 Aug 2024 09:12:29 -0400 +Subject: [PATCH 4/4] Skip OSS CI tests as well in conda-forge azure + +--- + test/common_utils.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/test/common_utils.py b/test/common_utils.py +index 99c7931587..59768c5912 100644 +--- a/test/common_utils.py ++++ b/test/common_utils.py +@@ -25,6 +25,8 @@ from torchvision.transforms.v2.functional import to_image, to_pil_image + + + IN_OSS_CI = any(os.getenv(var) == "true" for var in ["CIRCLECI", "GITHUB_ACTIONS"]) ++# conda-forge defines the CI variable ++IN_OSS_CI = IN_OSS_CI or (os.getenv('CI') == 'azure') + IN_RE_WORKER = os.environ.get("INSIDE_RE_WORKER") is not None + IN_FBCODE = os.environ.get("IN_FBCODE_TORCHVISION") == "1" + CUDA_NOT_AVAILABLE_MSG = "CUDA device not available" +-- +2.46.0 + diff --git a/recipe/patches/no_strict_transforms_warning.patch b/recipe/patches/no_strict_transforms_warning.patch new file mode 100644 index 00000000..92a5979b --- /dev/null +++ b/recipe/patches/no_strict_transforms_warning.patch @@ -0,0 +1,20 @@ +diff --git a/test/test_transforms_v2.py b/test/test_transforms_v2.py +index f9218c3e84..012e556cae 100644 +--- a/test/test_transforms_v2.py ++++ b/test/test_transforms_v2.py +@@ -53,15 +53,6 @@ from torchvision.transforms.v2.functional._geometry import _get_perspective_coef + from torchvision.transforms.v2.functional._utils import _get_kernel, _register_kernel_internal + + +-# turns all warnings into errors for this module +-pytestmark = [pytest.mark.filterwarnings("error")] +- +-if sys.version_info[:2] >= (3, 12): +- # torchscript relies on some AST stuff that got deprecated in 3.12, +- # so we have to explicitly ignore those otherwise we'd error on warnings due to the pytestmark filter above. +- pytestmark.append(pytest.mark.filterwarnings("ignore::DeprecationWarning")) +- +- + @pytest.fixture(autouse=True) + def fix_rng_seed(): + set_rng_seed(0)
VariantStatus
linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpythonlinux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython - variant + variant
linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.10.____cpythonlinux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython - variant + variant
linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.11.____cpythonlinux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython - variant + variant
linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.12.____cpythonlinux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython - variant + variant
linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy2.0python3.9.____cpythonlinux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpythonlinux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.10.____cpythonlinux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.11.____cpythonlinux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.12.____cpythonlinux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpythonlinux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpythonlinux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.10.____cpythonlinux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.11.____cpythonlinux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.12.____cpythonlinux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.8.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy2.0python3.9.____cpythonlinux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython - variant + variant
linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpythonlinux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython - variant + variant
linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.10.____cpythonlinux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython - variant + variant
linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.11.____cpythonlinux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython - variant + variant
linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.12.____cpythonlinux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.8.____cpython - variant + variant
linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpythonlinux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython - variant + variant
osx_64_numpy1.22python3.8.____cpythonosx_64_python3.10.____cpython - variant + variant
osx_64_numpy2.0python3.10.____cpythonosx_64_python3.11.____cpython - variant + variant
osx_64_numpy2.0python3.11.____cpythonosx_64_python3.12.____cpython - variant + variant
osx_64_numpy2.0python3.12.____cpythonosx_64_python3.8.____cpython - variant + variant
osx_64_numpy2.0python3.9.____cpythonosx_64_python3.9.____cpython - variant + variant
osx_arm64_numpy1.22python3.8.____cpythonosx_arm64_python3.10.____cpython - variant + variant
osx_arm64_numpy2.0python3.10.____cpythonosx_arm64_python3.11.____cpython - variant + variant
osx_arm64_numpy2.0python3.11.____cpythonosx_arm64_python3.12.____cpython - variant + variant
osx_arm64_numpy2.0python3.12.____cpythonosx_arm64_python3.8.____cpython - variant + variant
osx_arm64_numpy2.0python3.9.____cpythonosx_arm64_python3.9.____cpython - variant + variant