gentoo auto-resync : 08:05:2023 - 23:39:55

6 files changed, 37 insertions, 68 deletions

diff --git a/sci-libs/gloo/Manifest b/sci-libs/gloo/Manifest
index cf989675b58a..455dc81171a2 100644
--- a/sci-libs/gloo/Manifest
+++ b/sci-libs/gloo/Manifest
@@ -1,6 +1,5 @@
-AUX gloo-2022.05.18-gentoo.patch 3385 BLAKE2B 4dfe8691ac3e381ef93254716eefc769698e6e6e788091d4e48d79369ef195d7617181d4a7098f8a5b096d20d52a9e9b403b968aacd0c76916f203929e253e74 SHA512 72312c20ed9a28f16ccad56bec4ee3f1eb9a6c50d1cb89ebe3262d30b08b269ec937fdeba415a7e2b574333af5a6352c07b1f6a2f97092db749d4ecc517ad9b2
-DIST gloo-2022.05.18.tar.gz 251778 BLAKE2B 90bd97cff437d030b87c333ebb6679f199491b97826f09278b7a6740d781ca750af4e8eda18f29a4311462473146aae1fd0686443a0eb2c73e8ba34e6837b0af SHA512 356b4bd4480fda0f9db039babd223c17ed24c35945877bdb6c5b28eb45ee8ce08def73d308bc906c478c4c9d485bb0f74080d90c7a4fafe84818df0a97a7f6e2
+AUX gloo-2022.05.18-gentoo.patch 3073 BLAKE2B 0d6b4b4f87d8b8507b8ed06b3ea1548f750eac0bbebb1618950ea2fc4c0eff98b46d5561d2eb8b1011e6ea87a1d51d2791c712fc46192f8957652a2017876dc9 SHA512 5b3ee22b5e4d08002798cdd940b962f179b24cce02fc5b1d3e1d42d8fb747381b5932467c0dbda12a2e37eeb85154198d53ec734256a820111e7e929762a841e
+AUX gloo-2023.01.17-cuda.patch 460 BLAKE2B 646004184eed2acbfb0cb54bdfadaa6cb4b3ac51b4323a6e16e825a3eabf0274061dcd8c1cfc996c72d75645176f3f798667caae33006d387bbd6ac1d00d4aa1 SHA512 649969154c42ef381c8220ea891ff3175292b2941efef0ce166bef137b1fb08d2f262de0961e3ce11661307a56c2338e7a7f81944e71b93aa5210bc2a7603caf
 DIST gloo-2023.01.17.tar.gz 252199 BLAKE2B 66b5fc6786a4c07aa639a30036a21d86f43c1577a950934f558051f241d198dd3e0d7bd9da39835c5e3d617a754164cb77ae30b9bc284b0119436bf0a26f5000 SHA512 d39102ed00c813576066b755730e367337f2558a4223fe8dd127bd48882db6a97c67522782f7e7b00c36198ccd2096e61e84382358783d2edb1ca4ee55123344
