* [gentoo-commits] repo/gentoo:master commit in: sci-libs/kineto/, sci-libs/kineto/files/
@ 2022-05-26 5:38 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2022-05-26 5:38 UTC (permalink / raw
To: gentoo-commits
commit: f383941f269d7e5f800ddddd4fde16a3ac00ea50
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 05:38:17 2022 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu May 26 05:38:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f383941f
sci-libs/kineto: add to tree
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-libs/kineto/Manifest | 1 +
.../kineto/files/kineto-2021.11.17-gentoo.patch | 77 ++++++++++++++++++++++
sci-libs/kineto/kineto-2021.11.17.ebuild | 42 ++++++++++++
sci-libs/kineto/metadata.xml | 11 ++++
4 files changed, 131 insertions(+)
diff --git a/sci-libs/kineto/Manifest b/sci-libs/kineto/Manifest
new file mode 100644
index 000000000000..f95e98c70918
--- /dev/null
+++ b/sci-libs/kineto/Manifest
@@ -0,0 +1 @@
+DIST kineto-2021.11.17.tar.gz 7497956 BLAKE2B b15573ab63ed0f2e09658a2d7fdd0746a659eb61ca48e996ef471f56af0be3a2778be8c1e93af69efe9d35e52090711ea7cce433988fa3ef1b7c9be8087bfda6 SHA512 bf237e66e44da9fbdf90e7bbf347ae68453cebb3c34c753472eeeeca27d22c0fa1e672dc148ec6394108146d10d1ee77d420cdc2397902fe457aa085643b9714
diff --git a/sci-libs/kineto/files/kineto-2021.11.17-gentoo.patch b/sci-libs/kineto/files/kineto-2021.11.17-gentoo.patch
new file mode 100644
index 000000000000..0c4cb7261273
--- /dev/null
+++ b/sci-libs/kineto/files/kineto-2021.11.17-gentoo.patch
@@ -0,0 +1,77 @@
+--- a/libkineto/CMakeLists.txt 2022-05-24 11:16:18.537610972 +0200
++++ b/libkineto/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
+ CXX_STANDARD_REQUIRED YES
+- CXX_EXTENSIONS NO
+- CXX_VISIBILITY_PRESET hidden)
++ CXX_EXTENSIONS NO)
+
+-set(KINETO_COMPILE_OPTIONS "-DKINETO_NAMESPACE=libkineto")
++set(KINETO_COMPILE_OPTIONS "-DKINETO_NAMESPACE=libkineto"
++ ${CMAKE_SHARED_LIBRARY_C_FLAGS})
+ list(APPEND KINETO_COMPILE_OPTIONS "-DFMT_HEADER_ONLY")
+ if(NOT MSVC)
+ list(APPEND KINETO_COMPILE_OPTIONS "-std=c++14")
+@@ -100,7 +102,7 @@
+ target_compile_options(kineto_base PRIVATE "${KINETO_COMPILE_OPTIONS}")
+ target_compile_options(kineto_api PRIVATE "${KINETO_COMPILE_OPTIONS}")
+
+-if(NOT TARGET fmt)
++if(FALSE)
+ if(NOT FMT_SOURCE_DIR)
+ set(FMT_SOURCE_DIR "${LIBKINETO_THIRDPARTY_DIR}/fmt"
+ CACHE STRING "fmt source directory from submodules")
+@@ -118,9 +120,7 @@
+ set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE)
+ endif()
+
+-set(FMT_INCLUDE_DIR "${FMT_SOURCE_DIR}/include")
+ message(STATUS "Kineto: FMT_SOURCE_DIR = ${FMT_SOURCE_DIR}")
+-message(STATUS "Kineto: FMT_INCLUDE_DIR = ${FMT_INCLUDE_DIR}")
+ if (NOT CUPTI_INCLUDE_DIR)
+ set(CUPTI_INCLUDE_DIR "${CUDA_SOURCE_DIR}/extras/CUPTI/include")
+ endif()
+@@ -140,14 +140,12 @@
+ target_include_directories(kineto_base PUBLIC
+ $<BUILD_INTERFACE:${LIBKINETO_INCLUDE_DIR}>
+ $<BUILD_INTERFACE:${LIBKINETO_SOURCE_DIR}>
+- $<BUILD_INTERFACE:${FMT_INCLUDE_DIR}>
+ $<BUILD_INTERFACE:${CUPTI_INCLUDE_DIR}>
+ $<BUILD_INTERFACE:${CUDA_INCLUDE_DIRS}>
+ $<BUILD_INTERFACE:${ROCTRACER_INCLUDE_DIR}>
+ $<BUILD_INTERFACE:${ROCM_INCLUDE_DIRS}>)
+
+ target_include_directories(kineto_api PUBLIC
+- $<BUILD_INTERFACE:${FMT_INCLUDE_DIR}>
+ $<BUILD_INTERFACE:${LIBKINETO_INCLUDE_DIR}>)
+
+ if(KINETO_LIBRARY_TYPE STREQUAL "default")
+@@ -178,8 +180,6 @@
+ if(NOT LIBKINETO_NOCUPTI)
+ target_link_libraries(kineto "${CUDA_cupti_LIBRARY}")
+ endif()
+-target_link_libraries(kineto $<BUILD_INTERFACE:fmt::fmt-header-only>)
+-add_dependencies(kineto fmt::fmt-header-only)
+
+ 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
+@@ -46,6 +46,7 @@
+ "src/init.cpp",
+ "src/output_csv.cpp",
+ "src/output_json.cpp",
++ "src/ILoggerObserver.cpp",
+ ] + (get_libkineto_api_srcs() if with_api else [])
+
+ def get_libkineto_public_headers():
+@@ -51,6 +56,7 @@
+ return [
+ "include/AbstractConfig.h",
+ "include/ActivityProfilerInterface.h",
++ "include/ActivityTraceInterface.h",
+ "include/ActivityType.h",
+ "include/Config.h",
+ "include/ClientInterface.h",
diff --git a/sci-libs/kineto/kineto-2021.11.17.ebuild b/sci-libs/kineto/kineto-2021.11.17.ebuild
new file mode 100644
index 000000000000..4a2841c7a5a9
--- /dev/null
+++ b/sci-libs/kineto/kineto-2021.11.17.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit python-any-r1 cmake
+
+CommitId=659a7f99ee737103273ef60551bfe1611c2d2cba
+
+DESCRIPTION="part of the PyTorch Profiler"
+HOMEPAGE="https://github.com/pytorch/kineto"
+SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ dev-libs/libfmt
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ test? ( dev-cpp/gtest )
+ ${PYTHON_DEPS}
+"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+src_prepare() {
+ eapply "${FILESDIR}"/${P}-gentoo.patch
+ cd libkineto
+ cmake_src_prepare
+}
+
+src_configure() {
+ cd libkineto
+ cmake_src_configure
+}
diff --git a/sci-libs/kineto/metadata.xml b/sci-libs/kineto/metadata.xml
new file mode 100644
index 000000000000..9d79d73e5c54
--- /dev/null
+++ b/sci-libs/kineto/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>tupone@gentoo.org</email>
+ <name>Tupone Alfredo</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">pytorch/kineto</remote-id>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/kineto/, sci-libs/kineto/files/
@ 2023-12-06 10:56 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2023-12-06 10:56 UTC (permalink / raw
To: gentoo-commits
commit: 40643eb7297ef27545907e2455e6b05a72996a94
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 6 10:55:33 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Dec 6 10:55:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40643eb7
sci-libs/kineto: add 0.4.0_p20231031
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-libs/kineto/Manifest | 1 +
.../files/kineto-0.4.0_p20231031-gentoo.patch | 74 ++++++++++++++++++++++
sci-libs/kineto/kineto-0.4.0_p20231031.ebuild | 51 +++++++++++++++
3 files changed, 126 insertions(+)
diff --git a/sci-libs/kineto/Manifest b/sci-libs/kineto/Manifest
index c2d3d9cba92f..3c8e81362366 100644
--- a/sci-libs/kineto/Manifest
+++ b/sci-libs/kineto/Manifest
@@ -1 +1,2 @@
DIST kineto-0.4.0.tar.gz 8190627 BLAKE2B 015017096b6a01b2f2172580884aef6c57df0d33c3d8904c959acc7f7dcc36386f72acb9a672571fa25b7f74c1d2d763692b8cc5a634a73ac143819f811737df SHA512 4a3cbf2f29aa174b9a67f55d0f4e7b8d952ed5dba612f33d144a4d019055031e2a6ff8c98ef1971bf2508460cb871dace38bfc669c10c076cc42d685a1842d86
+DIST kineto-0.4.0_p20231031.tar.gz 8234532 BLAKE2B 11ff60f865a09f651facdb9752d9cb401f89d36d72f977b79fd35a128fe6666c6cba6aaaf8119a939d1e26b30dff55d8d30f484c7d9fb4ab626327f2bd574bf4 SHA512 48421d9a6f4487112f37222350b33a171fc0e2119fa4636380e6ecb6574300576325d5c21affc8ab3b9769264ab549918fa2c4e5fee2c2e24c09c1f3f87f3444
diff --git a/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch b/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch
new file mode 100644
index 000000000000..29804d93161c
--- /dev/null
+++ b/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch
@@ -0,0 +1,74 @@
+--- a/CMakeLists.txt 2022-05-24 11:16:18.537610972 +0200
++++ b/CMakeLists.txt 2022-05-24 11:19:15.011073535 +0200
+@@ -86,7 +86,8 @@
+ CXX_STANDARD_REQUIRED YES
+ CXX_EXTENSIONS NO)
+
+-set(KINETO_COMPILE_OPTIONS "-DKINETO_NAMESPACE=libkineto")
++set(KINETO_COMPILE_OPTIONS "-DKINETO_NAMESPACE=libkineto"
++ ${CMAKE_SHARED_LIBRARY_C_FLAGS})
+ list(APPEND KINETO_COMPILE_OPTIONS "-DFMT_HEADER_ONLY")
+ list(APPEND KINETO_COMPILE_OPTIONS "-DENABLE_IPC_FABRIC")
+ if(NOT MSVC)
+@@ -111,7 +113,7 @@
+ target_compile_options(kineto_base PRIVATE "${KINETO_COMPILE_OPTIONS}")
+ target_compile_options(kineto_api PRIVATE "${KINETO_COMPILE_OPTIONS}")
+
+-if(NOT TARGET fmt)
++if(FALSE)
+ if(NOT FMT_SOURCE_DIR)
+ set(FMT_SOURCE_DIR "${LIBKINETO_THIRDPARTY_DIR}/fmt"
+ CACHE STRING "fmt source directory from submodules")
+@@ -129,9 +131,7 @@
+ set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE)
+ endif()
+
+-set(FMT_INCLUDE_DIR "${FMT_SOURCE_DIR}/include")
+ message(STATUS "Kineto: FMT_SOURCE_DIR = ${FMT_SOURCE_DIR}")
+-message(STATUS "Kineto: FMT_INCLUDE_DIR = ${FMT_INCLUDE_DIR}")
+ if (NOT CUPTI_INCLUDE_DIR)
+ set(CUPTI_INCLUDE_DIR "${CUDA_SOURCE_DIR}/extras/CUPTI/include")
+ endif()
+@@ -144,15 +144,14 @@
+ set(ROCM_INCLUDE_DIRS "${ROCM_SOURCE_DIR}/include")
+ endif()
+
+-set(DYNOLOG_INCLUDE_DIR "${LIBKINETO_THIRDPARTY_DIR}/dynolog/")
+-set(IPCFABRIC_INCLUDE_DIR "${DYNOLOG_INCLUDE_DIR}/dynolog/src/ipcfabric/")
++set(DYNOLOG_INCLUDE_DIR "/usr/include/dynolog/")
++set(IPCFABRIC_INCLUDE_DIR "/usr/include/dynolog/src/ipcfabric/")
+
+ message(INFO " CUPTI_INCLUDE_DIR = ${CUPTI_INCLUDE_DIR}")
+ message(INFO " ROCTRACER_INCLUDE_DIR = ${ROCTRACER_INCLUDE_DIR}")
+ message(INFO " DYNOLOG_INCLUDE_DIR = ${DYNOLOG_INCLUDE_DIR}")
+ message(INFO " IPCFABRIC_INCLUDE_DIR = ${IPCFABRIC_INCLUDE_DIR}")
+
+-add_subdirectory("${IPCFABRIC_INCLUDE_DIR}")
+ target_link_libraries(kineto_base PRIVATE dynolog_ipcfabric_lib)
+
+ target_include_directories(kineto_base PUBLIC
+@@ -160,7 +159,6 @@
+ $<BUILD_INTERFACE:${LIBKINETO_INCLUDE_DIR}>
+ $<BUILD_INTERFACE:${LIBKINETO_SOURCE_DIR}>
+ $<BUILD_INTERFACE:${DYNOLOG_INCLUDE_DIR}>
+- $<BUILD_INTERFACE:${FMT_INCLUDE_DIR}>
+ $<BUILD_INTERFACE:${IPCFABRIC_INCLUDE_DIR}>
+ $<BUILD_INTERFACE:${CUPTI_INCLUDE_DIR}>
+ $<BUILD_INTERFACE:${CUDA_INCLUDE_DIRS}>
+@@ -168,7 +166,6 @@
+ $<BUILD_INTERFACE:${ROCM_INCLUDE_DIRS}>)
+
+ target_include_directories(kineto_api PUBLIC
+- $<BUILD_INTERFACE:${FMT_INCLUDE_DIR}>
+ $<BUILD_INTERFACE:${LIBKINETO_INCLUDE_DIR}>)
+
+ if(KINETO_LIBRARY_TYPE STREQUAL "default")
+@@ -202,8 +199,6 @@
+ if(CUDA_nvperf_host_LIBRARY)
+ target_link_libraries(kineto "${CUDA_nvperf_host_LIBRARY}")
+ endif()
+-target_link_libraries(kineto $<BUILD_INTERFACE:fmt::fmt-header-only>)
+-add_dependencies(kineto fmt::fmt-header-only)
+
+ install(TARGETS kineto EXPORT kinetoLibraryConfig
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
diff --git a/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild b/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild
new file mode 100644
index 000000000000..fb7e15a451db
--- /dev/null
+++ b/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit python-any-r1 cmake
+
+CommitId=a30ca3f9509c2cfd28561abbca51328f0bdf9014
+
+DESCRIPTION="part of the PyTorch Profiler"
+HOMEPAGE="https://github.com/pytorch/kineto"
+SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ dev-libs/libfmt
+ dev-libs/dynolog
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ test? ( dev-cpp/gtest )
+ ${PYTHON_DEPS}
+"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${PN}-0.4.0-gcc13.patch
+)
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+src_prepare() {
+ cd libkineto
+ cmake_src_prepare
+}
+
+src_configure() {
+ cd libkineto
+ local mycmakeargs=(
+ -DLIBKINETO_THIRDPARTY_DIR=/usr/include/
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/kineto/, sci-libs/kineto/files/
@ 2023-12-11 7:43 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2023-12-11 7:43 UTC (permalink / raw
To: gentoo-commits
commit: 837259803593f16223ba81a222b8b7d160362367
Author: Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Mon Dec 11 07:03:29 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 07:42:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83725980
sci-libs/kineto: prefixify absolute paths
Closes: https://bugs.gentoo.org/919678
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34230
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch | 4 ++--
sci-libs/kineto/kineto-0.4.0_p20231031.ebuild | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch b/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch
index 29804d93161c..d0f8790ae5a5 100644
--- a/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch
+++ b/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch
@@ -35,8 +35,8 @@
-set(DYNOLOG_INCLUDE_DIR "${LIBKINETO_THIRDPARTY_DIR}/dynolog/")
-set(IPCFABRIC_INCLUDE_DIR "${DYNOLOG_INCLUDE_DIR}/dynolog/src/ipcfabric/")
-+set(DYNOLOG_INCLUDE_DIR "/usr/include/dynolog/")
-+set(IPCFABRIC_INCLUDE_DIR "/usr/include/dynolog/src/ipcfabric/")
++set(DYNOLOG_INCLUDE_DIR "@GENTOO_PORTAGE_EPREFIX@/usr/include/dynolog/")
++set(IPCFABRIC_INCLUDE_DIR "@GENTOO_PORTAGE_EPREFIX@/usr/include/dynolog/src/ipcfabric/")
message(INFO " CUPTI_INCLUDE_DIR = ${CUPTI_INCLUDE_DIR}")
message(INFO " ROCTRACER_INCLUDE_DIR = ${ROCTRACER_INCLUDE_DIR}")
diff --git a/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild b/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild
index fb7e15a451db..aa8b2eea8a00 100644
--- a/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild
+++ b/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
-inherit python-any-r1 cmake
+inherit python-any-r1 cmake prefix
CommitId=a30ca3f9509c2cfd28561abbca51328f0bdf9014
@@ -30,7 +30,6 @@ BDEPEND="
RESTRICT="!test? ( test )"
PATCHES=(
- "${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${PN}-0.4.0-gcc13.patch
)
@@ -44,8 +43,9 @@ src_prepare() {
src_configure() {
cd libkineto
local mycmakeargs=(
- -DLIBKINETO_THIRDPARTY_DIR=/usr/include/
+ -DLIBKINETO_THIRDPARTY_DIR="${EPREFIX}"/usr/include/
)
+ eapply $(prefixify_ro "${FILESDIR}"/${P}-gentoo.patch)
cmake_src_configure
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-12-11 7:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-06 10:56 [gentoo-commits] repo/gentoo:master commit in: sci-libs/kineto/, sci-libs/kineto/files/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2023-12-11 7:43 Alfredo Tupone
2022-05-26 5:38 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox