Skip to content

Commit bca00cf

Browse files
cyrushcyrush
committed
update
1 parent 65a787a commit bca00cf

36 files changed

Lines changed: 10429 additions & 2 deletions

‎.uberenv_config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"spack_concretizer": "clingo",
1010
"spack_url": "https://github.com/spack/spack",
1111
"spack_commit": "0c2be44e4ece21eb091ad5de4c97716b7c6d4c87",
12-
"spack_packages_commit": "92789f0bbd082f52996a0ccbc869ed352915c23b",
12+
"spack_packages_commit": "46831610f147df14f1af2c8afd1a95bc2ccc2421",
1313
"spack_host_config_patches":
1414
{
1515
"PYTHON_EXECUTABLE": "spack_view/view/bin/python3",

‎scripts/uberenv_configs/packages/openblas/0001-use-usr-bin-env-perl.patch‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
From ec6b354c32e939605331e2081590815a86413ca8 Mon Sep 17 00:00:00 2001
2+
From: Harmen Stoppels <harmenstoppels@gmail.com>
3+
Date: Wed, 24 Feb 2021 14:07:20 +0100
4+
Subject: [PATCH] use /usr/bin/env perl
5+
6+
---
7+
c_check | 2 +-
8+
exports/gensymbol | 2 +-
9+
f_check | 2 +-
10+
interface/create | 2 +-
11+
4 files changed, 4 insertions(+), 4 deletions(-)
12+
13+
diff --git a/c_check b/c_check
14+
index 9c8b1aba..e24943a2 100644
15+
--- a/c_check
16+
+++ b/c_check
17+
@@ -1,4 +1,4 @@
18+
-#!/usr/bin/perl
19+
+#!/usr/bin/env perl
20+
21+
#use File::Basename;
22+
# use File::Temp qw(tempfile);
23+
diff --git a/exports/gensymbol b/exports/gensymbol
24+
index 857a17a9..e7210a03 100644
25+
--- a/exports/gensymbol
26+
+++ b/exports/gensymbol
27+
@@ -1,4 +1,4 @@
28+
-#!/usr/bin/perl
29+
+#!/usr/bin/env perl
30+
31+
# Changelog
32+
# 2017/09/03 staticfloat
33+
diff --git a/f_check b/f_check
34+
index ffe9c6b4..d044f254 100644
35+
--- a/f_check
36+
+++ b/f_check
37+
@@ -1,4 +1,4 @@
38+
-#!/usr/bin/perl
39+
+#!/usr/bin/env perl
40+
41+
$hostos = `uname -s | sed -e s/\-.*//`; chop($hostos);
42+
43+
diff --git a/interface/create b/interface/create
44+
index b7be8ab6..0b9cefa2 100755
45+
--- a/interface/create
46+
+++ b/interface/create
47+
@@ -1,4 +1,4 @@
48+
-#!/usr/bin/perl
49+
+#!/usr/bin/env perl
50+
51+
$count = 0;
52+
53+
--
54+
2.25.1
55+

‎scripts/uberenv_configs/packages/openblas/blas_normalize_test_symbols.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/ctest/CMakeLists.txt b/ctest/CMakeLists.txt
2+
index 4496eff82..093c83541 100644
3+
--- a/ctest/CMakeLists.txt
4+
+++ b/ctest/CMakeLists.txt
5+
@@ -5,6 +5,8 @@ if (NOT NOFORTRAN)
6+
enable_language(Fortran)
7+
endif()
8+
9+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNOCHANGE")
10+
+
11+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DADD${BU} -DCBLAS")
12+
if (BINARY32 AND CMAKE_C_PLATFORM_ID MATCHES "MinGW" AND CMAKE_Fortran_COMPILER_VERSION VERSION_EQUAL 14.2)
13+
list(REMOVE_ITEM ${CMAKE_Fortran_FLAGS} -O3 -O2 -O1 -Os)

‎scripts/uberenv_configs/packages/openblas/cce.patch‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
diff -ruN spack-src/cmake/fc.cmake spack-src-patched/cmake/fc.cmake
2+
--- spack-src/cmake/fc.cmake 2022-02-20 16:35:05.000000000 -0500
3+
+++ spack-src-patched/cmake/fc.cmake 2022-08-04 13:02:13.294697807 -0400
4+
@@ -221,3 +221,14 @@
5+
set(TIMER "NONE")
6+
endif ()
7+
8+
+if (${F_COMPILER} STREQUAL "CRAY")
9+
+ set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_INTEL")
10+
+ set(FCOMMON_OPT "${FCOMMON_OPT} -hnopattern")
11+
+ if (INTERFACE64)
12+
+ set (FCOMMON_OPT "${FCOMMON_OPT} -s integer64")
13+
+ endif ()
14+
+ if (NOT USE_OPENMP)
15+
+ set(FCOMMON_OPT "${FCOMMON_OPT} -O noomp")
16+
+ endif ()
17+
+endif ()
18+
+
19+
diff -ruN spack-src/cmake/system.cmake spack-src-patched/cmake/system.cmake
20+
--- spack-src/cmake/system.cmake 2022-02-20 16:35:05.000000000 -0500
21+
+++ spack-src-patched/cmake/system.cmake 2022-08-04 13:03:15.173843680 -0400
22+
@@ -552,6 +552,14 @@
23+
endforeach ()
24+
endif ()
25+
26+
+if ("${F_COMPILER}" STREQUAL "NAG" OR "${F_COMPILER}" STREQUAL "CRAY")
27+
+ set(FILTER_FLAGS "-msse3;-mssse3;-msse4.1;-mavx;-mavx2,-mskylake-avx512")
28+
+ foreach (FILTER_FLAG ${FILTER_FLAGS})
29+
+ string(REPLACE ${FILTER_FLAG} "" LAPACK_FFLAGS ${LAPACK_FFLAGS})
30+
+ string(REPLACE ${FILTER_FLAG} "" LAPACK_FPFLAGS ${LAPACK_FPFLAGS})
31+
+ endforeach ()
32+
+endif ()
33+
+
34+
if ("${F_COMPILER}" STREQUAL "GFORTRAN")
35+
# lapack-netlib is rife with uninitialized warnings -hpa
36+
set(LAPACK_FFLAGS "${LAPACK_FFLAGS} -Wno-maybe-uninitialized")
37+
diff -ruN spack-src/f_check spack-src-patched/f_check
38+
--- spack-src/f_check 2022-02-20 16:35:05.000000000 -0500
39+
+++ spack-src-patched/f_check 2022-08-04 13:05:03.075337778 -0400
40+
@@ -34,7 +34,7 @@
41+
"pathf90", "pathf95",
42+
"pgf95", "pgf90", "pgf77", "pgfortran", "nvfortran",
43+
"flang", "egfortran",
44+
- "ifort", "nagfor");
45+
+ "ifort", "nagfor", "ftn", "crayftn");
46+
47+
OUTER:
48+
foreach $lists (@lists) {
49+
@@ -76,6 +76,11 @@
50+
$vendor = FUJITSU;
51+
$openmp = "-Kopenmp";
52+
53+
+ } elsif ($data =~ /Cray/) {
54+
+
55+
+ $vendor = CRAY;
56+
+ $openmp = "-fopenmp";
57+
+
58+
} elsif ($data =~ /GNU/ || $data =~ /GCC/ ) {
59+
60+
$data =~ s/\(+.*?\)+//g;
61+
@@ -306,6 +311,10 @@
62+
if ( $vendor eq "NAG") {
63+
$link = `$compiler $openmp -dryrun ftest2.f 2>&1 && rm -f a.out a.exe`;
64+
}
65+
+
66+
+if ( $vendor eq "CRAY") {
67+
+ $link = `$compiler $openmp -hnopattern ftest2.f 2>&1 && rm -f a.out a.exe`;
68+
+ }
69+
$linker_L = "";
70+
$linker_l = "";
71+
$linker_a = "";
72+
diff -ruN spack-src/Makefile.system spack-src-patched/Makefile.system
73+
--- spack-src/Makefile.system 2022-02-20 16:35:05.000000000 -0500
74+
+++ spack-src-patched/Makefile.system 2022-08-04 13:01:53.413702690 -0400
75+
@@ -1271,6 +1271,19 @@
76+
endif
77+
endif
78+
79+
+ifeq ($(F_COMPILER), CRAY)
80+
+CCOMMON_OPT += -DF_INTERFACE_INTEL
81+
+FCOMMON_OPT += -hnopattern
82+
+ifdef INTERFACE64
83+
+ifneq ($(INTERFACE64), 0)
84+
+FCOMMON_OPT += -s integer64
85+
+endif
86+
+endif
87+
+ifneq ($(USE_OPENMP), 1)
88+
+FCOMMON_OPT += -O noomp
89+
+endif
90+
+endif
91+
+
92+
ifdef BINARY64
93+
ifdef INTERFACE64
94+
ifneq ($(INTERFACE64), 0)
95+
@@ -1551,6 +1564,10 @@
96+
ifeq ($(F_COMPILER),NAG)
97+
LAPACK_FFLAGS := $(filter-out -msse3 -mssse3 -msse4.1 -mavx -mavx2 -mskylake-avx512 ,$(FFLAGS))
98+
endif
99+
+ifeq ($(F_COMPILER),CRAY)
100+
+LAPACK_FFLAGS := $(filter-out -msse3 -mssse3 -msse4.1 -mavx -mavx2 -mskylake-avx512 ,$(FFLAGS))
101+
+FFLAGS := $(filter-out -msse3 -mssse3 -msse4.1 -mavx -mavx2 -mskylake-avx512 ,$(FFLAGS))
102+
+endif
103+
104+
LAPACK_CFLAGS = $(CFLAGS)
105+
LAPACK_CFLAGS += -DHAVE_LAPACK_CONFIG_H

‎scripts/uberenv_configs/packages/openblas/f_check-intel.patch‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff -ur a/f_check b/f_check
2+
--- a/f_check 2022-08-07 15:36:26.000000000 -0500
3+
+++ b/f_check 2022-12-09 16:17:43.475278869 -0600
4+
@@ -102,7 +102,7 @@
5+
vendor=FLANG
6+
openmp='-fopenmp'
7+
;;
8+
- *ifx*)
9+
+ *ifort*|*ifx*)
10+
vendor=INTEL
11+
openmp='-fopenmp'
12+
;;
13+
diff -ur a/f_check.pl b/f_check.pl
14+
--- a/f_check.pl 2022-08-07 15:36:26.000000000 -0500
15+
+++ b/f_check.pl 2022-12-09 16:18:59.982923288 -0600
16+
@@ -95,7 +95,7 @@
17+
if ($compiler =~ /flang/) {
18+
$vendor = FLANG;
19+
$openmp = "-fopenmp";
20+
- } elsif ($compiler =~ /ifx/) {
21+
+ } elsif ($compiler =~ /ifort/ || $compiler =~ /ifx/) {
22+
$vendor = INTEL;
23+
$openmp = "-fopenmp";
24+
} elsif ($compiler =~ /pgf/ || $compiler =~ /nvf/) {

‎scripts/uberenv_configs/packages/openblas/f_check-oneapi.patch‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
diff -ruN spack-src/f_check spack-src-new/f_check
2+
--- spack-src/f_check 2022-02-20 13:35:05.000000000 -0800
3+
+++ spack-src-new/f_check 2022-07-25 14:41:31.877584474 -0700
4+
@@ -34,7 +34,7 @@
5+
"pathf90", "pathf95",
6+
"pgf95", "pgf90", "pgf77", "pgfortran", "nvfortran",
7+
"flang", "egfortran",
8+
- "ifort", "nagfor");
9+
+ "ifort", "nagfor", "ifx");
10+
11+
OUTER:
12+
foreach $lists (@lists) {
13+
@@ -90,6 +90,9 @@
14+
if ($compiler =~ /flang/) {
15+
$vendor = FLANG;
16+
$openmp = "-fopenmp";
17+
+ } elsif ($compiler =~ /ifx/) {
18+
+ $vendor = INTEL;
19+
+ $openmp = "-fopenmp";
20+
} elsif ($compiler =~ /pgf/ || $compiler =~ /nvf/) {
21+
$vendor = PGI;
22+
$openmp = "-mp";
23+
@@ -176,7 +179,7 @@
24+
$openmp = "-fopenmp";
25+
}
26+
27+
- if ($compiler =~ /ifort/) {
28+
+ if ($compiler =~ /ifort/ || $compiler =~ /ifx/) {
29+
$vendor = INTEL;
30+
$bu = "_";
31+
$openmp = "-fopenmp";

‎scripts/uberenv_configs/packages/openblas/fix-cray-fortran-detection-pr3778.patch‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
diff -ruN spack-src/f_check spack-src-patched/f_check
2+
--- spack-src/f_check 2022-08-07 16:36:26.000000000 -0400
3+
+++ spack-src-patched/f_check 2022-10-20 15:06:34.296845220 -0400
4+
@@ -82,10 +82,6 @@
5+
vendor=FUJITSU
6+
openmp='-Kopenmp'
7+
;;
8+
- *Cray*)
9+
- vendor=CRAY
10+
- openmp='-fopenmp'
11+
- ;;
12+
*GNU*|*GCC*)
13+
14+
v="${data#*GCC: *\) }"
15+
@@ -117,6 +113,10 @@
16+
esac
17+
fi
18+
;;
19+
+ *Cray*)
20+
+ vendor=CRAY
21+
+ openmp='-fopenmp'
22+
+ ;;
23+
*g95*)
24+
vendor=G95
25+
openmp=''
26+
diff -ruN spack-src/f_check.pl spack-src-patched/f_check.pl
27+
--- spack-src/f_check.pl 2022-08-07 16:36:26.000000000 -0400
28+
+++ spack-src-patched/f_check.pl 2022-10-20 15:07:50.884794505 -0400
29+
@@ -76,11 +76,6 @@
30+
$vendor = FUJITSU;
31+
$openmp = "-Kopenmp";
32+
33+
- } elsif ($data =~ /Cray/) {
34+
-
35+
- $vendor = CRAY;
36+
- $openmp = "-fopenmp";
37+
-
38+
} elsif ($data =~ /GNU/ || $data =~ /GCC/ ) {
39+
40+
$data =~ s/\(+.*?\)+//g;
41+
@@ -106,8 +101,12 @@
42+
$openmp = "";
43+
}
44+
}
45+
+ } elsif ($data =~ /Cray/) {
46+
+
47+
+ $vendor = CRAY;
48+
+ $openmp = "-fopenmp";
49+
50+
- }
51+
+ }
52+
53+
if ($data =~ /g95/) {
54+
$vendor = G95;

‎scripts/uberenv_configs/packages/openblas/ifort-msvc.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff -ruN spack-src/cmake/fc.cmake spack-src-new/cmake/fc.cmake
2+
--- spack-src/cmake/fc.cmake 2023-04-01 14:18:01.000000000 -0600
3+
+++ spack-src-new/cmake/fc.cmake 2023-06-06 09:34:12.921982500 -0600
4+
@@ -89,6 +89,9 @@
5+
6+
if (${F_COMPILER} STREQUAL "INTEL")
7+
set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_INTEL")
8+
+ if (MSVC)
9+
+ set(FCOMMON_OPT "${FCOMMON_OPT} -names:uppercase -assume:underscore")
10+
+ endif ()
11+
if (INTERFACE64)
12+
set(FCOMMON_OPT "${FCOMMON_OPT} -i8")
13+
endif ()

‎scripts/uberenv_configs/packages/openblas/lapack-0.3.9-xerbl.patch‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/lapack-netlib/SRC/sorhr_col.f b/lapack-netlib/SRC/sorhr_col.f
2+
index 38976245..600c19fb 100644
3+
--- a/lapack-netlib/SRC/sorhr_col.f
4+
+++ b/lapack-netlib/SRC/sorhr_col.f
5+
@@ -282,7 +282,8 @@
6+
$ NPLUSONE
7+
* ..
8+
* .. External Subroutines ..
9+
- EXTERNAL SCOPY, SLAORHR_COL_GETRFNP, SSCAL, STRSM, XERBLA
10+
+ EXTERNAL SCOPY, SLAORHR_COL_GETRFNP, SSCAL, STRSM,
11+
+ $ XERBLA
12+
* ..
13+
* .. Intrinsic Functions ..
14+
INTRINSIC MAX, MIN

‎scripts/uberenv_configs/packages/openblas/linktest.patch‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
--- a/exports/gensymbol
2+
+++ b/exports/gensymbol
3+
@@ -3914,6 +3914,18 @@
4+
@underscore_objs = (@underscore_objs, @misc_common_objs);
5+
@no_underscore_objs = (@no_underscore_objs, @misc_common_objs);
6+
7+
+ foreach $objs (@underscore_objs) {
8+
+ print "void ", $symbolprefix, $objs, $bu, $symbolsuffix, "();\n" if $objs ne "xerbla";
9+
+ }
10+
+
11+
+ foreach $objs (@need_2underscore_objs) {
12+
+ print "void ", $symbolprefix, $objs, $bu, $bu, $symbolsuffix, "();\n";
13+
+ }
14+
+
15+
+ foreach $objs (@no_underscore_objs) {
16+
+ print "void ", $symbolprefix, $objs, $symbolsuffix, "();\n";
17+
+ }
18+
+
19+
print "int main(void){\n";
20+
foreach $objs (@underscore_objs) {
21+
print $symbolprefix, $objs, $bu, $symbolsuffix, "();\n" if $objs ne "xerbla";

0 commit comments

Comments
 (0)