-EBUILD gloo-2022.05.18-r1.ebuild 1055 BLAKE2B 9ec7ad808fd63c1b7208e6f89e83451e4183db9c046d3af75a8a94af3ba2ad87dfe3c084bb06529bdbd1380ab9637626726f5d44df158dca65813b6e9b67cbac SHA512 1b30e9cccaeec21068cfcbefd212d8c40ac79fe91fd20b716b12d361d5a18b9313d57e92f52180cc701126792f2be3b915d8badb0774a4957744fb81533eab76
-EBUILD gloo-2023.01.17.ebuild 1067 BLAKE2B cf0d64702562ee56162eb89bd79428a2a450355eefca46141d137729c6318114b940750048b1e216d17afd4ac6a692b21dbf41624e82dc174349175982ff0024 SHA512 8ceef1bc5fa5fa498c57042d0e5d056f2eabe60756e5c2c76f09607f586330975597328ebea94be621153593ee0d1affca5642bb80d1410cb979e6871f28a039
-MISC metadata.xml 492 BLAKE2B be64dabc0bd193d99c4458e6bad8c78042ef1d65800ebd3a3818ffdac3b361f18011ae044036e3c73deba03886e8aa6ffdcb5c2a66b635ecc2f29d636c660227 SHA512 e342a7d570f7ff12718f51e91fd6d359d038670dfb3b679a4cd8d7de61bef8d4b048e2362303bb925eddfd7c40e67f4179e89c24dc2f9b5c21e5a220bf9d4aa2
+EBUILD gloo-2023.01.17-r1.ebuild 1411 BLAKE2B 4dd98ef23aeda97fdcb5b5995fcd2cc824c96b7b23b8f624f5b405a6cd66b748844de68b3b4ded7aef7a8c97d6196a9ffd53018ec7fa32098847088ddb822fed SHA512 6aa52eeb82b0c965d8da0f6a4c884e50a6d711457becdc257b66bbed93520fed576fb8b7ff8e3c8550b0ba9f43e74f78318579050d60c909bed20e7c33090c1a
+MISC metadata.xml 539 BLAKE2B a003088828ee5ddab36b1b1796342e5ae93d1accae3c478c6030ae35b44dd64d33f637010b28c2bd56d0c70c7817d8601a794338d790964ee2e31e532e4e5618 SHA512 5828cdbfa19220b3bb07d964ad8d1a20031d361dff0ea319352f6b2e9ed511aefb5de3d8cae03f1b4f479b552de2a516cfea70d95d147a922a8761064bb4e875
diff --git a/sci-libs/gloo/files/gloo-2022.05.18-gentoo.patch b/sci-libs/gloo/files/gloo-2022.05.18-gentoo.patch
index 09f7588a1858..1344d42a0c3f 100644
--- a/sci-libs/gloo/files/gloo-2022.05.18-gentoo.patch
+++ b/sci-libs/gloo/files/gloo-2022.05.18-gentoo.patch
@@ -12,7 +12,7 @@
  set(GLOO_VERSION_PATCH 0)
 --- a/gloo/CMakeLists.txt	2022-06-09 08:41:09.883773600 +0200
 +++ b/gloo/CMakeLists.txt	2022-06-09 08:42:39.045637103 +0200
