Compare commits
28 Commits
Author | SHA1 | Date |
---|---|---|
Susi Lehtola | 95a8f0fa3e | |
Susi Lehtola | 4720c14646 | |
Susi Lehtola | edcce2ff97 | |
Fedora Release Engineering | cedd2e10d7 | |
Susi Lehtola | ad35a6455c | |
Susi Lehtola | 9e7216f7d0 | |
Susi Lehtola | dfacab6ca1 | |
Susi Lehtola | cbeaa9d626 | |
Fedora Release Engineering | 6573a842f1 | |
Tom Stellard | 4961e05b60 | |
Susi Lehtola | 516beadbb3 | |
Susi Lehtola | ebe26476b5 | |
Susi Lehtola | 860d1cd580 | |
Susi Lehtola | 7d66ff068d | |
Susi Lehtola | 6b5c3faa04 | |
Susi Lehtola | b114a34fb3 | |
Susi Lehtola | 209524874e | |
Susi Lehtola | 6ba14f0bda | |
Susi Lehtola | dc5c41fc4e | |
Susi Lehtola | 6b70620c6f | |
Susi Lehtola | af61eb4146 | |
Susi Lehtola | 5641975e5c | |
Jeff Law | a07fac9b19 | |
Susi Lehtola | 766d57e663 | |
Susi Lehtola | 4ab33d8758 | |
Susi Lehtola | a23aac5aed | |
Susi Lehtola | a1a0f15fec | |
Susi Lehtola | c0e5ad7d26 |
|
@ -19,3 +19,12 @@
|
|||
/openblas-0.3.7.tar.gz
|
||||
/openblas-0.3.8.tar.gz
|
||||
/openblas-0.3.9.tar.gz
|
||||
/openblas-0.3.10.tar.gz
|
||||
/openblas-0.3.11.tar.gz
|
||||
/openblas-0.3.12.tar.gz
|
||||
/openblas-0.3.14.tar.gz
|
||||
/openblas-0.3.15.tar.gz
|
||||
/openblas-0.3.16.tar.gz
|
||||
/openblas-0.3.17.tar.gz
|
||||
/openblas-0.3.18.tar.gz
|
||||
/openblas-0.3.19.tar.gz
|
||||
|
|
|
@ -0,0 +1,299 @@
|
|||
From b54b3bbdcc043dc839fcb5262c5239bb1548e02b Mon Sep 17 00:00:00 2001
|
||||
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
|
||||
Date: Fri, 24 Dec 2021 22:53:39 +0100
|
||||
Subject: [PATCH 01/10] Update param.h
|
||||
|
||||
---
|
||||
param.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/param.h b/param.h
|
||||
index 2dffaae3c..3d592c056 100644
|
||||
--- a/param.h
|
||||
+++ b/param.h
|
||||
@@ -1670,7 +1670,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#define SGEMM_DEFAULT_UNROLL_M 16
|
||||
#ifndef DYNAMIC_ARCH
|
||||
-#define DGEMM_DEFAULT_UNROLL_M 16
|
||||
+#define DGEMM_DEFAULT_UNROLL_M 4
|
||||
#else
|
||||
#define DGEMM_DEFAULT_UNROLL_M 4
|
||||
#endif
|
||||
@@ -1681,7 +1681,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#define SGEMM_DEFAULT_UNROLL_N 4
|
||||
#ifndef DYNAMIC_ARCH
|
||||
-#define DGEMM_DEFAULT_UNROLL_N 2
|
||||
+#define DGEMM_DEFAULT_UNROLL_N 8
|
||||
#else
|
||||
#define DGEMM_DEFAULT_UNROLL_N 8
|
||||
#endif
|
||||
|
||||
From e62e797d3adb796275114bd894262978f30d03dc Mon Sep 17 00:00:00 2001
|
||||
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
|
||||
Date: Fri, 24 Dec 2021 22:54:40 +0100
|
||||
Subject: [PATCH 02/10] Update KERNEL.SKYLAKEX
|
||||
|
||||
---
|
||||
kernel/x86_64/KERNEL.SKYLAKEX | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/kernel/x86_64/KERNEL.SKYLAKEX b/kernel/x86_64/KERNEL.SKYLAKEX
|
||||
index d2d7de42a..c5a2fcecb 100644
|
||||
--- a/kernel/x86_64/KERNEL.SKYLAKEX
|
||||
+++ b/kernel/x86_64/KERNEL.SKYLAKEX
|
||||
@@ -20,7 +20,7 @@ SGEMM_SMALL_K_B0_TN = sgemm_small_kernel_tn_skylakex.c
|
||||
SGEMM_SMALL_K_TT = sgemm_small_kernel_tt_skylakex.c
|
||||
SGEMM_SMALL_K_B0_TT = sgemm_small_kernel_tt_skylakex.c
|
||||
|
||||
-ifndef DYNAMIC_ARCH
|
||||
+ifdef DYNAMIC_ARCHO
|
||||
DGEMMKERNEL = dgemm_kernel_16x2_skylakex.c
|
||||
DTRMMKERNEL = dgemm_kernel_16x2_skylakex.c
|
||||
DGEMMINCOPY = ../generic/gemm_ncopy_16.c
|
||||
|
||||
From 892ed1e53b17bdc4e367ae0697ae9a995641dbf6 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
|
||||
Date: Sat, 25 Dec 2021 13:26:35 +0100
|
||||
Subject: [PATCH 03/10] Update param.h
|
||||
|
||||
---
|
||||
param.h | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/param.h b/param.h
|
||||
index 3d592c056..03ab214e2 100644
|
||||
--- a/param.h
|
||||
+++ b/param.h
|
||||
@@ -1670,9 +1670,9 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#define SGEMM_DEFAULT_UNROLL_M 16
|
||||
#ifndef DYNAMIC_ARCH
|
||||
-#define DGEMM_DEFAULT_UNROLL_M 4
|
||||
+#define DGEMM_DEFAULT_UNROLL_M 16
|
||||
#else
|
||||
-#define DGEMM_DEFAULT_UNROLL_M 4
|
||||
+#define DGEMM_DEFAULT_UNROLL_M 16
|
||||
#endif
|
||||
#define QGEMM_DEFAULT_UNROLL_M 2
|
||||
#define CGEMM_DEFAULT_UNROLL_M 8
|
||||
@@ -1681,9 +1681,9 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#define SGEMM_DEFAULT_UNROLL_N 4
|
||||
#ifndef DYNAMIC_ARCH
|
||||
-#define DGEMM_DEFAULT_UNROLL_N 8
|
||||
+#define DGEMM_DEFAULT_UNROLL_N 2
|
||||
#else
|
||||
-#define DGEMM_DEFAULT_UNROLL_N 8
|
||||
+#define DGEMM_DEFAULT_UNROLL_N 2
|
||||
#endif
|
||||
#define QGEMM_DEFAULT_UNROLL_N 2
|
||||
#define CGEMM_DEFAULT_UNROLL_N 2
|
||||
|
||||
From d97a3e5a5f5b28cb5f3b8f5ce3fef05b0a81b715 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
|
||||
Date: Sat, 25 Dec 2021 13:27:49 +0100
|
||||
Subject: [PATCH 04/10] Update KERNEL.SKYLAKEX
|
||||
|
||||
---
|
||||
kernel/x86_64/KERNEL.SKYLAKEX | 10 +++-------
|
||||
1 file changed, 3 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/kernel/x86_64/KERNEL.SKYLAKEX b/kernel/x86_64/KERNEL.SKYLAKEX
|
||||
index c5a2fcecb..ba093d24b 100644
|
||||
--- a/kernel/x86_64/KERNEL.SKYLAKEX
|
||||
+++ b/kernel/x86_64/KERNEL.SKYLAKEX
|
||||
@@ -20,19 +20,15 @@ SGEMM_SMALL_K_B0_TN = sgemm_small_kernel_tn_skylakex.c
|
||||
SGEMM_SMALL_K_TT = sgemm_small_kernel_tt_skylakex.c
|
||||
SGEMM_SMALL_K_B0_TT = sgemm_small_kernel_tt_skylakex.c
|
||||
|
||||
-ifdef DYNAMIC_ARCHO
|
||||
+
|
||||
DGEMMKERNEL = dgemm_kernel_16x2_skylakex.c
|
||||
DTRMMKERNEL = dgemm_kernel_16x2_skylakex.c
|
||||
DGEMMINCOPY = ../generic/gemm_ncopy_16.c
|
||||
-DGEMMITCOPY = dgemm_tcopy_16_skylakex.c
|
||||
+DGEMMITCOPY = ../generic/gemm_tcopy_16.c
|
||||
DGEMMONCOPY = ../generic/gemm_ncopy_2.c
|
||||
DGEMMOTCOPY = ../generic/gemm_tcopy_2.c
|
||||
DTRSMKERNEL_RN = ../generic/trsm_kernel_RN.c
|
||||
-else
|
||||
-DGEMMKERNEL = dgemm_kernel_4x8_skylakex_2.c
|
||||
-DGEMMONCOPY = dgemm_ncopy_8_skylakex.c
|
||||
-DGEMMOTCOPY = dgemm_tcopy_8_skylakex.c
|
||||
-endif
|
||||
+
|
||||
DGEMM_SMALL_M_PERMIT = dgemm_small_kernel_permit_skylakex.c
|
||||
DGEMM_SMALL_K_NN = dgemm_small_kernel_nn_skylakex.c
|
||||
DGEMM_SMALL_K_B0_NN = dgemm_small_kernel_nn_skylakex.c
|
||||
|
||||
From fa2c9de62161178566499db9d78cdbd146ce3058 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
|
||||
Date: Fri, 31 Dec 2021 18:37:50 +0100
|
||||
Subject: [PATCH 05/10] Update azure-pipelines.yml
|
||||
|
||||
---
|
||||
azure-pipelines.yml | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
|
||||
index 710940924..a6e2e71b5 100644
|
||||
--- a/azure-pipelines.yml
|
||||
+++ b/azure-pipelines.yml
|
||||
@@ -58,6 +58,15 @@ jobs:
|
||||
docker run --privileged intel_sde
|
||||
displayName: 'Run AVX512 SkylakeX docker build / test'
|
||||
|
||||
+- job: Intel_skx
|
||||
+ pool:
|
||||
+ vmImage: 'ubuntu-latest'
|
||||
+ variables:
|
||||
+ OPENBLAS_VERBOSE: 2
|
||||
+ steps:
|
||||
+ - script: |
|
||||
+ make CC=gcc FC=gfortran QUIET_MAKE=1 DYNAMIC_ARCH=1 NUM_THREADS=32 BINARY=64
|
||||
+
|
||||
- job: Windows_cl
|
||||
pool:
|
||||
vmImage: 'windows-latest'
|
||||
|
||||
From 4f7e6f01ddda2b3375d655471304a81de7972070 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
|
||||
Date: Sat, 1 Jan 2022 20:14:27 +0100
|
||||
Subject: [PATCH 06/10] Add SDE job that builds on Sandybridge, tests on
|
||||
SkylakeX
|
||||
|
||||
---
|
||||
azure-pipelines.yml | 25 +++++++++++++++++++++++++
|
||||
1 file changed, 25 insertions(+)
|
||||
|
||||
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
|
||||
index a6e2e71b5..d5cb765db 100644
|
||||
--- a/azure-pipelines.yml
|
||||
+++ b/azure-pipelines.yml
|
||||
@@ -58,6 +58,31 @@ jobs:
|
||||
docker run --privileged intel_sde
|
||||
displayName: 'Run AVX512 SkylakeX docker build / test'
|
||||
|
||||
+- job: Intel_SDE_sndskx
|
||||
+ pool:
|
||||
+ vmImage: 'ubuntu-latest'
|
||||
+ steps:
|
||||
+ - script: |
|
||||
+ # at the time of writing the available Azure Ubuntu vm image
|
||||
+ # does not support AVX512VL, so use more recent LTS version
|
||||
+ echo "FROM ubuntu:bionic
|
||||
+ COPY . /tmp/openblas
|
||||
+ RUN apt-get -y update && apt-get -y install \\
|
||||
+ cmake \\
|
||||
+ gfortran \\
|
||||
+ make \\
|
||||
+ wget
|
||||
+ RUN mkdir /tmp/SDE && cd /tmp/SDE && \\
|
||||
+ mkdir sde-external-8.35.0-2019-03-11-lin && \\
|
||||
+ wget --quiet -O sde-external-8.35.0-2019-03-11-lin.tar.bz2 https://www.dropbox.com/s/fopsnzj67572sj5/sde-external-8.35.0-2019-03-11-lin.tar.bz2?dl=0 && \\
|
||||
+ tar -xjvf sde-external-8.35.0-2019-03-11-lin.tar.bz2 -C /tmp/SDE/sde-external-8.35.0-2019-03-11-lin --strip-components=1
|
||||
+ RUN cd /tmp/openblas && echo 0 > /proc/sys/kernel/yama/ptrace_scope && CC=gcc /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/sde64 -cpuid_in /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/misc/cpuid/snb/cpuid.def -- make QUIET_MAKE=1 DYNAMIC_ARCH=1 NUM_THREADS=32 BINARY=64
|
||||
+ CMD cd /tmp/openblas && echo 0 > /proc/sys/kernel/yama/ptrace_scope && CC=gcc OPENBLAS_VERBOSE=2 /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/sde64 -cpuid_in /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/misc/cpuid/skx/cpuid.def -- make -C utest DYNAMIC_ARCH=1 NUM_THREADS=32 BINARY=64" > Dockerfile
|
||||
+ docker build -t intel_sde .
|
||||
+ # we need a privileged docker run for sde process attachment
|
||||
+ docker run --privileged intel_sde
|
||||
+ displayName: 'Run AVX512 SkylakeX docker build / test'
|
||||
+
|
||||
- job: Intel_skx
|
||||
pool:
|
||||
vmImage: 'ubuntu-latest'
|
||||
|
||||
From ffb10f187263d5da447382ab36a7da412b744390 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
|
||||
Date: Sat, 1 Jan 2022 22:43:43 +0100
|
||||
Subject: [PATCH 07/10] Update azure-pipelines.yml
|
||||
|
||||
---
|
||||
azure-pipelines.yml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
|
||||
index d5cb765db..683bc7ad6 100644
|
||||
--- a/azure-pipelines.yml
|
||||
+++ b/azure-pipelines.yml
|
||||
@@ -76,7 +76,7 @@ jobs:
|
||||
mkdir sde-external-8.35.0-2019-03-11-lin && \\
|
||||
wget --quiet -O sde-external-8.35.0-2019-03-11-lin.tar.bz2 https://www.dropbox.com/s/fopsnzj67572sj5/sde-external-8.35.0-2019-03-11-lin.tar.bz2?dl=0 && \\
|
||||
tar -xjvf sde-external-8.35.0-2019-03-11-lin.tar.bz2 -C /tmp/SDE/sde-external-8.35.0-2019-03-11-lin --strip-components=1
|
||||
- RUN cd /tmp/openblas && echo 0 > /proc/sys/kernel/yama/ptrace_scope && CC=gcc /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/sde64 -cpuid_in /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/misc/cpuid/snb/cpuid.def -- make QUIET_MAKE=1 DYNAMIC_ARCH=1 NUM_THREADS=32 BINARY=64
|
||||
+ CMD cd /tmp/openblas && echo 0 > /proc/sys/kernel/yama/ptrace_scope && CC=gcc /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/sde64 -cpuid_in /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/misc/cpuid/snb/cpuid.def -- make QUIET_MAKE=1 DYNAMIC_ARCH=1 NUM_THREADS=32 BINARY=64
|
||||
CMD cd /tmp/openblas && echo 0 > /proc/sys/kernel/yama/ptrace_scope && CC=gcc OPENBLAS_VERBOSE=2 /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/sde64 -cpuid_in /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/misc/cpuid/skx/cpuid.def -- make -C utest DYNAMIC_ARCH=1 NUM_THREADS=32 BINARY=64" > Dockerfile
|
||||
docker build -t intel_sde .
|
||||
# we need a privileged docker run for sde process attachment
|
||||
|
||||
From b9e9431821df240535c3a8ee8657343b1c65fbd0 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
|
||||
Date: Sat, 1 Jan 2022 23:17:12 +0100
|
||||
Subject: [PATCH 08/10] Update azure-pipelines.yml
|
||||
|
||||
---
|
||||
azure-pipelines.yml | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
|
||||
index 683bc7ad6..e199e85ca 100644
|
||||
--- a/azure-pipelines.yml
|
||||
+++ b/azure-pipelines.yml
|
||||
@@ -76,8 +76,7 @@ jobs:
|
||||
mkdir sde-external-8.35.0-2019-03-11-lin && \\
|
||||
wget --quiet -O sde-external-8.35.0-2019-03-11-lin.tar.bz2 https://www.dropbox.com/s/fopsnzj67572sj5/sde-external-8.35.0-2019-03-11-lin.tar.bz2?dl=0 && \\
|
||||
tar -xjvf sde-external-8.35.0-2019-03-11-lin.tar.bz2 -C /tmp/SDE/sde-external-8.35.0-2019-03-11-lin --strip-components=1
|
||||
- CMD cd /tmp/openblas && echo 0 > /proc/sys/kernel/yama/ptrace_scope && CC=gcc /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/sde64 -cpuid_in /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/misc/cpuid/snb/cpuid.def -- make QUIET_MAKE=1 DYNAMIC_ARCH=1 NUM_THREADS=32 BINARY=64
|
||||
- CMD cd /tmp/openblas && echo 0 > /proc/sys/kernel/yama/ptrace_scope && CC=gcc OPENBLAS_VERBOSE=2 /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/sde64 -cpuid_in /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/misc/cpuid/skx/cpuid.def -- make -C utest DYNAMIC_ARCH=1 NUM_THREADS=32 BINARY=64" > Dockerfile
|
||||
+ CMD cd /tmp/openblas && echo 0 > /proc/sys/kernel/yama/ptrace_scope && CC=gcc /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/sde64 -cpuid_in /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/misc/cpuid/snb/cpuid.def -- make QUIET_MAKE=1 DYNAMIC_ARCH=1 NUM_THREADS=32 BINARY=64 && CC=gcc OPENBLAS_VERBOSE=2 /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/sde64 -cpuid_in /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/misc/cpuid/skx/cpuid.def -- make -C utest DYNAMIC_ARCH=1 NUM_THREADS=32 BINARY=64" > Dockerfile
|
||||
docker build -t intel_sde .
|
||||
# we need a privileged docker run for sde process attachment
|
||||
docker run --privileged intel_sde
|
||||
|
||||
From 0ea61108e3ad7c0e3154f6a0da7b8063706642f2 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
|
||||
Date: Sun, 2 Jan 2022 12:11:26 +0100
|
||||
Subject: [PATCH 09/10] Update azure-pipelines.yml
|
||||
|
||||
---
|
||||
azure-pipelines.yml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
|
||||
index e199e85ca..fd8e29c9d 100644
|
||||
--- a/azure-pipelines.yml
|
||||
+++ b/azure-pipelines.yml
|
||||
@@ -76,7 +76,7 @@ jobs:
|
||||
mkdir sde-external-8.35.0-2019-03-11-lin && \\
|
||||
wget --quiet -O sde-external-8.35.0-2019-03-11-lin.tar.bz2 https://www.dropbox.com/s/fopsnzj67572sj5/sde-external-8.35.0-2019-03-11-lin.tar.bz2?dl=0 && \\
|
||||
tar -xjvf sde-external-8.35.0-2019-03-11-lin.tar.bz2 -C /tmp/SDE/sde-external-8.35.0-2019-03-11-lin --strip-components=1
|
||||
- CMD cd /tmp/openblas && echo 0 > /proc/sys/kernel/yama/ptrace_scope && CC=gcc /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/sde64 -cpuid_in /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/misc/cpuid/snb/cpuid.def -- make QUIET_MAKE=1 DYNAMIC_ARCH=1 NUM_THREADS=32 BINARY=64 && CC=gcc OPENBLAS_VERBOSE=2 /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/sde64 -cpuid_in /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/misc/cpuid/skx/cpuid.def -- make -C utest DYNAMIC_ARCH=1 NUM_THREADS=32 BINARY=64" > Dockerfile
|
||||
+ CMD cd /tmp/openblas && echo 0 > /proc/sys/kernel/yama/ptrace_scope && CC=gcc /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/sde64 -cpuid_in /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/misc/cpuid/snb/cpuid.def -- make QUIET_MAKE=1 DYNAMIC_ARCH=1 DYNAMIC_LIST=\"SANDYBRIDGE HASWELL SKYLAKEX\" NUM_THREADS=32 BINARY=64 && CC=gcc OPENBLAS_VERBOSE=2 /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/sde64 -cpuid_in /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/misc/cpuid/skx/cpuid.def -- make -C utest DYNAMIC_ARCH=1 NUM_THREADS=32 BINARY=64" > Dockerfile
|
||||
docker build -t intel_sde .
|
||||
# we need a privileged docker run for sde process attachment
|
||||
docker run --privileged intel_sde
|
||||
|
||||
From ca2637af701fc5eed08065b192d9a9f63bf84243 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
|
||||
Date: Sun, 2 Jan 2022 13:24:26 +0100
|
||||
Subject: [PATCH 10/10] Update azure-pipelines.yml
|
||||
|
||||
---
|
||||
azure-pipelines.yml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
|
||||
index fd8e29c9d..79414055e 100644
|
||||
--- a/azure-pipelines.yml
|
||||
+++ b/azure-pipelines.yml
|
||||
@@ -76,7 +76,7 @@ jobs:
|
||||
mkdir sde-external-8.35.0-2019-03-11-lin && \\
|
||||
wget --quiet -O sde-external-8.35.0-2019-03-11-lin.tar.bz2 https://www.dropbox.com/s/fopsnzj67572sj5/sde-external-8.35.0-2019-03-11-lin.tar.bz2?dl=0 && \\
|
||||
tar -xjvf sde-external-8.35.0-2019-03-11-lin.tar.bz2 -C /tmp/SDE/sde-external-8.35.0-2019-03-11-lin --strip-components=1
|
||||
- CMD cd /tmp/openblas && echo 0 > /proc/sys/kernel/yama/ptrace_scope && CC=gcc /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/sde64 -cpuid_in /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/misc/cpuid/snb/cpuid.def -- make QUIET_MAKE=1 DYNAMIC_ARCH=1 DYNAMIC_LIST=\"SANDYBRIDGE HASWELL SKYLAKEX\" NUM_THREADS=32 BINARY=64 && CC=gcc OPENBLAS_VERBOSE=2 /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/sde64 -cpuid_in /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/misc/cpuid/skx/cpuid.def -- make -C utest DYNAMIC_ARCH=1 NUM_THREADS=32 BINARY=64" > Dockerfile
|
||||
+ CMD cd /tmp/openblas && echo 0 > /proc/sys/kernel/yama/ptrace_scope && CC=gcc /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/sde64 -cpuid_in /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/misc/cpuid/snb/cpuid.def -- make QUIET_MAKE=1 DYNAMIC_ARCH=1 DYNAMIC_LIST=\"SANDYBRIDGE SKYLAKEX\" NUM_THREADS=32 BINARY=64 && CC=gcc OPENBLAS_VERBOSE=2 /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/sde64 -cpuid_in /tmp/SDE/sde-external-8.35.0-2019-03-11-lin/misc/cpuid/skx/cpuid.def -- make -C utest DYNAMIC_ARCH=1 NUM_THREADS=32 BINARY=64" > Dockerfile
|
||||
docker build -t intel_sde .
|
||||
# we need a privileged docker run for sde process attachment
|
||||
docker run --privileged intel_sde
|
|
@ -1,73 +0,0 @@
|
|||
From ee2e758278b5d82b7242f505ea694f082ef65879 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
|
||||
Date: Fri, 13 Mar 2020 20:34:13 +0100
|
||||
Subject: [PATCH] Move declarations of lapack_complex_custom types outside the
|
||||
extern C
|
||||
|
||||
fixes #2510
|
||||
---
|
||||
lapack-netlib/LAPACKE/include/lapack.h | 44 ++++++++++++++------------
|
||||
1 file changed, 23 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/lapack-netlib/LAPACKE/include/lapack.h b/lapack-netlib/LAPACKE/include/lapack.h
|
||||
index 0a6226fe4..36e53ec24 100644
|
||||
--- a/lapack-netlib/LAPACKE/include/lapack.h
|
||||
+++ b/lapack-netlib/LAPACKE/include/lapack.h
|
||||
@@ -12,27 +12,6 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
-#ifdef __cplusplus
|
||||
-extern "C" {
|
||||
-#endif
|
||||
-
|
||||
-/*----------------------------------------------------------------------------*/
|
||||
-#ifndef lapack_int
|
||||
-#define lapack_int int
|
||||
-#endif
|
||||
-
|
||||
-#ifndef lapack_logical
|
||||
-#define lapack_logical lapack_int
|
||||
-#endif
|
||||
-
|
||||
-/* f2c, hence clapack and MacOS Accelerate, returns double instead of float
|
||||
- * for sdot, slange, clange, etc. */
|
||||
-#if defined(LAPACK_F2C)
|
||||
- typedef double lapack_float_return;
|
||||
-#else
|
||||
- typedef float lapack_float_return;
|
||||
-#endif
|
||||
-
|
||||
/* Complex types are structures equivalent to the
|
||||
* Fortran complex types COMPLEX(4) and COMPLEX(8).
|
||||
*
|
||||
@@ -88,6 +67,29 @@ extern "C" {
|
||||
|
||||
#endif /* LAPACK_COMPLEX_CUSTOM */
|
||||
|
||||
+
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
+
|
||||
+/*----------------------------------------------------------------------------*/
|
||||
+#ifndef lapack_int
|
||||
+#define lapack_int int
|
||||
+#endif
|
||||
+
|
||||
+#ifndef lapack_logical
|
||||
+#define lapack_logical lapack_int
|
||||
+#endif
|
||||
+
|
||||
+/* f2c, hence clapack and MacOS Accelerate, returns double instead of float
|
||||
+ * for sdot, slange, clange, etc. */
|
||||
+#if defined(LAPACK_F2C)
|
||||
+ typedef double lapack_float_return;
|
||||
+#else
|
||||
+ typedef float lapack_float_return;
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
/* Callback logical functions of one, two, or three arguments are used
|
||||
* to select eigenvalues to sort to the top left of the Schur form.
|
||||
* The value is selected if function returns TRUE (non-zero). */
|
|
@ -1,140 +0,0 @@
|
|||
diff -up OpenBLAS-0.2.10/exports/gensymbol.lapacke OpenBLAS-0.2.10/exports/gensymbol
|
||||
--- OpenBLAS-0.2.10/exports/gensymbol.lapacke 2014-07-16 12:04:30.000000000 +0200
|
||||
+++ OpenBLAS-0.2.10/exports/gensymbol 2014-07-16 19:35:48.856855925 +0200
|
||||
@@ -175,7 +175,7 @@
|
||||
sggglm, sgghrd, sgglse, sggqrf,
|
||||
sggrqf, sggsvd, sggsvp, sgtcon, sgtrfs, sgtsv,
|
||||
sgtsvx, sgttrf, sgttrs, sgtts2, shgeqz,
|
||||
- shsein, shseqr, slabrd, slacon, slacn2,
|
||||
+ shsein, shseqr, slabrd, slacon,
|
||||
slaein, slaexc, slag2, slags2, slagtm, slagv2, slahqr,
|
||||
slahrd, slahr2, slaic1, slaln2, slals0, slalsa, slalsd,
|
||||
slangb, slange, slangt, slanhs, slansb, slansp,
|
||||
@@ -256,7 +256,7 @@
|
||||
chpevx, chpgst, chpgv, chpgvd, chpgvx, chprfs, chpsv,
|
||||
chpsvx,
|
||||
chptrd, chptrf, chptri, chptrs, chsein, chseqr, clabrd,
|
||||
- clacgv, clacon, clacn2, clacp2, clacpy, clacrm, clacrt, cladiv,
|
||||
+ clacgv, clacon, clacpy, clacrm, clacrt, cladiv,
|
||||
claed0, claed7, claed8,
|
||||
claein, claesy, claev2, clags2, clagtm,
|
||||
clahef, clahqr,
|
||||
@@ -323,7 +323,7 @@
|
||||
dggglm, dgghrd, dgglse, dggqrf,
|
||||
dggrqf, dggsvd, dggsvp, dgtcon, dgtrfs, dgtsv,
|
||||
dgtsvx, dgttrf, dgttrs, dgtts2, dhgeqz,
|
||||
- dhsein, dhseqr, dlabrd, dlacon, dlacn2,
|
||||
+ dhsein, dhseqr, dlabrd, dlacon,
|
||||
dlaein, dlaexc, dlag2, dlags2, dlagtm, dlagv2, dlahqr,
|
||||
dlahrd, dlahr2, dlaic1, dlaln2, dlals0, dlalsa, dlalsd,
|
||||
dlangb, dlange, dlangt, dlanhs, dlansb, dlansp,
|
||||
@@ -398,7 +398,7 @@
|
||||
zhpevx, zhpgst, zhpgv, zhpgvd, zhpgvx, zhprfs, zhpsv,
|
||||
zhpsvx,
|
||||
zhptrd, zhptrf, zhptri, zhptrs, zhsein, zhseqr, zlabrd,
|
||||
- zlacgv, zlacon, zlacn2, zlacp2, zlacpy, zlacrm, zlacrt, zladiv,
|
||||
+ zlacgv, zlacon, zlacpy, zlacrm, zlacrt, zladiv,
|
||||
zlaed0, zlaed7, zlaed8,
|
||||
zlaein, zlaesy, zlaev2, zlags2, zlagtm,
|
||||
zlahef, zlahqr,
|
||||
@@ -845,10 +845,6 @@
|
||||
LAPACKE_chseqr_work,
|
||||
LAPACKE_clacgv,
|
||||
LAPACKE_clacgv_work,
|
||||
- LAPACKE_clacn2,
|
||||
- LAPACKE_clacn2_work,
|
||||
- LAPACKE_clacp2,
|
||||
- LAPACKE_clacp2_work,
|
||||
LAPACKE_clacpy,
|
||||
LAPACKE_clacpy_work,
|
||||
LAPACKE_clag2z,
|
||||
@@ -984,8 +980,6 @@
|
||||
LAPACKE_csyrfs,
|
||||
LAPACKE_csyrfs_work,
|
||||
LAPACKE_csysv,
|
||||
- LAPACKE_csysv_rook,
|
||||
- LAPACKE_csysv_rook_work,
|
||||
LAPACKE_csysv_work,
|
||||
LAPACKE_csysvx,
|
||||
LAPACKE_csysvx_work,
|
||||
@@ -1259,8 +1253,6 @@
|
||||
LAPACKE_dhsein_work,
|
||||
LAPACKE_dhseqr,
|
||||
LAPACKE_dhseqr_work,
|
||||
- LAPACKE_dlacn2,
|
||||
- LAPACKE_dlacn2_work,
|
||||
LAPACKE_dlacpy,
|
||||
LAPACKE_dlacpy_work,
|
||||
LAPACKE_dlag2s,
|
||||
@@ -1510,8 +1502,6 @@
|
||||
LAPACKE_dsyrfs,
|
||||
LAPACKE_dsyrfs_work,
|
||||
LAPACKE_dsysv,
|
||||
- LAPACKE_dsysv_rook,
|
||||
- LAPACKE_dsysv_rook_work,
|
||||
LAPACKE_dsysv_work,
|
||||
LAPACKE_dsysvx,
|
||||
LAPACKE_dsysvx_work,
|
||||
@@ -1749,8 +1739,6 @@
|
||||
LAPACKE_shsein_work,
|
||||
LAPACKE_shseqr,
|
||||
LAPACKE_shseqr_work,
|
||||
- LAPACKE_slacn2,
|
||||
- LAPACKE_slacn2_work,
|
||||
LAPACKE_slacpy,
|
||||
LAPACKE_slacpy_work,
|
||||
LAPACKE_slag2d,
|
||||
@@ -1996,8 +1984,6 @@
|
||||
LAPACKE_ssyrfs,
|
||||
LAPACKE_ssyrfs_work,
|
||||
LAPACKE_ssysv,
|
||||
- LAPACKE_ssysv_rook,
|
||||
- LAPACKE_ssysv_rook_work,
|
||||
LAPACKE_ssysv_work,
|
||||
LAPACKE_ssysvx,
|
||||
LAPACKE_ssysvx_work,
|
||||
@@ -2321,10 +2307,6 @@
|
||||
LAPACKE_zhseqr_work,
|
||||
LAPACKE_zlacgv,
|
||||
LAPACKE_zlacgv_work,
|
||||
- LAPACKE_zlacn2,
|
||||
- LAPACKE_zlacn2_work,
|
||||
- LAPACKE_zlacp2,
|
||||
- LAPACKE_zlacp2_work,
|
||||
LAPACKE_zlacpy,
|
||||
LAPACKE_zlacpy_work,
|
||||
LAPACKE_zlag2c,
|
||||
@@ -2460,8 +2442,6 @@
|
||||
LAPACKE_zsyrfs,
|
||||
LAPACKE_zsyrfs_work,
|
||||
LAPACKE_zsysv,
|
||||
- LAPACKE_zsysv_rook,
|
||||
- LAPACKE_zsysv_rook_work,
|
||||
LAPACKE_zsysv_work,
|
||||
LAPACKE_zsysvx,
|
||||
LAPACKE_zsysvx_work,
|
||||
@@ -2705,20 +2685,20 @@
|
||||
#These function may need 2 underscores.
|
||||
@lapack_embeded_underscore_objs=(xerbla_array, chla_transtype, slasyf_rook,
|
||||
ssytf2_rook, ssytrf_rook, ssytrs_rook,
|
||||
- ssytri_rook, ssycon_rook, ssysv_rook,
|
||||
+ ssytri_rook, ssycon_rook,
|
||||
chetf2_rook, chetrf_rook, chetri_rook,
|
||||
chetrs_rook, checon_rook, chesv_rook,
|
||||
clahef_rook, clasyf_rook,
|
||||
csytf2_rook, csytrf_rook, csytrs_rook,
|
||||
- csytri_rook, csycon_rook, csysv_rook,
|
||||
+ csytri_rook, csycon_rook,
|
||||
dlasyf_rook,
|
||||
dsytf2_rook, dsytrf_rook, dsytrs_rook,
|
||||
- dsytri_rook, dsycon_rook, dsysv_rook,
|
||||
+ dsytri_rook, dsycon_rook,
|
||||
zhetf2_rook, zhetrf_rook, zhetri_rook,
|
||||
zhetrs_rook, zhecon_rook, zhesv_rook,
|
||||
zlahef_rook, zlasyf_rook,
|
||||
zsytf2_rook, zsytrf_rook, zsytrs_rook,
|
||||
- zsytri_rook, zsycon_rook, zsysv_rook,
|
||||
+ zsytri_rook, zsycon_rook,
|
||||
|
||||
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
diff -up OpenBLAS-0.2.19/Makefile.tests OpenBLAS-0.2.19/Makefile
|
||||
--- OpenBLAS-0.2.19/Makefile.tests 2016-09-01 05:58:42.000000000 +0200
|
||||
+++ OpenBLAS-0.2.19/Makefile 2016-09-01 22:52:27.092706000 +0200
|
||||
@@ -110,11 +110,11 @@ tests :
|
||||
ifndef NOFORTRAN
|
||||
touch $(LIBNAME)
|
||||
ifndef NO_FBLAS
|
||||
- $(MAKE) -C test all
|
||||
- $(MAKE) -C utest all
|
||||
+ $(MAKE) -C test FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
|
||||
+ $(MAKE) -C utest FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
|
||||
endif
|
||||
ifndef NO_CBLAS
|
||||
- $(MAKE) -C ctest all
|
||||
+ $(MAKE) -C ctest FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
|
||||
endif
|
||||
endif
|
||||
|
|
@ -1,27 +1,6 @@
|
|||
diff -up OpenBLAS-0.3.7/Makefile.tests OpenBLAS-0.3.7/Makefile
|
||||
--- OpenBLAS-0.3.7/Makefile.tests 2019-08-11 23:23:27.000000000 +0200
|
||||
+++ OpenBLAS-0.3.7/Makefile 2019-08-12 11:32:09.937281485 +0200
|
||||
@@ -123,13 +123,13 @@ tests :
|
||||
ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
|
||||
touch $(LIBNAME)
|
||||
ifndef NO_FBLAS
|
||||
- $(MAKE) -C test all
|
||||
+ $(MAKE) -C test FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
|
||||
endif
|
||||
- $(MAKE) -C utest all
|
||||
+ $(MAKE) -C utest FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
|
||||
ifndef NO_CBLAS
|
||||
- $(MAKE) -C ctest all
|
||||
+ $(MAKE) -C ctest FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
|
||||
ifeq ($(CPP_THREAD_SAFETY_TEST), 1)
|
||||
- $(MAKE) -C cpp_thread_test all
|
||||
+ $(MAKE) -C cpp_thread_test FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
diff -up OpenBLAS-0.3.7/cpp_thread_test/Makefile.tests OpenBLAS-0.3.7/cpp_thread_test/Makefile
|
||||
--- OpenBLAS-0.3.7/cpp_thread_test/Makefile.tests 2019-08-11 19:23:00.000000000 +0000
|
||||
+++ OpenBLAS-0.3.7/cpp_thread_test/Makefile 2019-12-12 11:05:51.426334062 +0000
|
||||
diff -up OpenBLAS-0.3.11/cpp_thread_test/Makefile.tests OpenBLAS-0.3.11/cpp_thread_test/Makefile
|
||||
--- OpenBLAS-0.3.11/cpp_thread_test/Makefile.tests 2020-10-17 22:14:12.000000000 +0200
|
||||
+++ OpenBLAS-0.3.11/cpp_thread_test/Makefile 2020-10-18 18:18:59.460796184 +0200
|
||||
@@ -1,13 +1,14 @@
|
||||
-include ../Makefile.rule
|
||||
+TOPDIR = ..
|
||||
|
@ -40,3 +19,24 @@ diff -up OpenBLAS-0.3.7/cpp_thread_test/Makefile.tests OpenBLAS-0.3.7/cpp_thread
|
|||
./dgemm_tester
|
||||
|
||||
clean ::
|
||||
diff -up OpenBLAS-0.3.11/Makefile.tests OpenBLAS-0.3.11/Makefile
|
||||
--- OpenBLAS-0.3.11/Makefile.tests 2020-10-17 22:14:12.000000000 +0200
|
||||
+++ OpenBLAS-0.3.11/Makefile 2020-10-18 18:19:54.134437445 +0200
|
||||
@@ -138,13 +138,13 @@ tests :
|
||||
ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
|
||||
touch $(LIBNAME)
|
||||
ifndef NO_FBLAS
|
||||
- $(MAKE) -C test all
|
||||
+ $(MAKE) -C test FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
|
||||
endif
|
||||
- $(MAKE) -C utest all
|
||||
+ $(MAKE) -C utest FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
|
||||
ifneq ($(NO_CBLAS), 1)
|
||||
- $(MAKE) -C ctest all
|
||||
+ $(MAKE) -C ctest FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
|
||||
ifeq ($(CPP_THREAD_SAFETY_TEST), 1)
|
||||
- $(MAKE) -C cpp_thread_test all
|
||||
+ $(MAKE) -C cpp_thread_test FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
|
||||
endif
|
||||
endif
|
||||
endif
|
111
openblas.spec
111
openblas.spec
|
@ -1,6 +1,6 @@
|
|||
%bcond_with system_lapack
|
||||
# Version of bundled lapack
|
||||
%global lapackver 3.9.0
|
||||
%global lapackver 3.9.1
|
||||
|
||||
# DO NOT "CLEAN UP" OR MODIFY THIS SPEC FILE WITHOUT ASKING THE
|
||||
# MAINTAINER FIRST!
|
||||
|
@ -14,7 +14,7 @@
|
|||
# "obsoleted" features are still kept in the spec.
|
||||
|
||||
Name: openblas
|
||||
Version: 0.3.9
|
||||
Version: 0.3.19
|
||||
Release: 2%{?dist}
|
||||
Summary: An optimized BLAS library based on GotoBLAS2
|
||||
License: BSD
|
||||
|
@ -26,18 +26,21 @@ Patch0: openblas-0.2.15-system_lapack.patch
|
|||
Patch1: openblas-0.2.5-libname.patch
|
||||
# Don't use constructor priorities on too old architectures
|
||||
Patch2: openblas-0.2.15-constructor.patch
|
||||
# Supply the proper flags to the test makefile
|
||||
Patch3: openblas-0.3.7-tests.patch
|
||||
|
||||
# Fix C++ compatibility (BZ #1820131)
|
||||
Patch4: https://github.com/xianyi/OpenBLAS/commit/ee2e758278b5d82b7242f505ea694f082ef65879.patch
|
||||
# Fix BZ#1982856
|
||||
Patch3: https://github.com/xianyi/OpenBLAS/pull/3498.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gcc-gfortran
|
||||
BuildRequires: perl-devel
|
||||
BuildRequires: multilib-rpm-config
|
||||
|
||||
# Rblas library is no longer necessary
|
||||
%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
|
||||
Obsoletes: %{name}-Rblas < %{version}-%{release}
|
||||
%endif
|
||||
|
||||
# Do we have execstack?
|
||||
%if 0%{?rhel} == 7
|
||||
%ifarch ppc64le aarch64
|
||||
|
@ -100,12 +103,6 @@ Computational Science, ISCAS. http://www.rdcps.ac.cn
|
|||
%description
|
||||
%{base_description}
|
||||
|
||||
%package Rblas
|
||||
Summary: A version of OpenBLAS for R to use as libRblas
|
||||
|
||||
%description Rblas
|
||||
%{base_description}
|
||||
|
||||
%package serial
|
||||
Summary: An optimized BLAS library based on GotoBLAS2, serial version
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
@ -243,8 +240,7 @@ cd OpenBLAS-%{version}
|
|||
%if 0%{?rhel} == 5
|
||||
%patch2 -p1 -b .constructor
|
||||
%endif
|
||||
%patch3 -p1 -b .tests
|
||||
%patch4 -p1 -b .cplusplus
|
||||
%patch3 -p1 -b .bz1982856
|
||||
|
||||
# Fix source permissions
|
||||
find -name \*.f -exec chmod 644 {} \;
|
||||
|
@ -255,7 +251,6 @@ rm -rf lapack-netlib
|
|||
%endif
|
||||
|
||||
# Make serial, threaded and OpenMP versions; as well as 64-bit versions
|
||||
# Also make an libRblas.so
|
||||
cd ..
|
||||
cp -ar OpenBLAS-%{version} openmp
|
||||
cp -ar OpenBLAS-%{version} threaded
|
||||
|
@ -264,14 +259,8 @@ for d in {serial,threaded,openmp}64{,_}; do
|
|||
cp -ar OpenBLAS-%{version} $d
|
||||
done
|
||||
%endif
|
||||
cp -ar OpenBLAS-%{version} Rblas
|
||||
mv OpenBLAS-%{version} serial
|
||||
|
||||
# Hackup Rblas Makefiles
|
||||
sed -i 's|.so.$(MAJOR_VERSION)|.so|g' Rblas/Makefile
|
||||
sed -i 's|.so.$(MAJOR_VERSION)|.so|g' Rblas/exports/Makefile
|
||||
sed -i 's|@ln -fs $(LIBSONAME) $(LIBPREFIX).so|#@ln -fs $(LIBSONAME) $(LIBPREFIX).so|g' Rblas/Makefile
|
||||
|
||||
%if %{with system_lapack}
|
||||
# Setup 32-bit interface LAPACK
|
||||
mkdir netliblapack
|
||||
|
@ -348,6 +337,9 @@ rm -rf netliblapack64
|
|||
%endif
|
||||
|
||||
%build
|
||||
# openblas fails to build with LTO due to undefined symbols. These could
|
||||
# well be the result of the assembly code used in this package
|
||||
%define _lto_cflags %{nil}
|
||||
%if !%{lapacke}
|
||||
LAPACKE="NO_LAPACKE=1"
|
||||
%endif
|
||||
|
@ -398,12 +390,10 @@ FCOMMON="%{optflags} -fPIC -frecursive"
|
|||
# Use Fedora linker flags
|
||||
export LDFLAGS="%{__global_ldflags}"
|
||||
|
||||
make -C Rblas $TARGET USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libRblas" LIBSONAME="libRblas.so" $AVX $LAPACKE INTERFACE64=0
|
||||
|
||||
# Declare some necessary build flags
|
||||
COMMON="%{optflags} -fPIC"
|
||||
FCOMMON="$COMMON -frecursive"
|
||||
make -C serial $TARGET USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libopenblas" $AVX $LAPACKE INTERFACE64=0
|
||||
make -C serial $TARGET USE_THREAD=0 USE_LOCKING=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libopenblas" $AVX $LAPACKE INTERFACE64=0
|
||||
make -C threaded $TARGET USE_THREAD=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libopenblasp" $AVX $LAPACKE INTERFACE64=0
|
||||
|
||||
# USE_THREAD determines use of SMP, not of pthreads
|
||||
|
@ -414,7 +404,7 @@ make -C openmp $TARGET USE_THREAD=1 USE_OPENMP=1 FC=gfortran CC=gcc COMMON_O
|
|||
%if %build64
|
||||
COMMON="%{optflags} -fPIC"
|
||||
FCOMMON="$COMMON -frecursive -fdefault-integer-8"
|
||||
make -C serial64 $TARGET USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libopenblas64" $AVX $LAPACKE INTERFACE64=1
|
||||
make -C serial64 $TARGET USE_THREAD=0 USE_LOCKING=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libopenblas64" $AVX $LAPACKE INTERFACE64=1
|
||||
make -C threaded64 $TARGET USE_THREAD=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libopenblasp64" $AVX $LAPACKE INTERFACE64=1
|
||||
|
||||
COMMON="%{optflags} -fPIC -fopenmp -pthread"
|
||||
|
@ -423,7 +413,7 @@ make -C openmp64 $TARGET USE_THREAD=1 USE_OPENMP=1 FC=gfortran CC=gcc COMMON_O
|
|||
|
||||
COMMON="%{optflags} -fPIC"
|
||||
FCOMMON="$COMMON -frecursive -fdefault-integer-8"
|
||||
make -C serial64_ $TARGET USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libopenblas64_" $AVX $LAPACKE INTERFACE64=1 SYMBOLSUFFIX=64_
|
||||
make -C serial64_ $TARGET USE_THREAD=0 USE_LOCKING=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libopenblas64_" $AVX $LAPACKE INTERFACE64=1 SYMBOLSUFFIX=64_
|
||||
make -C threaded64_ $TARGET USE_THREAD=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="$COMMON" FCOMMON_OPT="$FCOMMON" $NMAX LIBPREFIX="libopenblasp64_" $AVX $LAPACKE INTERFACE64=1 SYMBOLSUFFIX=64_
|
||||
|
||||
COMMON="%{optflags} -fPIC -fopenmp -pthread"
|
||||
|
@ -459,10 +449,6 @@ else
|
|||
sname=${slibname}
|
||||
fi
|
||||
|
||||
# Install the Rblas library
|
||||
mkdir -p %{buildroot}%{_libdir}/R/lib/
|
||||
install -p -m 755 Rblas/libRblas.so %{buildroot}%{_libdir}/R/lib/
|
||||
|
||||
# Install the OpenMP library
|
||||
olibname=`echo ${slibname} | sed "s|lib%{name}|lib%{name}o|g"`
|
||||
install -D -p -m 644 openmp/${olibname}.a %{buildroot}%{_libdir}/lib%{name}o.a
|
||||
|
@ -566,9 +552,6 @@ ln -sf ${pname64_}.so lib%{name}p64_.so.0
|
|||
for lib in %{buildroot}%{_libdir}/libopenblas*.so; do
|
||||
execstack -c $lib
|
||||
done
|
||||
for lib in %{buildroot}%{_libdir}/R/lib/libRblas*.so; do
|
||||
execstack -c $lib
|
||||
done
|
||||
%endif
|
||||
|
||||
# Get rid of generated CMake config
|
||||
|
@ -580,8 +563,6 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
|
|||
|
||||
%ldconfig_scriptlets openmp
|
||||
|
||||
%ldconfig_scriptlets Rblas
|
||||
|
||||
%ldconfig_scriptlets threads
|
||||
|
||||
%if %build64
|
||||
|
@ -651,9 +632,6 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
|
|||
%{_libdir}/lib%{name}p64_.so
|
||||
%endif
|
||||
|
||||
%files Rblas
|
||||
%{_libdir}/R/lib/libRblas.so
|
||||
|
||||
%files static
|
||||
%{_libdir}/lib%{name}.a
|
||||
%{_libdir}/lib%{name}o.a
|
||||
|
@ -668,6 +646,61 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Jan 03 2022 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.3.19-2
|
||||
- Fix BZ#1982856.
|
||||
|
||||
* Sun Dec 19 2021 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.3.19-1
|
||||
- Update to 0.3.19.
|
||||
|
||||
* Mon Oct 11 2021 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.3.18-1
|
||||
- Update to 0.3.18.
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.17-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Mon Jul 19 2021 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.3.17-1
|
||||
- Update to 0.3.17.
|
||||
|
||||
* Mon Jul 12 2021 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.3.16-1
|
||||
- Update to 0.3.16.
|
||||
|
||||
* Mon May 03 2021 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.3.15-1
|
||||
- Update to 0.3.15.
|
||||
|
||||
* Thu Mar 18 2021 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.3.14-1
|
||||
- Update to 0.3.14.
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.12-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Sun Oct 25 2020 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.3.12-1
|
||||
- Update to 0.3.12.
|
||||
|
||||
* Sun Oct 18 2020 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.3.11-1
|
||||
- Update to 0.3.11.
|
||||
|
||||
* Fri Sep 18 2020 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.3.10-6
|
||||
- Fix incorrect result of cblas_zdotc_sub on ppc64le (BZ #1878449).
|
||||
|
||||
* Sat Aug 29 2020 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.3.10-5
|
||||
- Fix unresolved bfloat16 datatype (BZ #1873667).
|
||||
|
||||
* Fri Aug 14 2020 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.3.10-4
|
||||
- Obsolete Rblas package (BZ #1849966).
|
||||
|
||||
* Tue Aug 11 2020 Jeff Law <law@redhat.com> - 0.3.10-3
|
||||
- Disable LTO
|
||||
|
||||
* Tue Jul 28 2020 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.3.10-2
|
||||
- Include upstream patch 2672 to fix test suite on systems with few CPUs.
|
||||
|
||||
* Mon Jun 15 2020 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.3.10-1
|
||||
- Update to 0.3.10.
|
||||
|
||||
* Thu May 28 2020 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.3.9-3
|
||||
- Enable USE_LOCKING in the sequential versions of the library for
|
||||
thread safety.
|
||||
|
||||
* Thu Apr 02 2020 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.3.9-2
|
||||
- Patch for BZ #1820131.
|
||||
|
||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
SHA512 (openblas-0.3.9.tar.gz) = e34da25b3aaf959ec12826ac68c81e739e453d44f2dba28b15e57d7a827edc4d5f42988e9b6d98ac07999940be7b5876246cb3a980e590ae87f77f4c2f12f40a
|
||||
SHA512 (openblas-0.3.19.tar.gz) = 1fcbcfefb7744894b0b0c83c6071b342086ca311dc67f5c2745812d61dcc9d31ef7dd5e1215dfb2731ae7197d497dbdf8f8b26a432eb07d41a7db0983eb86a33
|
||||
|
|
Loading…
Reference in New Issue