From 34d112cea01fe6e391dba73feb42d890cd89697a Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Tue, 3 Dec 2024 19:16:32 -0600 Subject: [PATCH 1/8] NEW: Add cudatoolkit to deps of nvcc_* packages --- recipe/patch_yaml/nvcc.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 recipe/patch_yaml/nvcc.yaml diff --git a/recipe/patch_yaml/nvcc.yaml b/recipe/patch_yaml/nvcc.yaml new file mode 100644 index 000000000..b3fe9cd3a --- /dev/null +++ b/recipe/patch_yaml/nvcc.yaml @@ -0,0 +1,18 @@ +# Fixes https://github.com/conda-forge/nvcc-feedstock/issues/108 for older builds by +# appying https://github.com/conda-forge/nvcc-feedstock/pull/109/files#diff-f3725a55bf339595bf865fec73bda8ac99f283b0810c205442021f29c06eea9a +# tl;dr prevents older versions of nvcc from being installed with newer 12+ versions +if: + name: "nvcc_*" + version_lt: 12.0.0 + version_ge: 11.2.0 + timestamp_lt: 1733272752000 +then: + - add_depends: cudatoolkit >=${version},<12 +# No enhanced compatability until CUDA 11.2; everything before is pinned to minor version +if: + name: "nvcc_*" + # This will patch all the way back to version 9.2 + version_lt: 11.2.0 + timestamp_lt: 1733272752000 +then: + - add_depends: "cudatoolkit ${version}.*" From 1e3907c3380757ac3c5ec9e38bb4022adb0a41a8 Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Tue, 3 Dec 2024 19:28:29 -0600 Subject: [PATCH 2/8] BUG: Add missing divider --- recipe/patch_yaml/nvcc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/patch_yaml/nvcc.yaml b/recipe/patch_yaml/nvcc.yaml index b3fe9cd3a..2ea6820b1 100644 --- a/recipe/patch_yaml/nvcc.yaml +++ b/recipe/patch_yaml/nvcc.yaml @@ -8,6 +8,7 @@ if: timestamp_lt: 1733272752000 then: - add_depends: cudatoolkit >=${version},<12 +--- # No enhanced compatability until CUDA 11.2; everything before is pinned to minor version if: name: "nvcc_*" From 88be51e66c11c3f93ff7034a24e8b3a1e2e9a6a5 Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Tue, 3 Dec 2024 19:28:51 -0600 Subject: [PATCH 3/8] NEW: Remove unneeded dependency on libzlib-wapi --- recipe/patch_yaml/cudnn.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 recipe/patch_yaml/cudnn.yaml diff --git a/recipe/patch_yaml/cudnn.yaml b/recipe/patch_yaml/cudnn.yaml new file mode 100644 index 000000000..54fb2ec01 --- /dev/null +++ b/recipe/patch_yaml/cudnn.yaml @@ -0,0 +1,10 @@ +# cuDNN is a redist. zlib has been statically linked into the windows library since cuDNN 9 +# Resolves: https://github.com/conda-forge/cudnn-feedstock/issues/98 +if: + name: "cudnn" + version_lt: 9.3.1 + version_ge: 9.0.0 + timestamp_lt: 1733272752000 + subdir_in: win-64 +then: + - remove_depends: libzlib-wapi From ed444ed1214190ce17fda983dfd7e2002525a7e1 Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Tue, 3 Dec 2024 20:11:14 -0600 Subject: [PATCH 4/8] BUG: Match any version of libzlib --- recipe/patch_yaml/cudnn.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/patch_yaml/cudnn.yaml b/recipe/patch_yaml/cudnn.yaml index 54fb2ec01..af6e0f146 100644 --- a/recipe/patch_yaml/cudnn.yaml +++ b/recipe/patch_yaml/cudnn.yaml @@ -7,4 +7,4 @@ if: timestamp_lt: 1733272752000 subdir_in: win-64 then: - - remove_depends: libzlib-wapi + - remove_depends: "libzlib-wapi *" From fd075e4197e600bf4f256a90892e35ea599bf5bc Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Tue, 3 Dec 2024 20:20:32 -0600 Subject: [PATCH 5/8] STY: wrap text --- recipe/patch_yaml/nvcc.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/patch_yaml/nvcc.yaml b/recipe/patch_yaml/nvcc.yaml index 2ea6820b1..1c4daf11d 100644 --- a/recipe/patch_yaml/nvcc.yaml +++ b/recipe/patch_yaml/nvcc.yaml @@ -1,5 +1,5 @@ -# Fixes https://github.com/conda-forge/nvcc-feedstock/issues/108 for older builds by -# appying https://github.com/conda-forge/nvcc-feedstock/pull/109/files#diff-f3725a55bf339595bf865fec73bda8ac99f283b0810c205442021f29c06eea9a +# Fixes https://github.com/conda-forge/nvcc-feedstock/issues/108 for older builds by applying +# https://github.com/conda-forge/nvcc-feedstock/pull/109/files#diff-f3725a55bf339595bf865fec73bda8ac99f283b0810c205442021f29c06eea9a # tl;dr prevents older versions of nvcc from being installed with newer 12+ versions if: name: "nvcc_*" From 3a0038129d8322e863ffab4389aa9578e75ec299 Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Tue, 3 Dec 2024 20:20:37 -0600 Subject: [PATCH 6/8] Add subdirs --- recipe/patch_yaml/nvcc.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/recipe/patch_yaml/nvcc.yaml b/recipe/patch_yaml/nvcc.yaml index 1c4daf11d..09bbaf0a3 100644 --- a/recipe/patch_yaml/nvcc.yaml +++ b/recipe/patch_yaml/nvcc.yaml @@ -6,6 +6,11 @@ if: version_lt: 12.0.0 version_ge: 11.2.0 timestamp_lt: 1733272752000 + subdir_in: + - linux-64 + - win-64 + - linux-ppc64le + - linux-aarch64 then: - add_depends: cudatoolkit >=${version},<12 --- @@ -15,5 +20,10 @@ if: # This will patch all the way back to version 9.2 version_lt: 11.2.0 timestamp_lt: 1733272752000 + subdir_in: + - linux-64 + - win-64 + - linux-ppc64le + - linux-aarch64 then: - add_depends: "cudatoolkit ${version}.*" From 23d0832d5053b866808f4dc1a352399cc834d144 Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Wed, 4 Dec 2024 23:39:07 -0600 Subject: [PATCH 7/8] NEW: Add patch for aarch64 libcufile __glibc --- recipe/patch_yaml/libcufile.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 recipe/patch_yaml/libcufile.yaml diff --git a/recipe/patch_yaml/libcufile.yaml b/recipe/patch_yaml/libcufile.yaml new file mode 100644 index 000000000..885c74cb5 --- /dev/null +++ b/recipe/patch_yaml/libcufile.yaml @@ -0,0 +1,13 @@ +# For uninvestigated reasons, old aarch64 builds of libcufile have no constraint on __glibc +# This is a follow-up to https://github.com/conda-forge/libcufile-feedstock/pull/24 +if: + name: "libcufile*" + version_ge: 1.7.0 + timestamp_lt: 1733272752000 + subdir_in: + - linux-aarch64 +then: + - add_depends: __glibc >=2.28,<3.0.a0 + - replace_depends: + old: __glibc [*] + new: __glibc >=2.28,<3.0.a0 From 2acefa3158775ed082783bbc3ae1cd12091c3c62 Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Thu, 5 Dec 2024 13:29:57 -0600 Subject: [PATCH 8/8] STY: fix indendation --- recipe/patch_yaml/libcufile.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/patch_yaml/libcufile.yaml b/recipe/patch_yaml/libcufile.yaml index 885c74cb5..5d20849b6 100644 --- a/recipe/patch_yaml/libcufile.yaml +++ b/recipe/patch_yaml/libcufile.yaml @@ -9,5 +9,5 @@ if: then: - add_depends: __glibc >=2.28,<3.0.a0 - replace_depends: - old: __glibc [*] - new: __glibc >=2.28,<3.0.a0 + old: __glibc [*] + new: __glibc >=2.28,<3.0.a0