diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 07f13804..034dc889 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,36 +8,52 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.21python3.10.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.21python3.10.____cpython + ? linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.10.____cpython + : CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.21python3.8.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.21python3.8.____cpython + ? linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.8.____cpython + : CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.21python3.9.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.21python3.9.____cpython + ? linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.9.____cpython + : CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython + ? linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.23python3.11.____cpython + : CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.21python3.10.____cpython: - CONFIG: linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.21python3.10.____cpython + ? linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.21python3.10.____cpython + : CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.21python3.8.____cpython: - CONFIG: linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.21python3.8.____cpython + ? linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.21python3.8.____cpython + : CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.21python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.21python3.9.____cpython: - CONFIG: linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.21python3.9.____cpython + ? linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.21python3.9.____cpython + : CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.21python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython: - CONFIG: linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython + ? linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.23python3.11.____cpython + : CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.23python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.21python3.10.____cpython: + CONFIG: linux_aarch64_numpy1.21python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.21python3.8.____cpython: + CONFIG: linux_aarch64_numpy1.21python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.21python3.9.____cpython: + CONFIG: linux_aarch64_numpy1.21python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.23python3.11.____cpython: + CONFIG: linux_aarch64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.10.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.10.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.8.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.8.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.9.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.9.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.23python3.11.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.23python3.11.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.21python3.10.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.21python3.10.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.21python3.8.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.21python3.8.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.21python3.8.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.21python3.9.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.21python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.21python3.9.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.23python3.11.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.23python3.11.____cpython.yaml diff --git a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml index 6e7a137c..1bdc9ffa 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 libjpeg_turbo: - 2.1.5 libpng: diff --git a/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml index 75cdc620..055d6d75 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 libjpeg_turbo: - 2.1.5 libpng: diff --git a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml index 2f7e7576..bcabac4c 100644 --- a/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 libjpeg_turbo: - 2.1.5 libpng: diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index 07cc5dd0..c7508ee6 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 libjpeg_turbo: - 2.1.5 libpng: diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0cce69c2..00000000 --- a/.travis.yml +++ /dev/null @@ -1,37 +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. - -language: generic - - - -matrix: - include: - - env: CONFIG=linux_aarch64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_aarch64_numpy1.21python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_aarch64_numpy1.21python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_aarch64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - -script: - - export CI=travis - - export GIT_BRANCH="$TRAVIS_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) - - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi - - - - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index bd6ae997..123d24eb 100644 --- a/README.md +++ b/README.md @@ -17,14 +17,7 @@ Current build status ==================== - - - - +
Travis - - linux - -
@@ -38,59 +31,59 @@ Current build status
Azure
- + - + - + - + - + - + - + - + diff --git a/conda-forge.yml b/conda-forge.yml index 0ea0ff66..8fabf9fc 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,5 +1,5 @@ build_platform: - linux_aarch64: linux_aarch64 + linux_aarch64: linux_64 osx_arm64: osx_64 conda_build: pkg_format: '2' @@ -9,6 +9,4 @@ github: tooling_branch_name: main os_version: linux_64: cos7 -provider: - linux_aarch64: default -test_on_native_only: true +test: native_and_emulated diff --git a/recipe/0001-Monkeypatch-TORCH_LIB_PATH.patch b/recipe/0001-Monkeypatch-TORCH_LIB_PATH.patch new file mode 100644 index 00000000..c08611f4 --- /dev/null +++ b/recipe/0001-Monkeypatch-TORCH_LIB_PATH.patch @@ -0,0 +1,28 @@ +From ebc3a96e6e5dfe411d940b147c45368ba5fc3b2d Mon Sep 17 00:00:00 2001 +From: Uwe Korn +Date: Wed, 21 Jun 2023 19:13:57 +0000 +Subject: [PATCH] Monkeypatch TORCH_LIB_PATH + +--- + setup.py | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/setup.py b/setup.py +index 24b7a2e..4016405 100644 +--- a/setup.py ++++ b/setup.py +@@ -11,6 +11,11 @@ from pkg_resources import DistributionNotFound, get_distribution, parse_version + from setuptools import find_packages, setup + from torch.utils.cpp_extension import BuildExtension, CppExtension, CUDA_HOME, CUDAExtension + ++import site ++import torch.utils.cpp_extension ++ ++torch.utils.cpp_extension.TORCH_LIB_PATH = site.getsitepackages()[0] + '/torch/lib' ++ + + def read(*names, **kwargs): + with open(os.path.join(os.path.dirname(__file__), *names), encoding=kwargs.get("encoding", "utf8")) as fp: +-- +2.40.1 + diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 04eed291..34702b53 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,9 +9,11 @@ package: source: url: https://github.com/pytorch/vision/archive/v{{ version }}.tar.gz sha256: 1efcb80e0a6e42c54f07ee16167839b4d302aeeecc12839cc47c74b06a2c20d4 + patches: + - 0001-Monkeypatch-TORCH_LIB_PATH.patch build: - number: 0 + number: 1 skip: true # [win] # as of pytorch 1.13, conda-forge only builds for CUDA 11.2+, see # https://github.com/conda-forge/conda-forge-pinning-feedstock/issues/3491 @@ -146,7 +148,7 @@ outputs: # 2023/05 The gaussian blur tests are known to be flaky due to some non-determinism on CUDA (see pytorch/vision#6755) {% set tests_to_skip = tests_to_skip + " or test_batched_vs_single" %} - pytest --verbose -k "not ({{ tests_to_skip }})" --durations=50 test/ # [not aarch64] - - pytest -k "not ({{ tests_to_skip }})" --durations=50 test/ # [aarch64] + - pytest -k "not ({{ tests_to_skip }})" --durations=50 test/ # [aarch64 and (build_platform == target_platform)] about: home: http://pytorch.org/
VariantStatus
linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.21python3.10.____cpythonlinux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.10.____cpython - variant + variant
linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.21python3.8.____cpythonlinux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.8.____cpython - variant + variant
linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.21python3.9.____cpythonlinux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.9.____cpython - variant + variant
linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpythonlinux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.23python3.11.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.21python3.10.____cpythonlinux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.21python3.10.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.21python3.8.____cpythonlinux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.21python3.8.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.21python3.9.____cpythonlinux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.21python3.9.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpythonlinux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecudnnundefinedcxx_compiler_version12numpy1.23python3.11.____cpython - variant + variant