From 7ce4d4d98913c9674d12f29a7dff139bf67529a0 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 16 May 2024 16:20:44 +1100 Subject: [PATCH 1/8] renormalize patches --- recipe/meta.yaml | 8 ++++---- .../0001-Monkeypatch-TORCH_LIB_PATH.patch | 9 +++------ ...2-Remove-deprecated-distutils-usage.patch} | 8 ++++---- ...pendent-on-randint-compatible-with-.patch} | 20 +++++++++---------- ...re-python-3.12-deprecation-warnings.patch} | 11 +++++++++- 5 files changed, 31 insertions(+), 25 deletions(-) rename recipe/{ => patches}/0001-Monkeypatch-TORCH_LIB_PATH.patch (82%) rename recipe/{8280-remove_distutils.patch => patches/0002-Remove-deprecated-distutils-usage.patch} (78%) rename recipe/{8119-use_integer_division_for_range_inputs.patch => patches/0003-Help-make-test-dependent-on-randint-compatible-with-.patch} (85%) rename recipe/{ignore_python312_deprecation_warnings.patch => patches/0004-Ignore-python-3.12-deprecation-warnings.patch} (60%) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 037b883f..c06f8c82 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,13 +22,13 @@ source: sha256: d31fe52e4540750c8d372b0f38f1bfa81d8261193f2c2c06577332831d203c50 patches: # seems to be necessary for aarch??? - - 0001-Monkeypatch-TORCH_LIB_PATH.patch + - patches/0001-Monkeypatch-TORCH_LIB_PATH.patch # https://github.com/pytorch/vision/pull/8280 - - 8280-remove_distutils.patch + - patches/0002-Remove-deprecated-distutils-usage.patch # Test only patch below # https://github.com/pytorch/vision/pull/8119 - - 8119-use_integer_division_for_range_inputs.patch - - ignore_python312_deprecation_warnings.patch + - patches/0003-Help-make-test-dependent-on-randint-compatible-with-.patch + - patches/0004-Ignore-python-3.12-deprecation-warnings.patch build: string: cpu_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version == "None"] diff --git a/recipe/0001-Monkeypatch-TORCH_LIB_PATH.patch b/recipe/patches/0001-Monkeypatch-TORCH_LIB_PATH.patch similarity index 82% rename from recipe/0001-Monkeypatch-TORCH_LIB_PATH.patch rename to recipe/patches/0001-Monkeypatch-TORCH_LIB_PATH.patch index c08611f4..7ec25275 100644 --- a/recipe/0001-Monkeypatch-TORCH_LIB_PATH.patch +++ b/recipe/patches/0001-Monkeypatch-TORCH_LIB_PATH.patch @@ -1,14 +1,14 @@ -From ebc3a96e6e5dfe411d940b147c45368ba5fc3b2d Mon Sep 17 00:00:00 2001 +From 6e7cdb80377fc3b9ff13e92d9ae89ffb6e7d8358 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 +Subject: [PATCH 1/4] Monkeypatch TORCH_LIB_PATH --- setup.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/setup.py b/setup.py -index 24b7a2e..4016405 100644 +index ce67413..23a0324 100644 --- a/setup.py +++ b/setup.py @@ -11,6 +11,11 @@ from pkg_resources import DistributionNotFound, get_distribution, parse_version @@ -23,6 +23,3 @@ index 24b7a2e..4016405 100644 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/8280-remove_distutils.patch b/recipe/patches/0002-Remove-deprecated-distutils-usage.patch similarity index 78% rename from recipe/8280-remove_distutils.patch rename to recipe/patches/0002-Remove-deprecated-distutils-usage.patch index f8725f77..9afd9301 100644 --- a/recipe/8280-remove_distutils.patch +++ b/recipe/patches/0002-Remove-deprecated-distutils-usage.patch @@ -1,14 +1,14 @@ -From f7c60f74c063435a2fb2e5993b4cf2c32cf88fc5 Mon Sep 17 00:00:00 2001 +From 0c583e09393cc90bcb708238ca2699547598c55e Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sun, 25 Feb 2024 12:43:25 +1000 -Subject: [PATCH] Remove deprecated distutils usage +Subject: [PATCH 2/4] Remove deprecated distutils usage --- test/test_datasets_download.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_datasets_download.py b/test/test_datasets_download.py -index cf0211dbb1e..71aeb9ea774 100644 +index e99017d..8d721e3 100644 --- a/test/test_datasets_download.py +++ b/test/test_datasets_download.py @@ -1,12 +1,12 @@ @@ -25,7 +25,7 @@ index cf0211dbb1e..71aeb9ea774 100644 from os import path from urllib.error import HTTPError, URLError from urllib.parse import urlparse -@@ -180,7 +180,7 @@ def collect_urls(dataset_cls, *args, **kwargs): +@@ -180,7 +180,7 @@ ROOT = tempfile.mkdtemp() @pytest.fixture(scope="module", autouse=True) def root(): yield ROOT diff --git a/recipe/8119-use_integer_division_for_range_inputs.patch b/recipe/patches/0003-Help-make-test-dependent-on-randint-compatible-with-.patch similarity index 85% rename from recipe/8119-use_integer_division_for_range_inputs.patch rename to recipe/patches/0003-Help-make-test-dependent-on-randint-compatible-with-.patch index 07312bf3..2065fd92 100644 --- a/recipe/8119-use_integer_division_for_range_inputs.patch +++ b/recipe/patches/0003-Help-make-test-dependent-on-randint-compatible-with-.patch @@ -1,8 +1,8 @@ -From d922c581576eb5f19af7ac730d1bdbb68b8a591e Mon Sep 17 00:00:00 2001 +From 6e5e684aaf5a94c1738d483d380ee55b7ab2ccf1 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Wed, 15 Nov 2023 23:06:08 -0500 -Subject: [PATCH] Help make test dependent on randint compatible with python - 3.12 +Subject: [PATCH 3/4] Help make test dependent on randint compatible with + python 3.12 --- test/test_transforms.py | 8 ++++---- @@ -10,10 +10,10 @@ Subject: [PATCH] Help make test dependent on randint compatible with python 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/test_transforms.py b/test/test_transforms.py -index 4440942f7cf..e87a8cd28bc 100644 +index 7581bf3..44b6051 100644 --- a/test/test_transforms.py +++ b/test/test_transforms.py -@@ -1613,8 +1613,8 @@ def test_augmix(fill, severity, mixture_width, chain_depth, all_ops, grayscale): +@@ -1623,8 +1623,8 @@ def test_augmix(fill, severity, mixture_width, chain_depth, all_ops, grayscale): def test_random_crop(): height = random.randint(10, 32) * 2 width = random.randint(10, 32) * 2 @@ -24,7 +24,7 @@ index 4440942f7cf..e87a8cd28bc 100644 img = torch.ones(3, height, width, dtype=torch.uint8) result = transforms.Compose( [ -@@ -1663,8 +1663,8 @@ def test_random_crop(): +@@ -1673,8 +1673,8 @@ def test_random_crop(): def test_center_crop(): height = random.randint(10, 32) * 2 width = random.randint(10, 32) * 2 @@ -36,10 +36,10 @@ index 4440942f7cf..e87a8cd28bc 100644 img = torch.ones(3, height, width, dtype=torch.uint8) oh1 = (height - oheight) // 2 diff --git a/test/test_transforms_video.py b/test/test_transforms_video.py -index 21594868f09..4ad57e6a98e 100644 +index 2159486..4ad57e6 100644 --- a/test/test_transforms_video.py +++ b/test/test_transforms_video.py -@@ -23,8 +23,8 @@ def test_random_crop_video(self): +@@ -23,8 +23,8 @@ class TestVideoTransforms: numFrames = random.randint(4, 128) height = random.randint(10, 32) * 2 width = random.randint(10, 32) * 2 @@ -50,7 +50,7 @@ index 21594868f09..4ad57e6a98e 100644 clip = torch.randint(0, 256, (numFrames, height, width, 3), dtype=torch.uint8) result = Compose( [ -@@ -41,8 +41,8 @@ def test_random_resized_crop_video(self): +@@ -41,8 +41,8 @@ class TestVideoTransforms: numFrames = random.randint(4, 128) height = random.randint(10, 32) * 2 width = random.randint(10, 32) * 2 @@ -61,7 +61,7 @@ index 21594868f09..4ad57e6a98e 100644 clip = torch.randint(0, 256, (numFrames, height, width, 3), dtype=torch.uint8) result = Compose( [ -@@ -59,8 +59,8 @@ def test_center_crop_video(self): +@@ -59,8 +59,8 @@ class TestVideoTransforms: numFrames = random.randint(4, 128) height = random.randint(10, 32) * 2 width = random.randint(10, 32) * 2 diff --git a/recipe/ignore_python312_deprecation_warnings.patch b/recipe/patches/0004-Ignore-python-3.12-deprecation-warnings.patch similarity index 60% rename from recipe/ignore_python312_deprecation_warnings.patch rename to recipe/patches/0004-Ignore-python-3.12-deprecation-warnings.patch index a691c3e2..433b958d 100644 --- a/recipe/ignore_python312_deprecation_warnings.patch +++ b/recipe/patches/0004-Ignore-python-3.12-deprecation-warnings.patch @@ -1,5 +1,14 @@ +From 34f969e41510f5a9a7f65671f03c07a0028193b2 Mon Sep 17 00:00:00 2001 +From: Mark Harfouche +Date: Sun, 25 Feb 2024 12:45:23 -0500 +Subject: [PATCH 4/4] Ignore python 3.12 deprecation warnings + +--- + test/test_transforms_v2_refactored.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + diff --git a/test/test_transforms_v2_refactored.py b/test/test_transforms_v2_refactored.py -index e18beb35a4..142e3f2d43 100644 +index e18beb3..142e3f2 100644 --- a/test/test_transforms_v2_refactored.py +++ b/test/test_transforms_v2_refactored.py @@ -416,7 +416,10 @@ def reference_affine_bounding_boxes_helper(bounding_boxes, *, affine_matrix, new From 9b830b08bd4438408351a02ca322cad0f1dcf228 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 16 May 2024 16:21:10 +1100 Subject: [PATCH 2/8] update version & URL --- recipe/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c06f8c82..aa2eb7fd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "0.16.1" %} +{% set version = "0.18.0" %} # see github.com/conda-forge/conda-forge.github.io/issues/1059 for naming discussion # torchvision requires that CUDA major and minor versions match with pytorch # https://github.com/pytorch/vision/blob/fa99a5360fbcd1683311d57a76fcc0e7323a4c1e/torchvision/extension.py#L79C1-L85C1 @@ -18,8 +18,8 @@ package: version: {{ version }} source: - url: https://github.com/pytorch/vision/archive/v{{ version }}.tar.gz - sha256: d31fe52e4540750c8d372b0f38f1bfa81d8261193f2c2c06577332831d203c50 + url: https://github.com/pytorch/vision/archive/refs/tags/v{{ version }}.tar.gz + sha256: 3e61cbac33986a862a59cd733fd65da8b2c2a6160a66556cfa0e850f62fd43c7 patches: # seems to be necessary for aarch??? - patches/0001-Monkeypatch-TORCH_LIB_PATH.patch @@ -33,7 +33,7 @@ source: build: string: cpu_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version == "None"] string: cuda{{ cuda_compiler_version | replace('.', '') }}py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version != "None"] - number: 3 + number: 0 skip: true # [win] # no CUDA-enabled pytorch on aarch yet skip: true # [cuda_compiler_version != "None" and aarch64] From e719e6ffb28ac2246ab166a4e6ea9fe31fb21893 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 16 May 2024 16:21:23 +1100 Subject: [PATCH 3/8] remove obsolete skip --- recipe/meta.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index aa2eb7fd..b7bdbef2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -37,9 +37,6 @@ build: skip: true # [win] # no CUDA-enabled pytorch on aarch yet skip: true # [cuda_compiler_version != "None" and aarch64] - # Upstream has specific compatability ranges for pytorch and python which are - # updated every 0.x release. https://github.com/pytorch/vision#installation - skip: true # [py < 38] requirements: build: From 029a35ae3fb514aff3d3a78f2d4aadd3272483b5 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 16 May 2024 16:22:58 +1100 Subject: [PATCH 4/8] rebase patches --- recipe/meta.yaml | 6 -- .../0001-Monkeypatch-TORCH_LIB_PATH.patch | 6 +- ...02-Remove-deprecated-distutils-usage.patch | 36 --------- ...ependent-on-randint-compatible-with-.patch | 74 ------------------- ...ore-python-3.12-deprecation-warnings.patch | 25 ------- 5 files changed, 3 insertions(+), 144 deletions(-) delete mode 100644 recipe/patches/0002-Remove-deprecated-distutils-usage.patch delete mode 100644 recipe/patches/0003-Help-make-test-dependent-on-randint-compatible-with-.patch delete mode 100644 recipe/patches/0004-Ignore-python-3.12-deprecation-warnings.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b7bdbef2..3c4ff609 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,12 +23,6 @@ source: patches: # seems to be necessary for aarch??? - patches/0001-Monkeypatch-TORCH_LIB_PATH.patch - # https://github.com/pytorch/vision/pull/8280 - - patches/0002-Remove-deprecated-distutils-usage.patch - # Test only patch below - # https://github.com/pytorch/vision/pull/8119 - - patches/0003-Help-make-test-dependent-on-randint-compatible-with-.patch - - patches/0004-Ignore-python-3.12-deprecation-warnings.patch build: string: cpu_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version == "None"] diff --git a/recipe/patches/0001-Monkeypatch-TORCH_LIB_PATH.patch b/recipe/patches/0001-Monkeypatch-TORCH_LIB_PATH.patch index 7ec25275..5aa60350 100644 --- a/recipe/patches/0001-Monkeypatch-TORCH_LIB_PATH.patch +++ b/recipe/patches/0001-Monkeypatch-TORCH_LIB_PATH.patch @@ -1,14 +1,14 @@ -From 6e7cdb80377fc3b9ff13e92d9ae89ffb6e7d8358 Mon Sep 17 00:00:00 2001 +From f9c173f8e85a6d1da6567458a8628f0b636dd15d Mon Sep 17 00:00:00 2001 From: Uwe Korn Date: Wed, 21 Jun 2023 19:13:57 +0000 -Subject: [PATCH 1/4] Monkeypatch TORCH_LIB_PATH +Subject: [PATCH] Monkeypatch TORCH_LIB_PATH --- setup.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/setup.py b/setup.py -index ce67413..23a0324 100644 +index ce1cd90..bb429a7 100644 --- a/setup.py +++ b/setup.py @@ -11,6 +11,11 @@ from pkg_resources import DistributionNotFound, get_distribution, parse_version diff --git a/recipe/patches/0002-Remove-deprecated-distutils-usage.patch b/recipe/patches/0002-Remove-deprecated-distutils-usage.patch deleted file mode 100644 index 9afd9301..00000000 --- a/recipe/patches/0002-Remove-deprecated-distutils-usage.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0c583e09393cc90bcb708238ca2699547598c55e Mon Sep 17 00:00:00 2001 -From: Tobias Fischer -Date: Sun, 25 Feb 2024 12:43:25 +1000 -Subject: [PATCH 2/4] Remove deprecated distutils usage - ---- - test/test_datasets_download.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/test/test_datasets_download.py b/test/test_datasets_download.py -index e99017d..8d721e3 100644 ---- a/test/test_datasets_download.py -+++ b/test/test_datasets_download.py -@@ -1,12 +1,12 @@ - import contextlib - import itertools -+import shutil - import tempfile - import time - import traceback - import unittest.mock - import warnings - from datetime import datetime --from distutils import dir_util - from os import path - from urllib.error import HTTPError, URLError - from urllib.parse import urlparse -@@ -180,7 +180,7 @@ ROOT = tempfile.mkdtemp() - @pytest.fixture(scope="module", autouse=True) - def root(): - yield ROOT -- dir_util.remove_tree(ROOT) -+ shutil.rmtree(ROOT) - - - def places365(): diff --git a/recipe/patches/0003-Help-make-test-dependent-on-randint-compatible-with-.patch b/recipe/patches/0003-Help-make-test-dependent-on-randint-compatible-with-.patch deleted file mode 100644 index 2065fd92..00000000 --- a/recipe/patches/0003-Help-make-test-dependent-on-randint-compatible-with-.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 6e5e684aaf5a94c1738d483d380ee55b7ab2ccf1 Mon Sep 17 00:00:00 2001 -From: Mark Harfouche -Date: Wed, 15 Nov 2023 23:06:08 -0500 -Subject: [PATCH 3/4] Help make test dependent on randint compatible with - python 3.12 - ---- - test/test_transforms.py | 8 ++++---- - test/test_transforms_video.py | 12 ++++++------ - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/test/test_transforms.py b/test/test_transforms.py -index 7581bf3..44b6051 100644 ---- a/test/test_transforms.py -+++ b/test/test_transforms.py -@@ -1623,8 +1623,8 @@ def test_augmix(fill, severity, mixture_width, chain_depth, all_ops, grayscale): - def test_random_crop(): - height = random.randint(10, 32) * 2 - width = random.randint(10, 32) * 2 -- oheight = random.randint(5, (height - 2) / 2) * 2 -- owidth = random.randint(5, (width - 2) / 2) * 2 -+ oheight = random.randint(5, (height - 2) // 2) * 2 -+ owidth = random.randint(5, (width - 2) // 2) * 2 - img = torch.ones(3, height, width, dtype=torch.uint8) - result = transforms.Compose( - [ -@@ -1673,8 +1673,8 @@ def test_random_crop(): - def test_center_crop(): - height = random.randint(10, 32) * 2 - width = random.randint(10, 32) * 2 -- oheight = random.randint(5, (height - 2) / 2) * 2 -- owidth = random.randint(5, (width - 2) / 2) * 2 -+ oheight = random.randint(5, (height - 2) // 2) * 2 -+ owidth = random.randint(5, (width - 2) // 2) * 2 - - img = torch.ones(3, height, width, dtype=torch.uint8) - oh1 = (height - oheight) // 2 -diff --git a/test/test_transforms_video.py b/test/test_transforms_video.py -index 2159486..4ad57e6 100644 ---- a/test/test_transforms_video.py -+++ b/test/test_transforms_video.py -@@ -23,8 +23,8 @@ class TestVideoTransforms: - numFrames = random.randint(4, 128) - height = random.randint(10, 32) * 2 - width = random.randint(10, 32) * 2 -- oheight = random.randint(5, (height - 2) / 2) * 2 -- owidth = random.randint(5, (width - 2) / 2) * 2 -+ oheight = random.randint(5, (height - 2) // 2) * 2 -+ owidth = random.randint(5, (width - 2) // 2) * 2 - clip = torch.randint(0, 256, (numFrames, height, width, 3), dtype=torch.uint8) - result = Compose( - [ -@@ -41,8 +41,8 @@ class TestVideoTransforms: - numFrames = random.randint(4, 128) - height = random.randint(10, 32) * 2 - width = random.randint(10, 32) * 2 -- oheight = random.randint(5, (height - 2) / 2) * 2 -- owidth = random.randint(5, (width - 2) / 2) * 2 -+ oheight = random.randint(5, (height - 2) // 2) * 2 -+ owidth = random.randint(5, (width - 2) // 2) * 2 - clip = torch.randint(0, 256, (numFrames, height, width, 3), dtype=torch.uint8) - result = Compose( - [ -@@ -59,8 +59,8 @@ class TestVideoTransforms: - numFrames = random.randint(4, 128) - height = random.randint(10, 32) * 2 - width = random.randint(10, 32) * 2 -- oheight = random.randint(5, (height - 2) / 2) * 2 -- owidth = random.randint(5, (width - 2) / 2) * 2 -+ oheight = random.randint(5, (height - 2) // 2) * 2 -+ owidth = random.randint(5, (width - 2) // 2) * 2 - - clip = torch.ones((numFrames, height, width, 3), dtype=torch.uint8) * 255 - oh1 = (height - oheight) // 2 diff --git a/recipe/patches/0004-Ignore-python-3.12-deprecation-warnings.patch b/recipe/patches/0004-Ignore-python-3.12-deprecation-warnings.patch deleted file mode 100644 index 433b958d..00000000 --- a/recipe/patches/0004-Ignore-python-3.12-deprecation-warnings.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 34f969e41510f5a9a7f65671f03c07a0028193b2 Mon Sep 17 00:00:00 2001 -From: Mark Harfouche -Date: Sun, 25 Feb 2024 12:45:23 -0500 -Subject: [PATCH 4/4] Ignore python 3.12 deprecation warnings - ---- - test/test_transforms_v2_refactored.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/test/test_transforms_v2_refactored.py b/test/test_transforms_v2_refactored.py -index e18beb3..142e3f2 100644 ---- a/test/test_transforms_v2_refactored.py -+++ b/test/test_transforms_v2_refactored.py -@@ -416,7 +416,10 @@ def reference_affine_bounding_boxes_helper(bounding_boxes, *, affine_matrix, new - - - # turns all warnings into errors for this module --pytestmark = pytest.mark.filterwarnings("error") -+pytestmark = [ -+ pytest.mark.filterwarnings("error"), -+ pytest.mark.filterwarnings("ignore::DeprecationWarning"), -+] - - - class TestResize: From eaeae7ac1c1d71326ddbca36b7823182cb3e3e2a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 16 May 2024 16:24:04 +1100 Subject: [PATCH 5/8] apply stdlib transformations --- recipe/conda_build_config.yaml | 2 ++ recipe/meta.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 00000000..4cafd481 --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,2 @@ +c_stdlib_version: # [linux] + - 2.17 # [linux] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3c4ff609..a2048e49 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -34,6 +34,7 @@ build: requirements: build: + - {{ stdlib('c') }} - {{ compiler('c') }} - {{ compiler('cxx') }} - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] @@ -42,7 +43,6 @@ requirements: - libcusolver-dev # [build_platform != target_platform] - libcusparse-dev # [build_platform != target_platform] {% endif %} - - sysroot_linux-64 ==2.17 # [linux64] - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] From e0e28f1846776ffe110883fc4cb71e8060afd80c Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 16 May 2024 16:25:00 +1100 Subject: [PATCH 6/8] add pytorch 2.3 migration --- .ci_support/migrations/pytorch23.yaml | 11 +++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/pytorch23.yaml diff --git a/.ci_support/migrations/pytorch23.yaml b/.ci_support/migrations/pytorch23.yaml new file mode 100644 index 00000000..c6c744fb --- /dev/null +++ b/.ci_support/migrations/pytorch23.yaml @@ -0,0 +1,11 @@ +__migrator: + kind: version + commit_message: "Rebuild for pytorch 2.3" + migration_number: 1 + bump_number: 1 + +libtorch: + - '2.3' +pytorch: + - '2.3' +migrator_ts: 1715797797.926 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a2048e49..72a7c8b2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -5,7 +5,7 @@ {% 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.1" %} +{% set compatible_pytorch = "2.3" %} {% if cuda_compiler_version in (None, "None", True, False) %} {% set cuda_major = 0 %} From c9494fbfd25116d80c5d45c1a07411a3cc90d19f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 16 May 2024 16:26:51 +1100 Subject: [PATCH 7/8] MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.35.1, and conda-forge-pinning 2024.05.16.03.01.34 --- .azure-pipelines/azure-pipelines-linux.yml | 21 +-------- .azure-pipelines/azure-pipelines-osx.yml | 3 +- ...sion10numpy1.22python3.10.____cpython.yaml | 47 ------------------- ...rsion10numpy1.22python3.8.____cpython.yaml | 47 ------------------- ...rsion10numpy1.22python3.9.____cpython.yaml | 47 ------------------- ...sion10numpy1.23python3.11.____cpython.yaml | 47 ------------------- ...sion10numpy1.26python3.12.____cpython.yaml | 47 ------------------- ...sion11numpy1.22python3.10.____cpython.yaml | 9 +++- ...rsion11numpy1.22python3.8.____cpython.yaml | 9 +++- ...rsion11numpy1.22python3.9.____cpython.yaml | 9 +++- ...sion11numpy1.23python3.11.____cpython.yaml | 9 +++- ...sion11numpy1.26python3.12.____cpython.yaml | 9 +++- ...sion12numpy1.22python3.10.____cpython.yaml | 9 +++- ...rsion12numpy1.22python3.8.____cpython.yaml | 9 +++- ...rsion12numpy1.22python3.9.____cpython.yaml | 9 +++- ...sion12numpy1.23python3.11.____cpython.yaml | 9 +++- ...sion12numpy1.26python3.12.____cpython.yaml | 9 +++- ...sion12numpy1.22python3.10.____cpython.yaml | 9 +++- ...rsion12numpy1.22python3.8.____cpython.yaml | 9 +++- ...rsion12numpy1.22python3.9.____cpython.yaml | 9 +++- ...sion12numpy1.23python3.11.____cpython.yaml | 9 +++- ...sion12numpy1.26python3.12.____cpython.yaml | 9 +++- ...sion12numpy1.22python3.10.____cpython.yaml | 9 +++- ...rsion12numpy1.22python3.8.____cpython.yaml | 9 +++- ...rsion12numpy1.22python3.9.____cpython.yaml | 9 +++- ...sion12numpy1.23python3.11.____cpython.yaml | 9 +++- ...sion12numpy1.26python3.12.____cpython.yaml | 9 +++- ...sx_64_numpy1.22python3.10.____cpython.yaml | 8 +++- ...osx_64_numpy1.22python3.8.____cpython.yaml | 8 +++- ...osx_64_numpy1.22python3.9.____cpython.yaml | 8 +++- ...sx_64_numpy1.23python3.11.____cpython.yaml | 8 +++- ...sx_64_numpy1.26python3.12.____cpython.yaml | 8 +++- ...arm64_numpy1.22python3.10.____cpython.yaml | 6 ++- ..._arm64_numpy1.22python3.8.____cpython.yaml | 6 ++- ..._arm64_numpy1.22python3.9.____cpython.yaml | 6 ++- ...arm64_numpy1.23python3.11.____cpython.yaml | 6 ++- ...arm64_numpy1.26python3.12.____cpython.yaml | 6 ++- .scripts/build_steps.sh | 6 +-- .scripts/run_osx_build.sh | 6 +-- README.md | 35 -------------- build-locally.py | 5 +- 41 files changed, 207 insertions(+), 354 deletions(-) delete mode 100644 .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.26python3.12.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 70454c71..144b6c4d 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,26 +8,6 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - ? linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython - : CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - ? linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython - : CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - ? linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython - : CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - ? linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython - : CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - ? linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.26python3.12.____cpython - : CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.26python3.12.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 ? linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -109,6 +89,7 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: - script: | diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index fc75a056..d5e39500 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_numpy1.22python3.10.____cpython: @@ -39,6 +39,7 @@ jobs: CONFIG: osx_arm64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml deleted file mode 100644 index 88e7727c..00000000 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml +++ /dev/null @@ -1,47 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.2' -cudnn: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libtorch: -- '2.1' -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index 10df2343..00000000 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,47 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.2' -cudnn: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libtorch: -- '2.1' -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml deleted file mode 100644 index 827de2bc..00000000 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml +++ /dev/null @@ -1,47 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.2' -cudnn: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libtorch: -- '2.1' -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml deleted file mode 100644 index 86e57d28..00000000 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml +++ /dev/null @@ -1,47 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.2' -cudnn: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libtorch: -- '2.1' -numpy: -- '1.23' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.26python3.12.____cpython.yaml deleted file mode 100644 index b53baa50..00000000 --- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.26python3.12.____cpython.yaml +++ /dev/null @@ -1,47 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.2' -cudnn: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libtorch: -- '2.1' -numpy: -- '1.26' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - cdt_name - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml index afb52a9f..359234c4 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -25,7 +29,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.22' pin_run_as_build: @@ -39,9 +43,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml index c0e6daa7..f024a16b 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -25,7 +29,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.22' pin_run_as_build: @@ -39,9 +43,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml index defe2ea9..01e1b4f7 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -25,7 +29,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.22' pin_run_as_build: @@ -39,9 +43,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml index e1fd36bf..111df8e1 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -25,7 +29,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.23' pin_run_as_build: @@ -39,9 +43,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.26python3.12.____cpython.yaml index 14281203..027e000c 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.26python3.12.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -25,7 +29,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.26' pin_run_as_build: @@ -39,9 +43,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml index b90b619b..974c15e5 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -25,7 +29,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.22' pin_run_as_build: @@ -39,9 +43,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml index 1467224c..f5a302f3 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -25,7 +29,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.22' pin_run_as_build: @@ -39,9 +43,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml index d21d91ff..fc31c38d 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -25,7 +29,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.22' pin_run_as_build: @@ -39,9 +43,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml index 381d8c03..934a66e6 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -25,7 +29,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.23' pin_run_as_build: @@ -39,9 +43,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml index 06869bc6..c322903a 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -25,7 +29,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.26' pin_run_as_build: @@ -39,9 +43,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml index c84855bb..14e8d706 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -25,7 +29,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.22' pin_run_as_build: @@ -39,9 +43,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml index 39a93286..1f4993a5 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -25,7 +29,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.22' pin_run_as_build: @@ -39,9 +43,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml index 0fb705bb..cc1efde3 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -25,7 +29,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.22' pin_run_as_build: @@ -39,9 +43,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml index d4fdeae7..16cc8dc4 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -25,7 +29,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.23' pin_run_as_build: @@ -39,9 +43,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml index ba978cff..87b313e0 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -25,7 +29,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.26' pin_run_as_build: @@ -39,9 +43,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml index 83307904..9eb7e945 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -27,7 +31,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.22' pin_run_as_build: @@ -41,9 +45,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml index 3b13900f..9d649d42 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -27,7 +31,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.22' pin_run_as_build: @@ -41,9 +45,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml index 52cf9586..23f75901 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -27,7 +31,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.22' pin_run_as_build: @@ -41,9 +45,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml index b155007f..b11f30ed 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -27,7 +31,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.23' pin_run_as_build: @@ -41,9 +45,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml index 7bb45422..c63128b4 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -27,7 +31,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' numpy: - '1.26' pin_run_as_build: @@ -41,9 +45,10 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - python - numpy diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 196b7bb6..3adb6053 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -21,7 +25,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index c316749e..e1f00947 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -21,7 +25,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 6a1cf81e..b245afb3 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -21,7 +25,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index efa273b2..ca85b885 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -21,7 +25,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index de81bc42..ab0df88a 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -21,7 +25,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 7299e605..064a4bf0 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -21,7 +25,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index a9566646..66b71e52 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -21,7 +25,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 6b95cf4e..a0d2099c 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -21,7 +25,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 455d83ce..a3e1cac2 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -21,7 +25,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index 20b80c67..f0739112 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -21,7 +25,7 @@ libjpeg_turbo: libpng: - '1.6' libtorch: -- '2.1' +- '2.3' macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index beda247e..899ba03c 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -68,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 9259eb93..07dff219 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" diff --git a/README.md b/README.md index 924afa29..e13a2a51 100644 --- a/README.md +++ b/README.md @@ -31,41 +31,6 @@ Current build status - - - - - - - - - - - - - - -
VariantStatus
linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython - - variant - -
linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython - - variant - -
linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython - - variant - -
linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython - - variant - -
linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.26python3.12.____cpython - - variant - -
linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython diff --git a/build-locally.py b/build-locally.py index 3f4b7a79..e0d408d0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From 9a8da1ca49c19c6d473ec838bf7ab4a1c7f4024b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 16 May 2024 16:47:29 +1100 Subject: [PATCH 8/8] add missing test dependence --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 72a7c8b2..967d3865 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -82,6 +82,7 @@ test: requires: - pytest - av + - expecttest - scipy - pytest-mock source_files: