[gentoo-commits] repo/gentoo:master commit in: sci-libs/kineto/files/, sci-libs/kineto/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/kineto/files/, sci-libs/kineto/

[Alfredo Tupone]

commit:     5a07d6d7f362834066166d13163dc46721619a37
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 12 10:21:05 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Apr 12 10:21:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a07d6d7

sci-libs/kineto: include stdint

Closes: https://bugs.gentoo.org/904085
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 sci-libs/kineto/files/kineto-0.4.0-gcc13.patch       | 10 ++++++++++
 sci-libs/kineto/files/kineto-2021.11.17-gentoo.patch |  8 ++++----
 sci-libs/kineto/kineto-0.4.0.ebuild                  |  6 +++++-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/sci-libs/kineto/files/kineto-0.4.0-gcc13.patch b/sci-libs/kineto/files/kineto-0.4.0-gcc13.patch
new file mode 100644
index 000000000000..296104aef7fc
--- /dev/null
+++ b/sci-libs/kineto/files/kineto-0.4.0-gcc13.patch
@@ -0,0 +1,10 @@
+--- a/src/SampleListener.h	2023-04-12 12:07:58.869097270 +0200
++++ b/src/SampleListener.h	2023-04-12 12:09:42.930392363 +0200
+@@ -7,6 +7,7 @@
+ #include <iostream>
+ #include <string>
+ #include <vector>
++#include <cstdint>
+ 
+ namespace KINETO_NAMESPACE {
+ 

diff --git a/sci-libs/kineto/files/kineto-2021.11.17-gentoo.patch b/sci-libs/kineto/files/kineto-2021.11.17-gentoo.patch
index 0c4cb7261273..3e1a5cbc9b8d 100644
--- a/sci-libs/kineto/files/kineto-2021.11.17-gentoo.patch
+++ b/sci-libs/kineto/files/kineto-2021.11.17-gentoo.patch
@@ -1,5 +1,5 @@
---- a/libkineto/CMakeLists.txt	2022-05-24 11:16:18.537610972 +0200
-+++ b/libkineto/CMakeLists.txt	2022-05-24 11:19:15.011073535 +0200
+--- a/CMakeLists.txt	2022-05-24 11:16:18.537610972 +0200
++++ b/CMakeLists.txt	2022-05-24 11:19:15.011073535 +0200
 @@ -78,10 +78,10 @@
  set_target_properties(kineto_base kineto_api PROPERTIES
        CXX_STANDARD 14
@@ -57,8 +57,8 @@
  
  install(TARGETS kineto EXPORT kinetoLibraryConfig
    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
---- a/libkineto/libkineto_defs.bzl	2022-05-24 22:06:17.324000422 +0200
-+++ b/libkineto/libkineto_defs.bzl	2022-05-24 22:07:08.326419268 +0200
+--- a/libkineto_defs.bzl	2022-05-24 22:06:17.324000422 +0200
++++ b/libkineto_defs.bzl	2022-05-24 22:07:08.326419268 +0200
 @@ -46,6 +46,7 @@
          "src/init.cpp",
          "src/output_csv.cpp",

diff --git a/sci-libs/kineto/kineto-0.4.0.ebuild b/sci-libs/kineto/kineto-0.4.0.ebuild
index 60ac97c00887..2282c4406855 100644
--- a/sci-libs/kineto/kineto-0.4.0.ebuild
+++ b/sci-libs/kineto/kineto-0.4.0.ebuild
@@ -26,8 +26,12 @@ BDEPEND="
 "
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2021.11.17-gentoo.patch
+	"${FILESDIR}"/${P}-gcc13.patch
+)
+
 src_prepare() {
-	eapply "${FILESDIR}"/${PN}-2021.11.17-gentoo.patch
 	cd libkineto
 	cmake_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/kineto/files/, sci-libs/kineto/

[Alfredo Tupone]

commit:     8d38aaad1a7e20f4877768e6a665a7b9bc29ed05
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Mon Aug 12 00:10:10 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 19:42:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d38aaad

sci-libs/kineto: backport libfmt-11 build fix

Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 .../files/kineto-0.4.0_p20240525-libfmt-11.patch   | 91 ++++++++++++++++++++++
 sci-libs/kineto/kineto-0.4.0_p20240525.ebuild      |  1 +
 2 files changed, 92 insertions(+)

diff --git a/sci-libs/kineto/files/kineto-0.4.0_p20240525-libfmt-11.patch b/sci-libs/kineto/files/kineto-0.4.0_p20240525-libfmt-11.patch
new file mode 100644
index 000000000000..d9ad7a3dbae9
--- /dev/null
+++ b/sci-libs/kineto/files/kineto-0.4.0_p20240525-libfmt-11.patch
@@ -0,0 +1,91 @@
+https://github.com/pytorch/kineto/commit/eb34f147f2af821da931c18457c26b076c8491dd
+https://github.com/pytorch/kineto/pull/959
+https://github.com/pytorch/kineto/issues/958
+
+From eb34f147f2af821da931c18457c26b076c8491dd Mon Sep 17 00:00:00 2001
+From: Aaron Gokaslan <aaronGokaslan@gmail.com>
+Date: Fri, 12 Jul 2024 09:23:33 -0700
+Subject: [PATCH] Update libfmt to 11-0-0. Closes #958. (#959)
+
+Summary:
+Fixes https://github.com/pytorch/kineto/issues/958
+
+Pull Request resolved: https://github.com/pytorch/kineto/pull/959
+
+Reviewed By: davidberard98, yoyoyocmu
+
+Differential Revision: D59637583
+
+Pulled By: aaronenyeshi
+
+fbshipit-source-id: 48def339ed3097ecb4746d7870203040ac535858
+--- a/src/Config.cpp
++++ b/src/Config.cpp
+@@ -12,6 +12,7 @@
+ 
+ #include <fmt/chrono.h>
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+ #include <chrono>
+ #include <fstream>
+ #include <functional>
+--- a/src/CuptiRangeProfilerConfig.cpp
++++ b/src/CuptiRangeProfilerConfig.cpp
+@@ -12,6 +12,7 @@
+ #include <stdlib.h>
+ 
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+ #include <ostream>
+ 
+ 
+--- a/src/DeviceProperties.cpp
++++ b/src/DeviceProperties.cpp
+@@ -9,6 +9,7 @@
+ #include "DeviceProperties.h"
+ 
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+ #include <vector>
+ 
+ #if defined(HAS_CUPTI)
+--- a/src/EventProfiler.cpp
++++ b/src/EventProfiler.cpp
+@@ -10,6 +10,7 @@
+ 
+ #include <assert.h>
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+ #include <time.h>
+ #include <algorithm>
+ #include <cmath>
+--- a/test/CuptiActivityProfilerTest.cpp
++++ b/test/CuptiActivityProfilerTest.cpp
+@@ -7,6 +7,7 @@
+  */
+ 
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+ #include <folly/json/json.h>
+ #include <gmock/gmock.h>
+ #include <gtest/gtest.h>
+--- a/test/CuptiRangeProfilerConfigTest.cpp
++++ b/test/CuptiRangeProfilerConfigTest.cpp
+@@ -10,6 +10,7 @@
+ #include "src/CuptiRangeProfilerConfig.h"
+ 
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+ #include <gtest/gtest.h>
+ #include <time.h>
+ #include <chrono>
+--- a/test/CuptiRangeProfilerTest.cpp
++++ b/test/CuptiRangeProfilerTest.cpp
+@@ -16,6 +16,9 @@
+ #include <fcntl.h>
+ #endif
+ 
++#include <fmt/format.h>
++#include <fmt/ranges.h>
++
+ #include "include/libkineto.h"

diff --git a/sci-libs/kineto/kineto-0.4.0_p20240525.ebuild b/sci-libs/kineto/kineto-0.4.0_p20240525.ebuild
index ecabcbb39cff..bf65eb454709 100644
--- a/sci-libs/kineto/kineto-0.4.0_p20240525.ebuild
+++ b/sci-libs/kineto/kineto-0.4.0_p20240525.ebuild
@@ -32,6 +32,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.4.0-gcc13.patch
+	"${FILESDIR}"/kineto-0.4.0_p20240525-libfmt-11.patch
 )
 
 src_prepare() {