From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 403851581FB for ; Sun, 25 Aug 2024 16:10:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8DD4BE2A41; Sun, 25 Aug 2024 16:10:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 792B4E2A41 for ; Sun, 25 Aug 2024 16:10:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AE563343007 for ; Sun, 25 Aug 2024 16:10:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0DF321F1A for ; Sun, 25 Aug 2024 16:10:24 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1724602103.3eb644344c81572ed7a50f6e7a9c10db689dcd2c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/, sci-libs/caffe2/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/caffe2/caffe2-2.4.0.ebuild sci-libs/caffe2/files/caffe2-2.4.0-libfmt-11.patch X-VCS-Directories: sci-libs/caffe2/files/ sci-libs/caffe2/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3eb644344c81572ed7a50f6e7a9c10db689dcd2c X-VCS-Branch: master Date: Sun, 25 Aug 2024 16:10:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 678a0e68-0495-44c5-af0b-f6cd66387a4a X-Archives-Hash: d420096472bee9d9ed0e6d5c6bf64f6f commit: 3eb644344c81572ed7a50f6e7a9c10db689dcd2c Author: Alfred Wingate protonmail com> AuthorDate: Mon Aug 19 18:28:49 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Aug 25 16:08:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eb64434 sci-libs/caffe2: fix build against libfmt-11 Signed-off-by: Alfred Wingate protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/38210 Signed-off-by: Sam James gentoo.org> sci-libs/caffe2/caffe2-2.4.0.ebuild | 1 + sci-libs/caffe2/files/caffe2-2.4.0-libfmt-11.patch | 44 ++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/sci-libs/caffe2/caffe2-2.4.0.ebuild b/sci-libs/caffe2/caffe2-2.4.0.ebuild index 524dafcaacef..81a8906ea669 100644 --- a/sci-libs/caffe2/caffe2-2.4.0.ebuild +++ b/sci-libs/caffe2/caffe2-2.4.0.ebuild @@ -121,6 +121,7 @@ PATCHES=( ../patches/${PN}-2.4.0-exclude-aotriton.patch ../patches/${PN}-2.3.0-fix-rocm-gcc14-clamp.patch ../patches/${PN}-2.3.0-fix-libcpp.patch + "${FILESDIR}"/${PN}-2.4.0-libfmt-11.patch ) src_prepare() { diff --git a/sci-libs/caffe2/files/caffe2-2.4.0-libfmt-11.patch b/sci-libs/caffe2/files/caffe2-2.4.0-libfmt-11.patch new file mode 100644 index 000000000000..9f6740a07f1f --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.4.0-libfmt-11.patch @@ -0,0 +1,44 @@ +Fix build against libfmt-11 + +https://github.com/pytorch/pytorch/commit/83eedf66b9e7f52323d9f45c5dfaa64472452595 +https://github.com/pytorch/pytorch/pull/130628 + +From 83eedf66b9e7f52323d9f45c5dfaa64472452595 Mon Sep 17 00:00:00 2001 +From: Aaron Gokaslan +Date: Tue, 16 Jul 2024 06:12:08 +0000 +Subject: [PATCH] Update libfmt submodule to 11.0.1 (#130628) + +Update libfmt to 11.0.1 reopen of https://github.com/pytorch/pytorch/pull/129962. Requires a kineto update and moves fmt::join into a separate include so added it where necessary. + +Pull Request resolved: https://github.com/pytorch/pytorch/pull/130628 +Approved by: https://github.com/aaronenyeshi +--- a/torch/csrc/distributed/c10d/socket.cpp ++++ b/torch/csrc/distributed/c10d/socket.cpp +@@ -32,6 +32,7 @@ C10_DIAGNOSTIC_PUSH_AND_IGNORED_IF_DEFINED("-Wdeprecated") + #include + C10_DIAGNOSTIC_POP() + #include ++#include + + #include + #include +--- a/torch/csrc/profiler/standalone/execution_trace_observer.cpp ++++ b/torch/csrc/profiler/standalone/execution_trace_observer.cpp +@@ -10,6 +10,7 @@ + #endif // _WIN32 + + #include ++#include + #include + #include + #include +--- a/torch/csrc/profiler/util.cpp ++++ b/torch/csrc/profiler/util.cpp +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + + #ifdef USE_KINETO + #include