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 EE5E5158020 for ; Sat, 10 Dec 2022 21:36:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2459AE0839; Sat, 10 Dec 2022 21:36:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 0B0B2E0839 for ; Sat, 10 Dec 2022 21:36:45 +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 AB64E3410E3 for ; Sat, 10 Dec 2022 21:36:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1469D77B for ; Sat, 10 Dec 2022 21:36:42 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1670708017.d3d02c978022d196350ad85225be0346bfe0f2d8.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-libs/oneCCL/files/, dev-libs/oneCCL/ X-VCS-Repository: proj/sci X-VCS-Files: dev-libs/oneCCL/files/oneCCL-2021.7.1-use-system-libs.patch dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild X-VCS-Directories: dev-libs/oneCCL/ dev-libs/oneCCL/files/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: d3d02c978022d196350ad85225be0346bfe0f2d8 X-VCS-Branch: master Date: Sat, 10 Dec 2022 21:36:42 +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: fe8e3fa5-25ff-486b-84e0-28b70ac500f7 X-Archives-Hash: f25a6dfcc900e9be606ac3e80a01720f commit: d3d02c978022d196350ad85225be0346bfe0f2d8 Author: Andrew Ammerlaan gentoo org> AuthorDate: Sat Dec 10 21:33:37 2022 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Sat Dec 10 21:33:37 2022 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=d3d02c97 dev-libs/oneCCL: unbundle libitt.so Signed-off-by: Andrew Ammerlaan gentoo.org> dev-libs/oneCCL/files/oneCCL-2021.7.1-use-system-libs.patch | 10 ++++++---- dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dev-libs/oneCCL/files/oneCCL-2021.7.1-use-system-libs.patch b/dev-libs/oneCCL/files/oneCCL-2021.7.1-use-system-libs.patch index 0f9a785b4..e92608f4a 100644 --- a/dev-libs/oneCCL/files/oneCCL-2021.7.1-use-system-libs.patch +++ b/dev-libs/oneCCL/files/oneCCL-2021.7.1-use-system-libs.patch @@ -71,18 +71,20 @@ index 74c4fc0..92c4d16 100644 # copy kernels if (COMPUTE_BACKEND AND EXISTS "${PROJECT_SOURCE_DIR}/src/kernels") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 7b4cff9..7ef00f8 100644 +index 7b4cff9..e8296a0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -263,7 +263,7 @@ list(APPEND SRC_LINK_LIBS +@@ -263,8 +263,8 @@ list(APPEND SRC_LINK_LIBS pthread ${EXTERNAL_LIBS} fabric - ${HWLOC_LIB_DIR}/libhwloc.a -+ ${HWLOC_LIB_DIR}/libhwloc.so - ${ITT_LIB_DIR}/libittnotify.a) +- ${ITT_LIB_DIR}/libittnotify.a) ++ libhwloc.so ++ libittnotify.so) if (ENABLE_MPI) + set(SRC_C_FLAGS "${SRC_C_FLAGS} -DCCL_ENABLE_MPI") @@ -335,16 +335,3 @@ if ("${LIBFABRIC_DIR}" STREQUAL "") install(DIRECTORY ${DEPS_DIR}/ofi/lib/ DESTINATION ${CCL_INSTALL_LIB}) diff --git a/dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild b/dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild index e0369dc45..76ab29af2 100644 --- a/dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild +++ b/dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild @@ -21,6 +21,7 @@ DEPEND=" dev-libs/level-zero:= sys-apps/hwloc:= sys-block/libfabric:= + sys-devel/ittapi mpi? ( virtual/mpi ) " RDEPEND="${DEPEND}" @@ -34,7 +35,7 @@ src_prepare() { find . -name "CMakeLists.txt" -exec sed -i "s/-Werror//g" {} + || die # Use system libs instead - rm -r deps/hwloc deps/level_zero deps/mpi deps/ofi || die + rm -r deps/* || die # DPC++ compiler required for full functionality export CC="${ESYSROOT}/usr/lib/llvm/intel/bin/clang" @@ -55,7 +56,6 @@ src_configure() { -DENABLE_MPI="$(usex mpi)" # Use system fabric -DLIBFABRIC_DIR="${ESYSROOT}/usr" - # TODO: Unbundle ITT ) cmake_src_configure }