diff options
Diffstat (limited to 'sci-libs')
29 files changed, 671 insertions, 354 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex a5701981f113..955941710783 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/branca/Manifest b/sci-libs/branca/Manifest index 94d3b25cd2a9..5de14917210c 100644 --- a/sci-libs/branca/Manifest +++ b/sci-libs/branca/Manifest @@ -1,4 +1,5 @@ +AUX branca-0.4.2-setup.patch 317 BLAKE2B 7394a0d332202df1024e8099fcedd7e7a8b85a4a0b7e6f3422350ba45b33159110e0cda3e8091ab606b7a874b0bcfa9ede33fa31c6d32d4ea041302dfe9c0f14 SHA512 ef7cea556bd272f1711be641b8f7a99b96dd049756e8681af38caccdc232bfafe919fcf30c66d6dcab2f77adb6a83d50094c0d45f06513b3368ecc57937825ab AUX branca-0.4.2-test.patch 358 BLAKE2B 087756ebe2507101eaf8c18b2726294b3eec99f7708fff092217b6083ea4f85878c2671671fb8bfbddf92822b60dbdcc737bc0eef0d46b33e1e74f00e244c470 SHA512 81d6542e259c7233e3a2c926b07cadd9fbc930db7d25f552d8febb70f3d689f57f01c49c0b6cc5e795e7fa817a7989a05a8b2768162d730b021bb6a4f2ff3925 DIST branca-0.4.2.tar.gz 59337 BLAKE2B 7d7f101a3dcc07c0210f968da2ed41f4a75177b625ce46252024da7dbba82618dbe60886c615c9461c724af76b45c7710f631bc65d5743cee7f18a2052f9db49 SHA512 cefb3b0f41d515492902ef4046cf7f10b638aca8409f5b08f201550ed5a971a441d13243b1ce38ac0b8c0f76cde1329955d26c1856e1f3c25014a6ce0d805fd6 -EBUILD branca-0.4.2.ebuild 731 BLAKE2B c53004be38829f283538bdd3dd96879589c00e0230fc1dc03d9fc046e43c60d73a67910083babdc5d73d9c0e97d5926ea6cb49d9e21f69d11febae2493383c1a SHA512 5d53b6de85d12fd62a985aed96c64aa6c79bfa3c7f7fb38c8e6eab52bac4ef7190d9dcbcedb474c12fe881423de6a1d16d6e8636507f6d60bdc024b5265dd245 +EBUILD branca-0.4.2-r1.ebuild 805 BLAKE2B 03c957fbb69749be52a532ea0ffa1ea5bfbc09120810c6cf4d18d3a81423be209279325b9aba501fa76d551d74a6f4c01e8206f7282d17ed6ed80479279a3d5b SHA512 3d50cbb08f30e84ba03ebeace5f1b7a5d93fcb6b55460e8b4bd52a47c78eb8aa4a8f39df9ee6c2547d1b64e883e40cc8dd30c5eea1bd02ef4111b2382aa2c672 MISC metadata.xml 566 BLAKE2B a5480589b81b88e433fc25420876d44f2d2c44bac5283c7b06c203d6fbe05afc46f0f17c2d35721894dc88d52686bf5a7386eeb55a8142695ec45961cf0d75f1 SHA512 fa78103653a5554470eb01f24e6c32412697c99fe9d3b1a75a18918c9fde42b649748c2bd9534af41e61f16255bd0794b86354fcd0d0f1942fb017316a2d78b7 diff --git a/sci-libs/branca/branca-0.4.2.ebuild b/sci-libs/branca/branca-0.4.2-r1.ebuild index 78650db40a7a..84668d2004a7 100644 --- a/sci-libs/branca/branca-0.4.2.ebuild +++ b/sci-libs/branca/branca-0.4.2-r1.ebuild @@ -14,13 +14,17 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -PATCHES=( "${FILESDIR}"/${P}-test.patch ) +PATCHES=( + "${FILESDIR}"/${P}-test.patch + "${FILESDIR}"/${P}-setup.patch +) RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} test? ( dev-python/selenium[${PYTHON_USEDEP}] dev-python/nbconvert[${PYTHON_USEDEP}] + dev-python/ipykernel[${PYTHON_USEDEP}] )" BDEPEND="" diff --git a/sci-libs/branca/files/branca-0.4.2-setup.patch b/sci-libs/branca/files/branca-0.4.2-setup.patch new file mode 100644 index 000000000000..6ceea6b252b8 --- /dev/null +++ b/sci-libs/branca/files/branca-0.4.2-setup.patch @@ -0,0 +1,11 @@ +--- a/setup.cfg 2021-08-28 16:51:20.436726385 +0200 ++++ b/setup.cfg 2021-08-28 16:51:34.275526771 +0200 +@@ -20,7 +20,7 @@ + headless: mark headless tests (deselect with '-m "not headless"') + + [metadata] +-description-file = README.rst ++description_file = README.rst + license_file = LICENSE.txt + + [check-manifest] diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest new file mode 100644 index 000000000000..2d0d9ddcedeb --- /dev/null +++ b/sci-libs/rocBLAS/Manifest @@ -0,0 +1,9 @@ +AUX Tensile-4.3.0-hsaco-compile-specified-arch.patch 3859 BLAKE2B 4590978cff0fdb0501ba2405615775cb3f8900ce164c3d57cc59dfe82e1adc25376b6463855a045f5e0652cc985b0015566b95ff28327c59f2db875a84cb49b3 SHA512 57520f1d46f46c7cfd5b8c3ae307da07695c19479b687ce994ad9fba2e755ed7c776c3d8bee8e0642c7613a5d53d8469f329b1eb07563c13d2f7bda8b3d36687 +AUX Tensile-4.3.0-output-commands.patch 1629 BLAKE2B c43395d8e8aeb956d5eb84c8a34ad4b995ed32499ceababeb22d5ca3ac5ee6e8ef353a1467a77943a441f0840b9a6ad1f53202ec8673ef3753aa2bec1395fec4 SHA512 45bdae1d87f6e31d337b22f146b9dee25f4f87357c6ac52bd843556dd742431db10efb55fb8ef815cc9941b5b9f05970d43a6fec0f2d9195c30c633e33d138bf +AUX rocBLAS-4.3.0-change-default-Tensile-library-dir.patch 1533 BLAKE2B d6b48397b1df8da0325590b79fdd351bf7db39fee662dc8809da03cff1715f5b952b7dbebb6889a08ca8b67067ca0626fc6350a825433eaf1e4747eee5f8d70e SHA512 318a00649aa80771722c1128b619320d03fd66fd9375f065e2c2f69cc2353261fa104fb1a5d0991490c92cb9e3a0c78b4232764e43d262f83738663621560f8f +AUX rocBLAS-4.3.0-fix-glibc-2.32-and-above.patch 1254 BLAKE2B d3bcf526f374065ed0615c89ab74cbc203d2d6b6d0a1c49072f3328aaa40aa52f0fa155b23a936a865d353db32f48f348a64f05f157eb6bb2d55c93f9da364d1 SHA512 e899b26e3dc4717cb7854c16d104b9e070067f49e308fe6a38f1be5735a83a814da46ab41752cf4431b4c378d29f31c6082e1fe63e1bf5ae72a55b54a9017c15 +AUX rocBLAS-4.3.0-link-system-blas.patch 1106 BLAKE2B 83f525072dc34edec01c56353d8c87f0f967c9cf07d054da8c1f4af632e095cd2af9562dea8eab8a2ddc7a71a9570e654b4a6b0f68c95508e92cc743350c8129 SHA512 94efab3d507fc90bd0d0b2cd0096e68b7669d1de2faf73fe0bfbc8c26c83db88596664bd61f394863194ad3108985b6206c4408c6d2ec93cd30ccec13b3b37f1 +DIST rocm-Tensile-4.3.0.tar.gz 14250149 BLAKE2B 030138eaca2a0aadd96801e6dbd72e510716dd90553ef3795c5e04e00a34a05ecae82b24f755e4033a4acfcdb1cf26291da1e7902bb090f89a010d403e832beb SHA512 126db0b413c716fba8d5be9bff7a44fd1badacbf32f3db8d0db649819177db37ebd56fd22dd3c809655f5d29675be115e698cd10bc3d0b4b23878ae3726fce47 +DIST rocm-rocBLAS-4.3.0.tar.gz 11569970 BLAKE2B f11b0acf2bbd5737b036142d3b2cc1e18c38e088a8b7db58156d478dd6718befbb82bb7fd43a38fe64a5427124c5ad5241fa37977f094e6efd195d168d3e5f65 SHA512 490ab1c1e98a8b311ad5630515c448d9bb0a2bf588a08bcbebee345e2954d616b4ffe7c2e03dadca82c590438c42afccb98fe8ba00856aece101b5ffe62ef1e0 +EBUILD rocBLAS-4.3.0.ebuild 4140 BLAKE2B ea0a89cf0ecb6429874400661c1b43ce351b12f652b3d2880be9d8a79cd0c50dee2b0beba44fc50d6ab2f5e2da2262d3b4d8f9fe9ca7d8ca326f894f4a901c0c SHA512 ef6f442920694b5d250b2d548e49c891339b4c89802d2ea377bbcd42ac7b306753d154cae638878b03face948fafacaadc5dbb603f19fe94ca61a59dd233e80f +MISC metadata.xml 653 BLAKE2B b64c73fae3f09612e75407ca7d54fd2fb0a6d90bb9697623ae774f652fe0b06c4f74bf6b9fd4b2acf5f1e5e661ffdbf09b7c3f44e011adb4cd9d92e168ab64b0 SHA512 007d91b1ff3743757940b38feca5c0333d4e92325fafe02a0de8fb3230f39fe3dd295168f45822098c6e1a64e8a99fd6b6a98402a7a8c8d5e8f700881d37db26 diff --git a/sci-libs/rocBLAS/files/Tensile-4.3.0-hsaco-compile-specified-arch.patch b/sci-libs/rocBLAS/files/Tensile-4.3.0-hsaco-compile-specified-arch.patch new file mode 100644 index 000000000000..8e6753781a2a --- /dev/null +++ b/sci-libs/rocBLAS/files/Tensile-4.3.0-hsaco-compile-specified-arch.patch @@ -0,0 +1,96 @@ +https://github.com/ROCmSoftwarePlatform/Tensile/issues/1395 +https://github.com/ROCmSoftwarePlatform/Tensile/pull/1398 + +--- a/Tensile/TensileCreateLibrary.py ++++ b/Tensile/TensileCreateLibrary.py +@@ -136,6 +136,35 @@ def which(p): + return candidate + return None + ++def splitArchs(): ++ # Helper for architecture ++ def isSupported(arch): ++ return globalParameters["AsmCaps"][arch]["SupportedISA"] and \ ++ globalParameters["AsmCaps"][arch]["SupportedSource"] ++ ++ if ";" in globalParameters["Architecture"]: ++ wantedArchs = globalParameters["Architecture"].split(";") ++ else: ++ wantedArchs = globalParameters["Architecture"].split("_") ++ archs = [] ++ cmdlineArchs = [] ++ if "all" in wantedArchs: ++ for arch in globalParameters['SupportedISA']: ++ if isSupported(arch): ++ if (arch == (9,0,6) or arch == (9,0,8) or arch == (9,0,10)): ++ if (arch == (9,0,10)): ++ archs += [gfxName(arch) + '-xnack+'] ++ cmdlineArchs += [gfxName(arch) + ':xnack+'] ++ archs += [gfxName(arch) + '-xnack-'] ++ cmdlineArchs += [gfxName(arch) + ':xnack-'] ++ else: ++ archs += [gfxName(arch)] ++ cmdlineArchs += [gfxName(arch)] ++ else: ++ for arch in wantedArchs: ++ archs += [re.sub(":", "-", arch)] ++ cmdlineArchs += [arch] ++ return archs, cmdlineArchs + + def buildSourceCodeObjectFile(CxxCompiler, outputPath, kernelFile): + buildPath = ensurePath(os.path.join(globalParameters['WorkingPath'], 'code_object_tmp')) +@@ -149,24 +178,8 @@ def buildSourceCodeObjectFile(CxxCompiler, outputPath, kernelFile): + objectFilename = base + '.o' + soFilename = base + '.so' + +- def isSupported(arch): +- return globalParameters["AsmCaps"][arch]["SupportedISA"] and \ +- globalParameters["AsmCaps"][arch]["SupportedSource"] +- + if (CxxCompiler == "hipcc"): +- archs = [] +- cmdlineArchs = [] +- for arch in globalParameters['SupportedISA']: +- if isSupported(arch): +- if (arch == (9,0,6) or arch == (9,0,8) or arch == (9,0,10)): +- if (arch == (9,0,10)): +- archs += [gfxName(arch) + '-xnack+'] +- cmdlineArchs += [gfxName(arch) + ':xnack+'] +- archs += [gfxName(arch) + '-xnack-'] +- cmdlineArchs += [gfxName(arch) + ':xnack-'] +- else: +- archs += [gfxName(arch)] +- cmdlineArchs += [gfxName(arch)] ++ archs, cmdlineArchs = splitArchs() + + archFlags = ['--offload-arch=' + arch for arch in cmdlineArchs] + +@@ -1063,11 +1076,6 @@ def buildObjectFileNames(solutionWriter, kernelWriterSource, kernelWriterAssembl + sourceKernels = list([k for k in kernels if k['KernelLanguage'] == 'Source']) + asmKernels = list([k for k in kernels if k['KernelLanguage'] == 'Assembly']) + +- # Helper for architecture +- def isSupported(arch): +- return globalParameters["AsmCaps"][arch]["SupportedISA"] and \ +- globalParameters["AsmCaps"][arch]["SupportedSource"] +- + # Build a list of kernel object names. + for kernel in sourceKernels: + sourceKernelNames += [kernelWriterSource.getKernelFileBase(kernel)] +@@ -1081,15 +1089,7 @@ def buildObjectFileNames(solutionWriter, kernelWriterSource, kernelWriterAssembl + + # Source based kernels are built for all supported architectures + if (cxxCompiler == 'hipcc'): +- sourceArchs = [] +- for arch in globalParameters['SupportedISA']: +- if isSupported(arch): +- if (arch == (9,0,6) or arch == (9,0,8) or arch == (9,0,10)): +- if (arch == (9,0,10)): +- sourceArchs += [gfxName(arch) + '-xnack+'] +- sourceArchs += [gfxName(arch) + '-xnack-'] +- else: +- sourceArchs += [gfxName(arch)] ++ sourceArchs, _ = splitArchs() + else: + raise RuntimeError("Unknown compiler %s" % cxxCompiler) + diff --git a/sci-libs/rocBLAS/files/Tensile-4.3.0-output-commands.patch b/sci-libs/rocBLAS/files/Tensile-4.3.0-output-commands.patch new file mode 100644 index 000000000000..be5a4db21429 --- /dev/null +++ b/sci-libs/rocBLAS/files/Tensile-4.3.0-output-commands.patch @@ -0,0 +1,23 @@ +diff --color -uprN orig/Tensile/cmake/TensileConfig.cmake Tensile-rocm-4.3.0/Tensile/cmake/TensileConfig.cmake +--- orig/Tensile/cmake/TensileConfig.cmake 2021-08-18 17:48:00.115478470 +0800 ++++ Tensile-rocm-4.3.0/Tensile/cmake/TensileConfig.cmake 2021-08-18 17:48:49.963478801 +0800 +@@ -234,6 +234,7 @@ function(TensileCreateLibraryFiles + COMMENT "Generating Tensile Libraries" + OUTPUT ${Tensile_EMBED_LIBRARY_SOURCE};${Tensile_MANIFEST_CONTENTS} + COMMAND ${CommandLine} ++ USES_TERMINAL + ) + + set("${Tensile_VAR_PREFIX}_ALL_FILES" ${Tensile_MANIFEST_CONTENTS} PARENT_SCOPE) +diff --color -uprN orig/Tensile/Common.py Tensile-rocm-4.3.0/Tensile/Common.py +--- orig/Tensile/Common.py 2021-08-18 17:48:00.075478470 +0800 ++++ Tensile-rocm-4.3.0/Tensile/Common.py 2021-08-18 17:48:23.287478624 +0800 +@@ -179,7 +179,7 @@ globalParameters["PrintTensorD"] = 0 + globalParameters["PrintTensorRef"] = 0 # Print reference tensor. 0x1=after init; 0x2=after copy-back; 0x3=both + globalParameters["PrintIndexAssignments"] = 0 # Print the tensor index assignment info + globalParameters["PrintWinnersOnly"] = False # Only print the solutions which become the fastest +-globalParameters["PrintCodeCommands"] = False # print the commands used to generate the code objects (asm,link,hip-clang, etc) ++globalParameters["PrintCodeCommands"] = True # print the commands used to generate the code objects (asm,link,hip-clang, etc) + globalParameters["DumpTensors"] = False # If True, dump tensors to binary files instead of printing them. + + # TODO - remove this when NewClient is mainstream diff --git a/sci-libs/rocBLAS/files/rocBLAS-4.3.0-change-default-Tensile-library-dir.patch b/sci-libs/rocBLAS/files/rocBLAS-4.3.0-change-default-Tensile-library-dir.patch new file mode 100644 index 000000000000..1841424c6e56 --- /dev/null +++ b/sci-libs/rocBLAS/files/rocBLAS-4.3.0-change-default-Tensile-library-dir.patch @@ -0,0 +1,39 @@ +change the default rocm tensile library search path +--- orig/library/src/tensile_host.cpp 2021-08-21 17:56:47.040481580 +0800 ++++ rocBLAS-rocm-4.3.0/library/src/tensile_host.cpp 2021-08-21 17:58:46.360482372 +0800 +@@ -489,34 +489,7 @@ namespace + } + else + { +-#ifndef ROCBLAS_STATIC_LIB +- Dl_info info; +- +- // Find the location of librocblas.so +- // Fall back on hard-coded path if static library or not found +- // [Use a C API (rocblas_sccal) *not* defined in this file to +- // avoid compile-time resolution of the function pointer; cf. +- // https://man7.org/linux/man-pages/man3/dladdr.3.html "BUGS"] +- +- if(dladdr((void*)rocblas_sscal, &info)) +- { +- path = info.dli_fname; +- path = std::string{dirname(&path[0])}; +- } +- else +-#endif +- { +- path = "/opt/rocm/rocblas/lib"; +- } +- +- // Find the location of the libraries +- if(TestPath(path + "/../../Tensile/library")) +- path += "/../../Tensile/library"; +- else +- path += "/library"; +- +- if(TestPath(path + "/" + processor)) +- path += "/" + processor; ++ path="@GENTOO_PORTAGE_EPREFIX@/usr/lib64/rocblas/library"; + } + + // only load modules for the current architecture diff --git a/sci-libs/rocBLAS/files/rocBLAS-4.3.0-fix-glibc-2.32-and-above.patch b/sci-libs/rocBLAS/files/rocBLAS-4.3.0-fix-glibc-2.32-and-above.patch new file mode 100644 index 000000000000..a4d9f0bab344 --- /dev/null +++ b/sci-libs/rocBLAS/files/rocBLAS-4.3.0-fix-glibc-2.32-and-above.patch @@ -0,0 +1,25 @@ +https://sourceware.org/glibc/wiki/Release/2.32#Deprectation_sys_siglist.2C__sys_siglist.2C_sys_sigabbrev + +--- rocBLAS-rocm-4.1.0/clients/gtest/rocblas_test.cpp ++++ rocBLAS-rocm-4.1.0/clients/gtest/rocblas_test.cpp +@@ -173,7 +173,7 @@ void catch_signals_and_exceptions_as_fai + // Set up the return point, and handle siglongjmp returning back to here + if(sigsetjmp(t_handler.sigjmp_buf, true)) + { +- FAIL() << "Received " << sys_siglist[t_handler.signal] << " signal"; ++ FAIL() << "Received " << strsignal(t_handler.signal) << " signal"; + } + else + { + +--- rocBLAS-rocm-4.1.0/clients/include/utility.hpp ++++ rocBLAS-rocm-4.1.0/clients/include/utility.hpp +@@ -39,7 +39,7 @@ + // puts, putchar, fputs, printf, fprintf, vprintf, vfprintf: Use rocblas_cout or rocblas_cerr + // sprintf, vsprintf: Possible buffer overflows; us snprintf or vsnprintf instead + // strerror: Thread-unsafe; use snprintf / dprintf with %m or strerror_* alternatives +-// strsignal: Thread-unsafe; use sys_siglist[signal] instead ++// strsignal: Thread-unsafe; use strsignal(signal) instead + // strtok: Thread-unsafe; use strtok_r + // gmtime, ctime, asctime, localtime: Thread-unsafe + // tmpnam: Thread-unsafe; use mkstemp or related functions instead diff --git a/sci-libs/rocBLAS/files/rocBLAS-4.3.0-link-system-blas.patch b/sci-libs/rocBLAS/files/rocBLAS-4.3.0-link-system-blas.patch new file mode 100644 index 000000000000..184b76d7ef38 --- /dev/null +++ b/sci-libs/rocBLAS/files/rocBLAS-4.3.0-link-system-blas.patch @@ -0,0 +1,24 @@ +Link system blas libraries rather than the downloaded libraries (in install.sh) + +--- orig/clients/benchmarks/CMakeLists.txt ++++ rocBLAS-rocm-4.2.0/clients/benchmarks/CMakeLists.txt +@@ -49,7 +49,7 @@ target_include_directories( rocblas-benc + $<BUILD_INTERFACE:${BLIS_INCLUDE_DIR}> + ) + +-target_link_libraries( rocblas-bench PRIVATE rocblas_fortran_client roc::rocblas lapack cblas ) ++target_link_libraries( rocblas-bench PRIVATE rocblas_fortran_client roc::rocblas lapack cblas -lblas ) + if(LINK_BLIS) + target_link_libraries( rocblas-bench PRIVATE ${BLIS_LIBRARY} ) + endif() +--- orig/clients/gtest/CMakeLists.txt ++++ rocBLAS-rocm-4.2.0/clients/gtest/CMakeLists.txt +@@ -129,7 +129,7 @@ target_include_directories( rocblas-test + $<BUILD_INTERFACE:${BLIS_INCLUDE_DIR}> + ) + +-target_link_libraries( rocblas-test PRIVATE rocblas_fortran_client roc::rocblas lapack cblas ${GTEST_LIBRARIES} ) ++target_link_libraries( rocblas-test PRIVATE rocblas_fortran_client roc::rocblas lapack cblas -lblas ${GTEST_LIBRARIES} ) + if(LINK_BLIS) + target_link_libraries( rocblas-test PRIVATE ${BLIS_LIBRARY} ) + endif() diff --git a/sci-libs/rocBLAS/metadata.xml b/sci-libs/rocBLAS/metadata.xml new file mode 100644 index 000000000000..44cdde5646e8 --- /dev/null +++ b/sci-libs/rocBLAS/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'> +<pkgmetadata> + <maintainer type="project"> + <email>sci@gentoo.org</email> + </maintainer> + <maintainer type="person"> + <email>gentoo@holzke.net</email> + <name>Wilfried Holzke</name> + </maintainer> + <maintainer type="person"> + <email>xgreenlandforwyy@gmail.com</email> + <name>Yiyang Wu</name> + </maintainer> + <use> + <flag name="test">Perform rocblas-test to compare the result between rocBLAS and system BLAS.</flag> + <flag name="benchmark">Build and install rocblas-bench.</flag> + </use> +</pkgmetadata> diff --git a/sci-libs/rocBLAS/rocBLAS-4.3.0.ebuild b/sci-libs/rocBLAS/rocBLAS-4.3.0.ebuild new file mode 100644 index 000000000000..4e05309d0c48 --- /dev/null +++ b/sci-libs/rocBLAS/rocBLAS-4.3.0.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) + +inherit cmake prefix python-any-r1 + +DESCRIPTION="AMD's library for BLAS on ROCm." +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocBLAS" +SRC_URI="https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-${PV}.tar.gz -> rocm-${P}.tar.gz + https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-${PV}.tar.gz -> rocm-Tensile-${PV}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~amd64" +IUSE="benchmark test" +SLOT="0/$(ver_cut 1-2)" + +BDEPEND=" + dev-util/rocm-cmake + !dev-util/Tensile + $(python_gen_any_dep ' + dev-python/msgpack[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + ') +" + +DEPEND=" + dev-util/hip:${SLOT} + dev-libs/msgpack + test? ( virtual/blas + dev-cpp/gtest + sys-libs/libomp ) + benchmark? ( virtual/blas + sys-libs/libomp ) +" +RESTRICT="!test? ( test )" + +python_check_deps() { + has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" && + has_version "dev-python/msgpack[${PYTHON_USEDEP}]" +} + +S="${WORKDIR}"/${PN}-rocm-${PV} + +PATCHES=("${FILESDIR}"/${PN}-4.3.0-fix-glibc-2.32-and-above.patch + "${FILESDIR}"/${PN}-4.3.0-change-default-Tensile-library-dir.patch + "${FILESDIR}"/${PN}-4.3.0-link-system-blas.patch ) + +src_prepare() { + eapply_user + + pushd "${WORKDIR}"/Tensile-rocm-${PV} || die + eapply "${FILESDIR}/Tensile-${PV}-hsaco-compile-specified-arch.patch" # backported from upstream, should remove after 4.3.0 + eapply "${FILESDIR}/Tensile-4.3.0-output-commands.patch" + popd || die + + # Fit for Gentoo FHS rule + sed -e "/PREFIX rocblas/d" \ + -e "/<INSTALL_INTERFACE/s:include:include/rocblas:" \ + -e "s:rocblas/include:include/rocblas:" \ + -e "s:\\\\\${CPACK_PACKAGING_INSTALL_PREFIX}rocblas/lib:${EPREFIX}/usr/$(get_libdir)/rocblas:" \ + -e "s:share/doc/rocBLAS:share/doc/${P}:" \ + -e "/rocm_install_symlink_subdir( rocblas )/d" -i library/src/CMakeLists.txt || die + + # Use setup.py to install Tensile rather than pip + sed -r -e "/pip install/s:([^ \"\(]*python) -m pip install ([^ \"\)]*):\1 setup.py install --single-version-externally-managed --root / WORKING_DIRECTORY \2:g" -i cmake/virtualenv.cmake + + sed -e "s:,-rpath=.*\":\":" -i clients/CMakeLists.txt || die + + cmake_src_prepare + eprefixify library/src/tensile_host.cpp +} + +src_configure() { + # allow acces to hardware + addpredict /dev/kfd + addpredict /dev/dri/ + addpredict /dev/random + + export PATH="${EPREFIX}/usr/lib/llvm/roc/bin:${PATH}" + + local mycmakeargs=( + -DTensile_LOGIC="asm_full" + -DTensile_COMPILER="hipcc" + -DTensile_LIBRARY_FORMAT="msgpack" + -DTensile_CODE_OBJECT_VERSION="V3" + -DTensile_TEST_LOCAL_PATH="${WORKDIR}/Tensile-rocm-${PV}" + -DBUILD_WITH_TENSILE=ON + -DBUILD_WITH_TENSILE_HOST=ON + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DCMAKE_INSTALL_INCLUDEDIR="include/rocblas" + -DCMAKE_SKIP_RPATH=TRUE + -DBUILD_TESTING=OFF + -DBUILD_CLIENTS_SAMPLES=OFF + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) + ${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"} + -D__skip_rocmclang="ON" ## fix cmake-3.21 configuration issue caused by officialy support programming language "HIP" + ) + + CXX="hipcc" cmake_src_configure + + # do not rerun cmake and the build process in src_install + sed -e '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die +} + +check_rw_permission() { + cmd="[ -r $1 ] && [ -w $1 ]" + errormsg="${user} do not have read and write permissions on $1! \n Make sure ${user} is in render group and check the permissions." + if has sandbox ${FEATURES}; then + user=portage + su portage -c "${cmd}" || die ${errormsg} + else + user=`whoami` + ${cmd} || die ${errormsg} + fi +} + +src_test() { + # check permissions on /dev/kfd and /dev/dri/render* + check_rw_permission /dev/kfd + check_rw_permission /dev/dri/render* + addwrite /dev/kfd + addwrite /dev/dri/ + cd "${BUILD_DIR}/clients/staging" || die + ROCBLAS_TENSILE_LIBPATH="${BUILD_DIR}/Tensile/library" ./rocblas-test +} + +src_install() { + cmake_src_install + + if use benchmark; then + cd "${BUILD_DIR}" || die + dolib.so clients/librocblas_fortran_client.so + dobin clients/staging/rocblas-bench + fi +} diff --git a/sci-libs/rocPRIM/Manifest b/sci-libs/rocPRIM/Manifest index a1eb9cc3e542..426a8b63eb8c 100644 --- a/sci-libs/rocPRIM/Manifest +++ b/sci-libs/rocPRIM/Manifest @@ -1,3 +1,5 @@ DIST rocPRIM-4.0.0.tar.gz 285576 BLAKE2B 44f3542068dee48c0f2bb475f4d3fd74592fe27f4ca00a7b754014deaaa7187c4363d4b2e7fe13ff771b48d2885b848b9632ef71ce85e80e0946e4e5f13495d8 SHA512 c37fce4f16788d82379459af69b9f47f2bccb3b0e655e7314a23936cc99a474afb0092f240bd950341f1b02ce93d03abce0df7ce62ffcb5d577171ce870dd1d2 +DIST rocPRIM-4.3.0.tar.gz 290071 BLAKE2B f69ada9859ef9238d4f8c50bc2b10d131c986dbd8982cc0c7f8614cd51746080aba3b3e7b0ef3e1d5006c179a823f4fcb8ce03cc0a4c88fad3cb46947c7b7fb6 SHA512 9925f832637d19360bf1624dd7a6ef931fb740ee725e35c3159a09a3c569af6f61e3337124c8e0561e60c8595d0d533a4402b91345056ff8d276c6e1dd491036 EBUILD rocPRIM-4.0.0-r1.ebuild 1264 BLAKE2B eb3c16d117287c9a7c13b761b10af63e79b6f83d079f469319878c033bf690fed40ce0e73d29d06c2511fbc6e9a7cb87452d9019bb50e55a3a24b5b94dbe323f SHA512 69f4fb57bb026e85eebae3655a7f3f7f0ebc0155e6e503df93043cdceec8b1d5ec3a4bba4e217ea64def8be19314ddd7b4352ee6d4c8a003f9c447d25db3163a -MISC metadata.xml 600 BLAKE2B 58bfa38b94ad743ce533a8200ed17984d502d819a6db1006665727340a3b57d718f0659f16fcba34aedec7ef3bc94c639a024f9770ab2723acf534e2a9c2d537 SHA512 6da79fc8bed01f2236f79b3134435685c5732ea9362eb25b212501b0b77aeb3c72e260fe0156280f9d2e5d43a0a875dade787221ba1b718670202e762d32f626 +EBUILD rocPRIM-4.3.0.ebuild 2156 BLAKE2B c15e8c87f240c651e3eab048a14191fb7ca3804c8d19ad3ccb4af791e800616aa385795e5800722d7bc3ea0689d595dfdf15fa5c509b2ed5483107a0b09cab26 SHA512 cece69fc733336d2504009da1b1a9eb15f519e7f28ca881a1c2a6915f77c48395ebff11d2048e94a6bb4e517af0d0116004a2722cf413ebc506fd97ddfde57aa +MISC metadata.xml 697 BLAKE2B c5dfa03206ba2ef62423d00ca02783fe5c33837c8951148229fc4322017b0a28f30d96a652ef9b84af158e197e2bef69179f066e6cb8fe5ce1e538eb0bc5ba6f SHA512 6805892d01162edfe6a2fa9122f17667e7ac8038d4fe8547ecacc1659d8cdf5e378cfdf96fffeb3c871bbcb45d2c0923649e60336a31663dba0b3ed159b2e04c diff --git a/sci-libs/rocPRIM/metadata.xml b/sci-libs/rocPRIM/metadata.xml index 3902658bd2f1..69514726be69 100644 --- a/sci-libs/rocPRIM/metadata.xml +++ b/sci-libs/rocPRIM/metadata.xml @@ -16,4 +16,7 @@ <upstream> <remote-id type="github">ROCmSoftwarePlatform/rocPRIM</remote-id> </upstream> + <use> + <flag name="benchmark">Build and install benchmark programs.</flag> + </use> </pkgmetadata> diff --git a/sci-libs/rocPRIM/rocPRIM-4.3.0.ebuild b/sci-libs/rocPRIM/rocPRIM-4.3.0.ebuild new file mode 100644 index 000000000000..98f626fe7f9a --- /dev/null +++ b/sci-libs/rocPRIM/rocPRIM-4.3.0.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="HIP parallel primitives for developing performant GPU-accelerated code on ROCm" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocPRIM" +SRC_URI="https://github.com/ROCmSoftwarePlatform/rocPRIM/archive/rocm-${PV}.tar.gz -> rocPRIM-${PV}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" +IUSE="benchmark test" + +RDEPEND="dev-util/hip:${SLOT} + benchmark? ( dev-cpp/benchmark )" +BDEPEND="dev-util/rocm-cmake:${SLOT} + test? ( dev-cpp/gtest )" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/rocPRIM-rocm-${PV}" + +RESTRICT="!test? ( test )" + +src_prepare() { + # "hcc" is depcreated, new platform ist "rocclr" + sed -e "/HIP_PLATFORM STREQUAL/s,hcc,rocclr," -i cmake/VerifyCompiler.cmake || die + + # Install according to FHS + sed -e "/PREFIX rocprim/d" \ + -e "/INSTALL_INTERFACE/s,rocprim/include,include/rocprim," \ + -e "/DESTINATION/s,rocprim/include,include," \ + -e "/rocm_install_symlink_subdir(rocprim)/d" \ + -i rocprim/CMakeLists.txt || die + + # disable downloading googletest and googlebenchmark + sed -r -e '/Downloading/{:a;N;/\n *\)$/!ba; d}' -i cmake/Dependencies.cmake || die + + # remove GIT dependency + sed -r -e '/find_package\(Git/{:a;N;/\nendif/!ba; d}' -i cmake/Dependencies.cmake || die + + # install benchmark files + if use benchmark; then + sed -e "/get_filename_component/s,\${BENCHMARK_SOURCE},${PN}_\${BENCHMARK_SOURCE}," \ + -e "/add_executable/a\ install(TARGETS \${BENCHMARK_TARGET})" -i benchmark/CMakeLists.txt || die + fi + + eapply_user + cmake_src_prepare +} + +src_configure() { + # Grant access to the device + addwrite /dev/kfd + addpredict /dev/dri/ + + # Compiler to use + export CXX=hipcc + + local mycmakeargs=( + -DBUILD_TEST=$(usex test ON OFF) + -DBUILD_BENCHMARK=$(usex benchmark ON OFF) + ${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"} + -D__skip_rocmclang="ON" ## fix cmake-3.21 configuration issue caused by officialy support programming language "HIP" + ) + + cmake_src_configure +} + +src_test() { + # Grant access to the device + addwrite /dev/kfd + addwrite /dev/dri/ + cmake_src_test +} diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest index 0038d6442c91..cbf2945bd689 100644 --- a/sci-libs/rocSPARSE/Manifest +++ b/sci-libs/rocSPARSE/Manifest @@ -1,3 +1,30 @@ +AUX rocSPARSE-4.3.0-remove-matrices-unpacking.patch 933 BLAKE2B 03e9ded8e313352dcdb181351fb4decc1c1e6d7e2e8019b7624c0d3273182f1ba7b296fdfa862e8be8d13d023561a8febb5b982e4a8b16dc8fc1af3f508d2196 SHA512 1b63b4e2b930b4cde29c41ec9f2a5c6f5f4b8291ba7aa6a5a714a2fbfd2b7978c5cd6b3f4a5f5c63da6765e0696efadc54942096a0a985f1d3cc668477c44969 DIST rocSPARSE-4.0.0.tar.gz 587761 BLAKE2B 25f9f0183c06b574505fe6e9011b32ea4fbe48c0a1883b8991baf45b8a2238312f352e614c0069531c986e548453b6e7b7a77f883dffea82ed41df488964b55d SHA512 4a4acf24a789ea58b53a8d06ea528a6aed8eabac21a7a3cd73011e9b31d03dceb488cc72f29c5513205f2b538d24e9dbaccda1a932bcc466cd04a65606a77b3b +DIST rocSPARSE-4.3.0.tar.gz 809183 BLAKE2B 06a83d98572927f0f2c65f4f36194394b66a02a5ce9d3e21da04c53e9ad97809daffe02a35691aa52466f7dfb4d4a8c645b87e1e4da579de7f91323df3a41d59 SHA512 e3ee5a15d36c3002ee60aabd94c7f47b0cb9f0b5a33cefa9061df9f04b1fcc3c1503e4f01e2f36c07477179c6753827b505e9b512e8b5bfca00f76e3efd99c1d +DIST rocSPARSE_ASIC_320k.tar.gz 11301444 BLAKE2B a00cc4a3ededab3fb56339319e34e936645ddce2dee3c630153b37e337384c207b0a2829227fb7f4c2db1fe33383e97410ab7ad459d391c025f5410843d51cf2 SHA512 1db3af391c30a371c1ac0087436e266721474273a39d5b2b6d56408d950dcbbee004750e4dce4e3dbc4cb512f38f6d945676d7f29b62c52fd5a7fed0fe789e03 +DIST rocSPARSE_Chebyshev4.tar.gz 50165660 BLAKE2B f1a95554c8f38937f501488fabfd406b773eb980d7463cadac0de162529ac2f834c655cadd2b65f4c42a8487bc2d67c749601ae33bd789051f9e4d1e157196a0 SHA512 fdec4947a4af923d28b4be8d23690fd6d356c58f8344a5dcdd2e3fa61769d83e47a84d65316b527e6e82d9f988de2675a852367d406e44b44d784137a90b95c0 +DIST rocSPARSE_Chevron2.tar.gz 3210636 BLAKE2B 919bc19931cbcb32c09e6b623c9d3890400895dfd65e83845d351a8e3dd8b30ef43374c3c0ca3ee9708c81b5fb8886f1a4adbea6086495f08f9498f19a2279d5 SHA512 22b71deddec4f1af5b239d4065089230cf70e521102803a77ab3f16b34a0d69534817e54d81dfa7f8d1f299932c0f0424237baeb3d8289bcfffa4b902b00e256 +DIST rocSPARSE_Chevron3.tar.gz 15315390 BLAKE2B 72d06664f17ffb0190f27438244fbbdaab495d7fdda087f48608a8c3afbd52d9409bd9f96de5790e70d59ff2ae225a0992b50144746db3ca6b3853a03fd7530c SHA512 db80fd3c61c1b6e7cf1eb28b6e142cd4dbc61ad274003f1fcc8bd35e74d36add2f746550abc1b967cd46389a8f9b2a93016802777733b3f5a56338f753fe49ed +DIST rocSPARSE_Chevron4.tar.gz 30454185 BLAKE2B 42f906acde4046c1ca10b5c8a88356da0ae90875129b72805fc3c69954d194f712a26ee1a05093953e3d2f6d2af498aa4d28389ff8c2cb5a88389a0db3b34f9d SHA512 0b9fe82d58e9cdae8b9a585d57f12122708bdad453885c259ff5345b7756474bd15ecac26c10456eca8020b84c520a8b46c06bdd2414cb56efd5bd3ae07ade36 +DIST rocSPARSE_amazon0312.tar.gz 11303646 BLAKE2B 388947a29380253bb5eecb22d3a3b6f3378711044b3fe98d6d2517cd27330f11b3d12fdb96320a2889e139224f1a6a5ad1c455ff8e91a262aa2aadbe16301330 SHA512 aed2d62581763742d9c7faf3dcaf1eaa983caa1e2e7ad4abebe97c5e7c2aec9942e0e32291092b348b60052c92b130e721ec19ed59bda22e1b233ef72ac7d2ff +DIST rocSPARSE_bibd_22_8.tar.gz 20548479 BLAKE2B b6d0f7b7eb9c3b4ccade55313ca29f5706dde264c03d5d342f16ff27d7cf38ff2648dabea0342683257a6bb16cae85259c7e102a56c70d1e81c8a334c36f3d91 SHA512 3df85485f679c82e7554e8f6dff9d498bc9135bfc70aa81e85d83dbef457f31831dfc23b8d83425289329efc45fdcd41eef1e79f5205500479992892bbcf11fe +DIST rocSPARSE_bmwcra_1.tar.gz 67958791 BLAKE2B 8be4e73cf837fd717e77042c416dee81995cd39bae39bdc1b7f6e6b309ee263130774f030ce7883ae89234227fec115d0178cfe1b2589af79fde6e2a3270b01c SHA512 049722d3524fb7397c4f00ce9a034e75612b839353bbbd7b963900ec19eeb5a4ec54a780882b4929fc4dd6932efb2f676432d444c3d256f9b57d5f392e5241ca +DIST rocSPARSE_mac_econ_fwd500.tar.gz 12051668 BLAKE2B cd59723ea4fa8b0b4024c3534b3c3b42541754353319eca88628ca8216fb619dce3b1e774d6b823155c8afc9b5a65b3ea113edb36f6141c72e1189e97bfcbd37 SHA512 f279d2d71c92456bb0a5168bf3d8bc77eb991f4cbef6eea2c98d038be9ab2f2b576480e081099f766fe888480e91026a619a8de9d04758c26ee316ac4a09fdb5 +DIST rocSPARSE_mc2depi.tar.gz 10874561 BLAKE2B 89fd12479a76a9ec2f488aeadcf58688a2bf9dbc0e1065a7002b0a458bfa48704711ab69d1be6a25396c3c3e48ee4f6b6866984c1ff76074619898eeebb951bc SHA512 82e5bd935d5d6fb83801b5a7848bf7dc636459ba7b14b327a135c5e88528bdc47e4822927aa44c8e21316b538e5f6563024152253c5deb606dbaec77ff986594 +DIST rocSPARSE_mplate.tar.gz 499620 BLAKE2B 794b2e3b054ea40274115db8b981f475e9420982ded0e381fe0670350bda3918d36fdc5d21b1df417423dcce35f85d7c7dfa591d177c5a4491892abfceefdb4f SHA512 61f27e268fb17c24faeddca8279ca4747b076d6c7f98f2caaf814fcbbb9ccd374d133d6b7943dc4f1f7197a64a9fbc4366d194c51bad515bf48ceb5a73a0b1c8 +DIST rocSPARSE_nos1.tar.gz 3025 BLAKE2B cb0630782e996fd8717f845dfecc979abf9d59e5573c00226990a9575a9ec4b14d25197c3a0602baa5bf3e9073e14484374f28ce43108e3df680c1f62995cc77 SHA512 6eb5b65ba2230bb2468d93526990772ce7508faffe0fa5b0c5767859cd0fb0acbdc2d94dab3e5097a4a47dc4d7b0313891037d8a29720eb803cfaf26ae529495 +DIST rocSPARSE_nos2.tar.gz 10313 BLAKE2B 15e83686358285746b4d51e4d69d27bf058ea29aa448745fde76e3cb9ed6f1f8612f94739d980ff830e3610da7a9afe8ee9f6eb86e28e41bf8df74032a23ad63 SHA512 2e50b3bf99e2bedb1eabf58d0293bf9484713204340b2f68ae919d9e842a8c6e4ca917b7d61d4e171ae9e4002ced034913d83c5de6e75f16dae9079467cc424a +DIST rocSPARSE_nos3.tar.gz 34282 BLAKE2B 741257a8c0945cfacce808ad56ee5c306a6d7ea96c8c36183bd3b5b24ddef586d78bbfb5dfdb251ab8e6905842b63ebfa9c481c272d598ff195558248a566e01 SHA512 cb260dec5947765004f497249c0b46d15271e2dd69e99bc2925352d52ac75d27bb9635b1d4bb445b1d79de03aa6803a219a5c80a242fcf7ff74c7e80c0f8f59c +DIST rocSPARSE_nos4.tar.gz 1760 BLAKE2B 24b9dadfd42a6c5f1988c98ef01319d8ae20f447293ce334723f9290f76b878311df4e0ae0fe7788081f27303359392b8694e06b7dc0a64a69fac00a3168d59a SHA512 2f0c40c971d5eea986efc389fc6770f5e8099c8924c7221b1c46ab0be44641d499f20d536b313999d2b31b356568255c98cbba3b0804a00de18a95a052431e0b +DIST rocSPARSE_nos5.tar.gz 13125 BLAKE2B 3b5e7166dfae258e9b6667eaa7b172d862eb3fc755751f6f9e63e76b16b5a0b14bf2f58a59ed5513fc641eb7df7f478e1cacc45940a6a49ec87eb1007c3209c3 SHA512 6151b9de84498495f3e03d11ff26d7013b5109068474abbee6018b3fe90a5e518823a06a9cc8c62013cd61925061b45d3f5aabaa01da61286665039d8cb06655 +DIST rocSPARSE_nos6.tar.gz 7644 BLAKE2B 1690af9969bcd2eee760571874a04e36ef4dd76a8349a307c0cc4d02cbc59ed12df0646509528e3b136836230d887a8eb4e1095b7423737a3831e5680ea07e9e SHA512 22dbbb825648948fd3d2eb7a2ca8c45d6746b5b386406b1dacbeb575f1ebeeb14ff49f62e5fbdc8a784def398c319f810537991180740f6efffe4e94fdb15aef +DIST rocSPARSE_nos7.tar.gz 9639 BLAKE2B 5d63cfbe45f2f968a62cd8bcf0c25b831f485cd9dd0d95bdb248ab7b62ab67476c60ed8a4ad811f7db158a893e08a753beb3b1e7ed6f727219b985d932570eb0 SHA512 39109bbe3d0d791a0a2eeb272f2359bad34332191c53db7487a01770ac4c7ea1af2cc5e05a0ff5744f413113b7fcbe493a36cfc880436af274fe7dc6c39d6e11 +DIST rocSPARSE_qc2534.tar.gz 1247151 BLAKE2B 9e0515d5fa20019bf436e45b72be6ee6d832388e59194516a393c9c6efc52fdbc6dee64e75d72576b495886324acc81be3642b7cde2f07dff2072059fbf5ebf9 SHA512 d2a18d73122362484944cddca55c28cbb41ba351257481b6803452295a41563976fcf7c73ef00e7b693550c0b32bad2af1220b67a14ac727c023fe80b4abb271 +DIST rocSPARSE_rma10.tar.gz 19466055 BLAKE2B bb8ac5fe06bb6d7814864b3d43f9ddd1d2daafe55c31bdd9153cf6744d3d113fff878c4396a26d1a021bf9612c08798964c3bd9de8ea9829b202b912fb31db2e SHA512 c8ce8fc8fa7192ba2ac240439c90701080a590945dfb92bb80886f513205a0360ff8e5fd19819ad97d1eb58c3d83b57e5482e5361199cc9626e2afee8d84f4ac +DIST rocSPARSE_scircuit.tar.gz 8635362 BLAKE2B 3f1d6e35a6a774664bd653dd466fa3c07818bfdee4a2633bfcacd5936569194863753fe7ebd0e1497ecdabbc716617ca6012801242e8d733f5d5d189e8d3feb2 SHA512 4949c869c17a66f19660cbe21b61615fb468d5afb1a773f9d6fe09cbc45b4c6245b647148dbab102b45599c53acaf4ed96ab815e17e538068c927a4d25b9bd2a +DIST rocSPARSE_shipsec1.tar.gz 22175245 BLAKE2B f1d34482b8c3d3ee48033097d7d6f9b648e3c396a5ab2379efdc7de218adec519a235e2e94904f85a4f24c8d4ff15af096ca089379e00db47519023f64b85c16 SHA512 e027097e74f8ffc058339855b1c38cab52c68b661058318b429487e7188e11e907f6734894f9c71d1e38d262986525fba8d0f165bc0a1b4632d7e25be8db4f17 +DIST rocSPARSE_sme3Dc.tar.gz 42483568 BLAKE2B f0d16b58f6ea28e67727637697a812a0b10d524c73aeb82f702411b9ebaea3670780e762ed0701aae80c6829e950233f74555523ef2d6c5740b007c7a65c03d4 SHA512 c5a0be2db919a45310a73ea1dd96d0d30168135f887a8c5c3d7ca11e2c3d12ea7d1331be20968d0135bd18da4ef2b043db68eeb7567b6f0f8daf782b87083c3a +DIST rocSPARSE_webbase-1M.tar.gz 11360460 BLAKE2B 01b1d06adb5fb32fa402ed888d25a7e52a34779b078fc2e21c60e688d03579bb4ca8694f5ee4a824f7859952d55590a1fd9449dc80d6fe894d7b662b918882d4 SHA512 6401a965b8f6dd5392879956fde3c94f77fe1801a4a43428c03b6d639031575c647eab47b1babe53f4ecc2c3b8fc183e8339536b78dcd0d94ce62bfedd87c161 EBUILD rocSPARSE-4.0.0-r1.ebuild 1166 BLAKE2B fc45fdaaf8d5f20afcc0d477eac01d30100a3ac3355ddae786ee934f46ef55b4f6ac3b284875fc905f75452cbfbb655ad4cfb9f916905e1a6091e8b97a14f141 SHA512 221e3aea6c45e7d7a6edc3b96db32ed9d2deb040f1f4cafa9cbb139a146aa7500d4619e6e8db39683fed9c0bc34053dc8ede22525340457c1774f6ea90297a98 -MISC metadata.xml 602 BLAKE2B 20524bdc94d007be739f97e51d576ff04fe83e69b2d49751ae2b4fca6afa12cbdf5ea86f8be34c6743e76c070a18c4d5c40c2c2488614517d9ff346042a8ba3d SHA512 8a68af54bc151d635fc48dcac6253f427acdc3947a3f7eb9c0c271e6733de9f432df17be7ae584dbc29f3068dc23b08e165657b356d8f90a7f9cf77809825c62 +EBUILD rocSPARSE-4.3.0.ebuild 4557 BLAKE2B 0ca53de6d519bc369b25ba573c6aacc5adf7a554bad514698a719c4794af236909cc4be8650bf84327ed6965d7e86ca9a96fd31240c06a1e49723f7b303001e5 SHA512 f746cda86084c8e6ccfc7ff9635332440663ffec3082ddb78052204f5210110a81edc0fb19d6616166bea1962d20c746e0ee92160468aa670433bfd1d567ba9f +MISC metadata.xml 694 BLAKE2B ff879c8ee3db081bcfb673e15086ab483d35d293aa5332b775cd73549090e801056977b7d8d1241ca273f58e80f6ae65da242bc3b6163f156d569fa938341213 SHA512 20c2b415ad843741c7b1fa22ad6a8380a3253a304f6ef66df2a3c1d8748b546190f00acc799e067d07df7ed6ed2309ab7b538b28363ad7705a356e3e8b606df0 diff --git a/sci-libs/rocSPARSE/files/rocSPARSE-4.3.0-remove-matrices-unpacking.patch b/sci-libs/rocSPARSE/files/rocSPARSE-4.3.0-remove-matrices-unpacking.patch new file mode 100644 index 000000000000..2f19725a6e10 --- /dev/null +++ b/sci-libs/rocSPARSE/files/rocSPARSE-4.3.0-remove-matrices-unpacking.patch @@ -0,0 +1,36 @@ +Don't let cmake handle test data download, unpack and convert + +--- orig/clients/tests/CMakeLists.txt ++++ rocSPARSE-rocm-4.3.0/clients/tests/CMakeLists.txt +@@ -23,31 +23,6 @@ + + find_package(GTest 1.10.0 REQUIRED) + +-# +-# Client matrices. +-# +-if(NOT EXISTS "${CMAKE_MATRICES_DIR}") +- # +- # Download. +- # +- set(CMAKE_MATRICES_DIR ${PROJECT_BINARY_DIR}/matrices CACHE STRING "Matrices directory.") +- +- if(NOT TARGET rocsparse) +- set(CONVERT ${CMAKE_SOURCE_DIR}/../deps/convert CACHE STRING "Convert tool mtx2csr.") +- include(${CMAKE_SOURCE_DIR}/../cmake/ClientMatrices.cmake) +- else() +- set(CONVERT ${CMAKE_SOURCE_DIR}/deps/convert CACHE STRING "Convert tool mtx2csr.") +- include(${CMAKE_SOURCE_DIR}/cmake/ClientMatrices.cmake) +- endif() +- +-else() +- +- # +- # Copy. +- # +- execute_process(COMMAND cp -r ${CMAKE_MATRICES_DIR} ${PROJECT_BINARY_DIR}/matrices) +- +-endif() + + set(ROCSPARSE_TEST_SOURCES + test_axpby.cpp diff --git a/sci-libs/rocSPARSE/metadata.xml b/sci-libs/rocSPARSE/metadata.xml index a6b4d47cdfe7..496b630798a6 100644 --- a/sci-libs/rocSPARSE/metadata.xml +++ b/sci-libs/rocSPARSE/metadata.xml @@ -16,4 +16,7 @@ <upstream> <remote-id type="github">ROCmSoftwarePlatform/rocSPARSE</remote-id> </upstream> + <use> + <flag name="benchmark">Build and install rocblas-bench.</flag> + </use> </pkgmetadata> diff --git a/sci-libs/rocSPARSE/rocSPARSE-4.3.0.ebuild b/sci-libs/rocSPARSE/rocSPARSE-4.3.0.ebuild new file mode 100644 index 000000000000..6683c6a0517d --- /dev/null +++ b/sci-libs/rocSPARSE/rocSPARSE-4.3.0.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake toolchain-funcs + +DESCRIPTION="Basic Linear Algebra Subroutines for sparse computation" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocSPARSE" + +SRC_URI="https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-${PV}.tar.gz -> rocSPARSE-${PV}.tar.gz +test? ( +https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> ${PN}_amazon0312.tar.gz +https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> ${PN}_Chebyshev4.tar.gz +https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> ${PN}_sme3Dc.tar.gz +https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> ${PN}_webbase-1M.tar.gz +https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> ${PN}_rma10.tar.gz +https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> ${PN}_bibd_22_8.tar.gz +https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> ${PN}_mac_econ_fwd500.tar.gz +https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> ${PN}_mc2depi.tar.gz +https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> ${PN}_scircuit.tar.gz +https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> ${PN}_ASIC_320k.tar.gz +https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> ${PN}_bmwcra_1.tar.gz +https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> ${PN}_nos1.tar.gz +https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> ${PN}_nos2.tar.gz +https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> ${PN}_nos3.tar.gz +https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> ${PN}_nos4.tar.gz +https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> ${PN}_nos5.tar.gz +https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> ${PN}_nos6.tar.gz +https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> ${PN}_nos7.tar.gz +https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> ${PN}_shipsec1.tar.gz +https://sparse.tamu.edu/MM/Cote/mplate.tar.gz -> ${PN}_mplate.tar.gz +https://sparse.tamu.edu/MM/Bai/qc2534.tar.gz -> ${PN}_qc2534.tar.gz +https://sparse.tamu.edu/MM/Chevron/Chevron2.tar.gz -> ${PN}_Chevron2.tar.gz +https://sparse.tamu.edu/MM/Chevron/Chevron3.tar.gz -> ${PN}_Chevron3.tar.gz +https://sparse.tamu.edu/MM/Chevron/Chevron4.tar.gz -> ${PN}_Chevron4.tar.gz +)" + +LICENSE="MIT" +KEYWORDS="~amd64" +IUSE="benchmark test" +SLOT="0/$(ver_cut 1-2)" + +RDEPEND="dev-util/hip:${SLOT} + sci-libs/rocPRIM:${SLOT}" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-cpp/gtest ) +benchmark? ( app-admin/chrpath )" + +RESTRICT="!test? ( test )" + +S="${WORKDIR}/rocSPARSE-rocm-${PV}" + +PATCHES=( "${FILESDIR}/${PN}-4.3.0-remove-matrices-unpacking.patch" ) + +src_prepare() { + sed -e "s/PREFIX rocsparse//" \ + -e "/<INSTALL_INTERFACE/s,include,include/rocsparse," \ + -e "/rocm_install_symlink_subdir(rocsparse)/d" \ + -e "s:rocsparse/include:include/rocsparse:" \ + -i "${S}/library/CMakeLists.txt" || die + + # remove GIT dependency + sed -e "/find_package(Git/d" -i cmake/Dependencies.cmake || die + + # Test need download data from https://sparse.tamu.edu (or other mirror site), check MD5, unpack and convert them into csr format + # This process is handled default by ${S}/cmake/ClientMatrices.cmake, but should be the responsibility of portage. + if use test; then + mkdir -p "${BUILD_DIR}"/matrices + # compile and use the mtx2csr converter. Do not use any optimization flags, because it causes error! + ebegin "$(tc-getCXX) deps/convert.cpp -o deps/convert" + $(tc-getCXX) deps/convert.cpp -o deps/convert + eend $? + find "${WORKDIR}" -maxdepth 2 -name "*.mtx" -print0 | + while IFS= read -r -d '' mtxfile; do + destination=${BUILD_DIR}/matrices/$(basename -s '.mtx' ${mtxfile}).csr + ebegin "Converting ${mtxfile} to ${destination}" + deps/convert ${mtxfile} ${destination} + eend $? + done + fi + + cmake_src_prepare +} + +src_configure() { + # Grant access to the device to omit a sandbox violation + addwrite /dev/kfd + addpredict /dev/dri/ + + # Compiler to use + export CXX=hipcc + + local mycmakeargs=( + -DBUILD_CLIENTS_SAMPLES=OFF + -DCMAKE_INSTALL_INCLUDEDIR="include/rocsparse" + -DCMAKE_SKIP_RPATH="ON" + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) + ${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"} + -D__skip_rocmclang="ON" ## fix cmake-3.21 configuration issue caused by officialy support programming language "HIP" + ) + + cmake_src_configure +} + +src_test() { + addwrite /dev/kfd + addwrite /dev/dri/ + cd "${BUILD_DIR}/clients/staging" || die + ./rocsparse-test +} + +src_install() { + cmake_src_install + + if use benchmark; then + local rocsparse_bench="${BUILD_DIR}/clients/staging/rocsparse-bench" + chrpath -d "${rocsparse_bench}" + dobin "${rocsparse_bench}" + fi +} diff --git a/sci-libs/rosetta-fragments/Manifest b/sci-libs/rosetta-fragments/Manifest deleted file mode 100644 index 30499e229715..000000000000 --- a/sci-libs/rosetta-fragments/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX rosetta-fragments-3.1-chemshift.patch 1721 BLAKE2B fe06e82eb2888767a0f16a8e045c78ccdcbb142b48d9da334bc1465acd5cf5850e3511552b224272c30908e24cfbfcc0d0ba88f0ebc094b9438a30174ac1ca4b SHA512 3475a4fd7a433d4d380ccd5ab11cf32f326fafc828d1bead0dbb0e03f5e53c613bf57c7950e090d8a2eb34c4ba93ecf25b25afcc9f251ff5f943e6b7e3112bb1 -AUX rosetta-fragments-3.1-nnmake.patch 7030 BLAKE2B a3ca2811e9831d4fd49e981374783448060b09aab2749c366b438b66a3c5114c4cdf86cdcd2d9277ff52b3cfb004fa5d6510292b730af4eb3e15f9b70e83a70e SHA512 de6d41f68911a5beddc8a15c9ce33013b03462642229aaf3b09ae4123c281260fa725bbd55593eea305b05d2ed21e1d17394686ee4e42bda20825d71d9367501 -DIST rosetta3.1_fragments.tgz 221931894 BLAKE2B 0fb5764f24f3386cdbce9afce7da3f81cce91a6a0a57a265e5dbe0bf06146e4ab057c02961ed0dd8074f86309257bcf5b42ca0d1c6adf92c9f8ebf36b3f25f5d SHA512 a2b2646c916ea1b98e2c7267c1eadb1fd6cb76d015c24bd4e8318ce127cb5d96ca56bfdd76821e1dd884e03d59631f544e221b9f541ad4063a99e96dbb029da1 -EBUILD rosetta-fragments-3.1-r1.ebuild 1136 BLAKE2B cfc7638e87da56b1af8ae0b5859dfe4701d836c50961df5a09d2fe949da3716c4ec2c2eafe75e8c7bc5fff9564905dce35f3839ef5b02fd06ca392f80add1a64 SHA512 c9f25d1f5017aaae5d9043f6ce6b22d77f1d7109fc2dd54073eb24197dcb725ef69846ef0a6643c80c61aab036be0d8e0aad638c7950dcb0b3a4f5bb3e84cf92 -MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92 diff --git a/sci-libs/rosetta-fragments/files/rosetta-fragments-3.1-chemshift.patch b/sci-libs/rosetta-fragments/files/rosetta-fragments-3.1-chemshift.patch deleted file mode 100644 index cb8fd9197d1b..000000000000 --- a/sci-libs/rosetta-fragments/files/rosetta-fragments-3.1-chemshift.patch +++ /dev/null @@ -1,62 +0,0 @@ - chemshift/make.system | 24 ++++++++++++------------ - chemshift/makefile | 2 +- - 2 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/chemshift/make.system b/chemshift/make.system -index 53bbd38..d105802 100644 ---- a/chemshift/make.system -+++ b/chemshift/make.system -@@ -60,18 +60,18 @@ endif - ########## once COMPILER is set, here are the options - - # defaults --F77=f77 --FFLAGS= --FOPTIMFLAGS=-O --FDEBUGFLAGS=-g -+F77?=f77 -+FFLAGS?= -+FOPTIMFLAGS?= -+FDEBUGFLAGS?= - FPROFILEFLAGS=-P - - ifeq ($(COMPILER),gnu) -- F77 = g77 -- FFLAGS = -finline-functions -funroll-loops -W -ffixed-line-length-132 -Wimplicit -- FOPTIMFLAGS = -O -ffast-math -malign-double -- FDEBUGFLAGS = -g -Wall -Wimplicit -Wsurprising -Wformat -W -- FPROFILEFLAGS = -pg -+ F77 ?= g77 -+ FFLAGS += -W -ffixed-line-length-132 -Wimplicit -+ FOPTIMFLAGS += -malign-double -+ FDEBUGFLAGS += -Wall -Wimplicit -Wsurprising -Wformat -W -+ FPROFILEFLAGS = - endif - - ifeq ($(COMPILER),pgi) # on mary, good bounds checking -@@ -108,9 +108,9 @@ endif - - # Suse ppc gnu - ifeq ($(COMPILER),ppc) -- F77 = g77 -- FFLAGS = -Wall -finline-functions -funroll-loops -W -ffixed-line-length-132 -- FDEBUGFLAGS = -g -C -Mbounds -+ F77 ?= g77 -+ FFLAGS += -Wall -W -ffixed-line-length-132 -+ FDEBUGFLAGS += -C -Mbounds - FOPTIMFLAGS = - endif - -diff --git a/chemshift/makefile b/chemshift/makefile -index 712e98f..05d3b64 100644 ---- a/chemshift/makefile -+++ b/chemshift/makefile -@@ -64,7 +64,7 @@ regular: compile - # rule to compile executable - compile: $(BASE_NAME).$(COMPILER) - $(BASE_NAME).$(COMPILER) : print ${OBJS} -- $(F77) $(FFLAGS) -o $@ $(OBJS) $(LINKFLAGS) -+ $(F77) $(FFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LINKFLAGS) - - # rule to compile object files: - .$(COMPILER).%.o: %.f diff --git a/sci-libs/rosetta-fragments/files/rosetta-fragments-3.1-nnmake.patch b/sci-libs/rosetta-fragments/files/rosetta-fragments-3.1-nnmake.patch deleted file mode 100644 index 91da48017eff..000000000000 --- a/sci-libs/rosetta-fragments/files/rosetta-fragments-3.1-nnmake.patch +++ /dev/null @@ -1,153 +0,0 @@ - nnmake/dipolar_nn.f | 2 +- - nnmake/make.system | 33 ++++++++++++++++----------------- - nnmake/make_fragments.pl | 36 ++++++++++++++++++------------------ - nnmake/makefile | 2 +- - 4 files changed, 36 insertions(+), 37 deletions(-) - -diff --git a/nnmake/dipolar_nn.f b/nnmake/dipolar_nn.f -index c159888..4412a20 100644 ---- a/nnmake/dipolar_nn.f -+++ b/nnmake/dipolar_nn.f -@@ -1396,7 +1396,7 @@ car pairDipolar(1,i) .le. pairDipolar(1,i+1) - write(0,*)'rejected' - write(0,*)x(1,iset),x(2,iset),x(3,iset),x(4,iset),x(5,iset) - do i=1,maplength(iset) -- write(0,'(i,6f6.3)')i,A(i,1),A(i,2),A(i,3),A(i,4),A(i,5), -+ write(0,'(i6,6f6.3)')i,A(i,1),A(i,2),A(i,3),A(i,4),A(i,5), - # b(i) - enddo - goto 300 -diff --git a/nnmake/make.system b/nnmake/make.system -index 34bea8f..2fbfabf 100644 ---- a/nnmake/make.system -+++ b/nnmake/make.system -@@ -55,18 +55,17 @@ endif - ########## once COMPILER is set, here are the options - - # defaults --F77=f77 --FFLAGS= --FOPTIMFLAGS=-O --FDEBUGFLAGS=-g --FPROFILEFLAGS=-P -+F77?=f77 -+FOPTIMFLAGS= -+FDEBUGFLAGS= -+FPROFILEFLAGS= - - ifeq ($(COMPILER),gnu) -- F77 = g77 -- FFLAGS = -finline-functions -funroll-loops -W -ffixed-line-length-132 -Wimplicit -- FOPTIMFLAGS = -O -ffast-math -malign-double -- FDEBUGFLAGS = -g -Wall -Wimplicit -Wsurprising -Wformat -W -- FPROFILEFLAGS = -pg -+ F77 ?= g77 -+ FFLAGS += -W -ffixed-line-length-132 -Wimplicit -+ FOPTIMFLAGS += -malign-double -+ FDEBUGFLAGS += -Wall -Wimplicit -Wsurprising -Wformat -W -+ FPROFILEFLAGS = - endif - - ifeq ($(COMPILER),pgi) # on mary, good bounds checking -@@ -82,9 +81,9 @@ ifeq ($(COMPILER),pgi) # on mary, good bounds checking - endif - - ifeq ($(COMPILER),absoft) # on mary, fast -- F77 = f77 -- FFLAGS = -N109 -s -W -- LINKFLAGS = -lU77 -+ F77 ?= f77 -+ FFLAGS ?= -N109 -s -W -+ LINKFLAGS += -lU77 - FDEBUGFLAGS = -C -g - FOPTIMFLAGS = -O -N18 - FPROFILEFLAGS = -P -O -@@ -103,10 +102,10 @@ endif - - # Suse ppc gnu - ifeq ($(COMPILER),ppc) -- F77 = g77 -- FFLAGS = -Wall -finline-functions -funroll-loops -W -ffixed-line-length-132 -- FDEBUGFLAGS = -g -C -Mbounds -- FOPTIMFLAGS = -+ F77 ?= g77 -+ FFLAGS += -Wall -W -ffixed-line-length-132 -+ FDEBUGFLAGS += -C -Mbounds -+ FOPTIMFLAGS += - endif - - # alpha flags -diff --git a/nnmake/make_fragments.pl b/nnmake/make_fragments.pl -index 5273685..29619a2 100755 ---- a/nnmake/make_fragments.pl -+++ b/nnmake/make_fragments.pl -@@ -19,38 +19,38 @@ - - my $TAIL = "_v1_3"; - --$src_dir = '/work/chu/rosetta/rosetta_C++/rosetta-2.2.0/rosetta_fragments'; --$shareware_dir = '/work/chu/src/shareware'; --$scratch = "/scratch/shared"; -+$src_dir = '@GENTOO_PORTAGE_EPREFIX@/'; -+$shareware_dir = '$src_dir/usr/share'; -+$scratch = "$src_dir/scratch/shared"; - - # psi-blast - #my $BLAST_BIN_DIR = "$shareware_dir/new_blast/blast-2.2.12/bin"; --my $PSIBLAST = "$shareware_dir/blast/bin/blastpgp"; # PSI-BLAST (duh.) --my $NR = "/$scratch/genomes/nr"; # nr blast database filename --my $VALL_BLAST_DB = "/$scratch/nnmake_database/vall.blast.2006-05-05"; # vall blast database filename (cvs respository 'nnmake_database') --my $BLOSUM = "$scratch/nnmake_database/"; # BLOSUM score matrices directory (cvs repository 'nnmake_database') -+my $PSIBLAST = "$src_dir/usr/bin/blastpgp"; # PSI-BLAST (duh.) -+my $NR = "$shareware_dir/nr"; # nr blast database filename -+my $VALL_BLAST_DB = "$shareware_dir/rosetta-fragments/nnmake_database/vall.blast.2006-05-05"; # vall blast database filename (cvs respository 'nnmake_database') -+my $BLOSUM = "$shareware_dir/rosetta-fragments/nnmake_database/"; # BLOSUM score matrices directory (cvs repository 'nnmake_database') - - # psipred --my $FILTNR = "$scratch/genomes/filtnr"; # filtnr blast database filename --my $MAKEMAT = "$shareware_dir/blast/bin/makemat"; # makemat utility (part of NCBI tools) --my $PSIPRED = "$shareware_dir/psipred/bin/psipred"; # psipred --my $PSIPASS2 = "$shareware_dir/psipred/bin/psipass2"; # psipass2 (part of psipred pkg) -+my $FILTNR = "$src_dir/tmp/filtnr"; # filtnr blast database filename -+my $MAKEMAT = "$src_dir/usr/bin/makemat"; # makemat utility (part of NCBI tools) -+my $PSIPRED = "$src_dir/usr/bin/psipred"; # psipred -+my $PSIPASS2 = "$src_dir/usr/bin/psipass2"; # psipass2 (part of psipred pkg) - my $PSIPRED_DATA = "$shareware_dir/psipred/data"; # dir containing psipred data files. - - # prof - #my $PROF = "$shareware_dir/prof/run_prof.py"; --my $PROF = "$src_dir/nnmake/run_prof.py"; # remember to change prof executable location in run_prof.py -+my $PROF = "$src_dir/usr/bin/run_prof.py"; # remember to change prof executable location in run_prof.py - - # nnmake --my $VALL = "$scratch/nnmake_database"; # dir containing vall database (cvs repository 'nnmake_database') --my $VALL2 = "$scratch/nnmake_database"; # alt dir containing vall database (cvs repository 'nnmake_database') -+my $VALL = "$shareware_dir/rosetta-fragments/nnmake_database"; # dir containing vall database (cvs repository 'nnmake_database') -+my $VALL2 = "$shareware_dir/rosetta-fragments/nnmake_database"; # alt dir containing vall database (cvs repository 'nnmake_database') - my $VALL_NAME = "vall.dat.2006-05-05"; # filename of vall (vall.dat.<id> and vall_cst_coord.dat.<id> must exist) --my $NNMAKE = "$src_dir/nnmake/pNNMAKE.gnu"; # nnmake binary (cvs respository 'nnmake') --my $TRIMLOOPS = "$src_dir/nnmake/trimLoopLibrary.pl"; # trimLoopLibrary.pl (cvs respository 'nnmake') -+my $NNMAKE = "$src_dir/usr/bin/pNNMAKE"; # nnmake binary (cvs respository 'nnmake') -+my $TRIMLOOPS = "$src_dir/usr/bin/trimLoopLibrary.pl"; # trimLoopLibrary.pl (cvs respository 'nnmake') - - # chemshift --my $CHEMSHIFT = "$src_dir/chemshift/pCHEMSHIFT.gnu"; # chemshift binary (cvs repository 'chemshift') --my $TALOS_DB = "$scratch/chemshift_database"; # TALOS databases directory (cvs respository 'chemshift_database') -+my $CHEMSHIFT = "$src_dir/usr/bin/pCHEMSHIFT"; # chemshift binary (cvs repository 'chemshift') -+my $TALOS_DB = "$shareware_dir/rosetta-fragments/chemshift_database"; # TALOS databases directory (cvs respository 'chemshift_database') - - # jufo (secondary structure prediction software) - my $JUFO = "$shareware_dir/jufo/molecule.exe"; # jufo executable -diff --git a/nnmake/makefile b/nnmake/makefile -index c09ac1c..ebfde68 100644 ---- a/nnmake/makefile -+++ b/nnmake/makefile -@@ -102,7 +102,7 @@ VallCoord: coord_compile - # rule to compile executable - compile: print $(BASE_NAME).$(COMPILER) - $(BASE_NAME).$(COMPILER) : ${OBJS} -- $(F77) $(FFLAGS) -o $@ $(OBJS) $(LINKFLAGS) -+ $(F77) $(FFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LINKFLAGS) - - coord_compile: print $(COORD_BASE_NAME).$(COMPILER) - $(COORD_BASE_NAME).$(COMPILER) : ${COORD_OBJS} diff --git a/sci-libs/rosetta-fragments/metadata.xml b/sci-libs/rosetta-fragments/metadata.xml deleted file mode 100644 index 8937bad0b175..000000000000 --- a/sci-libs/rosetta-fragments/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-chemistry@gentoo.org</email> - <name>Gentoo Chemistry Project</name> - </maintainer> -</pkgmetadata> diff --git a/sci-libs/rosetta-fragments/rosetta-fragments-3.1-r1.ebuild b/sci-libs/rosetta-fragments/rosetta-fragments-3.1-r1.ebuild deleted file mode 100644 index bc262a212a42..000000000000 --- a/sci-libs/rosetta-fragments/rosetta-fragments-3.1-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic prefix toolchain-funcs vcs-clean - -DESCRIPTION="Fragment library for rosetta" -HOMEPAGE="http://www.rosettacommons.org" -SRC_URI="rosetta3.1_fragments.tgz" - -LICENSE="rosetta" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -DEPEND="" -RDEPEND=" - sci-biology/ncbi-tools - sci-biology/update-blastdb - sci-biology/psipred" - -RESTRICT="fetch" - -S="${WORKDIR}"/${PN/-/_} - -PATCHES=( - "${FILESDIR}"/${P}-nnmake.patch - "${FILESDIR}"/${P}-chemshift.patch -) - -pkg_nofetch() { - einfo "Go to ${HOMEPAGE} and get ${PN}.tgz and rename it to ${A}" - einfo "which must be placed into your DISTDIR directory." -} - -src_prepare() { - default - tc-export F77 - eprefixify nnmake/*.pl -} - -src_compile() { - emake -C nnmake - emake -C chemshift -} - -src_install() { - esvn_clean . - - newbin nnmake/pNNMAKE.gnu pNNMAKE - newbin chemshift/pCHEMSHIFT.gnu pCHEMSHIFT - - dobin nnmake/*.pl - - insinto /usr/share/${PN} - doins -r *_database - dodoc \ - fragments.README \ - nnmake/{nnmake.README,vall/*.pl} \ - chemshift/chemshift.README -} diff --git a/sci-libs/sktime/Manifest b/sci-libs/sktime/Manifest deleted file mode 100644 index 6dcd7a2b3853..000000000000 --- a/sci-libs/sktime/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST sktime-0.4.2.tar.gz 9662976 BLAKE2B 248c2a9868f9199caab5c4c724ddcad61301a75ce1425baaabb2185da37d80a68332bf5c2d2d64a10e0b844bea9226be5291005d9893705eb0ff8f2018c6493d SHA512 855b33f42f938c671e99b8fa58ff6adbf67144daf53dd883ac041fe9b8cd5400cfbb8e27169d491c6bea2d76a53c035bae08d9e4f8a1c6f5f444c08bcd65c4f4 -EBUILD sktime-0.4.2.ebuild 754 BLAKE2B 4d4b2679b32c3871350d8d721266818aa3941551091f73abb3e79a7bfeaf0da3b81dfcac6959873391c9f6829a3afac3fb6b819e73faa6daed74f910c52d953b SHA512 fe6d6647c4f73c4da02ccf986fb1faff56ef9ebb09337f19f3d5fb9ceeea688e9ae83717b3996b42e1eb3e8e5a6d116b434ceae3139eb55c183a417125bc5cb3 -MISC metadata.xml 527 BLAKE2B a32578630788b5265c4bf937c5de0cf71b9a9a7a4f3be9572a4e192c75961348a2a67700a7fb865b543588d21aca6da52e85c8fc7dbedd14ce3b2cd5af3fc928 SHA512 73068f2761ecdcc91fc607070ce9a7e362b89644653b8ed4a35ffc3b6cae9f684e3c8773f107c2489adc726edec8c6af756f52e4893f197c5ef9fa3f2686f079 diff --git a/sci-libs/sktime/metadata.xml b/sci-libs/sktime/metadata.xml deleted file mode 100644 index c1db6c242c36..000000000000 --- a/sci-libs/sktime/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>gentoo@aisha.cc</email> - <name>Aisha Tammy</name> - </maintainer> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <upstream> - <remote-id type="pypi">sktime</remote-id> - <remote-id type="github">alan-turing-institute/sktime</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/sktime/sktime-0.4.2.ebuild b/sci-libs/sktime/sktime-0.4.2.ebuild deleted file mode 100644 index 74a80acafb4a..000000000000 --- a/sci-libs/sktime/sktime-0.4.2.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_IN_SOURCE_BUILD=1 -inherit distutils-r1 - -DESCRIPTION="scikit-learn toolbox for working with time series" -HOMEPAGE="https://sktime.org" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pandas[${PYTHON_USEDEP}] - dev-python/statsmodels[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - sci-libs/scikit-learn[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -python_compile() { - distutils-r1_python_compile bdist_egg egg_info bdist_wheel -} - -python_install() { - distutils-r1_python_install - python_optimize -} diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index cbb6f6edd974..16ad699f7a9e 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -9,13 +9,13 @@ AUX vtk-8.2.0-qt-5.15.patch 1153 BLAKE2B 2e0d041d15f547845c07d46da4f641df7a57c0d AUX vtk-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch 1529 BLAKE2B 6e3890d824cd3362439f3fdea0f3d01a37d7a5c1e871ed6ecbcecfb4e6e425ce4caf6176b122df4b80fbe1b95661a729428be0e3302205309949080894be7563 SHA512 1177b4815a800afbbaf8ee92a4d52df513c702fcc965cd0c12ba7f91cf58b2ed035277138ef2a091a4649eaf84e6f9b9275f8875385d4cfb89f6d3262c5eef4a AUX vtk-9.0.1-limits-include-gcc11.patch 2654 BLAKE2B 69eae5782234e46c2a38dbc3bf3d01082518314c62742996b953a6b17ceca9d85ca9a83a907c6820210bc0ff406640476dcafc1a533d90071e1c0517a06cc938 SHA512 ef16b3dea49f29d537bfbef26e62f91e59056288eac5c0c41191fee6c2181336dcceaa27b84a541c442d986b8ce1cdf3a9effdedcab1e1a1e242efad34954d00 DIST VTK-8.2.0.tar.gz 35511819 BLAKE2B 908ed9377d75da6d0bd84de0078ba90a1e9396fcc906ca2981102e2c79d9d3ba4b1297f98682cd2802c7c04f9dbec32ee70740e645c44180befd765f7cda34a6 SHA512 521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286 -DIST VTK-9.0.1.tar.gz 34687900 BLAKE2B 2c1cc2a35eb6f05d23ec49d8c3c8d787134ce840f940d948da1e03d6875c15e2660c52776218fc3dbccf77959d9affaef051cba14991e6dd150ef5d50b5ae2eb SHA512 eb2508e2409ad302cc5db65282a9c1ff4477ac8a93e0fee898ad8f0974d72decc7d5d444dc825a3c2f7952ebf59853616097ebe0d134649cab0d49a9619065bf +DIST VTK-9.0.3.tar.gz 34684378 BLAKE2B 6862ab2df95bbefe9d3970757af6521cfa874476f6ee8e64c4e6e279f2e0cbb8a8299bc3b0b8bb9b7254d01a169644e7927b67b11b2ce934ddc87bce0a9e4c26 SHA512 00528011f9206444d09fc6cea05c46930745bb70ea02be6244ab3eb510ae82af772157c025157b1761dc4c6a9ab538b57f814c03a708f30aa3598a421fdc6ae2 DIST VTKData-8.2.0.tar.gz 304287875 BLAKE2B 0292d84be40e11203326dcb1bf45f4a6ad2a785968130d4868a230f1cfbdcb600d0c03d4dae3519e2737dc7a964f29c51500c91b3da4291069608dd80a2bce45 SHA512 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b -DIST VTKData-9.0.1.tar.gz 413680549 BLAKE2B 2804f8261763553408c1de8b0d47091875a262cf670604289879253922932f260d4ce8d1586e9b2a8ef3a1286c90e8a61c6472fafcddbd9b40090818eb310d49 SHA512 2fc418a6e15bd4e30ce181bb209c39666982645dbdbe2d6491683497662b72712689e58cf54b7af91865d0e3d0cb3f9ab66606b02964d57bf88d769d292dd938 +DIST VTKData-9.0.3.tar.gz 413854066 BLAKE2B 84c2fa0ae5df8567cc06022262fe3ea1202c553168757c94aa4a0a258360deccdf349d474c2f6585fc2054ee8e0468df4c80ec835cecf6b2391efa639f479eaa SHA512 28ab2ecb32860d820f736e9ceb4345bcd03471f0a35b90f8c9ccbe05454f7a95a4de3c99bae2f4b9db87a27ef8fe50159cd283f5e921f4e6e69b06a50a0570c6 DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d26599b48208b4104f41eaa90f99483689cd928cb00e3a7def396d65db2f03c9294d132854a27af74f66eb118c8319c4ce SHA512 8a7ea3d5870b1e4ccb31c77b4c270d00208349da1b2938e957210db3ec1449b678c66edc2faee1d4514aca6d725f642abc91e10ab0c151f6743cad1c53485588 -DIST VTKLargeData-9.0.1.tar.gz 247522733 BLAKE2B a1d603f7560cf2cd7d1f355fd30fa5b638f2559259f09a6cbbe80da8c2937b1c50cfa2c3b2c6adf99b5bbf537678f817e44bc72962f36364913ae6cc524ae8a8 SHA512 b3303d633f063a6f3bfcc61b441f445611ff7cff6f006c77d8452eb5a3af89a18b2a1201a2dbd230af085b9e45b9abb70319d2f41db0f1e19c632286e7b02ec2 +DIST VTKLargeData-9.0.3.tar.gz 247523270 BLAKE2B f4011292957454da5d8c9e515bcd0972af4299cef3928098d745be96559a1e0080297871c6e11fdd98498c8786a30a6674bc650368adcbcdbc6260e0938d21a1 SHA512 ebd6cb5f2935b77961dd68d0c0da2ea5ab900cec8c2eb641c785a604c65702e40a3e44d32bf3f2acfce9ec28dd89f41bf29f93a4f89d5b36c713f3743d7125b1 DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317 -DIST vtkDocHtml-9.0.1.tar.gz 138707547 BLAKE2B 1493d21a41b5f8fd43c3503cb4f98905c6d8d0c39e3245a97141bb1baa59ef0054b52595b48fe2b1c1579b02da0dd1f660e5ef7fefd3c7a9cfdbed42f923a234 SHA512 9997fb73ab46d28f107f5a7ef31a86f6948cd3ff88184fd4f1b0cc14dff1b8b6395e420ae2b2a42e772b90b84d8e077cc4543b8b8c9495481c3f8271949f11e4 +DIST vtkDocHtml-9.0.3.tar.gz 132650096 BLAKE2B 45fc1a6942df3e79e500a552c3b3cda2099b9451191559d471e3a2e785a8c52b2c6273cfd2cc4a3f3f65582e607d9414475f58d243fde96a4f985bed479e53db SHA512 9b5fef43f3c2b92aa1fe6a9ba9458d6677874b09b167654db7f26df6feffdc34ed1a8fb4e59d64b75625063a774af77fe57f275903602a5f7daa74e1a2e71800 EBUILD vtk-8.2.0-r4.ebuild 10333 BLAKE2B 834bac0a4f2a2ebb770a67b62dab0240c45588ddebf5939e4e0557441750c8a83cb76ecee02a3841673e2749ffd628ea8e611f9327c214c01a95eeb5dd23fd75 SHA512 26c1bf583d835717950cd0f5842eb358ed31728484c906b9122e5cb72b72f0255f73f6a52974d098eebe2af6af9a72aa4b369148cf47d1ca994ebd6dfcd3f68a -EBUILD vtk-9.0.1.ebuild 14476 BLAKE2B 2e67bbb40a0b63df76193c8d3883b35180e84c6a97b65ac551017a6e32340a67433d2f34db1f912996d5c6a138816d7efb5f3fe39e2c892c421c4395e650df0b SHA512 bfa4a2d152b81e52cf0bec0fb41b35985df7e8ff0a11385b3907bd93a8745a3e5726819f84edc5b63d0a30afdcd5d065dd70afed077de64234904602ed7bbd90 +EBUILD vtk-9.0.3.ebuild 14489 BLAKE2B 959b7accc51be3a2b8b6995fc1bf7c0a700c754270bd99764cc0540bb669f2ce62d0226a4db4a0b973381834aa01651e1d838074534c39e2582be8384c8f94c4 SHA512 b83b1fdce20db83441959c16ac2d777c718880c5844a67a4b1ffc1d6b2d91b66ce53a149054292b5f8423fc5f999e04e1a54ddc1bde91598b45e229d815608ef MISC metadata.xml 1404 BLAKE2B d55945785c3e374227585ec5adb6cf9ad652c111cf4de2572179ea7f88df21b281bd02f841f9acdea72e034e4504cfe204833c44a265690ef4966bcf574bc0d0 SHA512 1d15b7c59d735c84915288dec1166ab9e48cfbe42d050bb4cc74e6c878a54c1e31da0e7edca5ffcbcb7d50de77d849b3df6ff68e07495e1c549217f87b0708c1 diff --git a/sci-libs/vtk/vtk-9.0.1.ebuild b/sci-libs/vtk/vtk-9.0.3.ebuild index a38e3f1c3270..df3fa636198a 100644 --- a/sci-libs/vtk/vtk-9.0.1.ebuild +++ b/sci-libs/vtk/vtk-9.0.3.ebuild @@ -64,7 +64,7 @@ RDEPEND=" media-libs/libpng media-libs/libtheora media-libs/tiff - sci-libs/hdf5:=[mpi=] + <sci-libs/hdf5-1.12:=[mpi=] sci-libs/kissfft[openmp?] sci-libs/netcdf:=[mpi=] sys-libs/zlib @@ -130,7 +130,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${P}-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch + "${FILESDIR}"/${PN}-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch "${FILESDIR}"/${PN}-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch "${FILESDIR}"/${PN}-9.0.1-limits-include-gcc11.patch ) |