Merge pull request #83 from hmaarrfk/0.16.1

Update to 0.16.1, Pytorch 2.1
conda-forge · Nov 27, 2023 · 43854d5 · 43854d5
2 parents ab7b3e6 + c4cf770
commit 43854d5
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 44 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/...ion10numpy1.22python3.10.____cpython.yaml → ...ion10numpy1.22python3.10.____cpython.yaml b/...ion10numpy1.22python3.10.____cpython.yaml → ...ion10numpy1.22python3.10.____cpython.yaml
diff --git a/...sion10numpy1.22python3.8.____cpython.yaml → ...sion10numpy1.22python3.8.____cpython.yaml b/...sion10numpy1.22python3.8.____cpython.yaml → ...sion10numpy1.22python3.8.____cpython.yaml
diff --git a/...sion10numpy1.22python3.9.____cpython.yaml → ...sion10numpy1.22python3.9.____cpython.yaml b/...sion10numpy1.22python3.9.____cpython.yaml → ...sion10numpy1.22python3.9.____cpython.yaml
diff --git a/...ion10numpy1.23python3.11.____cpython.yaml → ...ion10numpy1.23python3.11.____cpython.yaml b/...ion10numpy1.23python3.11.____cpython.yaml → ...ion10numpy1.23python3.11.____cpython.yaml
diff --git a/...ion12numpy1.22python3.10.____cpython.yaml → ...ion12numpy1.22python3.10.____cpython.yaml b/...ion12numpy1.22python3.10.____cpython.yaml → ...ion12numpy1.22python3.10.____cpython.yaml
diff --git a/...sion12numpy1.22python3.8.____cpython.yaml → ...sion12numpy1.22python3.8.____cpython.yaml b/...sion12numpy1.22python3.8.____cpython.yaml → ...sion12numpy1.22python3.8.____cpython.yaml
diff --git a/...sion12numpy1.22python3.9.____cpython.yaml → ...sion12numpy1.22python3.9.____cpython.yaml b/...sion12numpy1.22python3.9.____cpython.yaml → ...sion12numpy1.22python3.9.____cpython.yaml
diff --git a/...ion12numpy1.23python3.11.____cpython.yaml → ...ion12numpy1.23python3.11.____cpython.yaml b/...ion12numpy1.23python3.11.____cpython.yaml → ...ion12numpy1.23python3.11.____cpython.yaml
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/README.md b/README.md
diff --git a/recipe/build-torch.sh b/recipe/build-torch.sh
@@ -1,3 +1,5 @@
+set -ex
+
 if [[ "$cuda_compiler_version" == "None" ]]; then
   export FORCE_CUDA=0
 else
@@ -23,7 +25,10 @@ else
 fi
 
 # remove pyproject.toml
-rm $SRC_DIR/pyproject.toml
+rm -f pyproject.toml
 
+# hmaarrfk I found that it was pretty buggy:
+# https://github.com/conda-forge/torchvision-feedstock/pull/60
+export TORCHVISION_USE_FFMPEG=0
 export TORCHVISION_INCLUDE="${PREFIX}/include/"
 ${PYTHON} -m pip install . -vv --no-deps --no-build-isolation
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,24 +1,24 @@
-{% set version = "0.15.2" %}
+{% set version = "0.16.1" %}
 # see github.com/conda-forge/conda-forge.github.io/issues/1059 for naming discussion
 # torchvision requires that CUDA major and minor versions match with pytorch
 # https://github.com/pytorch/vision/blob/fa99a5360fbcd1683311d57a76fcc0e7323a4c1e/torchvision/extension.py#L79C1-L85C1
 {% set torch_proc_type = "cuda" ~ cuda_compiler_version | replace('.', '') if cuda_compiler_version != "None" else "cpu" %}
 # Upstream has specific compatability ranges for pytorch and python which are
 # updated every 0.x release. https://github.com/pytorch/vision#installation
-{% set compatible_pytorch = "2.0" %}
+{% set compatible_pytorch = "2.1" %}
 
 package:
   name: torchvision-split
   version: {{ version }}
 
 source:
   url: https://github.com/pytorch/vision/archive/v{{ version }}.tar.gz
-  sha256: 1efcb80e0a6e42c54f07ee16167839b4d302aeeecc12839cc47c74b06a2c20d4
+  sha256: d31fe52e4540750c8d372b0f38f1bfa81d8261193f2c2c06577332831d203c50
   patches:
     - 0001-Monkeypatch-TORCH_LIB_PATH.patch
 
 build:
-  number: 4
+  number: 0
   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