diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-05-08 23:39:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-08 23:39:55 +0100 |
commit | 2c359e29620429f94a60fc1e832048e54ee41eb5 (patch) | |
tree | 3a24152899725be0796179577e84caf957a80ce3 /sci-libs | |
parent | d6a3ca89e16356791af128f18ca5d5aeaf1323e0 (diff) |
gentoo auto-resync : 08:05:2023 - 23:39:55
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/Manifest.gz | bin | 44305 -> 44301 bytes | |||
-rw-r--r-- | sci-libs/caffe2/Manifest | 4 | ||||
-rw-r--r-- | sci-libs/caffe2/caffe2-1.13.1-r6.ebuild (renamed from sci-libs/caffe2/caffe2-1.13.1-r5.ebuild) | 2 | ||||
-rw-r--r-- | sci-libs/caffe2/caffe2-2.0.0-r4.ebuild (renamed from sci-libs/caffe2/caffe2-2.0.0-r3.ebuild) | 2 | ||||
-rw-r--r-- | sci-libs/datasets/Manifest | 2 | ||||
-rw-r--r-- | sci-libs/datasets/files/datasets-2.11.0-tests.patch | 28 | ||||
-rw-r--r-- | sci-libs/gloo/Manifest | 9 | ||||
-rw-r--r-- | sci-libs/gloo/files/gloo-2022.05.18-gentoo.patch | 14 | ||||
-rw-r--r-- | sci-libs/gloo/files/gloo-2023.01.17-cuda.patch | 13 | ||||
-rw-r--r-- | sci-libs/gloo/gloo-2022.05.18-r1.ebuild | 49 | ||||
-rw-r--r-- | sci-libs/gloo/gloo-2023.01.17-r1.ebuild (renamed from sci-libs/gloo/gloo-2023.01.17.ebuild) | 19 | ||||
-rw-r--r-- | sci-libs/gloo/metadata.xml | 1 |
12 files changed, 57 insertions, 86 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex da33b8729997..6a427ac3fdd6 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest index 233586705e75..6f604164504a 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -8,6 +8,6 @@ AUX caffe2-2.0.0-gcc13.patch 1203 BLAKE2B df55608c6019802da32809cb210b60cf0debf3 AUX caffe2-2.0.0-gentoo.patch 7081 BLAKE2B d2b8d411f6f2c19c5339053accd445606092d15fad78f793c9a2ba708156b9425607324b842bd78402e3a2009756249a13addb75241a593582e2c6711a702d1a SHA512 ff168df38fef53c7afd3abe2064e258248f7293e16f3fca757f714da41a094be18d18a9180759ebafd952896a9d06aa68927ff9215cab904926ba362eef79929 DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B 75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3 SHA512 f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62 DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B 6d593a975c0ade714f0b189f7e3c4ff704b9a9a2377b5e441a9cefc202fa22779966d08948e63671912c6ea5a0eee124042155f4f57a654db34e19e42f013cc9 SHA512 4dd76160711c0d87f3026c8b7fa3ed149dd86b8ac0ee9ecea0eaf80d2e6ce8c29368392e77b9466d90b60634087b462b782495997a5d33367cc8ca9fe14c8a14 -EBUILD caffe2-1.13.1-r5.ebuild 5214 BLAKE2B f301b7ce86f581c8abffd54b3a5cc63c5ab7f4c226b5bad4b6397a2829345defdd2a14442f9624e40734c2abdcc04343b64456511742f7ae69e5ab295c498d1b SHA512 21f6ddb2655fe68588baba91c667050df9eb322f5c0493f3fabd38445d6ebd7ec19b49f39c2baa997f4e3dc29eadd2b17ba23ac0d29193e735debaf9cd15e6a7 -EBUILD caffe2-2.0.0-r3.ebuild 5285 BLAKE2B dacdacc1f81d1bb635b87b0a2f4922ac5f8a5d403fb0576eb35f23ce952199845da738dbdc8fa251259bcfd8e0e2875bd9f7f9392a0844582c6fb10e12b9b7e8 SHA512 0a27cb4ebf5daac2ddbd5513b9017fafee554854fa201995b126e7d9a19ee633546c6a9de2bc80ecfe1f2588fa66caa8eae858833e86d7cebadd324ecb7d86f7 +EBUILD caffe2-1.13.1-r6.ebuild 5221 BLAKE2B 64a0309f8601752187205d49629245ae8a3305d9fad0626eff293fa555e50c7c147bfa9879ada2bd0a076e41120a9f5f9667cd784a4a3418cee9a4711eb69b05 SHA512 d1162bb88a1ac0c412cc2fa828521f98be9eda5f55d63f4a5162c727940121db1a7ab8155bd151fe1a2b9985851ff82bb49e3f3e01c4e4f1fdc1f3f4444d56ce +EBUILD caffe2-2.0.0-r4.ebuild 5292 BLAKE2B f0560c057af3e24e81e4538f4ef6f35eba6b3e70a435c00be0e08aed40e1991997beea05127e195fcefe019147b10ca74c338e3b5a1b8bd61c631b680805a587 SHA512 4556d43911ca5fd8438d603529cf74bde4ec8ac30b9e7a45debab2252a9a8db53dde09b20d1be08a76f90dc783bd70401b1252427da6556d6c3e7d487b656345 MISC metadata.xml 1161 BLAKE2B af1b8f3ab7789f9aa5f635d5a3f1175bbdd7ccbf68f205bfc2769ccab2cb5c519f6fe62024759eb28f0e1353a04bed3216d222808b9f95100d3e0bb591f1d82b SHA512 1737d3dc8fa7786550930beb067ca4eca173a47095a88450ab5c913d3aed08f51fe21c875f484e5663542471a48ef55878cddc97881ff8be7648987b90b79126 diff --git a/sci-libs/caffe2/caffe2-1.13.1-r5.ebuild b/sci-libs/caffe2/caffe2-1.13.1-r6.ebuild index 7fc257acd3ab..e0d99129a9ac 100644 --- a/sci-libs/caffe2/caffe2-1.13.1-r5.ebuild +++ b/sci-libs/caffe2/caffe2-1.13.1-r6.ebuild @@ -47,7 +47,7 @@ RDEPEND=" ) fbgemm? ( dev-libs/FBGEMM ) ffmpeg? ( media-video/ffmpeg:= ) - gloo? ( sci-libs/gloo ) + gloo? ( sci-libs/gloo[cuda?] ) mpi? ( sys-cluster/openmpi ) nnpack? ( sci-libs/NNPACK ) numpy? ( $(python_gen_cond_dep ' diff --git a/sci-libs/caffe2/caffe2-2.0.0-r3.ebuild b/sci-libs/caffe2/caffe2-2.0.0-r4.ebuild index 42b8dae69229..f6a3684a96a0 100644 --- a/sci-libs/caffe2/caffe2-2.0.0-r3.ebuild +++ b/sci-libs/caffe2/caffe2-2.0.0-r4.ebuild @@ -47,7 +47,7 @@ RDEPEND=" ) fbgemm? ( dev-libs/FBGEMM ) ffmpeg? ( media-video/ffmpeg:= ) - gloo? ( sci-libs/gloo ) + gloo? ( sci-libs/gloo[cuda?] ) mpi? ( sys-cluster/openmpi ) nnpack? ( sci-libs/NNPACK ) numpy? ( $(python_gen_cond_dep ' diff --git a/sci-libs/datasets/Manifest b/sci-libs/datasets/Manifest index 3274fb3f5b10..60c41a959a09 100644 --- a/sci-libs/datasets/Manifest +++ b/sci-libs/datasets/Manifest @@ -1,4 +1,4 @@ -AUX datasets-2.11.0-tests.patch 6408 BLAKE2B aed33ac39b4bd1b3a75776a6efc93b03817b09cf63ee582f72a4acf48149ce7865bc3f4501f67dbc73d02c478732d8c953c54cf66918b70e22fdea6393c639da SHA512 88e9f86af80c2197282a9d8878a9319d7d7e63937a7bdc17ad8ae51e53ed49c1b98a9e8476c161d1eb6dc3a603ebd95c5f822c5078c5eea59cc2d86cda591fbd +AUX datasets-2.11.0-tests.patch 6391 BLAKE2B ce947a4c52b224d860b58ee7cbe2cbeb006d0f532b29b6d67e2d3a60fcad50e6a9e63534bc6dccb8a6d83ddaca6b8bce81fafafa22265f5ac44964347e18244c SHA512 a89d57195acbc5e99d7dc4adbd1dde0f04461421fbfef8735964ff41e90b071f03526acbfe4a266ae8a4e3a1796c39ffebe299a8638c2a476d23d1c75f8495ee DIST datasets-2.11.0.gh.tar.gz 2141289 BLAKE2B 0fb471dd6ee5de3831eb6586c4a15e67381262470b72d5ab02ee87dfc7977cb4d40e04da6507049d1e47cb8948cad11988bb7627293b48231e1cd413d2cfb885 SHA512 9ec2274d7978e3dde1b2f8ce78dd65bdf66742bbfee7b8672af46216aeaae3ef5c4604a8a5ea0bdee808f1c362cca9a122c16d2e9a161678148e581e4cd5c863 EBUILD datasets-2.11.0.ebuild 1393 BLAKE2B 9a4e44ff67d4dfceffa95b8710a6f7dd5b97d071cfcd1dbeb86d9c9a52168f211cc65f02268a94a5f6e41871e8caededab126ec9e109862d1d4b3b66b88938ae SHA512 b7aef0e39a2693af36e478c857b1e339ae5ef46b45f9477eacdac08aa737c53bf99e0c7f2d418a7ac5fe5e8dbbdbe4bfb1ab28bc801219f8c3e07bb84632eae3 MISC metadata.xml 379 BLAKE2B 48ebb9e7bfa8b58b0d15b82c4146def465e08cf3212ab4af04129d09c153b67b00d0fa05b94d6af54f643ec3a202f2335d3254b966f49d1394d3c7b9e5da56a5 SHA512 99560decfaa0e438980f372d99257695e9ca9585167d9aba091e0b775c2f8384657ddc017841c8f06f8b568017a54fb9e31da736f3c875da717e154cdce876d1 diff --git a/sci-libs/datasets/files/datasets-2.11.0-tests.patch b/sci-libs/datasets/files/datasets-2.11.0-tests.patch index 01e5d9c70e7b..0bbf200acbd0 100644 --- a/sci-libs/datasets/files/datasets-2.11.0-tests.patch +++ b/sci-libs/datasets/files/datasets-2.11.0-tests.patch @@ -59,7 +59,7 @@ @pytest.mark.parametrize( "build_example", [ -@@ -82,6 +82,7 @@ +@@ -81,6 +82,7 @@ assert decoded_example.keys() == {"path", "array", "sampling_rate"} @@ -75,7 +75,7 @@ @pytest.mark.parametrize("sampling_rate", [16_000, 48_000]) def test_audio_decode_example_pcm(shared_datadir, sampling_rate): audio_path = str(shared_datadir / "test_audio_16000.pcm") -@@ -416,6 +417,7 @@ +@@ -414,6 +417,7 @@ assert column[0]["sampling_rate"] == 16000 @@ -83,7 +83,7 @@ @pytest.mark.parametrize( "build_data", [ -@@ -440,6 +442,7 @@ +@@ -438,6 +442,7 @@ assert item["audio"].keys() == {"path", "array", "sampling_rate"} @@ -91,7 +91,7 @@ def test_dataset_concatenate_audio_features(shared_datadir): # we use a different data structure between 1 and 2 to make sure they are compatible with each other audio_path = str(shared_datadir / "test_audio_44100.wav") -@@ -453,6 +456,7 @@ +@@ -451,6 +456,7 @@ assert concatenated_dataset[1]["audio"]["array"].shape == dset2[0]["audio"]["array"].shape @@ -99,7 +99,7 @@ def test_dataset_concatenate_nested_audio_features(shared_datadir): # we use a different data structure between 1 and 2 to make sure they are compatible with each other audio_path = str(shared_datadir / "test_audio_44100.wav") -@@ -616,6 +616,7 @@ +@@ -610,6 +616,7 @@ assert isinstance(ds, Dataset) @@ -107,7 +107,7 @@ def test_dataset_with_audio_feature_undecoded(shared_datadir): audio_path = str(shared_datadir / "test_audio_44100.wav") data = {"audio": [audio_path]} -@@ -633,6 +634,7 @@ +@@ -627,6 +634,7 @@ assert column[0] == {"path": audio_path, "bytes": None} @@ -115,7 +115,7 @@ def test_formatted_dataset_with_audio_feature_undecoded(shared_datadir): audio_path = str(shared_datadir / "test_audio_44100.wav") data = {"audio": [audio_path]} -@@ -664,6 +666,7 @@ +@@ -658,6 +666,7 @@ assert column[0] == {"path": audio_path, "bytes": None} @@ -135,24 +135,26 @@ wrong_scheme = "ERROR" --- a/tests/packaged_modules/test_audiofolder.py 2023-05-06 14:00:39.560876163 +0200 +++ b/tests/packaged_modules/test_audiofolder.py 2023-05-06 14:01:26.005212423 +0200 -@@ -4,7 +4,6 @@ - import librosa +@@ -1,10 +1,8 @@ + import shutil + import textwrap + +-import librosa import numpy as np import pytest -import soundfile as sf from datasets import Audio, ClassLabel, Features, Value from datasets.data_files import DataFilesDict, get_data_patterns_locally -@@ -191,9 +190,11 @@ - assert len(data_files_with_two_splits_and_metadata["test"]) == 2 +@@ -192,8 +190,11 @@ return data_files_with_two_splits_and_metadata -- + +@pytest.mark.skip(reason="require soundfile") @pytest.fixture def data_files_with_zip_archives(tmp_path, audio_file): + import soundfile as sf -+ ++ import librosa data_dir = tmp_path / "audiofolder_data_dir_with_zip_archives" data_dir.mkdir(parents=True, exist_ok=True) archive_dir = data_dir / "archive" 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> |