-@@ -176,7 +176,7 @@
+@@ -181,7 +181,7 @@
  # want to statically link with Gloo and not install any artifacts.
  if(GLOO_INSTALL)
    install(TARGETS gloo EXPORT GlooTargets
@@ -23,7 +23,7 @@
          DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 --- a/gloo/test/CMakeLists.txt	2022-06-10 22:17:03.682856314 +0200
 +++ b/gloo/test/CMakeLists.txt	2022-06-10 22:17:49.671242697 +0200
-@@ -68,3 +68,4 @@
+@@ -73,3 +73,4 @@
    gloo_hip_add_executable(gloo_test_hip ${GLOO_TEST_HIP_SRCS})
    target_link_libraries(gloo_test_hip gloo_hip gtest OpenSSL::SSL OpenSSL::Crypto)
  endif()
@@ -62,16 +62,6 @@
    endif()
  endif()
  
---- a/gloo/transport/tcp/device.cc	2022-08-02 11:25:32.404166606 +0200
-+++ b/gloo/transport/tcp/device.cc	2022-08-02 11:25:48.706963018 +0200
-@@ -12,6 +12,7 @@
- #include <netdb.h>
- #include <netinet/in.h>
- #include <string.h>
-+#include <array>
- 
- #include "gloo/common/linux.h"
- #include "gloo/common/logging.h"
 --- a/gloo/transport/tcp/tls/pair.cc	2022-10-04 21:14:04.099150060 +0200
 +++ b/gloo/transport/tcp/tls/pair.cc	2022-10-04 21:14:22.330886610 +0200
 @@ -17,6 +17,7 @@
diff --git a/sci-libs/gloo/files/gloo-2023.01.17-cuda.patch b/sci-libs/gloo/files/gloo-2023.01.17-cuda.patch
new file mode 100644
index 000000000000..1a894d3e4251
--- /dev/null
+++ b/sci-libs/gloo/files/gloo-2023.01.17-cuda.patch
@@ -0,0 +1,13 @@
+diff --git a/gloo/CMakeLists.txt b/gloo/CMakeLists.txt
+index 9ee82df..3b3affb 100644
+--- a/gloo/CMakeLists.txt
++++ b/gloo/CMakeLists.txt
+@@ -184,7 +184,7 @@ if(GLOO_INSTALL)
+           DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   if(USE_CUDA)
+     install(TARGETS gloo_cuda EXPORT GlooTargets
+-        DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
++        DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   endif()
+   if(USE_ROCM)
+     install(TARGETS gloo_hip EXPORT GlooTargets
diff --git a/sci-libs/gloo/gloo-2022.05.18-r1.ebuild b/sci-libs/gloo/gloo-2022.05.18-r1.ebuild
deleted file mode 100644
index f22733551794..000000000000
--- a/sci-libs/gloo/gloo-2022.05.18-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake
-
-CommitId=5b143513263133af2b95547e97c07cebeb72bf72
-
-DESCRIPTION="library of floating-point neural network inference operators"
-HOMEPAGE="https://github.com/facebookincubator/gloo/"
-SRC_URI="https://github.com/facebookincubator/${PN}/archive/${CommitId}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libuv mpi redis ssl test"
-
-RDEPEND="
-	libuv? ( dev-libs/libuv )
-	mpi? ( virtual/mpi )
-	redis? (
-		dev-db/redis
-		dev-libs/hiredis
-	)
-	ssl? ( dev-libs/openssl:0/1.1 )
-"
-DEPEND="${RDEPEND}
-"
-
-BDEPEND="test? ( dev-cpp/gtest )"
-RESTRICT="test" # For some test the network is needed
-
-S="${WORKDIR}"/${PN}-${CommitId}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TEST=$(usex test ON OFF)
-		-DUSE_LIBUV=$(usex libuv ON OFF)
-		-DUSE_MPI=$(usex mpi ON OFF)
-		-DUSE_REDIS=$(usex redis ON OFF)
-		-DUSE_TCP_OPENSSL_LINK=$(usex ssl ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/sci-libs/gloo/gloo-2023.01.17.ebuild b/sci-libs/gloo/gloo-2023.01.17-r1.ebuild
index f9c90704924d..a2c76198f848 100644
--- a/sci-libs/gloo/gloo-2023.01.17.ebuild
+++ b/sci-libs/gloo/gloo-2023.01.17-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit cmake
+inherit cmake cuda
 
 CommitId=10909297fedab0a680799211a299203e53515032
 
@@ -14,9 +14,10 @@ SRC_URI="https://github.com/facebookincubator/${PN}/archive/${CommitId}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libuv mpi redis ssl test"
+IUSE="cuda libuv mpi redis ssl test"
 
 RDEPEND="
+	cuda? ( <dev-util/nvidia-cuda-toolkit-12:= )
 	libuv? ( dev-libs/libuv )
 	mpi? ( virtual/mpi )
 	redis? (
@@ -35,15 +36,29 @@ S="${WORKDIR}"/${PN}-${CommitId}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2022.05.18-gentoo.patch
+	"${FILESDIR}"/${P}-cuda.patch
 )
 
+src_prepare() {
+	eapply_user
+	cmake_src_prepare
+	use cuda && cuda_add_sandbox
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TEST=$(usex test ON OFF)
+		-DUSE_CUDA=$(usex cuda ON OFF)
+		-DGLOO_USE_CUDA_TOOLKIT=$(usex cuda ON OFF)
 		-DUSE_LIBUV=$(usex libuv ON OFF)
 		-DUSE_MPI=$(usex mpi ON OFF)
 		-DUSE_REDIS=$(usex redis ON OFF)
 		-DUSE_TCP_OPENSSL_LINK=$(usex ssl ON OFF)
 	)
+	if use cuda; then
+		mycmakeargs+=(
+			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
+		)
+	fi
 	cmake_src_configure
 }
diff --git a/sci-libs/gloo/metadata.xml b/sci-libs/gloo/metadata.xml
index 453b2878b484..e83d24904d0f 100644
--- a/sci-libs/gloo/metadata.xml
+++ b/sci-libs/gloo/metadata.xml
@@ -9,6 +9,7 @@
 		<remote-id type="github">facebookincubator/gloo</remote-id>
 	</upstream>
 	<use>
+		<flag name="cuda">Enable CUDA support</flag>
 		<flag name="libuv">Enable libuv support</flag>
 		<flag name="redis">Enable Redis backend for storage via <pkg>dev-libs/hiredis</pkg></flag>
 	</use>