diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fb5be67d..8d48579e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -73,17 +73,19 @@ source: - patches/0039-Fix-matmul-unused-result-error.patch - patches/0040-Support-cuda-12.8.patch - patches/0041-Disable-profiler.patch - - patches/0042-bump-h5py-req.patch # [aarch64] - - patches/0043-cross-arch-config.patch # [aarch64 and target_platform != build_platform] + - patches/0042-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 + - patches/0043-Support-for-TFv2.20-to-compile-with-CUDA-v12.9.1.patch + # backport https://github.com/openxla/xla/pull/22572 into vendored xla + - patches/0044-PR-22572-Fix-build-break-in-convolution_thunk_intern.patch + - url: https://github.com/tensorflow/estimator/archive/refs/tags/v{{ estimator_version.replace(".rc", "-rc") }}.tar.gz sha256: 2d7e100b1878084da34b5e23b49a0cbb5ee8a7add74b7dd189a82ada1cf85530 folder: tensorflow-estimator build: number: {{ build }} - skip: true # [win] + skip: true # [not aarch64] # TODO: debug issues with CUDA cross-compilation skip: true # [aarch64 and cuda_compiler_version != "None"] diff --git a/recipe/patches/0042-bump-h5py-req.patch b/recipe/patches/0042-bump-h5py-req.patch deleted file mode 100644 index 6de87bdd..00000000 --- a/recipe/patches/0042-bump-h5py-req.patch +++ /dev/null @@ -1,309 +0,0 @@ -From e2c9291edfeac83893563ae0fcd90ab36a89af9e Mon Sep 17 00:00:00 2001 -From: dslarm -Date: Tue, 16 Sep 2025 19:41:25 +0000 -Subject: [PATCH 42/44] bump h5py req - -h5py and psutil are not available as a binary for -the versions of h5py in tensorflow 2.18's spec, but the -system won't try to build it. Bump the version so we get ones that -do exist. ---- - .../requirements_updater/requirements.in | 3 +- - requirements_lock_3_10.txt | 50 +------------------ - requirements_lock_3_11.txt | 50 +------------------ - requirements_lock_3_12.txt | 50 +------------------ - requirements_lock_3_9.txt | 49 +----------------- - 5 files changed, 10 insertions(+), 192 deletions(-) - -diff --git a/ci/official/requirements_updater/requirements.in b/ci/official/requirements_updater/requirements.in -index 68871582683..145aab77a17 100644 ---- a/ci/official/requirements_updater/requirements.in -+++ b/ci/official/requirements_updater/requirements.in -@@ -1,7 +1,7 @@ - # Note that numpy 2.1.0 does not support python 3.9 - numpy >= 2.0.0, < 2.2.0 - wheel ~= 0.41.2 --h5py >= 3.11.0 -+h5py >= 3.12.0 - lit ~= 17.0.2 - opt_einsum == 3.3.0 - astunparse == 1.6.3 -@@ -23,6 +23,7 @@ tensorboard ~= 2.19.0 - # Test dependencies - grpcio >= 1.24.3, < 2.0 - portpicker == 1.6.0 -+psutil >=7.0.0 - scipy >= 1.13.0 - requests >= 2.31.0 - packaging==23.2 -diff --git a/requirements_lock_3_10.txt b/requirements_lock_3_10.txt -index 0bf28443588..b5ac15546b9 100644 ---- a/requirements_lock_3_10.txt -+++ b/requirements_lock_3_10.txt -@@ -185,36 +185,7 @@ grpcio==1.64.1 \ - # via - # -r ci/official/requirements_updater/requirements.in - # tensorboard --h5py==3.13.0 \ -- --hash=sha256:10894c55d46df502d82a7a4ed38f9c3fdbcb93efb42e25d275193e093071fade \ -- --hash=sha256:1870e46518720023da85d0895a1960ff2ce398c5671eac3b1a41ec696b7105c3 \ -- --hash=sha256:21daf38171753899b5905f3d82c99b0b1ec2cbbe282a037cad431feb620e62ec \ -- --hash=sha256:22ffe2a25770a2d67213a1b94f58006c14dce06933a42d2aaa0318c5868d1508 \ -- --hash=sha256:337af114616f3656da0c83b68fcf53ecd9ce9989a700b0883a6e7c483c3235d4 \ -- --hash=sha256:357e6dc20b101a805ccfd0024731fbaf6e8718c18c09baf3b5e4e9d198d13fca \ -- --hash=sha256:477c58307b6b9a2509c59c57811afb9f598aedede24a67da808262dfa0ee37b4 \ -- --hash=sha256:4f97ecde7ac6513b21cd95efdfc38dc6d19f96f6ca6f2a30550e94e551458e0a \ -- --hash=sha256:5540daee2b236d9569c950b417f13fd112d51d78b4c43012de05774908dff3f5 \ -- --hash=sha256:560e71220dc92dfa254b10a4dcb12d56b574d2d87e095db20466b32a93fec3f9 \ -- --hash=sha256:56dd172d862e850823c4af02dc4ddbc308f042b85472ffdaca67f1598dff4a57 \ -- --hash=sha256:57c4c74f627c616f02b7aec608a8c706fe08cb5b0ba7c08555a4eb1dde20805a \ -- --hash=sha256:782ff0ac39f455f21fd1c8ebc007328f65f43d56718a89327eec76677ebf238a \ -- --hash=sha256:82690e89c72b85addf4fc4d5058fb1e387b6c14eb063b0b879bf3f42c3b93c35 \ -- --hash=sha256:851ae3a8563d87a5a0dc49c2e2529c75b8842582ccaefbf84297d2cfceeacd61 \ -- --hash=sha256:8a8e38ef4ceb969f832cc230c0cf808c613cc47e31e768fd7b1106c55afa1cb8 \ -- --hash=sha256:9c82ece71ed1c2b807b6628e3933bc6eae57ea21dac207dca3470e3ceaaf437c \ -- --hash=sha256:be949b46b7388074c5acae017fbbe3e5ba303fd9daaa52157fdfef30bbdacadd \ -- --hash=sha256:c10f061764d8dce0a9592ce08bfd5f243a00703325c388f1086037e5d619c5f1 \ -- --hash=sha256:d2cf6a231a07c14acd504a945a6e9ec115e0007f675bde5e0de30a4dc8d86a31 \ -- --hash=sha256:d571644958c5e19a61c793d8d23cd02479572da828e333498c9acc463f4a3997 \ -- --hash=sha256:d6f13f9b5ce549448c01e4dfe08ea8d1772e6078799af2c1c8d09e941230a90d \ -- --hash=sha256:e520ec76de00943dd017c8ea3f354fa1d2f542eac994811943a8faedf2a7d5cb \ -- --hash=sha256:e79d8368cd9295045956bfb436656bea3f915beaa11d342e9f79f129f5178763 \ -- --hash=sha256:f35640e81b03c02a88b8bf99fb6a9d3023cc52f7c627694db2f379e0028f2868 \ -- --hash=sha256:fb267ce4b83f9c42560e9ff4d30f60f7ae492eacf9c7ede849edf8c1b860e16b -- # via -- # -r ci/official/requirements_updater/requirements.in -- # keras -+h5py>=3.12.0 - idna==3.7 \ - --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \ - --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0 -@@ -587,24 +558,7 @@ protobuf==4.25.3 \ - --hash=sha256:f1279ab38ecbfae7e456a108c5c0681e4956d5b1090027c1de0f934dfdb4b35c \ - --hash=sha256:f4f118245c4a087776e0a8408be33cf09f6c547442c00395fbfb116fac2f8ac2 - # via tensorboard --psutil==5.9.8 \ -- --hash=sha256:02615ed8c5ea222323408ceba16c60e99c3f91639b07da6373fb7e6539abc56d \ -- --hash=sha256:05806de88103b25903dff19bb6692bd2e714ccf9e668d050d144012055cbca73 \ -- --hash=sha256:26bd09967ae00920df88e0352a91cff1a78f8d69b3ecabbfe733610c0af486c8 \ -- --hash=sha256:27cc40c3493bb10de1be4b3f07cae4c010ce715290a5be22b98493509c6299e2 \ -- --hash=sha256:36f435891adb138ed3c9e58c6af3e2e6ca9ac2f365efe1f9cfef2794e6c93b4e \ -- --hash=sha256:50187900d73c1381ba1454cf40308c2bf6f34268518b3f36a9b663ca87e65e36 \ -- --hash=sha256:611052c4bc70432ec770d5d54f64206aa7203a101ec273a0cd82418c86503bb7 \ -- --hash=sha256:6be126e3225486dff286a8fb9a06246a5253f4c7c53b475ea5f5ac934e64194c \ -- --hash=sha256:7d79560ad97af658a0f6adfef8b834b53f64746d45b403f225b85c5c2c140eee \ -- --hash=sha256:8cb6403ce6d8e047495a701dc7c5bd788add903f8986d523e3e20b98b733e421 \ -- --hash=sha256:8db4c1b57507eef143a15a6884ca10f7c73876cdf5d51e713151c1236a0e68cf \ -- --hash=sha256:aee678c8720623dc456fa20659af736241f575d79429a0e5e9cf88ae0605cc81 \ -- --hash=sha256:bc56c2a1b0d15aa3eaa5a60c9f3f8e3e565303b465dbf57a1b730e7a2b9844e0 \ -- --hash=sha256:bd1184ceb3f87651a67b2708d4c3338e9b10c5df903f2e3776b62303b26cb631 \ -- --hash=sha256:d06016f7f8625a1825ba3732081d77c94589dca78b7a3fc072194851e88461a4 \ -- --hash=sha256:d16bbddf0693323b8c6123dd804100241da461e41d6e332fb0ba6058f630f8c8 -- # via portpicker -+psutil>=7.0.0 - pyelftools==0.31 \ - --hash=sha256:c774416b10310156879443b81187d182d8d9ee499660380e645918b50bc88f99 \ - --hash=sha256:f52de7b3c7e8c64c8abc04a79a1cf37ac5fb0b8a49809827130b858944840607 -diff --git a/requirements_lock_3_11.txt b/requirements_lock_3_11.txt -index b305e7e58f8..a6606206652 100644 ---- a/requirements_lock_3_11.txt -+++ b/requirements_lock_3_11.txt -@@ -185,36 +185,7 @@ grpcio==1.64.1 \ - # via - # -r ci/official/requirements_updater/requirements.in - # tensorboard --h5py==3.13.0 \ -- --hash=sha256:10894c55d46df502d82a7a4ed38f9c3fdbcb93efb42e25d275193e093071fade \ -- --hash=sha256:1870e46518720023da85d0895a1960ff2ce398c5671eac3b1a41ec696b7105c3 \ -- --hash=sha256:21daf38171753899b5905f3d82c99b0b1ec2cbbe282a037cad431feb620e62ec \ -- --hash=sha256:22ffe2a25770a2d67213a1b94f58006c14dce06933a42d2aaa0318c5868d1508 \ -- --hash=sha256:337af114616f3656da0c83b68fcf53ecd9ce9989a700b0883a6e7c483c3235d4 \ -- --hash=sha256:357e6dc20b101a805ccfd0024731fbaf6e8718c18c09baf3b5e4e9d198d13fca \ -- --hash=sha256:477c58307b6b9a2509c59c57811afb9f598aedede24a67da808262dfa0ee37b4 \ -- --hash=sha256:4f97ecde7ac6513b21cd95efdfc38dc6d19f96f6ca6f2a30550e94e551458e0a \ -- --hash=sha256:5540daee2b236d9569c950b417f13fd112d51d78b4c43012de05774908dff3f5 \ -- --hash=sha256:560e71220dc92dfa254b10a4dcb12d56b574d2d87e095db20466b32a93fec3f9 \ -- --hash=sha256:56dd172d862e850823c4af02dc4ddbc308f042b85472ffdaca67f1598dff4a57 \ -- --hash=sha256:57c4c74f627c616f02b7aec608a8c706fe08cb5b0ba7c08555a4eb1dde20805a \ -- --hash=sha256:782ff0ac39f455f21fd1c8ebc007328f65f43d56718a89327eec76677ebf238a \ -- --hash=sha256:82690e89c72b85addf4fc4d5058fb1e387b6c14eb063b0b879bf3f42c3b93c35 \ -- --hash=sha256:851ae3a8563d87a5a0dc49c2e2529c75b8842582ccaefbf84297d2cfceeacd61 \ -- --hash=sha256:8a8e38ef4ceb969f832cc230c0cf808c613cc47e31e768fd7b1106c55afa1cb8 \ -- --hash=sha256:9c82ece71ed1c2b807b6628e3933bc6eae57ea21dac207dca3470e3ceaaf437c \ -- --hash=sha256:be949b46b7388074c5acae017fbbe3e5ba303fd9daaa52157fdfef30bbdacadd \ -- --hash=sha256:c10f061764d8dce0a9592ce08bfd5f243a00703325c388f1086037e5d619c5f1 \ -- --hash=sha256:d2cf6a231a07c14acd504a945a6e9ec115e0007f675bde5e0de30a4dc8d86a31 \ -- --hash=sha256:d571644958c5e19a61c793d8d23cd02479572da828e333498c9acc463f4a3997 \ -- --hash=sha256:d6f13f9b5ce549448c01e4dfe08ea8d1772e6078799af2c1c8d09e941230a90d \ -- --hash=sha256:e520ec76de00943dd017c8ea3f354fa1d2f542eac994811943a8faedf2a7d5cb \ -- --hash=sha256:e79d8368cd9295045956bfb436656bea3f915beaa11d342e9f79f129f5178763 \ -- --hash=sha256:f35640e81b03c02a88b8bf99fb6a9d3023cc52f7c627694db2f379e0028f2868 \ -- --hash=sha256:fb267ce4b83f9c42560e9ff4d30f60f7ae492eacf9c7ede849edf8c1b860e16b -- # via -- # -r ci/official/requirements_updater/requirements.in -- # keras -+h5py>=3.12.0 - idna==3.7 \ - --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \ - --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0 -@@ -587,24 +558,7 @@ protobuf==4.25.3 \ - --hash=sha256:f1279ab38ecbfae7e456a108c5c0681e4956d5b1090027c1de0f934dfdb4b35c \ - --hash=sha256:f4f118245c4a087776e0a8408be33cf09f6c547442c00395fbfb116fac2f8ac2 - # via tensorboard --psutil==5.9.8 \ -- --hash=sha256:02615ed8c5ea222323408ceba16c60e99c3f91639b07da6373fb7e6539abc56d \ -- --hash=sha256:05806de88103b25903dff19bb6692bd2e714ccf9e668d050d144012055cbca73 \ -- --hash=sha256:26bd09967ae00920df88e0352a91cff1a78f8d69b3ecabbfe733610c0af486c8 \ -- --hash=sha256:27cc40c3493bb10de1be4b3f07cae4c010ce715290a5be22b98493509c6299e2 \ -- --hash=sha256:36f435891adb138ed3c9e58c6af3e2e6ca9ac2f365efe1f9cfef2794e6c93b4e \ -- --hash=sha256:50187900d73c1381ba1454cf40308c2bf6f34268518b3f36a9b663ca87e65e36 \ -- --hash=sha256:611052c4bc70432ec770d5d54f64206aa7203a101ec273a0cd82418c86503bb7 \ -- --hash=sha256:6be126e3225486dff286a8fb9a06246a5253f4c7c53b475ea5f5ac934e64194c \ -- --hash=sha256:7d79560ad97af658a0f6adfef8b834b53f64746d45b403f225b85c5c2c140eee \ -- --hash=sha256:8cb6403ce6d8e047495a701dc7c5bd788add903f8986d523e3e20b98b733e421 \ -- --hash=sha256:8db4c1b57507eef143a15a6884ca10f7c73876cdf5d51e713151c1236a0e68cf \ -- --hash=sha256:aee678c8720623dc456fa20659af736241f575d79429a0e5e9cf88ae0605cc81 \ -- --hash=sha256:bc56c2a1b0d15aa3eaa5a60c9f3f8e3e565303b465dbf57a1b730e7a2b9844e0 \ -- --hash=sha256:bd1184ceb3f87651a67b2708d4c3338e9b10c5df903f2e3776b62303b26cb631 \ -- --hash=sha256:d06016f7f8625a1825ba3732081d77c94589dca78b7a3fc072194851e88461a4 \ -- --hash=sha256:d16bbddf0693323b8c6123dd804100241da461e41d6e332fb0ba6058f630f8c8 -- # via portpicker -+psutil>=7.0.0 - pyelftools==0.31 \ - --hash=sha256:c774416b10310156879443b81187d182d8d9ee499660380e645918b50bc88f99 \ - --hash=sha256:f52de7b3c7e8c64c8abc04a79a1cf37ac5fb0b8a49809827130b858944840607 -diff --git a/requirements_lock_3_12.txt b/requirements_lock_3_12.txt -index 179f77b4843..1a803ef414f 100644 ---- a/requirements_lock_3_12.txt -+++ b/requirements_lock_3_12.txt -@@ -185,36 +185,7 @@ grpcio==1.64.1 \ - # via - # -r ci/official/requirements_updater/requirements.in - # tensorboard --h5py==3.13.0 \ -- --hash=sha256:10894c55d46df502d82a7a4ed38f9c3fdbcb93efb42e25d275193e093071fade \ -- --hash=sha256:1870e46518720023da85d0895a1960ff2ce398c5671eac3b1a41ec696b7105c3 \ -- --hash=sha256:21daf38171753899b5905f3d82c99b0b1ec2cbbe282a037cad431feb620e62ec \ -- --hash=sha256:22ffe2a25770a2d67213a1b94f58006c14dce06933a42d2aaa0318c5868d1508 \ -- --hash=sha256:337af114616f3656da0c83b68fcf53ecd9ce9989a700b0883a6e7c483c3235d4 \ -- --hash=sha256:357e6dc20b101a805ccfd0024731fbaf6e8718c18c09baf3b5e4e9d198d13fca \ -- --hash=sha256:477c58307b6b9a2509c59c57811afb9f598aedede24a67da808262dfa0ee37b4 \ -- --hash=sha256:4f97ecde7ac6513b21cd95efdfc38dc6d19f96f6ca6f2a30550e94e551458e0a \ -- --hash=sha256:5540daee2b236d9569c950b417f13fd112d51d78b4c43012de05774908dff3f5 \ -- --hash=sha256:560e71220dc92dfa254b10a4dcb12d56b574d2d87e095db20466b32a93fec3f9 \ -- --hash=sha256:56dd172d862e850823c4af02dc4ddbc308f042b85472ffdaca67f1598dff4a57 \ -- --hash=sha256:57c4c74f627c616f02b7aec608a8c706fe08cb5b0ba7c08555a4eb1dde20805a \ -- --hash=sha256:782ff0ac39f455f21fd1c8ebc007328f65f43d56718a89327eec76677ebf238a \ -- --hash=sha256:82690e89c72b85addf4fc4d5058fb1e387b6c14eb063b0b879bf3f42c3b93c35 \ -- --hash=sha256:851ae3a8563d87a5a0dc49c2e2529c75b8842582ccaefbf84297d2cfceeacd61 \ -- --hash=sha256:8a8e38ef4ceb969f832cc230c0cf808c613cc47e31e768fd7b1106c55afa1cb8 \ -- --hash=sha256:9c82ece71ed1c2b807b6628e3933bc6eae57ea21dac207dca3470e3ceaaf437c \ -- --hash=sha256:be949b46b7388074c5acae017fbbe3e5ba303fd9daaa52157fdfef30bbdacadd \ -- --hash=sha256:c10f061764d8dce0a9592ce08bfd5f243a00703325c388f1086037e5d619c5f1 \ -- --hash=sha256:d2cf6a231a07c14acd504a945a6e9ec115e0007f675bde5e0de30a4dc8d86a31 \ -- --hash=sha256:d571644958c5e19a61c793d8d23cd02479572da828e333498c9acc463f4a3997 \ -- --hash=sha256:d6f13f9b5ce549448c01e4dfe08ea8d1772e6078799af2c1c8d09e941230a90d \ -- --hash=sha256:e520ec76de00943dd017c8ea3f354fa1d2f542eac994811943a8faedf2a7d5cb \ -- --hash=sha256:e79d8368cd9295045956bfb436656bea3f915beaa11d342e9f79f129f5178763 \ -- --hash=sha256:f35640e81b03c02a88b8bf99fb6a9d3023cc52f7c627694db2f379e0028f2868 \ -- --hash=sha256:fb267ce4b83f9c42560e9ff4d30f60f7ae492eacf9c7ede849edf8c1b860e16b -- # via -- # -r ci/official/requirements_updater/requirements.in -- # keras -+h5py>=3.12.0 - idna==3.7 \ - --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \ - --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0 -@@ -587,24 +558,7 @@ protobuf==4.25.3 \ - --hash=sha256:f1279ab38ecbfae7e456a108c5c0681e4956d5b1090027c1de0f934dfdb4b35c \ - --hash=sha256:f4f118245c4a087776e0a8408be33cf09f6c547442c00395fbfb116fac2f8ac2 - # via tensorboard --psutil==5.9.8 \ -- --hash=sha256:02615ed8c5ea222323408ceba16c60e99c3f91639b07da6373fb7e6539abc56d \ -- --hash=sha256:05806de88103b25903dff19bb6692bd2e714ccf9e668d050d144012055cbca73 \ -- --hash=sha256:26bd09967ae00920df88e0352a91cff1a78f8d69b3ecabbfe733610c0af486c8 \ -- --hash=sha256:27cc40c3493bb10de1be4b3f07cae4c010ce715290a5be22b98493509c6299e2 \ -- --hash=sha256:36f435891adb138ed3c9e58c6af3e2e6ca9ac2f365efe1f9cfef2794e6c93b4e \ -- --hash=sha256:50187900d73c1381ba1454cf40308c2bf6f34268518b3f36a9b663ca87e65e36 \ -- --hash=sha256:611052c4bc70432ec770d5d54f64206aa7203a101ec273a0cd82418c86503bb7 \ -- --hash=sha256:6be126e3225486dff286a8fb9a06246a5253f4c7c53b475ea5f5ac934e64194c \ -- --hash=sha256:7d79560ad97af658a0f6adfef8b834b53f64746d45b403f225b85c5c2c140eee \ -- --hash=sha256:8cb6403ce6d8e047495a701dc7c5bd788add903f8986d523e3e20b98b733e421 \ -- --hash=sha256:8db4c1b57507eef143a15a6884ca10f7c73876cdf5d51e713151c1236a0e68cf \ -- --hash=sha256:aee678c8720623dc456fa20659af736241f575d79429a0e5e9cf88ae0605cc81 \ -- --hash=sha256:bc56c2a1b0d15aa3eaa5a60c9f3f8e3e565303b465dbf57a1b730e7a2b9844e0 \ -- --hash=sha256:bd1184ceb3f87651a67b2708d4c3338e9b10c5df903f2e3776b62303b26cb631 \ -- --hash=sha256:d06016f7f8625a1825ba3732081d77c94589dca78b7a3fc072194851e88461a4 \ -- --hash=sha256:d16bbddf0693323b8c6123dd804100241da461e41d6e332fb0ba6058f630f8c8 -- # via portpicker -+psutil>=7.0.0 - pyelftools==0.31 \ - --hash=sha256:c774416b10310156879443b81187d182d8d9ee499660380e645918b50bc88f99 \ - --hash=sha256:f52de7b3c7e8c64c8abc04a79a1cf37ac5fb0b8a49809827130b858944840607 -diff --git a/requirements_lock_3_9.txt b/requirements_lock_3_9.txt -index a3d77545aed..2d9911ac3c4 100644 ---- a/requirements_lock_3_9.txt -+++ b/requirements_lock_3_9.txt -@@ -185,36 +185,7 @@ grpcio==1.64.1 \ - # via - # -r ci/official/requirements_updater/requirements.in - # tensorboard --h5py==3.13.0 \ -- --hash=sha256:10894c55d46df502d82a7a4ed38f9c3fdbcb93efb42e25d275193e093071fade \ -- --hash=sha256:1870e46518720023da85d0895a1960ff2ce398c5671eac3b1a41ec696b7105c3 \ -- --hash=sha256:21daf38171753899b5905f3d82c99b0b1ec2cbbe282a037cad431feb620e62ec \ -- --hash=sha256:22ffe2a25770a2d67213a1b94f58006c14dce06933a42d2aaa0318c5868d1508 \ -- --hash=sha256:337af114616f3656da0c83b68fcf53ecd9ce9989a700b0883a6e7c483c3235d4 \ -- --hash=sha256:357e6dc20b101a805ccfd0024731fbaf6e8718c18c09baf3b5e4e9d198d13fca \ -- --hash=sha256:477c58307b6b9a2509c59c57811afb9f598aedede24a67da808262dfa0ee37b4 \ -- --hash=sha256:4f97ecde7ac6513b21cd95efdfc38dc6d19f96f6ca6f2a30550e94e551458e0a \ -- --hash=sha256:5540daee2b236d9569c950b417f13fd112d51d78b4c43012de05774908dff3f5 \ -- --hash=sha256:560e71220dc92dfa254b10a4dcb12d56b574d2d87e095db20466b32a93fec3f9 \ -- --hash=sha256:56dd172d862e850823c4af02dc4ddbc308f042b85472ffdaca67f1598dff4a57 \ -- --hash=sha256:57c4c74f627c616f02b7aec608a8c706fe08cb5b0ba7c08555a4eb1dde20805a \ -- --hash=sha256:782ff0ac39f455f21fd1c8ebc007328f65f43d56718a89327eec76677ebf238a \ -- --hash=sha256:82690e89c72b85addf4fc4d5058fb1e387b6c14eb063b0b879bf3f42c3b93c35 \ -- --hash=sha256:851ae3a8563d87a5a0dc49c2e2529c75b8842582ccaefbf84297d2cfceeacd61 \ -- --hash=sha256:8a8e38ef4ceb969f832cc230c0cf808c613cc47e31e768fd7b1106c55afa1cb8 \ -- --hash=sha256:9c82ece71ed1c2b807b6628e3933bc6eae57ea21dac207dca3470e3ceaaf437c \ -- --hash=sha256:be949b46b7388074c5acae017fbbe3e5ba303fd9daaa52157fdfef30bbdacadd \ -- --hash=sha256:c10f061764d8dce0a9592ce08bfd5f243a00703325c388f1086037e5d619c5f1 \ -- --hash=sha256:d2cf6a231a07c14acd504a945a6e9ec115e0007f675bde5e0de30a4dc8d86a31 \ -- --hash=sha256:d571644958c5e19a61c793d8d23cd02479572da828e333498c9acc463f4a3997 \ -- --hash=sha256:d6f13f9b5ce549448c01e4dfe08ea8d1772e6078799af2c1c8d09e941230a90d \ -- --hash=sha256:e520ec76de00943dd017c8ea3f354fa1d2f542eac994811943a8faedf2a7d5cb \ -- --hash=sha256:e79d8368cd9295045956bfb436656bea3f915beaa11d342e9f79f129f5178763 \ -- --hash=sha256:f35640e81b03c02a88b8bf99fb6a9d3023cc52f7c627694db2f379e0028f2868 \ -- --hash=sha256:fb267ce4b83f9c42560e9ff4d30f60f7ae492eacf9c7ede849edf8c1b860e16b -- # via -- # -r ci/official/requirements_updater/requirements.in -- # keras -+h5py>=3.12.0 - idna==3.7 \ - --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \ - --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0 -@@ -583,23 +554,7 @@ protobuf==4.25.3 \ - --hash=sha256:f1279ab38ecbfae7e456a108c5c0681e4956d5b1090027c1de0f934dfdb4b35c \ - --hash=sha256:f4f118245c4a087776e0a8408be33cf09f6c547442c00395fbfb116fac2f8ac2 - # via tensorboard --psutil==5.9.8 \ -- --hash=sha256:02615ed8c5ea222323408ceba16c60e99c3f91639b07da6373fb7e6539abc56d \ -- --hash=sha256:05806de88103b25903dff19bb6692bd2e714ccf9e668d050d144012055cbca73 \ -- --hash=sha256:26bd09967ae00920df88e0352a91cff1a78f8d69b3ecabbfe733610c0af486c8 \ -- --hash=sha256:27cc40c3493bb10de1be4b3f07cae4c010ce715290a5be22b98493509c6299e2 \ -- --hash=sha256:36f435891adb138ed3c9e58c6af3e2e6ca9ac2f365efe1f9cfef2794e6c93b4e \ -- --hash=sha256:50187900d73c1381ba1454cf40308c2bf6f34268518b3f36a9b663ca87e65e36 \ -- --hash=sha256:611052c4bc70432ec770d5d54f64206aa7203a101ec273a0cd82418c86503bb7 \ -- --hash=sha256:6be126e3225486dff286a8fb9a06246a5253f4c7c53b475ea5f5ac934e64194c \ -- --hash=sha256:7d79560ad97af658a0f6adfef8b834b53f64746d45b403f225b85c5c2c140eee \ -- --hash=sha256:8cb6403ce6d8e047495a701dc7c5bd788add903f8986d523e3e20b98b733e421 \ -- --hash=sha256:8db4c1b57507eef143a15a6884ca10f7c73876cdf5d51e713151c1236a0e68cf \ -- --hash=sha256:aee678c8720623dc456fa20659af736241f575d79429a0e5e9cf88ae0605cc81 \ -- --hash=sha256:bc56c2a1b0d15aa3eaa5a60c9f3f8e3e565303b465dbf57a1b730e7a2b9844e0 \ -- --hash=sha256:bd1184ceb3f87651a67b2708d4c3338e9b10c5df903f2e3776b62303b26cb631 \ -- --hash=sha256:d06016f7f8625a1825ba3732081d77c94589dca78b7a3fc072194851e88461a4 \ -- --hash=sha256:d16bbddf0693323b8c6123dd804100241da461e41d6e332fb0ba6058f630f8c8 -+psutil>=7.0.0 - # via portpicker - pyelftools==0.31 \ - --hash=sha256:c774416b10310156879443b81187d182d8d9ee499660380e645918b50bc88f99 \ diff --git a/recipe/patches/0043-cross-arch-config.patch b/recipe/patches/0042-cross-arch-config.patch similarity index 94% rename from recipe/patches/0043-cross-arch-config.patch rename to recipe/patches/0042-cross-arch-config.patch index 6baccecb..3f3df753 100644 --- a/recipe/patches/0043-cross-arch-config.patch +++ b/recipe/patches/0042-cross-arch-config.patch @@ -1,7 +1,7 @@ -From 2a4e3c49ce87c62dae261011b8d2b297f300695d Mon Sep 17 00:00:00 2001 +From 977dfe9a0ff84b6d42307a5784ced2aa70bc93b6 Mon Sep 17 00:00:00 2001 From: dslarm Date: Tue, 14 Oct 2025 15:02:09 +0000 -Subject: [PATCH 43/44] cross arch config +Subject: [PATCH 42/44] cross arch config --- third_party/llvm/dirty.patch | 11 +++++++++++ diff --git a/recipe/patches/0044-Support-for-TFv2.20-to-compile-with-CUDA-v12.9.1.patch b/recipe/patches/0043-Support-for-TFv2.20-to-compile-with-CUDA-v12.9.1.patch similarity index 96% rename from recipe/patches/0044-Support-for-TFv2.20-to-compile-with-CUDA-v12.9.1.patch rename to recipe/patches/0043-Support-for-TFv2.20-to-compile-with-CUDA-v12.9.1.patch index 0590b21b..c735de41 100644 --- a/recipe/patches/0044-Support-for-TFv2.20-to-compile-with-CUDA-v12.9.1.patch +++ b/recipe/patches/0043-Support-for-TFv2.20-to-compile-with-CUDA-v12.9.1.patch @@ -1,7 +1,7 @@ -From 360ce4cf9f33f0567dd5e169e87950d0bafc5126 Mon Sep 17 00:00:00 2001 +From e9edf6f421d091b5c51f4022bedf67e9a0bc2ca9 Mon Sep 17 00:00:00 2001 From: aravindhbalaji1985 Date: Mon, 25 Aug 2025 15:15:14 -0700 -Subject: [PATCH 44/44] Support for TFv2.20 to compile with CUDA v12.9.1 +Subject: [PATCH 43/44] Support for TFv2.20 to compile with CUDA v12.9.1 --- tensorflow/core/kernels/concat_lib_gpu_impl.cu.cc | 2 +- diff --git a/recipe/patches/0044-PR-22572-Fix-build-break-in-convolution_thunk_intern.patch b/recipe/patches/0044-PR-22572-Fix-build-break-in-convolution_thunk_intern.patch new file mode 100644 index 00000000..23e47e01 --- /dev/null +++ b/recipe/patches/0044-PR-22572-Fix-build-break-in-convolution_thunk_intern.patch @@ -0,0 +1,75 @@ +From 8e1d101acfaed847d292650609839f1a6a1939be Mon Sep 17 00:00:00 2001 +From: mmakevic-amd +Date: Thu, 13 Feb 2025 06:43:50 -0800 +Subject: [PATCH 44/44] PR #22572: Fix build break in + convolution_thunk_internal +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Imported from GitHub PR https://github.com/openxla/xla/pull/22572 + +After this change https://github.com/openxla/xla/commit/8e6b84bd729a1d079ed5035f1ba8afc9d205587e, following build error occurred: + +``` +In file included from xla/backends/cpu/runtime/convolution_thunk_f16.cc:16: +./xla/backends/cpu/runtime/convolution_thunk_internal.h: In lambda function: +./xla/backends/cpu/runtime/convolution_thunk_internal.h:345:71: error: no matching function for call to ‘tsl::CountDownAsyncValueRef::CountDown() const’ + 345 | auto on_done = [count_down]() mutable { count_down.CountDown(); }; + | ~~~~~~~~~~~~~~~~~~~~^~ +In file included from ./xla/backends/cpu/runtime/convolution_thunk_internal.h:26, + from xla/backends/cpu/runtime/convolution_thunk_f16.cc:16: +./xla/tsl/concurrency/async_value_ref.h:867:8: note: candidate: ‘bool tsl::CountDownAsyncValueRef::CountDown(size_t, const absl::lts_20230802::Status&) [with T = tsl::Chain; size_t = long unsigned int]’ + 867 | bool CountDown(size_t count, const absl::Status& status = absl::OkStatus()) { + | ^~~~~~~~~ +./xla/tsl/concurrency/async_value_ref.h:867:8: note: candidate expects 2 arguments, 0 provided +./xla/tsl/concurrency/async_value_ref.h:919:8: note: candidate: ‘bool tsl::CountDownAsyncValueRef::CountDown(absl::lts_20230802::Status) [with T = tsl::Chain]’ (near match) + 919 | bool CountDown(absl::Status status = absl::OkStatus()) { + | ^~~~~~~~~ +./xla/tsl/concurrency/async_value_ref.h:919:8: note: passing ‘const tsl::CountDownAsyncValueRef*’ as ‘this’ argument discards qualifiers +``` +Copybara import of the project: + +-- +69268a699eb07efb65be4e42087f75d504f750a6 by Milica Makevic : + +Allow modification of captured variable in nested lambda + +Merging this change closes #22572 + +COPYBARA_INTEGRATE_REVIEW=https://github.com/openxla/xla/pull/22572 from ROCm:ci_build_fix_250211 69268a699eb07efb65be4e42087f75d504f750a6 +PiperOrigin-RevId: 726463713 +--- + .../cpu/runtime/convolution_thunk_internal.h | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +diff --git a/third_party/xla/xla/backends/cpu/runtime/convolution_thunk_internal.h b/third_party/xla/xla/backends/cpu/runtime/convolution_thunk_internal.h +index 84fed6bb786..7e22492e785 100644 +--- a/third_party/xla/xla/backends/cpu/runtime/convolution_thunk_internal.h ++++ b/third_party/xla/xla/backends/cpu/runtime/convolution_thunk_internal.h +@@ -338,15 +338,16 @@ void EigenGenericConv2D( + auto num_tasks = Eigen::numext::div_ceil(feature_group_count, task_size); + + if (use_thunk_runtime) { +- ScheduleAll(&device, num_tasks, [=, &device](Eigen::Index task_index) { +- Eigen::Index start = task_index * task_size; +- Eigen::Index end = std::min(start + task_size, feature_group_count); +- for (Eigen::Index i = start; i < end; ++i) { +- auto on_done = [count_down]() mutable { count_down.CountDown(); }; +- auto [output, convolved] = convolve_group(i); +- output.device(device, std::move(on_done)) = convolved; +- } +- }); ++ ScheduleAll( ++ &device, num_tasks, [=, &device](Eigen::Index task_index) mutable { ++ Eigen::Index start = task_index * task_size; ++ Eigen::Index end = std::min(start + task_size, feature_group_count); ++ for (Eigen::Index i = start; i < end; ++i) { ++ auto on_done = [count_down]() mutable { count_down.CountDown(); }; ++ auto [output, convolved] = convolve_group(i); ++ output.device(device, std::move(on_done)) = convolved; ++ } ++ }); + } else { + Eigen::Barrier barrier(num_tasks); + ScheduleAll(