diff options
| author |   Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2022-12-10 22:33:37 +0100 |
|---|---|---|
| committer | Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2022-12-10 22:33:37 +0100 |
| commit | d3d02c978022d196350ad85225be0346bfe0f2d8 (patch) | |
| tree | ac1a053dcf379a1ad29302695b1edede1941269d /dev-libs | |
| parent | sys-devel/ittapi: new package, add 3.23.0 (diff) | |
| download | sci-d3d02c978022d196350ad85225be0346bfe0f2d8.tar.gz sci-d3d02c978022d196350ad85225be0346bfe0f2d8.tar.bz2 sci-d3d02c978022d196350ad85225be0346bfe0f2d8.zip | |
dev-libs/oneCCL: unbundle libitt.so
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/oneCCL/files/oneCCL-2021.7.1-use-system-libs.patch | 10 | ||||
| -rw-r--r-- | 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 } |