From 9b211bfd3484126938e94d9c3d9f3cdb046ee47d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 26 Dec 2024 13:02:33 +0100 Subject: [PATCH 01/13] Use pytest-socket to block Internet access in tests --- recipe/recipe.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index e3dbb93..cda5fda 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -201,11 +201,12 @@ outputs: - expecttest - scipy - pytest-mock + - pytest-socket script: - if: not aarch64 - then: pytest --verbose -k "not (${{ tests_to_skip }})" --durations=50 test/ + then: pytest --disable-socket --verbose -k "not (${{ tests_to_skip }})" --durations=50 test/ - if: aarch64 and (build_platform == target_platform) - then: pytest -k "not (${{ tests_to_skip }})" --durations=50 test/ + then: pytest --disable-socket -k "not (${{ tests_to_skip }})" --durations=50 test/ - if: aarch64 and (build_platform != target_platform) then: true From 4a25d532ff74b955afa28427d3e252e88784fa1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 26 Dec 2024 13:03:57 +0100 Subject: [PATCH 02/13] Skip tests using Internet --- recipe/recipe.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index cda5fda..852e8e3 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -69,6 +69,8 @@ context: ${{ '2024/02 These tests assert warnings and in PyTorch 2.1.2 the number of warnings increased' if 0 }} ${{ 'causing them to fail' if 0 }} or test_pretrained_pos or test_equivalent_behavior_weights + ${{ '2024/12 These tests use Internet' if 0 }} + or test_decode_gif or test_download_url recipe: name: torchvision From 9ef1270d7f3344cf03a7509b84f42bbee94b6915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 26 Dec 2024 15:49:24 +0100 Subject: [PATCH 03/13] Add one more test to skips, that fetches (and caches) model --- recipe/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index 852e8e3..10311fe 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -70,7 +70,7 @@ context: ${{ 'causing them to fail' if 0 }} or test_pretrained_pos or test_equivalent_behavior_weights ${{ '2024/12 These tests use Internet' if 0 }} - or test_decode_gif or test_download_url + or test_decode_gif or test_download_url or "test_get_model[lraspp" recipe: name: torchvision From 4b6df9866c1612fae760dee04044120a2628397a Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 26 Dec 2024 11:06:33 -0500 Subject: [PATCH 04/13] bump build_number and rename to build --- recipe/recipe.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index 10311fe..9ffe76a 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -1,6 +1,6 @@ context: version: 0.20.1 - build_number: 2 + build: 3 # 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 @@ -92,8 +92,8 @@ source: - patches/8776_compatibility_with_pyav_14.patch build: - number: ${{ build_number }} - string: ${{ torch_proc_type }}_py${{ python | version_to_buildstring }}_h${{ hash }}_${{ build_number }} + number: ${{ build }} + string: ${{ torch_proc_type }}_py${{ python | version_to_buildstring }}_h${{ hash }}_${{ build }} # CUDA < 12 not supported by pytorch anymore skip: cuda_compiler_version == "11.8" or win From c62a3408738e26923b31dd3c9e32ac2e37d132d9 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 26 Dec 2024 11:25:06 -0500 Subject: [PATCH 05/13] Revert build_number -> build --- recipe/recipe.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index 9ffe76a..843fdd7 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -1,6 +1,6 @@ context: version: 0.20.1 - build: 3 + build_number: 3 # 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 @@ -92,8 +92,8 @@ source: - patches/8776_compatibility_with_pyav_14.patch build: - number: ${{ build }} - string: ${{ torch_proc_type }}_py${{ python | version_to_buildstring }}_h${{ hash }}_${{ build }} + number: ${{ build_number }} + string: ${{ torch_proc_type }}_py${{ python | version_to_buildstring }}_h${{ hash }}_${{ build_number }} # CUDA < 12 not supported by pytorch anymore skip: cuda_compiler_version == "11.8" or win From e01c3cc75a316161f531e7e5558e98d1373faeed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 26 Dec 2024 18:02:30 +0100 Subject: [PATCH 06/13] Enable AVIF and HEIF support --- recipe/build.sh | 6 ++++++ recipe/recipe.yaml | 2 ++ 2 files changed, 8 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index fdf0376..d93b922 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -27,4 +27,10 @@ rm -rf torchvision/csrc/io/image/cpu/giflib export TORCHVISION_USE_FFMPEG=0 export TORCHVISION_USE_NVJPEG=${FORCE_CUDA} export TORCHVISION_INCLUDE="${PREFIX}/include/" + +# disabled by default but with a TODO to "enable by default" +export TORCHVISION_USE_AVIF=1 +# (typo upstream) +export TORCHVISION_USE_HEIC=1 + ${PYTHON} -m pip install . -vv --no-deps --no-build-isolation diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index 843fdd7..960a96c 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -138,6 +138,8 @@ outputs: - libcusolver-dev - libcusparse-dev - libnvjpeg-dev + - libavif + - libheif - libjpeg-turbo - libpng - libwebp From 1dcc8a5358e020a99c109ac96ae0e8604a688907 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 26 Dec 2024 17:12:16 +0000 Subject: [PATCH 07/13] MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.1, and conda-forge-pinning 2024.12.26.03.25.00 --- .azure-pipelines/azure-pipelines-win.yml | 81 ------------------- ...piler_version13python3.10.____cpython.yaml | 2 + ...piler_version13python3.11.____cpython.yaml | 2 + ...piler_version13python3.12.____cpython.yaml | 2 + ...ompiler_version13python3.13.____cp313.yaml | 2 + ...mpiler_version13python3.9.____cpython.yaml | 2 + ...piler_version13python3.10.____cpython.yaml | 2 + ...piler_version13python3.11.____cpython.yaml | 2 + ...piler_version13python3.12.____cpython.yaml | 2 + ...ompiler_version13python3.13.____cp313.yaml | 2 + ...mpiler_version13python3.9.____cpython.yaml | 2 + ...piler_version13python3.10.____cpython.yaml | 2 + ...piler_version13python3.11.____cpython.yaml | 2 + ...piler_version13python3.12.____cpython.yaml | 2 + ...ompiler_version13python3.13.____cp313.yaml | 2 + ...mpiler_version13python3.9.____cpython.yaml | 2 + ...piler_version13python3.10.____cpython.yaml | 2 + ...piler_version13python3.11.____cpython.yaml | 2 + ...piler_version13python3.12.____cpython.yaml | 2 + ...ompiler_version13python3.13.____cp313.yaml | 2 + ...mpiler_version13python3.9.____cpython.yaml | 2 + .../osx_64_python3.10.____cpython.yaml | 2 + .../osx_64_python3.11.____cpython.yaml | 2 + .../osx_64_python3.12.____cpython.yaml | 2 + .ci_support/osx_64_python3.13.____cp313.yaml | 2 + .ci_support/osx_64_python3.9.____cpython.yaml | 2 + .../osx_arm64_python3.10.____cpython.yaml | 2 + .../osx_arm64_python3.11.____cpython.yaml | 2 + .../osx_arm64_python3.12.____cpython.yaml | 2 + .../osx_arm64_python3.13.____cp313.yaml | 2 + .../osx_arm64_python3.9.____cpython.yaml | 2 + 31 files changed, 60 insertions(+), 81 deletions(-) delete mode 100755 .azure-pipelines/azure-pipelines-win.yml diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml deleted file mode 100755 index 6392b1a..0000000 --- a/.azure-pipelines/azure-pipelines-win.yml +++ /dev/null @@ -1,81 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- - -jobs: -- job: win - pool: - vmImage: windows-2022 - strategy: - matrix: - win_64_cuda_compiler_version11.8python3.10.____cpython: - CONFIG: win_64_cuda_compiler_version11.8python3.10.____cpython - UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_version11.8python3.11.____cpython: - CONFIG: win_64_cuda_compiler_version11.8python3.11.____cpython - UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_version11.8python3.12.____cpython: - CONFIG: win_64_cuda_compiler_version11.8python3.12.____cpython - UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_version11.8python3.13.____cp313: - CONFIG: win_64_cuda_compiler_version11.8python3.13.____cp313 - UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_version11.8python3.9.____cpython: - CONFIG: win_64_cuda_compiler_version11.8python3.9.____cpython - UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_version12.6python3.10.____cpython: - CONFIG: win_64_cuda_compiler_version12.6python3.10.____cpython - UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_version12.6python3.11.____cpython: - CONFIG: win_64_cuda_compiler_version12.6python3.11.____cpython - UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_version12.6python3.12.____cpython: - CONFIG: win_64_cuda_compiler_version12.6python3.12.____cpython - UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_version12.6python3.13.____cp313: - CONFIG: win_64_cuda_compiler_version12.6python3.13.____cp313 - UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_version12.6python3.9.____cpython: - CONFIG: win_64_cuda_compiler_version12.6python3.9.____cpython - UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_versionNonepython3.10.____cpython: - CONFIG: win_64_cuda_compiler_versionNonepython3.10.____cpython - UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_versionNonepython3.11.____cpython: - CONFIG: win_64_cuda_compiler_versionNonepython3.11.____cpython - UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_versionNonepython3.12.____cpython: - CONFIG: win_64_cuda_compiler_versionNonepython3.12.____cpython - UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_versionNonepython3.13.____cp313: - CONFIG: win_64_cuda_compiler_versionNonepython3.13.____cp313 - UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_versionNonepython3.9.____cpython: - CONFIG: win_64_cuda_compiler_versionNonepython3.9.____cpython - UPLOAD_PACKAGES: 'True' - maxParallel: 14 - timeoutInMinutes: 360 - variables: - CONDA_BLD_PATH: D:\\bld\\ - MINIFORGE_HOME: D:\Miniforge - UPLOAD_TEMP: D:\\tmp - - steps: - - - script: | - call ".scripts\run_win_build.bat" - displayName: Run Windows build - env: - MINIFORGE_HOME: $(MINIFORGE_HOME) - CONDA_BLD_PATH: $(CONDA_BLD_PATH) - PYTHONUNBUFFERED: 1 - CONFIG: $(CONFIG) - CI: azure - flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) - remote_url: $(Build.Repository.Uri) - sha: $(Build.SourceVersion) - UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) - UPLOAD_TEMP: $(UPLOAD_TEMP) - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml index a4e4217..b40faab 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml index dd5ba08..c8b0e22 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml index 6858aeb..b05a967 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml index 94fcdfb..675d2ee 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml index 862ad23..8851f97 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml index 2d262c5..ef1715e 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml index 73d11c1..e70e256 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython.yaml index 459e7b8..197d4c9 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313.yaml index 400b6aa..0479c5b 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml index f042a5a..316c5fe 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml index 0680369..117a7bf 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml index 639bd23..4d7f28c 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml index 41e8a46..624c05f 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml index 3617365..729d763 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml index cef1bd6..ecddc90 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml index 6ec995c..8ceefa2 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml index cb37e0b..5e3f65a 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython.yaml index 0f65681..2e7e8f5 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313.yaml index ffa4e4e..736db12 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml index 819a14d..f354f5c 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml @@ -26,6 +26,8 @@ docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index e23df30..7611200 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -24,6 +24,8 @@ cxx_compiler_version: - '18' giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 3fbac6e..88952bc 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -24,6 +24,8 @@ cxx_compiler_version: - '18' giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index 23cea13..d0aeabd 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -24,6 +24,8 @@ cxx_compiler_version: - '18' giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_64_python3.13.____cp313.yaml b/.ci_support/osx_64_python3.13.____cp313.yaml index 4d807e7..4924f2b 100644 --- a/.ci_support/osx_64_python3.13.____cp313.yaml +++ b/.ci_support/osx_64_python3.13.____cp313.yaml @@ -24,6 +24,8 @@ cxx_compiler_version: - '18' giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index f26840b..5c7b01b 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -24,6 +24,8 @@ cxx_compiler_version: - '18' giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index da4e7e2..a16c550 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -24,6 +24,8 @@ cxx_compiler_version: - '18' giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 123ca37..ac5a376 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -24,6 +24,8 @@ cxx_compiler_version: - '18' giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index 6655eae..318fbb5 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -24,6 +24,8 @@ cxx_compiler_version: - '18' giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_arm64_python3.13.____cp313.yaml b/.ci_support/osx_arm64_python3.13.____cp313.yaml index 717786c..1fe476c 100644 --- a/.ci_support/osx_arm64_python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_python3.13.____cp313.yaml @@ -24,6 +24,8 @@ cxx_compiler_version: - '18' giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index d888a89..a873733 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -24,6 +24,8 @@ cxx_compiler_version: - '18' giflib: - '5.2' +libavif: +- '1' libjpeg_turbo: - '3' libpng: From 71cb295454c3f71fc21701f0c885625c7f36991d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 26 Dec 2024 18:13:46 +0100 Subject: [PATCH 08/13] Require lgpl* libheif --- recipe/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index 960a96c..a7f6acb 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -139,7 +139,7 @@ outputs: - libcusparse-dev - libnvjpeg-dev - libavif - - libheif + - libheif * [build=lgpl*] - libjpeg-turbo - libpng - libwebp From 4fb37235368bf3fc63c066ed7ed28ae8c9d66cc0 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 26 Dec 2024 14:05:12 -0500 Subject: [PATCH 09/13] Create libheif118.yaml --- .ci_support/migrations/libheif118.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .ci_support/migrations/libheif118.yaml diff --git a/.ci_support/migrations/libheif118.yaml b/.ci_support/migrations/libheif118.yaml new file mode 100644 index 0000000..3a33317 --- /dev/null +++ b/.ci_support/migrations/libheif118.yaml @@ -0,0 +1,8 @@ +migrator_ts: 1735237686 +__migrator: + kind: version + migration_number: 1 + bump_number: 1 + +libheif: + - 1.18 From 49ce7fb4db741f1fc92f8ba99a286c5ce7d72bf7 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 26 Dec 2024 21:34:46 -0500 Subject: [PATCH 10/13] Two lines of heif --- recipe/recipe.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index a7f6acb..eb17b42 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -139,7 +139,10 @@ outputs: - libcusparse-dev - libnvjpeg-dev - libavif - - libheif * [build=lgpl*] + # Add a "naked" libheif so that the global pinning is picked up + - libheif + # Add a constraint on the build time configuration of libheif to avoid gpl code + - libheif [build=lgpl*] - libjpeg-turbo - libpng - libwebp From 76962e89c6daa2b0b4c4df9c85d164c40b518616 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 26 Dec 2024 21:31:10 -0500 Subject: [PATCH 11/13] MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.1, and conda-forge-pinning 2024.12.26.18.39.45 --- ...versionNonecxx_compiler_version13python3.10.____cpython.yaml | 2 ++ ...versionNonecxx_compiler_version13python3.11.____cpython.yaml | 2 ++ ...versionNonecxx_compiler_version13python3.12.____cpython.yaml | 2 ++ ...r_versionNonecxx_compiler_version13python3.13.____cp313.yaml | 2 ++ ..._versionNonecxx_compiler_version13python3.9.____cpython.yaml | 2 ++ ...version12.6cxx_compiler_version13python3.10.____cpython.yaml | 2 ++ ...version12.6cxx_compiler_version13python3.11.____cpython.yaml | 2 ++ ...version12.6cxx_compiler_version13python3.12.____cpython.yaml | 2 ++ ...r_version12.6cxx_compiler_version13python3.13.____cp313.yaml | 2 ++ ..._version12.6cxx_compiler_version13python3.9.____cpython.yaml | 2 ++ ...versionNonecxx_compiler_version13python3.10.____cpython.yaml | 2 ++ ...versionNonecxx_compiler_version13python3.11.____cpython.yaml | 2 ++ ...versionNonecxx_compiler_version13python3.12.____cpython.yaml | 2 ++ ...r_versionNonecxx_compiler_version13python3.13.____cp313.yaml | 2 ++ ..._versionNonecxx_compiler_version13python3.9.____cpython.yaml | 2 ++ ...version12.6cxx_compiler_version13python3.10.____cpython.yaml | 2 ++ ...version12.6cxx_compiler_version13python3.11.____cpython.yaml | 2 ++ ...version12.6cxx_compiler_version13python3.12.____cpython.yaml | 2 ++ ...r_version12.6cxx_compiler_version13python3.13.____cp313.yaml | 2 ++ ..._version12.6cxx_compiler_version13python3.9.____cpython.yaml | 2 ++ .ci_support/osx_64_python3.10.____cpython.yaml | 2 ++ .ci_support/osx_64_python3.11.____cpython.yaml | 2 ++ .ci_support/osx_64_python3.12.____cpython.yaml | 2 ++ .ci_support/osx_64_python3.13.____cp313.yaml | 2 ++ .ci_support/osx_64_python3.9.____cpython.yaml | 2 ++ .ci_support/osx_arm64_python3.10.____cpython.yaml | 2 ++ .ci_support/osx_arm64_python3.11.____cpython.yaml | 2 ++ .ci_support/osx_arm64_python3.12.____cpython.yaml | 2 ++ .ci_support/osx_arm64_python3.13.____cp313.yaml | 2 ++ .ci_support/osx_arm64_python3.9.____cpython.yaml | 2 ++ 30 files changed, 60 insertions(+) diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml index b40faab..a52603c 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml index c8b0e22..76c3995 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml index b05a967..9bd8ccc 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml index 675d2ee..93805d4 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml index 8851f97..9d9f9a1 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml index ef1715e..51e1f34 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml index e70e256..0af346f 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython.yaml index 197d4c9..141c876 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313.yaml index 0479c5b..27a4625 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml index 316c5fe..1f9907b 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml index 117a7bf..7c1a9e3 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml index 4d7f28c..99ef203 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml index 624c05f..48fa1e6 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml index 729d763..4bbd83b 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml index ecddc90..62c4a9c 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml index 8ceefa2..e12481d 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml index 5e3f65a..2c8d482 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython.yaml index 2e7e8f5..61539a4 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313.yaml index 736db12..98ec062 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml index f354f5c..4eadc04 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml @@ -28,6 +28,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 7611200..1c2d377 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -26,6 +26,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 88952bc..ba00e6a 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -26,6 +26,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index d0aeabd..72a366a 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -26,6 +26,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_64_python3.13.____cp313.yaml b/.ci_support/osx_64_python3.13.____cp313.yaml index 4924f2b..fd25e63 100644 --- a/.ci_support/osx_64_python3.13.____cp313.yaml +++ b/.ci_support/osx_64_python3.13.____cp313.yaml @@ -26,6 +26,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 5c7b01b..09dbf53 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -26,6 +26,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index a16c550..a7efd63 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -26,6 +26,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index ac5a376..e715a6d 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -26,6 +26,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index 318fbb5..a79ec94 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -26,6 +26,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_arm64_python3.13.____cp313.yaml b/.ci_support/osx_arm64_python3.13.____cp313.yaml index 1fe476c..918e9ef 100644 --- a/.ci_support/osx_arm64_python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_python3.13.____cp313.yaml @@ -26,6 +26,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index a873733..634792f 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -26,6 +26,8 @@ giflib: - '5.2' libavif: - '1' +libheif: +- '1.18' libjpeg_turbo: - '3' libpng: From 50c72be30d834823c250bbb4e59da35edfb97709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 27 Dec 2024 06:15:17 +0100 Subject: [PATCH 12/13] Remove incorrect comment --- recipe/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index d93b922..2d4f80c 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -30,7 +30,6 @@ export TORCHVISION_INCLUDE="${PREFIX}/include/" # disabled by default but with a TODO to "enable by default" export TORCHVISION_USE_AVIF=1 -# (typo upstream) export TORCHVISION_USE_HEIC=1 ${PYTHON} -m pip install . -vv --no-deps --no-build-isolation From 80c9576a7842d388e6d0c56b43d60d97fb0abd9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 27 Dec 2024 06:16:16 +0100 Subject: [PATCH 13/13] Copyy AVIF/HEIF bits to build.bat as well --- recipe/build.bat | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/build.bat b/recipe/build.bat index b9d3f5e..9e378aa 100644 --- a/recipe/build.bat +++ b/recipe/build.bat @@ -1,2 +1,7 @@ set "TORCHVISION_INCLUDE=%LIBRARY_INC%" + +rem disabled by default but with a TODO to "enable by default" +set "TORCHVISION_USE_AVIF=1" +set "TORCHVISION_USE_HEIC=1" + %PYTHON% -m pip install . -vv --no-deps --no-build-isolation