diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-12-05 02:47:11 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-05 02:47:11 +0000 |
commit | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch) | |
tree | c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /sci-libs/openblas | |
parent | e9d044d4b9b71200a96adfa280848858c0f468c9 (diff) |
gentoo resync : 05.12.2021
Diffstat (limited to 'sci-libs/openblas')
-rw-r--r-- | sci-libs/openblas/Manifest | 3 | ||||
-rw-r--r-- | sci-libs/openblas/files/dont-clobber-fflags.patch | 31 | ||||
-rw-r--r-- | sci-libs/openblas/files/openblas-0.3.10-dont-clobber-fflags.patch | 26 | ||||
-rw-r--r-- | sci-libs/openblas/files/shared-blas-lapack.patch | 137 |
4 files changed, 0 insertions, 197 deletions
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest index 34ada6e9fffb..b9db4cc5ad39 100644 --- a/sci-libs/openblas/Manifest +++ b/sci-libs/openblas/Manifest @@ -1,7 +1,4 @@ -AUX dont-clobber-fflags.patch 1251 BLAKE2B 7451d67e8676be33c2070b9eea767d24d961eff708eec3f6544b68228963166138f844f51dde8d48f723412ce0fcb6d0da427d298c652156da56d34073a1c82c SHA512 d06cd469749c88c69e2bdab01b5c0c67105a756a6d4c3704842335261ad57f6e898ceb73943487396178ae99ccf2ee3e551ae5881996af54e36fb951c6be43dc -AUX openblas-0.3.10-dont-clobber-fflags.patch 1209 BLAKE2B 8759226f8a2b9371a89434f14e5db6e10b079dec5b260b438811f476ceeded67bcf2a596c7f4892ec2b3388a3437c9cd276592bb01ebb84af69977002e0bbe88 SHA512 6b239e750a6c5baf6dfca58dc8036a1de34efd917839558d2b2ff1d6fab00067dfe953bfb0837d8f19e1f52cf5ab7f92f9e3f65f3963fd3ae9052c0a00d6065d AUX openblas-0.3.12-shared-blas-lapack.patch 2008 BLAKE2B 2d3a4a90d8144cbf149b7711b67364176a94287f26448930b5a4fd29fe761fb250e9007c580fb1ffa8148c477e2f4057f9cd8d7aa07efeb85caa842802d358fd SHA512 3f0d4b480549565c838eba6371e0990c162f56a226f9d26e1639e012ae3f39809f8c6badcf8fdfbb1258f45367dbaff9c4c611b8b44bac27d341aea954f0133e -AUX shared-blas-lapack.patch 5557 BLAKE2B 1e41b18e5a9c12eec9283c835e9b09e4ca89c6512f47a2f158f29c8a8a822d0365ad350177e379bec13f7c7574d8debd55a2f612027ff661c67ac7b226bb2370 SHA512 baa23f0c2bc8b7bc3384d7b8fa20eb5e095f20e1d8859badb55e680ccd435a851da6099b20aa203e46d62096ac93663ea130bea04dabf19432522e53139d393b DIST openblas-0.3.18.tar.gz 12619822 BLAKE2B 38a5e7b861eb0063a4494c1cfb6f7f5723741437ecdd5cb1fb42645eb73bceb472b3a8c11eec3d0ba4f676981ac89de4ff1ee0d7ea42d1e234746f34ce8fb6b8 SHA512 df9a14026a61bdc5285636bfd7a52dce244d24fcf4a0c870ef4e58b8b50e412849828ca5aeac2a2435f635e78e60559762e8bae22ea7bc5dff2e865a96d81152 EBUILD openblas-0.3.18.ebuild 5679 BLAKE2B 08e30894d5c3d7eb488f008388aeae506eb7ee421a9b591b9738d3ba38bb1440dd382d5c7c8e3c79c655cb7c6a2432f954dee0c0d65fc8f93bbb17e165dc920f SHA512 a23a6d112452702b570a8c30a888e70afffe2ae7e24da58ee915ceb4b2cc5d11914fdfc653ab7c225878af8ab6202cca5d03cb1cbd17792a82f5916a8d5fc91c MISC metadata.xml 1561 BLAKE2B 5ba7ec66dd8ba7ca8bc29bc0193b48b6a82b4949bb79bab461400040667aa66aac3cfd2ad9c7323798048fd43d18ac96a562d53b68f3f7ae8bf8505ac7a04691 SHA512 05272eb56480ff82b240d0f430df3df03981e24b971dbd37c13d464f4f4b334bac19b54915446a09326a334aa76249bb79a4fa389d26150365f21389992f9a48 diff --git a/sci-libs/openblas/files/dont-clobber-fflags.patch b/sci-libs/openblas/files/dont-clobber-fflags.patch deleted file mode 100644 index 21bbec4b1b3b..000000000000 --- a/sci-libs/openblas/files/dont-clobber-fflags.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 05c96dad9b26cc1f00831661dc55139dcc9d5680 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Thu, 11 Jun 2020 18:32:17 -0400 -Subject: [PATCH 1/1] Makefile: don't clobber fortran flags while building - lapack. - -When a user has the FFLAGS environment variable set, it clobbers the -flags used to compile lapack. This can lead to "rare and hard to -reproduce crashes" or test failures, as we have observed in Gentoo. - -Issue: https://github.com/xianyi/OpenBLAS/issues/2657 ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index a22e16ba..2bae565e 100644 ---- a/Makefile -+++ b/Makefile -@@ -248,7 +248,7 @@ prof_lapack : lapack_prebuild - lapack_prebuild : - ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN))) - -@echo "FC = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc -- -@echo "FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc -+ -@echo "override FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "POPTS = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "FFLAGS_NOOPT = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "PNOOPT = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc --- -2.26.2 - diff --git a/sci-libs/openblas/files/openblas-0.3.10-dont-clobber-fflags.patch b/sci-libs/openblas/files/openblas-0.3.10-dont-clobber-fflags.patch deleted file mode 100644 index 4890b7377ab5..000000000000 --- a/sci-libs/openblas/files/openblas-0.3.10-dont-clobber-fflags.patch +++ /dev/null @@ -1,26 +0,0 @@ -Rebased version of previous patch below. ----- -From 05c96dad9b26cc1f00831661dc55139dcc9d5680 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Thu, 11 Jun 2020 18:32:17 -0400 -Subject: [PATCH 1/1] Makefile: don't clobber fortran flags while building - lapack. - -When a user has the FFLAGS environment variable set, it clobbers the -flags used to compile lapack. This can lead to "rare and hard to -reproduce crashes" or test failures, as we have observed in Gentoo. - -Issue: https://github.com/xianyi/OpenBLAS/issues/2657 -diff --git a/Makefile b/Makefile -index e113026..dd8b655 100644 ---- a/Makefile -+++ b/Makefile -@@ -263,7 +263,7 @@ prof_lapack : lapack_prebuild - lapack_prebuild : - ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN))) - -@echo "FC = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc -- -@echo "FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc -+ -@echo "override FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "FFLAGS_DRV = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "POPTS = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "FFLAGS_NOOPT = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc diff --git a/sci-libs/openblas/files/shared-blas-lapack.patch b/sci-libs/openblas/files/shared-blas-lapack.patch deleted file mode 100644 index fc77427362c1..000000000000 --- a/sci-libs/openblas/files/shared-blas-lapack.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff --git a/sci-libs/openblas/files/Makefile b/sci-libs/openblas/files/Makefile -index 20ec74e..87e842f 100644 ---- a/interface/Makefile -+++ b/interface/Makefile -@@ -2151,3 +2151,132 @@ cblas_zgeadd.$(SUFFIX) cblas_zgeadd.$(PSUFFIX) : zgeadd.c - - cblas_xerbla.$(SUFFIX) cblas_xerbla.$(PSUFFIX) : xerbla.c - $(CC) -c $(CFLAGS) -DCBLAS $< -o $(@F) -+ -+############################################################################# -+# Customized shared objects -+ -+FSBLAS1OBJS = \ -+ saxpy.$(SUFFIX) sswap.$(SUFFIX) \ -+ scopy.$(SUFFIX) sscal.$(SUFFIX) \ -+ sdot.$(SUFFIX) sdsdot.$(SUFFIX) dsdot.$(SUFFIX) \ -+ sasum.$(SUFFIX) snrm2.$(SUFFIX) \ -+ smax.$(SUFFIX) samax.$(SUFFIX) ismax.$(SUFFIX) isamax.$(SUFFIX) \ -+ smin.$(SUFFIX) samin.$(SUFFIX) ismin.$(SUFFIX) isamin.$(SUFFIX) \ -+ srot.$(SUFFIX) srotg.$(SUFFIX) srotm.$(SUFFIX) srotmg.$(SUFFIX) \ -+ saxpby.$(SUFFIX) -+ -+FSBLAS2OBJS = \ -+ sgemv.$(SUFFIX) sger.$(SUFFIX) \ -+ strsv.$(SUFFIX) strmv.$(SUFFIX) ssymv.$(SUFFIX) \ -+ ssyr.$(SUFFIX) ssyr2.$(SUFFIX) sgbmv.$(SUFFIX) \ -+ ssbmv.$(SUFFIX) sspmv.$(SUFFIX) \ -+ sspr.$(SUFFIX) sspr2.$(SUFFIX) \ -+ stbsv.$(SUFFIX) stbmv.$(SUFFIX) \ -+ stpsv.$(SUFFIX) stpmv.$(SUFFIX) -+ -+FSBLAS3OBJS = \ -+ sgemm.$(SUFFIX) ssymm.$(SUFFIX) strmm.$(SUFFIX) \ -+ strsm.$(SUFFIX) ssyrk.$(SUFFIX) ssyr2k.$(SUFFIX) \ -+ somatcopy.$(SUFFIX) simatcopy.$(SUFFIX)\ -+ sgeadd.$(SUFFIX) -+ -+ -+FDBLAS1OBJS = \ -+ daxpy.$(SUFFIX) dswap.$(SUFFIX) \ -+ dcopy.$(SUFFIX) dscal.$(SUFFIX) \ -+ ddot.$(SUFFIX) \ -+ dasum.$(SUFFIX) dnrm2.$(SUFFIX) \ -+ dmax.$(SUFFIX) damax.$(SUFFIX) idmax.$(SUFFIX) idamax.$(SUFFIX) \ -+ dmin.$(SUFFIX) damin.$(SUFFIX) idmin.$(SUFFIX) idamin.$(SUFFIX) \ -+ drot.$(SUFFIX) drotg.$(SUFFIX) drotm.$(SUFFIX) drotmg.$(SUFFIX) \ -+ daxpby.$(SUFFIX) -+ -+FDBLAS2OBJS = \ -+ dgemv.$(SUFFIX) dger.$(SUFFIX) \ -+ dtrsv.$(SUFFIX) dtrmv.$(SUFFIX) dsymv.$(SUFFIX) \ -+ dsyr.$(SUFFIX) dsyr2.$(SUFFIX) dgbmv.$(SUFFIX) \ -+ dsbmv.$(SUFFIX) dspmv.$(SUFFIX) \ -+ dspr.$(SUFFIX) dspr2.$(SUFFIX) \ -+ dtbsv.$(SUFFIX) dtbmv.$(SUFFIX) \ -+ dtpsv.$(SUFFIX) dtpmv.$(SUFFIX) -+ -+FDBLAS3OBJS = \ -+ dgemm.$(SUFFIX) dsymm.$(SUFFIX) dtrmm.$(SUFFIX) \ -+ dtrsm.$(SUFFIX) dsyrk.$(SUFFIX) dsyr2k.$(SUFFIX) \ -+ domatcopy.$(SUFFIX) dimatcopy.$(SUFFIX)\ -+ dgeadd.$(SUFFIX) -+ -+FCBLAS1OBJS = \ -+ caxpy.$(SUFFIX) caxpyc.$(SUFFIX) cswap.$(SUFFIX) \ -+ ccopy.$(SUFFIX) cscal.$(SUFFIX) csscal.$(SUFFIX) \ -+ cdotc.$(SUFFIX) cdotu.$(SUFFIX) \ -+ scasum.$(SUFFIX) scnrm2.$(SUFFIX) \ -+ scamax.$(SUFFIX) icamax.$(SUFFIX) \ -+ scamin.$(SUFFIX) icamin.$(SUFFIX) \ -+ csrot.$(SUFFIX) crotg.$(SUFFIX) \ -+ caxpby.$(SUFFIX) -+ -+FCBLAS2OBJS = \ -+ cgemv.$(SUFFIX) cgeru.$(SUFFIX) cgerc.$(SUFFIX) \ -+ ctrsv.$(SUFFIX) ctrmv.$(SUFFIX) \ -+ csyr2.$(SUFFIX) cgbmv.$(SUFFIX) \ -+ csbmv.$(SUFFIX) \ -+ cspr2.$(SUFFIX) \ -+ ctbsv.$(SUFFIX) ctbmv.$(SUFFIX) \ -+ ctpsv.$(SUFFIX) ctpmv.$(SUFFIX) \ -+ chemv.$(SUFFIX) chbmv.$(SUFFIX) \ -+ cher.$(SUFFIX) cher2.$(SUFFIX) \ -+ chpmv.$(SUFFIX) chpr.$(SUFFIX) chpr2.$(SUFFIX) -+ -+FCBLAS3OBJS = \ -+ cgemm.$(SUFFIX) csymm.$(SUFFIX) ctrmm.$(SUFFIX) \ -+ ctrsm.$(SUFFIX) csyrk.$(SUFFIX) csyr2k.$(SUFFIX) \ -+ chemm.$(SUFFIX) cherk.$(SUFFIX) cher2k.$(SUFFIX) \ -+ comatcopy.$(SUFFIX) cimatcopy.$(SUFFIX)\ -+ cgeadd.$(SUFFIX) -+ -+FZBLAS1OBJS = \ -+ zaxpy.$(SUFFIX) zaxpyc.$(SUFFIX) zswap.$(SUFFIX) \ -+ zcopy.$(SUFFIX) zscal.$(SUFFIX) zdscal.$(SUFFIX) \ -+ zdotc.$(SUFFIX) zdotu.$(SUFFIX) \ -+ dzasum.$(SUFFIX) dznrm2.$(SUFFIX) \ -+ dzamax.$(SUFFIX) izamax.$(SUFFIX) \ -+ dzamin.$(SUFFIX) izamin.$(SUFFIX) \ -+ zdrot.$(SUFFIX) zrotg.$(SUFFIX) \ -+ zaxpby.$(SUFFIX) -+ -+FZBLAS2OBJS = \ -+ zgemv.$(SUFFIX) zgeru.$(SUFFIX) zgerc.$(SUFFIX) \ -+ ztrsv.$(SUFFIX) ztrmv.$(SUFFIX) \ -+ zsyr2.$(SUFFIX) zgbmv.$(SUFFIX) \ -+ zsbmv.$(SUFFIX) \ -+ zspr2.$(SUFFIX) \ -+ ztbsv.$(SUFFIX) ztbmv.$(SUFFIX) \ -+ ztpsv.$(SUFFIX) ztpmv.$(SUFFIX) \ -+ zhemv.$(SUFFIX) zhbmv.$(SUFFIX) \ -+ zher.$(SUFFIX) zher2.$(SUFFIX) \ -+ zhpmv.$(SUFFIX) zhpr.$(SUFFIX) zhpr2.$(SUFFIX) -+ -+FZBLAS3OBJS = \ -+ zgemm.$(SUFFIX) zsymm.$(SUFFIX) ztrmm.$(SUFFIX) \ -+ ztrsm.$(SUFFIX) zsyrk.$(SUFFIX) zsyr2k.$(SUFFIX) \ -+ zhemm.$(SUFFIX) zherk.$(SUFFIX) zher2k.$(SUFFIX) \ -+ zomatcopy.$(SUFFIX) zimatcopy.$(SUFFIX)\ -+ zgeadd.$(SUFFIX) -+ -+shared-blas-lapack: libblas.so.3 libcblas.so.3 liblapack.so.3 -+ -+# The list of prerequisite is created by comparing with NETLIB BLAS public API. -+# The symbol cblas_xerbla is missing here, but it does not seem to be provided -+# by libopenblas.so.0 either. -+libblas.so.3: $(FSBLAS1OBJS) $(FSBLAS2OBJS) $(FSBLAS3OBJS) $(FDBLAS1OBJS) $(FDBLAS2OBJS) $(FDBLAS3OBJS) $(FCBLAS1OBJS) $(FCBLAS2OBJS) $(FCBLAS3OBJS) $(FZBLAS1OBJS) $(FZBLAS2OBJS) $(FZBLAS3OBJS) ../kernel/lsame.o ../kernel/scabs1.o ../kernel/dcabs1.o ../driver/others/xerbla.o -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname,libblas.so.3 -L.. -lopenblas $(EXTRALIB) -+ -+libcblas.so.3: $(CSBLAS1OBJS) $(CSBLAS2OBJS) $(CSBLAS3OBJS) $(CDBLAS1OBJS) $(CDBLAS2OBJS) $(CDBLAS3OBJS) $(CCBLAS1OBJS) $(CCBLAS2OBJS) $(CCBLAS3OBJS) $(CZBLAS1OBJS) $(CZBLAS2OBJS) $(CZBLAS3OBJS) ../kernel/lsame.o ../kernel/scabs1.o ../kernel/dcabs1.o ../driver/others/xerbla.o -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname,libcblas.so.3 -L.. -lopenblas $(EXTRALIB) -+ -+liblapack.so.3: $(SLAPACKOBJS) $(DLAPACKOBJS) $(CLAPACKOBJS) $(ZLAPACKOBJS) ../kernel/lsame.o ../driver/others/xerbla.o -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ ../lapack-netlib/SRC/*.o -Wl,-soname,liblapack.so.3 -L.. -lopenblas $(EXTRALIB) -+ -+clean:: -+ rm -f libblas.so.3 libcblas.so.3 liblapack.so.3 |