commit:     54d2f997ce7d3d5e5f27e42d2e836345846c0486
Author:     Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Sat Jun 14 14:05:41 2025 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Jun 14 20:00:09 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54d2f997

sci-ml/caffe2-2.7.0[rocm]: fix compilation

There were 2 independent issues:
* incorrect revision for composable-kernel (see 
https://github.com/pytorch/pytorch/tree/v2.7.0/third_party)

Closes: https://bugs.gentoo.org/955525
Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42594
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 sci-ml/caffe2/Manifest               | 1 +
 sci-ml/caffe2/caffe2-2.7.0-r2.ebuild | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sci-ml/caffe2/Manifest b/sci-ml/caffe2/Manifest
index 32f540381bbc..d354f3d2d760 100644
--- a/sci-ml/caffe2/Manifest
+++ b/sci-ml/caffe2/Manifest
@@ -1,5 +1,6 @@
 DIST caffe2-patches-20240809.tar.gz 15242 BLAKE2B 
77503c61487e7d85cca5afcab9a6e638f9833a70861845638cf1b62bc492d7b6650e6db81d53ebb2f39c6313509250d339f725f04d03ec6dd23dd0cf70843d8c
 SHA512 
74b3b0b6671b655ecac93f7436c4ed7cb0157a83aafbf6afcc0811e11cef341cd8f638db1a111bcbb01e1a6dd4daf3a36b96d7a8ce90f04c2fa091bd6e3a142b
 DIST composable_kernel-50ee4267.tar.gz 4194795 BLAKE2B 
b3c97d98a0c9e4620fdae3d30006edf55cc60ffa7f8518f6acb8d808647bc4de362c2e2b7e974686503fa2c7f359b6981cfbda74e40cc1bad4d351c5d2ff92e1
 SHA512 
9fc6f5f15556f020414b4567520329ef762209a82411a246c2bc1240a9fed2669f7fcb982cf773e3e9561bf9a2c557dba82b8b469d2e5844e679e2f5ab7c3e17
+DIST composable_kernel-8086bbe3.tar.gz 4418862 BLAKE2B 
b710e3d4586899443ec01044dad19fd2f992c351e2f65ba526dfcc47cc65c095beaf8ac21a8f71c02a0eb524d364e817b27241a9198884f2bdae9924b51e24e4
 SHA512 
8410b5a1c864d71f3034ef0d9d1245078856d09cc191faec59856c229bf11d89ae291036d735cb5cec4f1d72e6e9e8f6921833147f9619d30cfab8722d3a9f63
 DIST pytorch-2.4.1.tar.gz 115029469 BLAKE2B 
c2909ff27d527bc57cba56b780d3b8cd07a043ab045caa6c6b27857a16f9ad10aaab2116b26226b1e46ee08ffb44007965d914464418e4ae14ca48c3f3f383bb
 SHA512 
7e9b4485e242eaf0d648765c6621d73d95e7107b766646a098175436d1ab2e2b864badd0757a3bab6b7c318233f2120bad9ac07b39bb9e357897919580c87631
 DIST pytorch-2.5.1.tar.gz 116091366 BLAKE2B 
7838b17562b94ffc7d798031348689db607dd5eae2a3c35be365972e2b52a2c1b12067068d5aca5ab00cf0977d9c2c3c9ae5337d69534c864c732e6256cbeef6
 SHA512 
a913a466324a65fa3d79c5e9ad4d605fc7976f0134fda2f81aaa3cea29d56926604999b8a238759646d211e63b47bbb446cdffa86ca8defd8159f11e30301289
 DIST pytorch-2.6.0.tar.gz 119594438 BLAKE2B 
3152eb341cf42295e147e59625beb9c06608aa4b78f9618c1c0024b10c1c767715d07fe8c4be52d029ac47f808cd0d5e65c9530ec90d951a64b993083b4067ad
 SHA512 
a70da80ff09d226085e18228132cf6bb236ad8cc47eed52375d0d2a615f09dd33849da947270b5670c184eab60cb8e2adf11d801babfbda7aa621400501d07b0

diff --git a/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild 
b/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
index f9d324654e49..f5098c80fadb 100644
--- a/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
+++ b/sci-ml/caffe2/caffe2-2.7.0-r2.ebuild
@@ -12,7 +12,7 @@ MYP=${MYPN}-${PV}
 
 # caffe2-2.6.0 depends on future version of composable kernel
 # TODO: replace it with RDEPEND in the future
-CK_COMMIT=50ee4267e27b875d149e642f4cebd47be1dc3b57
+CK_COMMIT=8086bbe3a78d931eb96fe12fdc014082e18d18d3
 CK_P=composable_kernel-${CK_COMMIT:0:8}
 
 DESCRIPTION="A deep learning framework"
@@ -159,6 +159,9 @@ src_prepare() {
                cmake/Dependencies.cmake \
                || die
 
+       # Noisy warnings from Logging.h
+       sed -i 's/-Wextra-semi//' cmake/public/utils.cmake || die
+
        cmake_src_prepare
        pushd torch/csrc/jit/serialization || die
        flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
@@ -297,7 +300,7 @@ src_configure() {
                )
 
                # ROCm libraries produce too much warnings
-               append-cxxflags -Wno-deprecated-declarations -Wno-unused-result
+               append-cxxflags -Wno-deprecated-declarations -Wno-unused-result 
-Wno-unused-value
        fi
 
        if use onednn; then

Reply via email to