From 1d0929ae483058179ca20f55e7efafdc11ec431a Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 21 Oct 2021 19:09:28 +0000 Subject: [PATCH 01/11] updated v0.11.1 --- recipe/meta.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2304a56a..956b673c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,5 @@ -{% set version = "0.10.1" %} +{% set tests_to_skip = "test_url_is_accessible" %} +{% set version = "0.11.1" %} # see github.com/conda-forge/conda-forge.github.io/issues/1059 for naming discussion {% set torch_proc_type = "cuda" if cuda_compiler_version != "None" else "cpu" %} @@ -8,7 +9,7 @@ package: source: url: https://github.com/pytorch/vision/archive/v{{ version }}.tar.gz - sha256: 4d595cf0214c8adc817f8e3cd0043a027b52b481e05d67b04f4947fcb43d4277 + sha256: 32a06ccf755e4d75006ce03701f207652747a63dbfdf65f0f20a1b6f93a2e834 patches: # compatibility with pillow >=8.3.0,<8.3.2; can be dropped once 8.3.2 arrives (then update range below!) - patches/0001-Don-t-check-transparency-channel-for-pil-8.3-in-test.patch @@ -23,10 +24,10 @@ requirements: outputs: - name: torchvision - script: build-torch.sh # [not win] + script: build-torch.sh # [not win] script: build-torch.bat # [win] build: - string: py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ torch_proc_type }} # [cuda_compiler_version == "None"] + string: py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ torch_proc_type }} # [cuda_compiler_version == "None"] string: py{{ CONDA_PY }}cuda{{ cuda_compiler_version|replace('.', '') }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ torch_proc_type }} # [cuda_compiler_version != "None"] run_exports: # ensure matching proc-type From 224f81d2b58c32ecde7c3cc0aee2e33a1240ab8a Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 21 Oct 2021 19:11:14 +0000 Subject: [PATCH 02/11] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.13.0, and conda-forge-pinning 2021.10.21.11.39.39 --- .azure-pipelines/azure-pipelines-linux.yml | 25 ++-------- .azure-pipelines/azure-pipelines-osx.yml | 8 +-- ...2cudnn7numpy1.18python3.6.____cpython.yaml | 49 ------------------- ...2cudnn7numpy1.18python3.7.____cpython.yaml | 2 +- ...2cudnn7numpy1.18python3.8.____cpython.yaml | 2 +- ...2cudnn7numpy1.19python3.9.____cpython.yaml | 2 +- ...0cudnn8numpy1.18python3.6.____cpython.yaml | 49 ------------------- ...0cudnn8numpy1.18python3.7.____cpython.yaml | 2 +- ...0cudnn8numpy1.18python3.8.____cpython.yaml | 2 +- ...0cudnn8numpy1.19python3.9.____cpython.yaml | 2 +- ...1cudnn8numpy1.18python3.6.____cpython.yaml | 49 ------------------- ...1cudnn8numpy1.18python3.7.____cpython.yaml | 2 +- ...1cudnn8numpy1.18python3.8.____cpython.yaml | 2 +- ...1cudnn8numpy1.19python3.9.____cpython.yaml | 2 +- ...2cudnn8numpy1.18python3.6.____cpython.yaml | 49 ------------------- ...2cudnn8numpy1.18python3.7.____cpython.yaml | 2 +- ...2cudnn8numpy1.18python3.8.____cpython.yaml | 2 +- ...2cudnn8numpy1.19python3.9.____cpython.yaml | 2 +- ...definednumpy1.18python3.6.____cpython.yaml | 49 ------------------- ...definednumpy1.18python3.7.____cpython.yaml | 2 +- ...definednumpy1.18python3.8.____cpython.yaml | 2 +- ...definednumpy1.19python3.9.____cpython.yaml | 2 +- ...osx_64_numpy1.18python3.6.____cpython.yaml | 41 ---------------- ...osx_64_numpy1.18python3.7.____cpython.yaml | 2 +- ...osx_64_numpy1.18python3.8.____cpython.yaml | 2 +- ...osx_64_numpy1.19python3.9.____cpython.yaml | 2 +- .scripts/build_steps.sh | 5 +- .scripts/run_docker_build.sh | 2 + .scripts/run_osx_build.sh | 8 +-- README.md | 42 ---------------- build-locally.py | 1 + 31 files changed, 39 insertions(+), 374 deletions(-) delete mode 100644 .ci_support/linux_64_cuda_compiler_version10.2cudnn7numpy1.18python3.6.____cpython.yaml delete mode 100644 .ci_support/linux_64_cuda_compiler_version11.0cudnn8numpy1.18python3.6.____cpython.yaml delete mode 100644 .ci_support/linux_64_cuda_compiler_version11.1cudnn8numpy1.18python3.6.____cpython.yaml delete mode 100644 .ci_support/linux_64_cuda_compiler_version11.2cudnn8numpy1.18python3.6.____cpython.yaml delete mode 100644 .ci_support/linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.18python3.6.____cpython.yaml delete mode 100644 .ci_support/osx_64_numpy1.18python3.6.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index a1eb139f..d62952fe 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,10 +8,6 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_cuda_compiler_version10.2cudnn7numpy1.18python3.6.____cpython: - CONFIG: linux_64_cuda_compiler_version10.2cudnn7numpy1.18python3.6.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 linux_64_cuda_compiler_version10.2cudnn7numpy1.18python3.7.____cpython: CONFIG: linux_64_cuda_compiler_version10.2cudnn7numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' @@ -24,10 +20,6 @@ jobs: CONFIG: linux_64_cuda_compiler_version10.2cudnn7numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 - linux_64_cuda_compiler_version11.0cudnn8numpy1.18python3.6.____cpython: - CONFIG: linux_64_cuda_compiler_version11.0cudnn8numpy1.18python3.6.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 linux_64_cuda_compiler_version11.0cudnn8numpy1.18python3.7.____cpython: CONFIG: linux_64_cuda_compiler_version11.0cudnn8numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' @@ -40,10 +32,6 @@ jobs: CONFIG: linux_64_cuda_compiler_version11.0cudnn8numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 - linux_64_cuda_compiler_version11.1cudnn8numpy1.18python3.6.____cpython: - CONFIG: linux_64_cuda_compiler_version11.1cudnn8numpy1.18python3.6.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.1 linux_64_cuda_compiler_version11.1cudnn8numpy1.18python3.7.____cpython: CONFIG: linux_64_cuda_compiler_version11.1cudnn8numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' @@ -56,10 +44,6 @@ jobs: CONFIG: linux_64_cuda_compiler_version11.1cudnn8numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.1 - linux_64_cuda_compiler_version11.2cudnn8numpy1.18python3.6.____cpython: - CONFIG: linux_64_cuda_compiler_version11.2cudnn8numpy1.18python3.6.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 linux_64_cuda_compiler_version11.2cudnn8numpy1.18python3.7.____cpython: CONFIG: linux_64_cuda_compiler_version11.2cudnn8numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' @@ -72,10 +56,6 @@ jobs: CONFIG: linux_64_cuda_compiler_version11.2cudnn8numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.18python3.6.____cpython: - CONFIG: linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.18python3.6.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.18python3.7.____cpython: CONFIG: linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' @@ -108,6 +88,11 @@ jobs: export CI=azure export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi .scripts/run_docker_build.sh displayName: Run docker build env: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 5105ed58..a5922481 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,9 +8,6 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_numpy1.18python3.6.____cpython: - CONFIG: osx_64_numpy1.18python3.6.____cpython - UPLOAD_PACKAGES: 'True' osx_64_numpy1.18python3.7.____cpython: CONFIG: osx_64_numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' @@ -35,6 +32,11 @@ jobs: export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi ./.scripts/run_osx_build.sh displayName: Run OSX build env: diff --git a/.ci_support/linux_64_cuda_compiler_version10.2cudnn7numpy1.18python3.6.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version10.2cudnn7numpy1.18python3.6.____cpython.yaml deleted file mode 100644 index f506e7b8..00000000 --- a/.ci_support/linux_64_cuda_compiler_version10.2cudnn7numpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,49 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '7' -cdt_name: -- cos7 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '10.2' -cudnn: -- '7' -cxx_compiler: -- gxx -cxx_compiler_version: -- '7' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-cuda:10.2 -jpeg: -- '9' -libpng: -- '1.6' -numpy: -- '1.18' -pin_run_as_build: - jpeg: - max_pin: x - libpng: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - cdt_name - - cuda_compiler_version - - cudnn - - docker_image -- - numpy - - python diff --git a/.ci_support/linux_64_cuda_compiler_version10.2cudnn7numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version10.2cudnn7numpy1.18python3.7.____cpython.yaml index fbc9dbb3..0bf9a842 100644 --- a/.ci_support/linux_64_cuda_compiler_version10.2cudnn7numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_version10.2cudnn7numpy1.18python3.7.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cuda_compiler_version10.2cudnn7numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version10.2cudnn7numpy1.18python3.8.____cpython.yaml index 914577ab..bf8cadc2 100644 --- a/.ci_support/linux_64_cuda_compiler_version10.2cudnn7numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_version10.2cudnn7numpy1.18python3.8.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cuda_compiler_version10.2cudnn7numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version10.2cudnn7numpy1.19python3.9.____cpython.yaml index c1d7d1e1..0ed77da1 100644 --- a/.ci_support/linux_64_cuda_compiler_version10.2cudnn7numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_version10.2cudnn7numpy1.19python3.9.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cuda_compiler_version11.0cudnn8numpy1.18python3.6.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version11.0cudnn8numpy1.18python3.6.____cpython.yaml deleted file mode 100644 index 826b45fa..00000000 --- a/.ci_support/linux_64_cuda_compiler_version11.0cudnn8numpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,49 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '7' -cdt_name: -- cos7 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.0' -cudnn: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '7' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.0 -jpeg: -- '9' -libpng: -- '1.6' -numpy: -- '1.18' -pin_run_as_build: - jpeg: - max_pin: x - libpng: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - cdt_name - - cuda_compiler_version - - cudnn - - docker_image -- - numpy - - python diff --git a/.ci_support/linux_64_cuda_compiler_version11.0cudnn8numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version11.0cudnn8numpy1.18python3.7.____cpython.yaml index 414d2090..c409267b 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.0cudnn8numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.0cudnn8numpy1.18python3.7.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cuda_compiler_version11.0cudnn8numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version11.0cudnn8numpy1.18python3.8.____cpython.yaml index cf0e77b6..9d844d13 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.0cudnn8numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.0cudnn8numpy1.18python3.8.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cuda_compiler_version11.0cudnn8numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version11.0cudnn8numpy1.19python3.9.____cpython.yaml index 91bf23bf..e2bde4fd 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.0cudnn8numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.0cudnn8numpy1.19python3.9.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cuda_compiler_version11.1cudnn8numpy1.18python3.6.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version11.1cudnn8numpy1.18python3.6.____cpython.yaml deleted file mode 100644 index d9885cc0..00000000 --- a/.ci_support/linux_64_cuda_compiler_version11.1cudnn8numpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,49 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '7' -cdt_name: -- cos7 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.1' -cudnn: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '7' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.1 -jpeg: -- '9' -libpng: -- '1.6' -numpy: -- '1.18' -pin_run_as_build: - jpeg: - max_pin: x - libpng: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - cdt_name - - cuda_compiler_version - - cudnn - - docker_image -- - numpy - - python diff --git a/.ci_support/linux_64_cuda_compiler_version11.1cudnn8numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version11.1cudnn8numpy1.18python3.7.____cpython.yaml index 32b85ac5..a90e0567 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.1cudnn8numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.1cudnn8numpy1.18python3.7.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cuda_compiler_version11.1cudnn8numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version11.1cudnn8numpy1.18python3.8.____cpython.yaml index ee057dba..e0e28698 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.1cudnn8numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.1cudnn8numpy1.18python3.8.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cuda_compiler_version11.1cudnn8numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version11.1cudnn8numpy1.19python3.9.____cpython.yaml index 1a4be38e..fc997e7c 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.1cudnn8numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.1cudnn8numpy1.19python3.9.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cuda_compiler_version11.2cudnn8numpy1.18python3.6.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version11.2cudnn8numpy1.18python3.6.____cpython.yaml deleted file mode 100644 index 8641a07d..00000000 --- a/.ci_support/linux_64_cuda_compiler_version11.2cudnn8numpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,49 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '7' -cdt_name: -- cos7 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.2' -cudnn: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '7' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 -jpeg: -- '9' -libpng: -- '1.6' -numpy: -- '1.18' -pin_run_as_build: - jpeg: - max_pin: x - libpng: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - cdt_name - - cuda_compiler_version - - cudnn - - docker_image -- - numpy - - python diff --git a/.ci_support/linux_64_cuda_compiler_version11.2cudnn8numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version11.2cudnn8numpy1.18python3.7.____cpython.yaml index a54b38aa..881c00c9 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.2cudnn8numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.2cudnn8numpy1.18python3.7.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cuda_compiler_version11.2cudnn8numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version11.2cudnn8numpy1.18python3.8.____cpython.yaml index f8645de9..be2acf8e 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.2cudnn8numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.2cudnn8numpy1.18python3.8.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cuda_compiler_version11.2cudnn8numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_version11.2cudnn8numpy1.19python3.9.____cpython.yaml index 0f8ac783..103c8dcf 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.2cudnn8numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.2cudnn8numpy1.19python3.9.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.18python3.6.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.18python3.6.____cpython.yaml deleted file mode 100644 index f7dc253c..00000000 --- a/.ci_support/linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,49 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '7' -cdt_name: -- cos7 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- None -cudnn: -- undefined -cxx_compiler: -- gxx -cxx_compiler_version: -- '7' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -jpeg: -- '9' -libpng: -- '1.6' -numpy: -- '1.18' -pin_run_as_build: - jpeg: - max_pin: x - libpng: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - cdt_name - - cuda_compiler_version - - cudnn - - docker_image -- - numpy - - python diff --git a/.ci_support/linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.18python3.7.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.18python3.7.____cpython.yaml index ac737362..7f2138c4 100644 --- a/.ci_support/linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.18python3.7.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.18python3.8.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.18python3.8.____cpython.yaml index bb39e86b..cbb8d83d 100644 --- a/.ci_support/linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.18python3.8.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.19python3.9.____cpython.yaml index a14cc6e7..e911bbff 100644 --- a/.ci_support/linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.19python3.9.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/osx_64_numpy1.18python3.6.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.6.____cpython.yaml deleted file mode 100644 index 80559e33..00000000 --- a/.ci_support/osx_64_numpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,41 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '11' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '11' -jpeg: -- '9' -libpng: -- '1.6' -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.18' -pin_run_as_build: - jpeg: - max_pin: x - libpng: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml index e0c5b33b..23ceb191 100644 --- a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler_version: diff --git a/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml index ac10f925..35b0dbd0 100644 --- a/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler_version: diff --git a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml index 45126106..8a3aeb0d 100644 --- a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler_version: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 99baf86d..2e87f6d3 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -25,7 +25,8 @@ conda-build: root-dir: ${FEEDSTOCK_ROOT}/build_artifacts CONDARC -BUILD_CMD=build +GET_BOA=boa +BUILD_CMD=mambabuild conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} -c conda-forge @@ -66,7 +67,7 @@ else ( startgroup "Uploading packages" ) 2> /dev/null - if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then + if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" fi diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 244ccd1f..9a61caf7 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -75,12 +75,14 @@ fi ( startgroup "Start Docker" ) 2> /dev/null export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" +export IS_PR_BUILD="${IS_PR_BUILD:-False}" docker run ${DOCKER_RUN_ARGS} \ -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ -e CONFIG \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ + -e IS_PR_BUILD \ -e GIT_BRANCH \ -e UPLOAD_ON_BRANCH \ -e CI \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 708b1e1f..3dca4379 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -9,15 +9,17 @@ 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="Miniforge3-MacOSX-x86_64.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} ( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null -BUILD_CMD=build +GET_BOA=boa +BUILD_CMD=mambabuild source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base @@ -66,7 +68,7 @@ validate_recipe_outputs "${FEEDSTOCK_NAME}" ( startgroup "Uploading packages" ) 2> /dev/null -if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then +if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml fi diff --git a/README.md b/README.md index ffa669e0..05e5fc88 100644 --- a/README.md +++ b/README.md @@ -31,13 +31,6 @@ Current build status - - - - - - - - - - - - - - - - - -
VariantStatus
linux_64_cuda_compiler_version10.2cudnn7numpy1.18python3.6.____cpython - - variant - -
linux_64_cuda_compiler_version10.2cudnn7numpy1.18python3.7.____cpython @@ -58,13 +51,6 @@ Current build status variant
linux_64_cuda_compiler_version11.0cudnn8numpy1.18python3.6.____cpython - - variant - -
linux_64_cuda_compiler_version11.0cudnn8numpy1.18python3.7.____cpython @@ -86,13 +72,6 @@ Current build status variant
linux_64_cuda_compiler_version11.1cudnn8numpy1.18python3.6.____cpython - - variant - -
linux_64_cuda_compiler_version11.1cudnn8numpy1.18python3.7.____cpython @@ -114,13 +93,6 @@ Current build status variant
linux_64_cuda_compiler_version11.2cudnn8numpy1.18python3.6.____cpython - - variant - -
linux_64_cuda_compiler_version11.2cudnn8numpy1.18python3.7.____cpython @@ -142,13 +114,6 @@ Current build status variant
linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.18python3.6.____cpython - - variant - -
linux_64_cuda_compiler_versionNonecudnnundefinednumpy1.18python3.7.____cpython @@ -170,13 +135,6 @@ Current build status variant
osx_64_numpy1.18python3.6.____cpython - - variant - -
osx_64_numpy1.18python3.7.____cpython diff --git a/build-locally.py b/build-locally.py index 00eeb34b..f3d4f62f 100755 --- a/build-locally.py +++ b/build-locally.py @@ -13,6 +13,7 @@ def setup_environment(ns): os.environ["CONFIG"] = ns.config os.environ["UPLOAD_PACKAGES"] = "False" + os.environ["IS_PR_BUILD"] = "True" if ns.debug: os.environ["BUILD_WITH_CONDA_DEBUG"] = "1" if ns.output_id: From 4f46c2140611344d09e0bf4042caafd6c9554443 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 21 Oct 2021 19:31:42 -0400 Subject: [PATCH 03/11] Update meta.yaml --- recipe/meta.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 956b673c..9be5e312 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,9 +10,6 @@ package: source: url: https://github.com/pytorch/vision/archive/v{{ version }}.tar.gz sha256: 32a06ccf755e4d75006ce03701f207652747a63dbfdf65f0f20a1b6f93a2e834 - patches: - # compatibility with pillow >=8.3.0,<8.3.2; can be dropped once 8.3.2 arrives (then update range below!) - - patches/0001-Don-t-check-transparency-channel-for-pil-8.3-in-test.patch build: number: 0 @@ -65,7 +62,7 @@ outputs: - pytorch-cpu # [cuda_compiler_version == "None"] - {{ pin_compatible('cudnn') }} # [cuda_compiler_version != "None"] - {{ pin_compatible('numpy') }} - - pillow >=5.3.0,!=8.3.0 + - pillow >=5.3.0,!=8.3.0,!=8.3.1 test: requires: From f4dff31ccec4f35142ed51ff052ffd15a14e1ed3 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 21 Oct 2021 19:32:02 -0400 Subject: [PATCH 04/11] Delete recipe/patches directory --- ...sparency-channel-for-pil-8.3-in-test.patch | 47 ------------------- 1 file changed, 47 deletions(-) delete mode 100644 recipe/patches/0001-Don-t-check-transparency-channel-for-pil-8.3-in-test.patch diff --git a/recipe/patches/0001-Don-t-check-transparency-channel-for-pil-8.3-in-test.patch b/recipe/patches/0001-Don-t-check-transparency-channel-for-pil-8.3-in-test.patch deleted file mode 100644 index fc69f849..00000000 --- a/recipe/patches/0001-Don-t-check-transparency-channel-for-pil-8.3-in-test.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 88d28695deaf8c8d89bd02ec5c89e91422a1afca Mon Sep 17 00:00:00 2001 -From: Nicolas Hug -Date: Mon, 12 Jul 2021 14:26:01 +0100 -Subject: [PATCH] Don't check transparency channel for pil >= 8.3 in - test_decode_png (#4167) - ---- - test/test_image.py | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/test/test_image.py b/test/test_image.py -index eae4a147..ba7ccce3 100644 ---- a/test/test_image.py -+++ b/test/test_image.py -@@ -8,7 +8,7 @@ from pathlib import Path - import pytest - import numpy as np - import torch --from PIL import Image -+from PIL import Image, __version__ as PILLOW_VERSION - import torchvision.transforms.functional as F - from common_utils import get_tmp_dir, needs_cuda, cpu_only - from _assert_utils import assert_equal -@@ -23,6 +23,7 @@ IMAGE_DIR = os.path.join(FAKEDATA_DIR, "imagefolder") - DAMAGED_JPEG = os.path.join(IMAGE_ROOT, 'damaged_jpeg') - ENCODE_JPEG = os.path.join(IMAGE_ROOT, "encode_jpeg") - IS_WINDOWS = sys.platform in ('win32', 'cygwin') -+PILLOW_VERSION = tuple(int(x) for x in PILLOW_VERSION.split('.')) - - - def _get_safe_image_name(name): -@@ -120,6 +121,12 @@ class ImageTester(unittest.TestCase): - img_lpng = decode_image(data, mode=mode) - - tol = 0 if conversion is None else 1 -+ if PILLOW_VERSION >= (8, 3) and pil_mode == "LA": -+ # Avoid checking the transparency channel until -+ # https://github.com/python-pillow/Pillow/issues/5593#issuecomment-878244910 -+ # is fixed. -+ # TODO: remove once fix is released in PIL. Should be > 8.3.1. -+ img_lpng, img_pil = img_lpng[0], img_pil[0] - self.assertTrue(img_lpng.allclose(img_pil, atol=tol)) - - with self.assertRaises(RuntimeError): --- -2.31.1.windows.1 - From c2ef1c43f7bb2ab2e612c430849c2442efb4ef81 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 23 Oct 2021 14:04:48 -0400 Subject: [PATCH 05/11] Update meta.yaml --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9be5e312..6ec31f65 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -50,9 +50,9 @@ outputs: - libpng # ffmpeg - numpy - # exclude 8.3.0 specifically due to pytorch/vision#4146, python-pillow/Pillow#5571 - - pillow >=5.3.0,!=8.3.0 - - pytorch + # exclude 8.3.0 and 8.3.1 specifically due to pytorch/vision#4146, python-pillow/Pillow#5571 + - pillow >=5.3.0,!=8.3.0,!=8.3.1 + - pytorch 1.10 - pytorch-gpu # [cuda_compiler_version != "None"] - pytorch-cpu # [cuda_compiler_version == "None"] run: From 463ae98ec2efc2851fb68807424be5579935e054 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 28 Oct 2021 20:54:00 -0400 Subject: [PATCH 06/11] test in verbose and pin pytorch better --- recipe/meta.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6ec31f65..96f687f1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,6 @@ {% set tests_to_skip = "test_url_is_accessible" %} {% set version = "0.11.1" %} +{% set pytorch_version = "1.10.0" %} # see github.com/conda-forge/conda-forge.github.io/issues/1059 for naming discussion {% set torch_proc_type = "cuda" if cuda_compiler_version != "None" else "cpu" %} @@ -39,7 +40,7 @@ outputs: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] - - pytorch =*={{ torch_proc_type }}* # [build_platform != target_platform] + - pytorch ={{ pytorch_version }}={{ torch_proc_type }}* # [build_platform != target_platform] host: - python - pip @@ -52,12 +53,12 @@ outputs: - numpy # exclude 8.3.0 and 8.3.1 specifically due to pytorch/vision#4146, python-pillow/Pillow#5571 - pillow >=5.3.0,!=8.3.0,!=8.3.1 - - pytorch 1.10 + - pytorch {{ pytorch_version }} - pytorch-gpu # [cuda_compiler_version != "None"] - pytorch-cpu # [cuda_compiler_version == "None"] run: - python - - pytorch + - pytorch {{ pytorch_version }} - pytorch-gpu # [cuda_compiler_version != "None"] - pytorch-cpu # [cuda_compiler_version == "None"] - {{ pin_compatible('cudnn') }} # [cuda_compiler_version != "None"] @@ -84,7 +85,7 @@ outputs: {% set tests_to_skip = "test_url_is_accessible" %} # osx warns with nnpack if there is no AVX2, see conda-forge/pytorch-cpu-feedstock#56 {% set tests_to_skip = tests_to_skip + " or test_adjust_sharpness" %} # [osx] - - pytest -k "not ({{ tests_to_skip }})" test/ + - pytest --verbose -k "not ({{ tests_to_skip }})" test/ about: home: http://pytorch.org/ From 0283e17b23739bf46758848e16f88560960c9666 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 28 Oct 2021 21:09:43 -0400 Subject: [PATCH 07/11] Explain wy we are skipping tests --- recipe/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 96f687f1..e78a6dee 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -85,6 +85,10 @@ outputs: {% set tests_to_skip = "test_url_is_accessible" %} # osx warns with nnpack if there is no AVX2, see conda-forge/pytorch-cpu-feedstock#56 {% set tests_to_skip = tests_to_skip + " or test_adjust_sharpness" %} # [osx] + # 2021/10/28 hmaarrfk: I am able to run it locally on a large machine. + # It seems to fail around testing of vgg + # This test seems to just destroy the memory of the system. + {% set tests_to_skip = tests_to_skip " + or test_forward_backward" %} - pytest --verbose -k "not ({{ tests_to_skip }})" test/ about: From c2d53720a810069ea3e6f1ed1bb4626a1ebd2938 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 28 Oct 2021 21:16:07 -0400 Subject: [PATCH 08/11] lint --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e78a6dee..7bdc6f61 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -88,7 +88,7 @@ outputs: # 2021/10/28 hmaarrfk: I am able to run it locally on a large machine. # It seems to fail around testing of vgg # This test seems to just destroy the memory of the system. - {% set tests_to_skip = tests_to_skip " + or test_forward_backward" %} + {% set tests_to_skip = tests_to_skip + " or test_forward_backward" %} - pytest --verbose -k "not ({{ tests_to_skip }})" test/ about: From 0b3c520d82ee881e96f54ff5d4b88a01bd6bd131 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 28 Oct 2021 21:17:47 -0400 Subject: [PATCH 09/11] Add pytest-mock --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7bdc6f61..9fd57856 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -71,6 +71,7 @@ outputs: - av - requests - scipy + - pytest-mock source_files: - test imports: From 0d5b83ca21bdcc9014a544bb715e9486ccb17beb Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 28 Oct 2021 21:35:07 -0400 Subject: [PATCH 10/11] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9fd57856..c2dff728 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -90,6 +90,7 @@ outputs: # It seems to fail around testing of vgg # This test seems to just destroy the memory of the system. {% set tests_to_skip = tests_to_skip + " or test_forward_backward" %} + {% set tests_to_skip = tests_to_skip + " or test_jit_forward_backward" %} - pytest --verbose -k "not ({{ tests_to_skip }})" test/ about: From 7dd9450b78ee115b41e55fd2c7fac8dc98597556 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 28 Oct 2021 22:44:58 -0400 Subject: [PATCH 11/11] Delete the models tests to skip it. --- recipe/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c2dff728..7f9a554e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -91,6 +91,10 @@ outputs: # This test seems to just destroy the memory of the system. {% set tests_to_skip = tests_to_skip + " or test_forward_backward" %} {% set tests_to_skip = tests_to_skip + " or test_jit_forward_backward" %} + # 2021/10/29 hmaarrfk + # CIs do not have enough resources to run the full suite of model tests + - rm -f test/test_models.py # [unix] + - del /f test\test_models.py # [win] - pytest --verbose -k "not ({{ tests_to_skip }})" test/ about: