Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ channel_targets:
cuda_compiler:
- cuda-nvcc
cuda_compiler_version:
- '12.8'
- '12.9'
cudnn:
- '9.10'
- '9'
cxx_compiler:
- gxx
cxx_compiler_version:
Expand Down Expand Up @@ -76,6 +76,5 @@ zip_keys:
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler_version
- cudnn
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ channel_targets:
cuda_compiler:
- cuda-nvcc
cuda_compiler_version:
- '12.8'
- '12.9'
cudnn:
- '9.10'
- '9'
cxx_compiler:
- gxx
cxx_compiler_version:
Expand Down Expand Up @@ -76,6 +76,5 @@ zip_keys:
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler_version
- cudnn
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,5 @@ zip_keys:
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler_version
- cudnn
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,5 @@ zip_keys:
- cxx_compiler_version
- c_stdlib_version
- cuda_compiler_version
- cudnn
zlib:
- '1'
52 changes: 0 additions & 52 deletions .ci_support/migrations/cuda128.yaml

This file was deleted.

61 changes: 61 additions & 0 deletions .ci_support/migrations/cuda129.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
migrator_ts: 1738229377
__migrator:
kind:
version
migration_number:
1
build_number:
1
paused: false
override_cbc_keys:
- cuda_compiler_stub
check_solvable: false
primary_key: cuda_compiler_version
ordering:
cuda_compiler_version:
- 12.4
- 12.6
- 12.8
- None
- 12.9
- 13.0
# to allow manual opt-in for CUDA 11.8, see
# https://github.com/conda-forge/conda-forge-pinning-feedstock/pull/7472
# must be last due to how cuda_compiler ordering in that migrator works
- 11.8
commit_message: |
Upgrade to CUDA 12.9

CUDA 12.8 added support for architectures `sm_100`, `sm_101` and `sm_120`,
while CUDA 12.9 further added `sm_103` and `sm_121`. To build for these,
maintainers will need to modify their existing list of specified architectures
(e.g. `CMAKE_CUDA_ARCHITECTURES`, `TORCH_CUDA_ARCH_LIST`, etc.)
for their package. A good balance between broad support and storage
footprint (resp. compilation time) is to add `sm_100` and `sm_120`.

Since CUDA 12.8, the conda-forge nvcc package now sets `CUDAARCHS`
in its activation script to a string containing all
of the supported real architectures plus the virtual architecture of the
latest. Recipes for packages who use these variables to control their build
but do not want to build for all supported architectures will need to override
these variables in their build script.

ref: https://docs.nvidia.com/cuda/cuda-toolkit-release-notes/index.html#new-features

cuda_compiler_version: # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 12.9 # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

cuda_compiler_version_min: # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 12.9 # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

c_stdlib_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 2.17 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

c_compiler_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 14 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

cxx_compiler_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 14 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

fortran_compiler_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 14 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
34 changes: 0 additions & 34 deletions .ci_support/migrations/cudnn910.yaml

This file was deleted.

14 changes: 7 additions & 7 deletions .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ jobs:
fail-fast: false
matrix:
include:
- CONFIG: linux_64_cuda_compiler_version12.8microarch_level1
- CONFIG: linux_64_cuda_compiler_version12.9microarch_level1
UPLOAD_PACKAGES: True
os: ubuntu
runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_cuda_compiler_version12.8microa_hc8cea6d2', 'linux', 'x64', 'self-hosted']
runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_cuda_compiler_version12.9microa_h28a6e8b1', 'linux', 'x64', 'self-hosted']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
- CONFIG: linux_64_cuda_compiler_version12.8microarch_level3
- CONFIG: linux_64_cuda_compiler_version12.9microarch_level3
UPLOAD_PACKAGES: True
os: ubuntu
runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_cuda_compiler_version12.8microa_h82e5350b', 'linux', 'x64', 'self-hosted']
runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_cuda_compiler_version12.9microa_h764a83b2', 'linux', 'x64', 'self-hosted']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
- CONFIG: linux_64_cuda_compiler_versionNonemicroarch_level1
UPLOAD_PACKAGES: True
Expand All @@ -41,10 +41,10 @@ jobs:
os: ubuntu
runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_cuda_compiler_versionNonemicroa_hb1134425', 'linux', 'x64', 'self-hosted']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
- CONFIG: linux_aarch64_cuda_compiler_versionNone
- CONFIG: linux_aarch64_c_compiler_version11cuda_compiler_versionNonecxx_compiler_version11
UPLOAD_PACKAGES: True
os: ubuntu
runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_aarch64_cuda_compiler_versionNone', 'linux', 'x64', 'self-hosted']
runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_aarch64_c_compiler_version11cuda_c_hde0bec76', 'linux', 'x64', 'self-hosted']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
steps:

Expand Down Expand Up @@ -126,4 +126,4 @@ jobs:
UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }}
STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }}
STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }}
12 changes: 6 additions & 6 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set version = "2.19.1" %}
{% set estimator_version = "2.15.0" %}
{% set build = 1 %}
{% set build = 2 %}

