[gentoo-commits] proj/sci:master commit in: dev-libs/oneCCL/

[gentoo-commits] proj/sci:master commit in: dev-libs/oneCCL/

[Andrew Ammerlaan]

commit:     d4951c0280c685dcf18e404f82b20c07ff2e4010
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  6 19:52:34 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Dec  6 19:54:04 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d4951c02

dev-libs/oneCCL: use DPC++ compiler

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-libs/oneCCL/metadata.xml                                 |  6 +++---
 .../{oneCCL-2021.7.1.ebuild => oneCCL-2021.7.1-r1.ebuild}    | 12 +++++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dev-libs/oneCCL/metadata.xml b/dev-libs/oneCCL/metadata.xml
index ad55412d9..cbb320b12 100644
--- a/dev-libs/oneCCL/metadata.xml
+++ b/dev-libs/oneCCL/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>andrewammerlaan@gentoo.org</email>
-		<name>Andrew Ammerlaan</name>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">oneapi-src/oneCCL</remote-id>

diff --git a/dev-libs/oneCCL/oneCCL-2021.7.1.ebuild b/dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild
similarity index 82%
rename from dev-libs/oneCCL/oneCCL-2021.7.1.ebuild
rename to dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild
index ae069bb2a..b9c1fda6b 100644
--- a/dev-libs/oneCCL/oneCCL-2021.7.1.ebuild
+++ b/dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild
@@ -15,10 +15,12 @@ KEYWORDS="~amd64"
 
 IUSE="mpi"
 
+BDEPEND="sys-devel/DPC++"
+
 DEPEND="
-	dev-libs/level-zero
-	sys-apps/hwloc
-	sys-block/libfabric
+	dev-libs/level-zero:=
+	sys-apps/hwloc:=
+	sys-block/libfabric:=
 	mpi? ( virtual/mpi )
 "
 RDEPEND="${DEPEND}"
@@ -34,6 +36,9 @@ src_prepare() {
 	# Use system libs instead
 	rm -r deps/hwloc deps/level_zero deps/mpi deps/ofi || die
 
+	# DPC++ compiler required for full functionality
+	export CXX="${ESYSROOT}/usr/lib/llvm/intel/bin/clang"
+
 	cmake_src_prepare
 }
 
@@ -49,6 +54,7 @@ src_configure() {
 		-DENABLE_MPI="$(usex mpi)"
 		# Use system fabric
 		-DLIBFABRIC_DIR="${ESYSROOT}/usr"
+		# TODO: Unbundle ITT
 	)
 	cmake_src_configure
 }

[gentoo-commits] proj/sci:master commit in: dev-libs/oneCCL/

[Andrew Ammerlaan]

commit:     a4dd10d9fedbd529c19d0138fe3d343973681f5c
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  8 16:55:18 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Dec  8 16:55:18 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=a4dd10d9

dev-libs/oneCCL: also set CC

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild b/dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild
index b9c1fda6b..e0369dc45 100644
--- a/dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild
+++ b/dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild
@@ -37,7 +37,8 @@ src_prepare() {
 	rm -r deps/hwloc deps/level_zero deps/mpi deps/ofi || die
 
 	# DPC++ compiler required for full functionality
-	export CXX="${ESYSROOT}/usr/lib/llvm/intel/bin/clang"
+	export CC="${ESYSROOT}/usr/lib/llvm/intel/bin/clang"
+	export CXX="${ESYSROOT}/usr/lib/llvm/intel/bin/clang++"
 
 	cmake_src_prepare
 }

[gentoo-commits] proj/sci:master commit in: dev-libs/oneCCL/

[Andrew Ammerlaan]

commit:     db7de79cb97a1e5a3d454c60d1a993217a173555
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 22 09:05:35 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 09:05:35 2023 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=db7de79c

dev-libs/oneCCL: add 2021.10

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-libs/oneCCL/oneCCL-2021.10.ebuild | 62 +++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/dev-libs/oneCCL/oneCCL-2021.10.ebuild b/dev-libs/oneCCL/oneCCL-2021.10.ebuild
new file mode 100644
index 000000000..a67659f4a
--- /dev/null
+++ b/dev-libs/oneCCL/oneCCL-2021.10.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="oneAPI Collective Communications Library"
+HOMEPAGE="https://github.com/oneapi-src/oneCCL"
+SRC_URI="https://github.com/oneapi-src/oneCCL/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="mpi"
+
+BDEPEND="sys-devel/DPC++"
+
+DEPEND="
+	dev-libs/level-zero:=
+	sys-apps/hwloc:=
+	sys-block/libfabric:=
+	sys-devel/ittapi
+	sys-cluster/pmix
+	mpi? ( virtual/mpi )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.8-use-system-libs.patch"
+)
+
+src_prepare() {
+	# No -Werror
+	find . -name "CMakeLists.txt" -exec sed -i "s/-Werror//g" {} + || die
+
+	# Use system libs instead
+	rm -r deps/* || die
+
+	# DPC++ compiler required for full functionality
+	export CC="${ESYSROOT}/usr/lib/llvm/intel/bin/clang"
+	export CXX="${ESYSROOT}/usr/lib/llvm/intel/bin/clang++"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=OFF
+		# BUILD_CONFIG causes sandbox violation
+		-DBUILD_CONFIG=OFF
+		-DCCL_ENABLE_ZE=ON
+		# TODO: Find out how to execute the tests
+		-DBUILD_FT=OFF
+		-DENABLE_MPI_TESTS=OFF
+		-DENABLE_MPI="$(usex mpi)"
+		# Use system fabric
+		-DLIBFABRIC_DIR="${ESYSROOT}/usr"
+	)
+	cmake_src_configure
+}