From 57c2e006d0af9ab77ced676461d7100cade4a716 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Nov 2022 01:07:24 +0000 Subject: gentoo auto-resync : 23:11:2022 - 01:07:24 --- sci-libs/Manifest.gz | Bin 44406 -> 44403 bytes sci-libs/openblas/Manifest | 2 + .../openblas/files/openblas-0.3.21-clang16.patch | 581 +++++++++++++++++++++ sci-libs/openblas/openblas-0.3.21-r1.ebuild | 197 +++++++ sci-libs/pdal/Manifest | 2 +- sci-libs/pdal/pdal-2.4.3.ebuild | 2 +- 6 files changed, 782 insertions(+), 2 deletions(-) create mode 100644 sci-libs/openblas/files/openblas-0.3.21-clang16.patch create mode 100644 sci-libs/openblas/openblas-0.3.21-r1.ebuild (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index f73329c81e66..a2f469d46c1c 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest index e52f90808a85..356d811a9204 100644 --- a/sci-libs/openblas/Manifest +++ b/sci-libs/openblas/Manifest @@ -1,6 +1,7 @@ AUX openblas-0.3.12-shared-blas-lapack.patch 2008 BLAKE2B 2d3a4a90d8144cbf149b7711b67364176a94287f26448930b5a4fd29fe761fb250e9007c580fb1ffa8148c477e2f4057f9cd8d7aa07efeb85caa842802d358fd SHA512 3f0d4b480549565c838eba6371e0990c162f56a226f9d26e1639e012ae3f39809f8c6badcf8fdfbb1258f45367dbaff9c4c611b8b44bac27d341aea954f0133e AUX openblas-0.3.20-fix-loong.patch 5694 BLAKE2B 0d4eb185ead0a47855e411670816aaf52e22530160cc2b29c7eca8a077d7bfb49a501d154c7492a259287efbd6dd24496f53d91cb834a97b2fec441d3dd06cf1 SHA512 1e90165549bc0a441003cf7bc0b1fa3e2af6eaaaad92ab5aca0d3f9569976184cbe653a049c26e81f016cf66152ac9903f619a990f54613fe3f091eb94fd742f AUX openblas-0.3.20-fix-riscv.patch 3786 BLAKE2B 5ba65c1f44aa8cd8f1b88458dfe16ef32bfd92260bed2b3b60596a16c9778a94b7c03752f41ad649ba1742c72b7528768fa51fcf30639c2bc0064ad132b0d747 SHA512 aec236b9d6fa9c80cef6401cf43e594cb17c73137cfcc17286046d8d85bb6a5bb6367b808a8b85152313cb596919de0173812832037ba88e4e39b722e4a8d2e1 +AUX openblas-0.3.21-clang16.patch 17596 BLAKE2B 29a6d2716e31ad65de3252375c1a11b769c59924d09df190fd458a85dcb4c03fda041255b4239b6f41b9b799805e67bf4940f93e5baced5674eacb141eb6f711 SHA512 2e488295b282a267f5a49aa077331cfd2b35552d6099d22d8f37beb5521ebc1d4d08ba512b3b6d863f42a5f1c25153c74d83dc56be687f32e095fe1ff248bef6 AUX openblas-0.3.21-fix-loong.patch 7341 BLAKE2B 33bd86e61b8a9d5d7130a4dd3a2d03f2e4ddd9703a3c2d6cf8e31e0af7499ea6128a1b7979f0a347b813292af2dca507d9b06e9ced6ab4e821d5f33ee03e5054 SHA512 c1c19e8965794658baff61bdc9082981b9e69b487c4221837ef10f176b12ee152bad0e37bbd0c347722ee2daf83adb016e75b149dad2b140ad4c631646290642 DIST openblas-0.3.18.tar.gz 12619822 BLAKE2B 38a5e7b861eb0063a4494c1cfb6f7f5723741437ecdd5cb1fb42645eb73bceb472b3a8c11eec3d0ba4f676981ac89de4ff1ee0d7ea42d1e234746f34ce8fb6b8 SHA512 df9a14026a61bdc5285636bfd7a52dce244d24fcf4a0c870ef4e58b8b50e412849828ca5aeac2a2435f635e78e60559762e8bae22ea7bc5dff2e865a96d81152 DIST openblas-0.3.19.tar.gz 12706050 BLAKE2B c29aa27faaf18e3330087f8d2ebed733f53878266d6865239dfbb1624a113f3cabc988bbfcc18a0aa5d971697bc68bb267795ef24e2d8e0e8d50f802cb817b57 SHA512 1fcbcfefb7744894b0b0c83c6071b342086ca311dc67f5c2745812d61dcc9d31ef7dd5e1215dfb2731ae7197d497dbdf8f8b26a432eb07d41a7db0983eb86a33 @@ -9,5 +10,6 @@ DIST openblas-0.3.21.tar.gz 23729571 BLAKE2B 678bfb13ead69045e7d4d840bbcaed884d9 EBUILD openblas-0.3.18.ebuild 5778 BLAKE2B 20eacb6dfeb8114f77c9c63ee7962a4180bc029e8b950c4049b2d4d12cc81d666fd42ae13565cc9c1d9841510672308b8142ddcf898b795422c417e415ee3a9d SHA512 6155bff0b7bed8bff2db6eb3fc7d41be2eb1ae5638954825d6dea963a714067547bbd8459bbc438bad7c730e5607688bf8fc14fb6154c6a5065e87ea2012964e EBUILD openblas-0.3.19.ebuild 5778 BLAKE2B 20eacb6dfeb8114f77c9c63ee7962a4180bc029e8b950c4049b2d4d12cc81d666fd42ae13565cc9c1d9841510672308b8142ddcf898b795422c417e415ee3a9d SHA512 6155bff0b7bed8bff2db6eb3fc7d41be2eb1ae5638954825d6dea963a714067547bbd8459bbc438bad7c730e5607688bf8fc14fb6154c6a5065e87ea2012964e EBUILD openblas-0.3.20.ebuild 5882 BLAKE2B 593c2164016813464a3d3832e5b24ff4ed854960bda3c74a5bc10a1e5fe14c0dfb8c06a00d7c499e5cc1c04b7aae3abd0a074303a49c5fd409fe800cd95891f4 SHA512 5eee438e2d047b4f5df3e478d1809131e49f250396019b426e153124c6ea8d88b8f3b962c3074e037e3e6ef334b72deae7bff4e1d9452181fbbf2f49964cfa54 +EBUILD openblas-0.3.21-r1.ebuild 5640 BLAKE2B 3c28209ed2eab0fafb53de1a98fcfed2819bc75fd96e24207ed974265c982b272ff3b9628e9a611b2f07d92c725c9fda6b3b5a73ab39b64538755993ff17a2d2 SHA512 bb4220f766ff2f4e749b1ca54b366de238132f82fe632cfba8ca420dc5d6b97c6be09e9cbe03915a7f6404d3675aae266de0576d2785f5cb0d83ed347b6a6e3e EBUILD openblas-0.3.21.ebuild 5606 BLAKE2B 8f86ba88525b0b938cc766a57a7c38066ffcc584a5846791f15790b41ac59641449af3c8646a03a337dc23948ef2252857225a911c08105c066f023cffe54854 SHA512 210682410ff9731913d58eb34cdb0c5f550f91b23d8f50603044e0bb80a748b2eeb7779e2cf73fde6fc35ed08e1c586bd5c1a3d4ae7f43157ecba470566686b8 MISC metadata.xml 1561 BLAKE2B 5ba7ec66dd8ba7ca8bc29bc0193b48b6a82b4949bb79bab461400040667aa66aac3cfd2ad9c7323798048fd43d18ac96a562d53b68f3f7ae8bf8505ac7a04691 SHA512 05272eb56480ff82b240d0f430df3df03981e24b971dbd37c13d464f4f4b334bac19b54915446a09326a334aa76249bb79a4fa389d26150365f21389992f9a48 diff --git a/sci-libs/openblas/files/openblas-0.3.21-clang16.patch b/sci-libs/openblas/files/openblas-0.3.21-clang16.patch new file mode 100644 index 000000000000..051966b0a870 --- /dev/null +++ b/sci-libs/openblas/files/openblas-0.3.21-clang16.patch @@ -0,0 +1,581 @@ +https://github.com/xianyi/OpenBLAS/commit/f703846ad9400a8ea175cb8dd43e18c152aeab93 +https://github.com/xianyi/OpenBLAS/commit/515cf269291bec0d43651fe7bf99a71fb074a0ad +https://github.com/xianyi/OpenBLAS/commit/91110f92d218492d0efbdc1fdf34277ca45f4b36 +https://github.com/xianyi/OpenBLAS/commit/9402df5604e69f86f58953e3883f33f98c930baf +https://github.com/xianyi/OpenBLAS/commit/101a2c77c3f3610933f450cefca3e312edab2186 +https://src.fedoraproject.org/rpms/openblas/c/5f27d51cebe1c1bb6598d38326ece8dc0ac71ec7?branch=rawhide + +From f703846ad9400a8ea175cb8dd43e18c152aeab93 Mon Sep 17 00:00:00 2001 +From: Martin Kroeker +Date: Sat, 13 Aug 2022 11:38:27 +0200 +Subject: [PATCH] Add function prototypes + +--- a/exports/gensymbol ++++ b/exports/gensymbol +@@ -4000,6 +4000,22 @@ case "$p1" in + no_underscore_objs="$no_underscore_objs $misc_common_objs" + + printf 'int main(void){\n' ++ for obj in $underscore_objs; do ++ [ "$obj" != "xerbla" ] && printf 'extern void %s%s%s%s();\n' \ ++ "$symbolprefix" "$obj" "$bu" "$symbolsuffix" ++ done ++ ++ for obj in $need_2underscore_objs; do ++ printf 'extern void %s%s%s%s%s();\n' \ ++ "$symbolprefix" "$obj" "$bu" "$bu" "$symbolsuffix" ++ done ++ ++ for obj in $no_underscore_objs; do ++ printf 'extern void %s%s%s();\n' \ ++ "$symbolprefix" "$obj" "$symbolsuffix" ++ done ++ ++ printf '\n' + for obj in $underscore_objs; do + [ "$obj" != "xerbla" ] && printf '%s%s%s%s();\n' \ + "$symbolprefix" "$obj" "$bu" "$symbolsuffix" +--- a/exports/gensymbol.pl ++++ b/exports/gensymbol.pl +@@ -3955,6 +3955,18 @@ + @no_underscore_objs = (@no_underscore_objs, @misc_common_objs); + + print "int main(void){\n"; ++ foreach $objs (@underscore_objs) { ++ print "extern void ", $symbolprefix, $objs, $bu, $symbolsuffix, "();\n" if $objs ne "xerbla"; ++ } ++ ++ foreach $objs (@need_2underscore_objs) { ++ print "extern void ", $symbolprefix, $objs, $bu, $bu, $symbolsuffix, "();\n"; ++ } ++ ++ foreach $objs (@no_underscore_objs) { ++ print "extern void ", $symbolprefix, $objs, $symbolsuffix, "();\n"; ++ } ++ + foreach $objs (@underscore_objs) { + print $symbolprefix, $objs, $bu, $symbolsuffix, "();\n" if $objs ne "xerbla"; + } + +From 515cf269291bec0d43651fe7bf99a71fb074a0ad Mon Sep 17 00:00:00 2001 +From: Martin Kroeker +Date: Wed, 14 Sep 2022 11:48:36 +0200 +Subject: [PATCH] Fix pointer/integer argument mismatch in calls to pow() + +--- a/lapack-netlib/SRC/claed0.c ++++ b/lapack-netlib/SRC/claed0.c +@@ -796,10 +796,10 @@ f"> */ + + temp = log((real) (*n)) / log(2.f); + lgn = (integer) temp; +- if (pow_ii(&c__2, &lgn) < *n) { ++ if (pow_ii(c__2, lgn) < *n) { + ++lgn; + } +- if (pow_ii(&c__2, &lgn) < *n) { ++ if (pow_ii(c__2, lgn) < *n) { + ++lgn; + } + iprmpt = indxq + *n + 1; +--- a/lapack-netlib/SRC/claed7.c ++++ b/lapack-netlib/SRC/claed7.c +@@ -864,11 +864,11 @@ f"> */ + /* Form the z-vector which consists of the last row of Q_1 and the */ + /* first row of Q_2. */ + +- ptr = pow_ii(&c__2, tlvls) + 1; ++ ptr = pow_ii(c__2, *tlvls) + 1; + i__1 = *curlvl - 1; + for (i__ = 1; i__ <= i__1; ++i__) { + i__2 = *tlvls - i__; +- ptr += pow_ii(&c__2, &i__2); ++ ptr += pow_ii(c__2, i__2); + /* L10: */ + } + curr = ptr + *curpbm; +--- a/lapack-netlib/SRC/clalsa.c ++++ b/lapack-netlib/SRC/clalsa.c +@@ -1051,7 +1051,7 @@ f"> */ + /* Finally go through the left singular vector matrices of all */ + /* the other subproblems bottom-up on the tree. */ + +- j = pow_ii(&c__2, &nlvl); ++ j = pow_ii(c__2, nlvl); + sqre = 0; + + for (lvl = nlvl; lvl >= 1; --lvl) { +@@ -1065,7 +1065,7 @@ f"> */ + ll = 1; + } else { + i__1 = lvl - 1; +- lf = pow_ii(&c__2, &i__1); ++ lf = pow_ii(c__2, i__1); + ll = (lf << 1) - 1; + } + i__1 = ll; +@@ -1110,7 +1110,7 @@ f"> */ + ll = 1; + } else { + i__2 = lvl - 1; +- lf = pow_ii(&c__2, &i__2); ++ lf = pow_ii(c__2, i__2); + ll = (lf << 1) - 1; + } + i__2 = lf; +--- a/lapack-netlib/SRC/cstedc.c ++++ b/lapack-netlib/SRC/cstedc.c +@@ -836,10 +836,10 @@ f"> */ + lrwmin = *n - 1 << 1; + } else if (icompz == 1) { + lgn = (integer) (log((real) (*n)) / log(2.f)); +- if (pow_ii(&c__2, &lgn) < *n) { ++ if (pow_ii(c__2, lgn) < *n) { + ++lgn; + } +- if (pow_ii(&c__2, &lgn) < *n) { ++ if (pow_ii(c__2, lgn) < *n) { + ++lgn; + } + lwmin = *n * *n; +--- a/lapack-netlib/SRC/dlaed0.c ++++ b/lapack-netlib/SRC/dlaed0.c +@@ -827,10 +827,10 @@ f"> */ + + temp = log((doublereal) (*n)) / log(2.); + lgn = (integer) temp; +- if (pow_ii(&c__2, &lgn) < *n) { ++ if (pow_ii(c__2, lgn) < *n) { + ++lgn; + } +- if (pow_ii(&c__2, &lgn) < *n) { ++ if (pow_ii(c__2, lgn) < *n) { + ++lgn; + } + iprmpt = indxq + *n + 1; +--- a/lapack-netlib/SRC/dlaed7.c ++++ b/lapack-netlib/SRC/dlaed7.c +@@ -885,11 +885,11 @@ f"> */ + /* Form the z-vector which consists of the last row of Q_1 and the */ + /* first row of Q_2. */ + +- ptr = pow_ii(&c__2, tlvls) + 1; ++ ptr = pow_ii(c__2, *tlvls) + 1; + i__1 = *curlvl - 1; + for (i__ = 1; i__ <= i__1; ++i__) { + i__2 = *tlvls - i__; +- ptr += pow_ii(&c__2, &i__2); ++ ptr += pow_ii(c__2, i__2); + /* L10: */ + } + curr = ptr + *curpbm; +--- a/lapack-netlib/SRC/dlaeda.c ++++ b/lapack-netlib/SRC/dlaeda.c +@@ -754,7 +754,7 @@ f"> */ + /* scheme */ + + i__1 = *curlvl - 1; +- curr = ptr + *curpbm * pow_ii(&c__2, curlvl) + pow_ii(&c__2, &i__1) - 1; ++ curr = ptr + *curpbm * pow_ii(c__2, *curlvl) + pow_ii(c__2, i__1) - 1; + + /* Determine size of these matrices. We add HALF to the value of */ + /* the SQRT in case the machine underestimates one of these square */ +@@ -781,12 +781,12 @@ f"> */ + /* rotations and permutation and then multiplying the center matrices */ + /* against the current Z. */ + +- ptr = pow_ii(&c__2, tlvls) + 1; ++ ptr = pow_ii(c__2, *tlvls) + 1; + i__1 = *curlvl - 1; + for (k = 1; k <= i__1; ++k) { + i__2 = *curlvl - k; + i__3 = *curlvl - k - 1; +- curr = ptr + *curpbm * pow_ii(&c__2, &i__2) + pow_ii(&c__2, &i__3) - ++ curr = ptr + *curpbm * pow_ii(c__2, i__2) + pow_ii(c__2, i__3) - + 1; + psiz1 = prmptr[curr + 1] - prmptr[curr]; + psiz2 = prmptr[curr + 2] - prmptr[curr + 1]; +@@ -847,7 +847,7 @@ f"> */ + c__1); + + i__2 = *tlvls - k; +- ptr += pow_ii(&c__2, &i__2); ++ ptr += pow_ii(c__2, i__2); + /* L70: */ + } + +--- a/lapack-netlib/SRC/dlalsa.c ++++ b/lapack-netlib/SRC/dlalsa.c +@@ -951,7 +951,7 @@ f"> */ + /* Finally go through the left singular vector matrices of all */ + /* the other subproblems bottom-up on the tree. */ + +- j = pow_ii(&c__2, &nlvl); ++ j = pow_ii(c__2, nlvl); + sqre = 0; + + for (lvl = nlvl; lvl >= 1; --lvl) { +@@ -965,7 +965,7 @@ f"> */ + ll = 1; + } else { + i__1 = lvl - 1; +- lf = pow_ii(&c__2, &i__1); ++ lf = pow_ii(c__2, i__1); + ll = (lf << 1) - 1; + } + i__1 = ll; +@@ -1010,7 +1010,7 @@ f"> */ + ll = 1; + } else { + i__2 = lvl - 1; +- lf = pow_ii(&c__2, &i__2); ++ lf = pow_ii(c__2, i__2); + ll = (lf << 1) - 1; + } + i__2 = lf; +--- a/lapack-netlib/SRC/dlasd0.c ++++ b/lapack-netlib/SRC/dlasd0.c +@@ -824,7 +824,7 @@ f"> */ + ll = 1; + } else { + i__1 = lvl - 1; +- lf = pow_ii(&c__2, &i__1); ++ lf = pow_ii(c__2, i__1); + ll = (lf << 1) - 1; + } + i__1 = ll; +--- a/lapack-netlib/SRC/dlasda.c ++++ b/lapack-netlib/SRC/dlasda.c +@@ -1027,7 +1027,7 @@ f"> */ + + /* Now conquer each subproblem bottom-up. */ + +- j = pow_ii(&c__2, &nlvl); ++ j = pow_ii(c__2, nlvl); + for (lvl = nlvl; lvl >= 1; --lvl) { + lvl2 = (lvl << 1) - 1; + +@@ -1039,7 +1039,7 @@ f"> */ + ll = 1; + } else { + i__1 = lvl - 1; +- lf = pow_ii(&c__2, &i__1); ++ lf = pow_ii(c__2, i__1); + ll = (lf << 1) - 1; + } + i__1 = ll; +--- a/lapack-netlib/SRC/dstedc.c ++++ b/lapack-netlib/SRC/dstedc.c +@@ -806,10 +806,10 @@ f"> */ + lwmin = *n - 1 << 1; + } else { + lgn = (integer) (log((doublereal) (*n)) / log(2.)); +- if (pow_ii(&c__2, &lgn) < *n) { ++ if (pow_ii(c__2, lgn) < *n) { + ++lgn; + } +- if (pow_ii(&c__2, &lgn) < *n) { ++ if (pow_ii(c__2, lgn) < *n) { + ++lgn; + } + if (icompz == 1) { +--- a/lapack-netlib/SRC/slaed0.c ++++ b/lapack-netlib/SRC/slaed0.c +@@ -823,10 +823,10 @@ f"> */ + + temp = log((real) (*n)) / log(2.f); + lgn = (integer) temp; +- if (pow_ii(&c__2, &lgn) < *n) { ++ if (pow_ii(c__2, lgn) < *n) { + ++lgn; + } +- if (pow_ii(&c__2, &lgn) < *n) { ++ if (pow_ii(c__2, lgn) < *n) { + ++lgn; + } + iprmpt = indxq + *n + 1; +--- a/lapack-netlib/SRC/slaed7.c ++++ b/lapack-netlib/SRC/slaed7.c +@@ -883,11 +883,11 @@ f"> */ + /* Form the z-vector which consists of the last row of Q_1 and the */ + /* first row of Q_2. */ + +- ptr = pow_ii(&c__2, tlvls) + 1; ++ ptr = pow_ii(c__2, *tlvls) + 1; + i__1 = *curlvl - 1; + for (i__ = 1; i__ <= i__1; ++i__) { + i__2 = *tlvls - i__; +- ptr += pow_ii(&c__2, &i__2); ++ ptr += pow_ii(c__2, i__2); + /* L10: */ + } + curr = ptr + *curpbm; +--- a/lapack-netlib/SRC/slaeda.c ++++ b/lapack-netlib/SRC/slaeda.c +@@ -753,7 +753,7 @@ f"> */ + /* scheme */ + + i__1 = *curlvl - 1; +- curr = ptr + *curpbm * pow_ii(&c__2, curlvl) + pow_ii(&c__2, &i__1) - 1; ++ curr = ptr + *curpbm * pow_ii(c__2, *curlvl) + pow_ii(c__2, i__1) - 1; + + /* Determine size of these matrices. We add HALF to the value of */ + /* the SQRT in case the machine underestimates one of these square */ +@@ -779,12 +779,12 @@ f"> */ + /* rotations and permutation and then multiplying the center matrices */ + /* against the current Z. */ + +- ptr = pow_ii(&c__2, tlvls) + 1; ++ ptr = pow_ii(c__2, *tlvls) + 1; + i__1 = *curlvl - 1; + for (k = 1; k <= i__1; ++k) { + i__2 = *curlvl - k; + i__3 = *curlvl - k - 1; +- curr = ptr + *curpbm * pow_ii(&c__2, &i__2) + pow_ii(&c__2, &i__3) - ++ curr = ptr + *curpbm * pow_ii(c__2, i__2) + pow_ii(c__2, i__3) - + 1; + psiz1 = prmptr[curr + 1] - prmptr[curr]; + psiz2 = prmptr[curr + 2] - prmptr[curr + 1]; +@@ -844,7 +844,7 @@ f"> */ + c__1); + + i__2 = *tlvls - k; +- ptr += pow_ii(&c__2, &i__2); ++ ptr += pow_ii(c__2, i__2); + /* L70: */ + } + +--- a/lapack-netlib/SRC/slalsa.c ++++ b/lapack-netlib/SRC/slalsa.c +@@ -946,7 +946,7 @@ f"> */ + /* Finally go through the left singular vector matrices of all */ + /* the other subproblems bottom-up on the tree. */ + +- j = pow_ii(&c__2, &nlvl); ++ j = pow_ii(c__2, nlvl); + sqre = 0; + + for (lvl = nlvl; lvl >= 1; --lvl) { +@@ -960,7 +960,7 @@ f"> */ + ll = 1; + } else { + i__1 = lvl - 1; +- lf = pow_ii(&c__2, &i__1); ++ lf = pow_ii(c__2, i__1); + ll = (lf << 1) - 1; + } + i__1 = ll; +@@ -1005,7 +1005,7 @@ f"> */ + ll = 1; + } else { + i__2 = lvl - 1; +- lf = pow_ii(&c__2, &i__2); ++ lf = pow_ii(c__2, i__2); + ll = (lf << 1) - 1; + } + i__2 = lf; +--- a/lapack-netlib/SRC/slasd0.c ++++ b/lapack-netlib/SRC/slasd0.c +@@ -821,7 +821,7 @@ f"> */ + ll = 1; + } else { + i__1 = lvl - 1; +- lf = pow_ii(&c__2, &i__1); ++ lf = pow_ii(c__2, i__1); + ll = (lf << 1) - 1; + } + i__1 = ll; +--- a/lapack-netlib/SRC/slasda.c ++++ b/lapack-netlib/SRC/slasda.c +@@ -1023,7 +1023,7 @@ f"> */ + + /* Now conquer each subproblem bottom-up. */ + +- j = pow_ii(&c__2, &nlvl); ++ j = pow_ii(c__2, nlvl); + for (lvl = nlvl; lvl >= 1; --lvl) { + lvl2 = (lvl << 1) - 1; + +@@ -1035,7 +1035,7 @@ f"> */ + ll = 1; + } else { + i__1 = lvl - 1; +- lf = pow_ii(&c__2, &i__1); ++ lf = pow_ii(c__2, i__1); + ll = (lf << 1) - 1; + } + i__1 = ll; +--- a/lapack-netlib/SRC/sstedc.c ++++ b/lapack-netlib/SRC/sstedc.c +@@ -804,10 +804,10 @@ f"> */ + lwmin = *n - 1 << 1; + } else { + lgn = (integer) (log((real) (*n)) / log(2.f)); +- if (pow_ii(&c__2, &lgn) < *n) { ++ if (pow_ii(c__2, lgn) < *n) { + ++lgn; + } +- if (pow_ii(&c__2, &lgn) < *n) { ++ if (pow_ii(c__2, lgn) < *n) { + ++lgn; + } + if (icompz == 1) { +--- a/lapack-netlib/SRC/zlaed0.c ++++ b/lapack-netlib/SRC/zlaed0.c +@@ -793,10 +793,10 @@ f"> */ + + temp = log((doublereal) (*n)) / log(2.); + lgn = (integer) temp; +- if (pow_ii(&c__2, &lgn) < *n) { ++ if (pow_ii(c__2, lgn) < *n) { + ++lgn; + } +- if (pow_ii(&c__2, &lgn) < *n) { ++ if (pow_ii(c__2, lgn) < *n) { + ++lgn; + } + iprmpt = indxq + *n + 1; +--- a/lapack-netlib/SRC/zlaed7.c ++++ b/lapack-netlib/SRC/zlaed7.c +@@ -864,11 +864,11 @@ f"> */ + /* Form the z-vector which consists of the last row of Q_1 and the */ + /* first row of Q_2. */ + +- ptr = pow_ii(&c__2, tlvls) + 1; ++ ptr = pow_ii(c__2, *tlvls) + 1; + i__1 = *curlvl - 1; + for (i__ = 1; i__ <= i__1; ++i__) { + i__2 = *tlvls - i__; +- ptr += pow_ii(&c__2, &i__2); ++ ptr += pow_ii(c__2, i__2); + /* L10: */ + } + curr = ptr + *curpbm; +--- a/lapack-netlib/SRC/zlalsa.c ++++ b/lapack-netlib/SRC/zlalsa.c +@@ -1051,7 +1051,7 @@ f"> */ + /* Finally go through the left singular vector matrices of all */ + /* the other subproblems bottom-up on the tree. */ + +- j = pow_ii(&c__2, &nlvl); ++ j = pow_ii(c__2, nlvl); + sqre = 0; + + for (lvl = nlvl; lvl >= 1; --lvl) { +@@ -1065,7 +1065,7 @@ f"> */ + ll = 1; + } else { + i__1 = lvl - 1; +- lf = pow_ii(&c__2, &i__1); ++ lf = pow_ii(c__2, i__1); + ll = (lf << 1) - 1; + } + i__1 = ll; +@@ -1110,7 +1110,7 @@ f"> */ + ll = 1; + } else { + i__2 = lvl - 1; +- lf = pow_ii(&c__2, &i__2); ++ lf = pow_ii(c__2, i__2); + ll = (lf << 1) - 1; + } + i__2 = lf; +--- a/lapack-netlib/SRC/zstedc.c ++++ b/lapack-netlib/SRC/zstedc.c +@@ -836,10 +836,10 @@ f"> */ + lrwmin = *n - 1 << 1; + } else if (icompz == 1) { + lgn = (integer) (log((doublereal) (*n)) / log(2.)); +- if (pow_ii(&c__2, &lgn) < *n) { ++ if (pow_ii(c__2, lgn) < *n) { + ++lgn; + } +- if (pow_ii(&c__2, &lgn) < *n) { ++ if (pow_ii(c__2, lgn) < *n) { + ++lgn; + } + lwmin = *n * *n; + +From 91110f92d218492d0efbdc1fdf34277ca45f4b36 Mon Sep 17 00:00:00 2001 +From: Martin Kroeker +Date: Wed, 14 Sep 2022 14:03:31 +0200 +Subject: [PATCH] fix missing return type in function declaration + +--- a/ctest/c_sblat1c.c ++++ b/ctest/c_sblat1c.c +@@ -969,7 +969,7 @@ real *sfac; + 1.17 }; + + /* Local variables */ +- extern /* Subroutine */ srottest_(); ++ extern /* Subroutine */ void srottest_(); + static integer i__, k, ksize; + extern /* Subroutine */ int stest_(), srotmtest_(); + static integer ki, kn; + +From 9402df5604e69f86f58953e3883f33f98c930baf Mon Sep 17 00:00:00 2001 +From: Martin Kroeker +Date: Wed, 14 Sep 2022 21:44:34 +0200 +Subject: [PATCH] Fix missing external declaration + +--- a/driver/others/blas_server_omp.c ++++ b/driver/others/blas_server_omp.c +@@ -69,6 +69,8 @@ + + int blas_server_avail = 0; + ++extern int openblas_omp_adaptive_env(); ++ + static void * blas_thread_buffer[MAX_PARALLEL_NUMBER][MAX_CPU_NUMBER]; + #ifdef HAVE_C11 + static atomic_bool blas_buffer_inuse[MAX_PARALLEL_NUMBER]; + +From 101a2c77c3f3610933f450cefca3e312edab2186 Mon Sep 17 00:00:00 2001 +From: Martin Kroeker +Date: Thu, 15 Sep 2022 09:19:19 +0200 +Subject: [PATCH] Fix warnings + +--- a/kernel/x86_64/dgemm_ncopy_8_skylakex.c ++++ b/kernel/x86_64/dgemm_ncopy_8_skylakex.c +@@ -52,18 +52,18 @@ int CNAME(BLASLONG m, BLASLONG n, FLOAT * __restrict a, BLASLONG lda, FLOAT * __ + FLOAT ctemp05, ctemp06, ctemp07, ctemp08; + FLOAT ctemp09, ctemp10, ctemp11, ctemp12; + FLOAT ctemp13, ctemp14, ctemp15, ctemp16; +- FLOAT ctemp17, ctemp18, ctemp19, ctemp20; +- FLOAT ctemp21, ctemp22, ctemp23, ctemp24; +- FLOAT ctemp25, ctemp26, ctemp27, ctemp28; +- FLOAT ctemp29, ctemp30, ctemp31, ctemp32; +- FLOAT ctemp33, ctemp34, ctemp35, ctemp36; +- FLOAT ctemp37, ctemp38, ctemp39, ctemp40; +- FLOAT ctemp41, ctemp42, ctemp43, ctemp44; +- FLOAT ctemp45, ctemp46, ctemp47, ctemp48; +- FLOAT ctemp49, ctemp50, ctemp51, ctemp52; +- FLOAT ctemp53, ctemp54, ctemp55, ctemp56; +- FLOAT ctemp57, ctemp58, ctemp59, ctemp60; +- FLOAT ctemp61, ctemp62, ctemp63, ctemp64; ++ FLOAT ctemp17 /*, ctemp18, ctemp19, ctemp20*/ ; ++ FLOAT /*ctemp21, ctemp22,*/ ctemp23, ctemp24; ++ FLOAT ctemp25 /*, ctemp26, ctemp27, ctemp28*/ ; ++ FLOAT /*ctemp29, ctemp30,*/ ctemp31, ctemp32; ++ FLOAT ctemp33 /*, ctemp34, ctemp35, ctemp36*/ ; ++ FLOAT /*ctemp37, ctemp38,*/ ctemp39, ctemp40; ++ FLOAT ctemp41 /*, ctemp42, ctemp43, ctemp44*/ ; ++ FLOAT /*ctemp45, ctemp46,*/ ctemp47, ctemp48; ++ FLOAT ctemp49 /*, ctemp50, ctemp51, ctemp52*/ ; ++ FLOAT /*ctemp53, ctemp54,*/ ctemp55, ctemp56; ++ FLOAT ctemp57 /*, ctemp58, ctemp59, ctemp60*/ ; ++ FLOAT /*ctemp61, ctemp62,*/ ctemp63, ctemp64; + + + aoffset = a; +--- a/kernel/x86_64/omatcopy_rt.c ++++ b/kernel/x86_64/omatcopy_rt.c +@@ -142,7 +142,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ,"xmm0","xmm1","xmm2","xmm3","xmm4","xmm5","xmm6","xmm7","xmm8","xmm9","xmm10","xmm11","xmm12","xmm13","xmm14","xmm15");\ + } + int CNAME(BLASLONG rows, BLASLONG cols, FLOAT alpha, FLOAT *a, BLASLONG lda, FLOAT *b, BLASLONG ldb){ +- float *src, *dst, *dst_tmp, *src_base, *dst_base; ++ float *src, *dst, *dst_tmp=0, *src_base, *dst_base; + uint64_t src_ld_bytes = (uint64_t)lda * sizeof(float), dst_ld_bytes = (uint64_t)ldb * sizeof(float), num_rows = 0; + BLASLONG cols_left, rows_done; float ALPHA = alpha; + if(ALPHA==0.0){ + diff --git a/sci-libs/openblas/openblas-0.3.21-r1.ebuild b/sci-libs/openblas/openblas-0.3.21-r1.ebuild new file mode 100644 index 000000000000..f8be930b1154 --- /dev/null +++ b/sci-libs/openblas/openblas-0.3.21-r1.ebuild @@ -0,0 +1,197 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit fortran-2 toolchain-funcs + +DESCRIPTION="Optimized BLAS library based on GotoBLAS2" +HOMEPAGE="https://github.com/xianyi/OpenBLAS" +SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/OpenBLAS-${PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="dynamic eselect-ldso index-64bit openmp pthread relapack test" +REQUIRED_USE="?? ( openmp pthread )" +RESTRICT="!test? ( test )" + +RDEPEND=" + eselect-ldso? ( + >=app-eselect/eselect-blas-0.2 + >=app-eselect/eselect-lapack-0.2 + ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-0.3.12-shared-blas-lapack.patch" + "${FILESDIR}/${PN}-0.3.21-fix-loong.patch" + "${FILESDIR}/${P}-clang16.patch" +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + + elog "This software has a massive number of options that" + elog "are configurable and it is *impossible* for all of" + elog "those to fit inside any manageable ebuild." + elog "The Gentoo provided package has enough to build" + elog "a fully optimized library for your targeted CPU." + elog "You can set the CPU target using the environment" + elog "variable - OPENBLAS_TARGET or it will be detected" + elog "automatically from the target toolchain (supports" + elog "cross compilation toolchains)." + elog "You can control the maximum number of threads" + elog "using OPENBLAS_NTHREAD, default=64 and number of " + elog "parallel calls to allow before further calls wait" + elog "using OPENBLAS_NPARALLEL, default=8." +} + +pkg_setup() { + fortran-2_pkg_setup + + # List of most configurable options - Makefile.rule + + # https://github.com/xianyi/OpenBLAS/pull/2663 + tc-export CC FC LD AR AS RANLIB + + # HOSTCC is used for scripting + export HOSTCC="$(tc-getBUILD_CC)" + + # threading options + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + USE_THREAD=0 + if use openmp; then + USE_THREAD=1; USE_OPENMP=1; + elif use pthread; then + USE_THREAD=1; USE_OPENMP=0; + fi + export USE_THREAD USE_OPENMP + + # disable submake with -j and default optimization flags + # in Makefile.system + # Makefile.rule says to not modify COMMON_OPT/FCOMMON_OPT... + export MAKE_NB_JOBS=-1 \ + COMMON_OPT=" " \ + FCOMMON_OPT=" " + + # Target CPU ARCH options + # generally detected automatically from cross toolchain + use dynamic && \ + export DYNAMIC_ARCH=1 \ + NO_AFFINITY=1 \ + TARGET=GENERIC + + export NUM_PARALLEL=${OPENBLAS_NPARALLEL:-8} \ + NUM_THREADS=${OPENBLAS_NTHREAD:-64} + + # setting OPENBLAS_TARGET to override auto detection + # in case the toolchain is not enough to detect + # https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt + if ! use dynamic && [[ ! -z "${OPENBLAS_TARGET}" ]] ; then + export TARGET="${OPENBLAS_TARGET}" + fi + + export NO_STATIC=1 + + BUILD_RELAPACK=1 + if ! use relapack; then + BUILD_RELAPACK=0 + fi + + export PREFIX="${EPREFIX}/usr" BUILD_RELAPACK +} + +src_prepare() { + default + + # Don't build the tests as part of "make all". We'll do + # it explicitly later if the test phase is enabled. + sed -e "/^all ::/s/tests //" -i Makefile || die + + # if 64bit-index is needed, create second library + # with LIBPREFIX=libopenblas64 + if use index-64bit; then + cp -aL "${S}" "${S}-index-64bit" || die + fi +} + +src_compile() { + default + cd interface || die + emake shared-blas-lapack + + if use index-64bit; then + emake -C"${S}-index-64bit" \ + INTERFACE64=1 \ + LIBPREFIX=libopenblas64 + fi +} + +src_test() { + emake tests +} + +src_install() { + emake install DESTDIR="${D}" \ + OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \ + OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir) + + dodoc GotoBLAS_*.txt *.md Changelog.txt + + if use index-64bit; then + dolib.so "${S}-index-64bit"/libopenblas64*.so* + fi + + if use eselect-ldso; then + insinto /usr/$(get_libdir)/blas/openblas/ + doins interface/libblas.so.3 + dosym libblas.so.3 usr/$(get_libdir)/blas/openblas/libblas.so + doins interface/libcblas.so.3 + dosym libcblas.so.3 usr/$(get_libdir)/blas/openblas/libcblas.so + + insinto /usr/$(get_libdir)/lapack/openblas/ + doins interface/liblapack.so.3 + dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so + doins interface/liblapacke.so.3 + dosym liblapacke.so.3 usr/$(get_libdir)/lapack/openblas/liblapacke.so + fi +} + +pkg_postinst() { + use eselect-ldso || return + local libdir=$(get_libdir) me="openblas" + + # check blas + eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me} + local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2) + if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then + eselect blas set ${libdir} ${me} + elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]." + else + elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]." + elog "To use blas [${me}] implementation, you have to issue (as root):" + elog "\t eselect blas set ${libdir} ${me}" + fi + + # check lapack + eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me} + local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2) + if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then + eselect lapack set ${libdir} ${me} + elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]." + else + elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]." + elog "To use lapack [${me}] implementation, you have to issue (as root):" + elog "\t eselect lapack set ${libdir} ${me}" + fi +} + +pkg_postrm() { + if use eselect-ldso; then + eselect blas validate + eselect lapack validate + fi +} diff --git a/sci-libs/pdal/Manifest b/sci-libs/pdal/Manifest index 504df1bc73b6..86a0f190eee8 100644 --- a/sci-libs/pdal/Manifest +++ b/sci-libs/pdal/Manifest @@ -2,5 +2,5 @@ AUX pdal-2.4.3-fix-test.patch 1168 BLAKE2B a5b532ac015408c60d7f16d9aa325a36f85cd DIST PDAL-2.4.0-src.tar.gz 113449697 BLAKE2B 8f774555d32ad4f0afe6dd850e6dcaf33b58c02934207ee2224230af762a7d3062a48909e267abf790a97a1d11788bb7543971c99239e5ae742d7945db09bda5 SHA512 655fadd2b435ed1cb801ba542028bcc15156da9266eedde93b2210dbadbc50d36b0b6a151062113f2adfb68a2938e2b867438a5a94952a7b3e46f59a53b47623 DIST PDAL-2.4.3-src.tar.gz 100758279 BLAKE2B 7c157bb51416b24bd8896a62e71a186bc9a45b34d5ab58fadbe691cb1abc9595f598fcf92ec528c9103f646c21f940b26fbf199a998e707d17f1527eb2957a85 SHA512 ed342c29d10c0506e1c0f5ee4dba531189000dd0cc6912f681a95b7c56483d6136e515771a174e20906b1cd81dfd101d53be0cbaf200480d81d053d7dec8a386 EBUILD pdal-2.4.0-r1.ebuild 1213 BLAKE2B 0d780865c514764e77958ef362dff3c5593148c7f9f6d9af06ba28cf5b778f3cdd3056fbe4a3f0485041339ea9022806bcff4d2a7dff913733e98d436c7452df SHA512 116651a1910b2aa95a02237adfeb66144754e5b2b14c19e440b556f9411bf46f4d946cc813bdfa0651c83ad0cb76377827e4262df29d756db460142e8c6b8bb9 -EBUILD pdal-2.4.3.ebuild 1215 BLAKE2B 739834ee01cb743891d9db0fcf2e61fbb61773fc4fdabff1a75629a4320e501b4a494002716617979e954f61de451af0e105621401241be03d067da005f57fdc SHA512 8a2c39c0c0be40d2b667981478951049405984582b71fbebd2ba6fd9c700edca4d453e742de148fa2af1c4129906b2c9081dd9b73aae88433fbb749cdf65afd1 +EBUILD pdal-2.4.3.ebuild 1214 BLAKE2B 88e020a7f8a0f0afbff133427b9f0348a2765ac144578c3c0bdb1a2e74cb1dcd0e444d5beaded366cf3b31f52857251e0bdabb585d4b08423bdbb7427db04877 SHA512 75a076e5861fe1a0cc8000104d1a5f40a55e79ca769f174e15da2718cc0fe39dd0b3cfdf447fe059e32df54d00388efb6e0fee52bec90214bf5c64571eb90a32 MISC metadata.xml 799 BLAKE2B 44fff88edc36553687a49ecf5113b1f7f3c8d092e82ef4e45f0d96cf53cc619647f45b3d3439a5b98bf43a8965e1b80582e7b074489dcd69f6f3aad9e5c7f59a SHA512 da405bacd840b714fe274fa5ca658f7a51b0078054058dcce46f690b33e641579981739de9511f4a876ff0f88aec5c2dbaa59e4db035eb9a85bdd8e9725bc7c2 diff --git a/sci-libs/pdal/pdal-2.4.3.ebuild b/sci-libs/pdal/pdal-2.4.3.ebuild index 72c3e319af65..961bd7205f69 100644 --- a/sci-libs/pdal/pdal-2.4.3.ebuild +++ b/sci-libs/pdal/pdal-2.4.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/PDAL/PDAL/releases/download/${PV}/PDAL-${PV}-src.tar LICENSE="BSD" SLOT="0/14" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="postgres test" RESTRICT="!test? ( test )" -- cgit v1.2.3