{% if cuda_compiler_version != "None" %}
{% set build = build + 200 %}
Expand Down Expand Up @@ -75,6 +75,8 @@ source:
- patches/0041-Disable-profiler.patch
- patches/0042-bump-h5py-req.patch # [aarch64]
- patches/0043-cross-arch-config.patch # [aarch64 and target_platform != build_platform]
# backport https://github.com/tensorflow/tensorflow/pull/99364
- patches/0044-Support-for-TFv2.20-to-compile-with-CUDA-v12.9.1.patch
- url: https://github.com/tensorflow/estimator/archive/refs/tags/v{{ estimator_version.replace(".rc", "-rc") }}.tar.gz
sha256: 2d7e100b1878084da34b5e23b49a0cbb5ee8a7add74b7dd189a82ada1cf85530
folder: tensorflow-estimator
Expand Down
6 changes: 3 additions & 3 deletions recipe/patches/0001-loosen-requirements.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From ae4b01cd668c949c88872ba30e3ea44e0c43b633 Mon Sep 17 00:00:00 2001
From 86b5ecb970a2893fa01360b830cb86c3c7d9fc75 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <[email protected]>
Date: Thu, 30 Dec 2021 06:57:09 +0200
Subject: [PATCH 01/41] loosen requirements
Subject: [PATCH 01/44] loosen requirements

* Remove unused libclang requirement
* Remove unecessary tensorflow-io-gcs-filesystem
Expand All @@ -15,7 +15,7 @@ Co-authored-by: Uwe L. Korn <[email protected]>
1 file changed, 4 deletions(-)

diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
index 8f2d06ec373..35290f2226c 100644
index d83b45ea3cd..414b7df48b6 100644
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
@@ -84,7 +84,6 @@ REQUIRED_PACKAGES = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c26ba3c6eb5a544a01dad89dbd726b0514ff2f2e Mon Sep 17 00:00:00 2001
From e5601104fd788ee7912858e97f3f67fc297463af Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <[email protected]>
Date: Fri, 30 Jun 2023 08:39:32 +0000
Subject: [PATCH 02/41] Add additional absl_synchronization linkage to gRPC
Subject: [PATCH 02/44] Add additional absl_synchronization linkage to gRPC

---
third_party/systemlibs/grpc.BUILD | 3 +++
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0003-Fix-missing-abseil-linkages.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 08d13175a8a97ed97de56b89f836d9a7624d677c Mon Sep 17 00:00:00 2001
From 5f000fa6e71b9dbaaf8fc1ac691e3884106cb852 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <[email protected]>
Date: Mon, 3 Jul 2023 04:45:46 +0000
Subject: [PATCH 03/41] Fix missing abseil linkages
Subject: [PATCH 03/44] Fix missing abseil linkages

---
third_party/absl/system.absl.strings.BUILD | 2 +-
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 78fe26cde07460b7e2ebfe2b017398986ea8f10a Mon Sep 17 00:00:00 2001
From 298c5e540ab03f75ab5ede906fbb21d54ee8dc8f Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <[email protected]>
Date: Wed, 30 Aug 2023 16:58:41 +0200
Subject: [PATCH 04/41] Fix protobuf_python for systemlibs
Subject: [PATCH 04/44] Fix protobuf_python for systemlibs

---
tensorflow/workspace2.bzl | 1 +
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0005-Add-absl_log-systemlib.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 1bb1c61fa1e5a13e2db74dbc9c4aaf08d7a7e17f Mon Sep 17 00:00:00 2001
From d49beaef49c52ea690f02de7cfbde0e6aef06490 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <[email protected]>
Date: Wed, 30 Aug 2023 16:59:28 +0200
Subject: [PATCH 05/41] Add absl_log systemlib
Subject: [PATCH 05/44] Add absl_log systemlib

---
third_party/absl/system.absl.log.BUILD | 22 ++++++++++++++++++++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0d4bb8d059721a4969f8c0267ce92c753ba1e521 Mon Sep 17 00:00:00 2001
From e449e51b042dac4e687fb9dd95cb472819ae0dba Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <[email protected]>
Date: Fri, 15 Sep 2023 11:06:27 +0200
Subject: [PATCH 06/41] Omit linking to layout_proto_cc if protobuf linkage is
Subject: [PATCH 06/44] Omit linking to layout_proto_cc if protobuf linkage is
shared

---
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/0007-Fix-further-abseil-linkage.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 06977c1cf3f9af375fab69b189a3862e02774f44 Mon Sep 17 00:00:00 2001
From 7010ed5f6b5832cebabee3ff33cd987dc003fcdc Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <[email protected]>
Date: Mon, 18 Sep 2023 14:47:08 +0000
Subject: [PATCH 07/41] Fix further abseil linkage
Subject: [PATCH 07/44] Fix further abseil linkage

---
third_party/absl/system.absl.base.BUILD | 14 ++++++++++++--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 2ca8630407e1761f3a1cad9e83ac62e5283cf24d Mon Sep 17 00:00:00 2001
From 8d650f38d371a8ba2a48bf2caed5ec094a15a4c3 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <[email protected]>
Date: Fri, 27 Oct 2023 11:20:12 +0200
Subject: [PATCH 08/41] Add constraint to pybind11 systemlib
Subject: [PATCH 08/44] Add constraint to pybind11 systemlib

---
third_party/systemlibs/pybind11.BUILD | 6 ++++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 98427157b56dcc5c1e785c5324c9fb0b3776fb3a Mon Sep 17 00:00:00 2001
From 0a2b6ff411c387419807e50b9a4dc61118068d40 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <[email protected]>
Date: Fri, 27 Oct 2023 11:21:11 +0200
Subject: [PATCH 09/41] Different file ending for flatbuffers LICENSE
Subject: [PATCH 09/44] Different file ending for flatbuffers LICENSE

---
third_party/flatbuffers/BUILD.system | 5 +++++
Expand Down
Loading
Loading