Skip to content

Commit 99256f6

Browse files
jslobodzianjslobodzian
committed
Merge branch '3.0-dev' into 3.0
2 parents 30579df + d31c91c commit 99256f6

455 files changed

Lines changed: 26445 additions & 11488 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LICENSES-AND-NOTICES/SPECS/data/licenses.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,6 +1125,7 @@
11251125
"perl-B-Keywords",
11261126
"perl-B-Lint",
11271127
"perl-bareword-filehandles",
1128+
"perl-BDB",
11281129
"perl-Bit-Vector",
11291130
"perl-boolean",
11301131
"perl-Browser-Open",
@@ -1694,6 +1695,7 @@
16941695
"python-filelock",
16951696
"python-fixtures",
16961697
"python-flake8",
1698+
"python-flaky",
16971699
"python-flask",
16981700
"python-flit",
16991701
"python-flit-core",
@@ -1840,6 +1842,7 @@
18401842
"python-sphinxcontrib-jsmath",
18411843
"python-sphinxcontrib-qthelp",
18421844
"python-sphinxcontrib-serializinghtml",
1845+
"python-sphinxygen",
18431846
"python-sqlalchemy",
18441847
"python-suds",
18451848
"python-systemd",

‎SPECS-EXTENDED/SuperLU/SuperLU-5.2.1-set_soname.patch‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎SPECS-EXTENDED/SuperLU/SuperLU-fedora-make.inc.in‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
############################################################################
2+
#
3+
# Program: SuperLU
4+
#
5+
# Module: make.inc
6+
#
7+
# Purpose: Top-level Definitions
8+
#
9+
# Creation date: May 10, 2015
10+
#
11+
# Modified:
12+
#
13+
#
14+
############################################################################
15+
#
16+
# The name of the libraries to be created/linked to
17+
#
18+
SuperLUroot = ${CMAKE_SOURCE_DIR}/build
19+
#
20+
# SuperLUroot = ${CMAKE_INSTALL_PREFIX}
21+
SUPERLULIB = $(SuperLUroot)/SRC/${PROJECT_NAME_LIB_EXPORT}
22+
23+
#TMGLIB = libtmglib.a
24+
25+
# BLASDEF = -DUSE_VENDOR_BLAS
26+
BLASLIB = $(TPL_BLAS_LIBRARIES)
27+
LIBS = $(SUPERLULIB) $(BLASLIB)
28+
29+
#
30+
# The archiver and the flag(s) to use when building archive (library)
31+
# If your system has no ranlib, set RANLIB = echo.
32+
#
33+
ARCH = @CMAKE_AR@
34+
ARCHFLAGS = cr
35+
RANLIB = @CMAKE_RANLIB@
36+
37+
CC = @CMAKE_C_COMPILER@
38+
CFLAGS = @CMAKE_C_FLAGS_RELEASE@ @CMAKE_C_FLAGS@
39+
NOOPTS =
40+
FORTRAN = @CMAKE_Fortran_COMPILER@
41+
FFLAGS = @CMAKE_Fortran_FLAGS_RELEASE@
42+
43+
LOADER = $(CC)
44+
LOADOPTS = $(LDFLAGS)
45+
46+
#
47+
# The directory in which Matlab is installed
48+
#
49+
MATLAB = /Applications/MATLAB_R2015b.app

‎SPECS-EXTENDED/SuperLU/SuperLU-fix_example_builds.patch‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
--- a/EXAMPLE/Makefile.orig 2020-10-18 00:23:21.000000000 +0200
2+
+++ b/EXAMPLE/Makefile 2021-01-29 17:58:26.396762602 +0100
3+
@@ -101,10 +101,10 @@
4+
$(LOADER) $(LOADOPTS) $(SLINXEXM3) $(LIBS) -lm -o $@
5+
6+
sitersol: $(SITSOL) $(SUPERLULIB)
7+
- $(LOADER) $(LOADOPTS) $(SITSOL) $(LIBS) -lm -o $@
8+
+ $(LOADER) $(LOADOPTS) $(SITSOL) $(LIBS) $(TPL_BLAS_LIBRARIES) -lm -o $@
9+
10+
sitersol1: $(SITSOL1) $(SUPERLULIB)
11+
- $(LOADER) $(LOADOPTS) $(SITSOL1) $(LIBS) -lm -o $@
12+
+ $(LOADER) $(LOADOPTS) $(SITSOL1) $(LIBS) $(TPL_BLAS_LIBRARIES) -lm -o $@
13+
14+
dlinsol: $(DLINEXM) $(SUPERLULIB)
15+
$(LOADER) $(LOADOPTS) $(DLINEXM) $(LIBS) -lm -o $@
16+
@@ -128,10 +128,10 @@
17+
$(LOADER) $(LOADOPTS) $(SUPERLUEXM) $(LIBS) -lm -o $@
18+
19+
ditersol: $(DITSOL) $(SUPERLULIB)
20+
- $(LOADER) $(LOADOPTS) $(DITSOL) $(LIBS) -lm -o $@
21+
+ $(LOADER) $(LOADOPTS) $(DITSOL) $(LIBS) $(TPL_BLAS_LIBRARIES) -lm -o $@
22+
23+
ditersol1: $(DITSOL1) $(SUPERLULIB)
24+
- $(LOADER) $(LOADOPTS) $(DITSOL1) $(LIBS) -lm -o $@
25+
+ $(LOADER) $(LOADOPTS) $(DITSOL1) $(LIBS) $(TPL_BLAS_LIBRARIES) -lm -o $@
26+
27+
clinsol: $(CLINEXM) $(SUPERLULIB)
28+
$(LOADER) $(LOADOPTS) $(CLINEXM) $(LIBS) -lm -o $@
29+
@@ -152,10 +152,10 @@
30+
$(LOADER) $(LOADOPTS) $(CLINXEXM3) $(LIBS) -lm -o $@
31+
32+
citersol: $(CITSOL) $(SUPERLULIB)
33+
- $(LOADER) $(LOADOPTS) $(CITSOL) $(LIBS) -lm -o $@
34+
+ $(LOADER) $(LOADOPTS) $(CITSOL) $(LIBS) $(TPL_BLAS_LIBRARIES) -lm -o $@
35+
36+
citersol1: $(CITSOL1) $(SUPERLULIB)
37+
- $(LOADER) $(LOADOPTS) $(CITSOL1) $(LIBS) -lm -o $@
38+
+ $(LOADER) $(LOADOPTS) $(CITSOL1) $(LIBS) $(TPL_BLAS_LIBRARIES) -lm -o $@
39+
40+
zlinsol: $(ZLINEXM) $(SUPERLULIB)
41+
$(LOADER) $(LOADOPTS) $(ZLINEXM) $(LIBS) -lm -o $@
42+
@@ -176,10 +176,10 @@
43+
$(LOADER) $(LOADOPTS) $(ZLINXEXM3) $(LIBS) -lm -o $@
44+
45+
zitersol: $(ZITSOL) $(SUPERLULIB)
46+
- $(LOADER) $(LOADOPTS) $(ZITSOL) $(LIBS) -lm -o $@
47+
+ $(LOADER) $(LOADOPTS) $(ZITSOL) $(LIBS) $(TPL_BLAS_LIBRARIES) -lm -o $@
48+
49+
zitersol1: $(ZITSOL1) $(SUPERLULIB)
50+
- $(LOADER) $(LOADOPTS) $(ZITSOL1) $(LIBS) -lm -o $@
51+
+ $(LOADER) $(LOADOPTS) $(ZITSOL1) $(LIBS) $(TPL_BLAS_LIBRARIES) -lm -o $@
52+
53+
.c.o:
54+
$(CC) $(CFLAGS) $(CDEFS) $(INCLUDEDIR) -c $< $(VERBOSE)

‎SPECS-EXTENDED/SuperLU/SuperLU.signatures.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
22
"Signatures": {
3-
"superlu-5.2.1.tar.gz": "28fb66d6107ee66248d5cf508c79de03d0621852a0ddeba7301801d3d859f463"
3+
"superlu-7.0.0.tar.gz": "d7b91d4e0bb52644ca74c1a4dd466a694ddf1244a7bbf93cb453e8ca1f6527eb",
4+
"SuperLU-fedora-make.inc.in": "e918165e7039b02bb5e67896aed16875f8d6946e0e9aed2f6dfbd9618fad3a5e"
45
}
56
}
7+

‎SPECS-EXTENDED/SuperLU/SuperLU.spec‎

Lines changed: 53 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,38 @@
11
Vendor: Microsoft Corporation
22
Distribution: Azure Linux
33
%global genname superlu
4-
%global libver 5
54

65
## The RPM macro for the linker flags does not exist on EPEL
76
%if 0%{?rhel} && 0%{?rhel} < 7
87
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
98
%endif
109

1110
Name: SuperLU
12-
Version: 5.2.1
13-
Release: 10%{?dist}
11+
Version: 7.0.0
12+
Release: 1%{?dist}
1413
Summary: Subroutines to solve sparse linear systems
15-
License: BSD and GPLv2+
14+
License: BSD-2-Clause AND GPL-2.0-or-later
1615
URL: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/
17-
Source0: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/%{genname}_%{version}.tar.gz#/%{genname}-%{version}.tar.gz
18-
Patch0: %{genname}-cmake-includedir.patch
19-
Patch1: %{genname}-removemc64.patch
2016

21-
# Patch soname (5 -> 5.2) of shared library
22-
Patch2: %{name}-%{version}-set_soname.patch
17+
Source0: https://github.com/xiaoyeli/%{genname}/archive/refs/tags/v%{version}.tar.gz#/%{genname}-%{version}.tar.gz
2318

24-
BuildRequires: openblas-devel, openblas-srpm-macros
25-
BuildRequires: gcc
19+
# Use a pre-made configuration file for Make
20+
Source1: %{name}-fedora-make.inc.in
21+
Patch0: %{genname}-removemc64.patch
22+
23+
# Fix ldflags of example files
24+
Patch1: %{name}-fix_example_builds.patch
25+
26+
BuildRequires: openblas-devel, openblas-srpm-macros
27+
BuildRequires: metis-devel
28+
BuildRequires: gcc
2629
%if 0%{?rhel}
27-
BuildRequires: epel-rpm-macros
30+
BuildRequires: epel-rpm-macros
2831
%endif
29-
BuildRequires: cmake3
30-
BuildRequires: gcc-gfortran
31-
BuildRequires: csh
32+
BuildRequires: make
33+
BuildRequires: cmake
34+
BuildRequires: gcc-gfortran
35+
BuildRequires: csh
3236

3337
%description
3438
SuperLU contains a set of subroutines to solve a sparse linear system
@@ -53,49 +57,68 @@ The %{name}-doc package contains all the help documentation along with C
5357
and FORTRAN examples.
5458

5559
%prep
56-
%autosetup -n %{name}_%{version} -p1
60+
%autosetup -n %{genname}-%{version} -p1
61+
62+
rm -f make.inc
63+
cp -pf %{SOURCE1} make.inc.in
64+
65+
# Remove bundled BLAS
66+
rm -rf CBLAS
5767

5868
rm -fr SRC/mc64ad.f.bak
5969
find . -type f | sed -e "/TESTING/d" | xargs chmod a-x
70+
6071
# Remove the shippped executables from EXAMPLE
6172
find EXAMPLE -type f | while read file
6273
do
6374
[ "$(file $file | awk '{print $2}')" = ELF ] && rm $file || :
6475
done
6576

6677
# Change optimization level
67-
sed -i.bak '/NOOPTS/d' make.inc.in
6878
sed -e 's|-O0|-O2|g' -i SRC/CMakeLists.txt
6979

7080
%build
71-
mkdir -p build; cd build
72-
73-
# Do not use bundled CBLAS code
74-
%cmake3 -Denable_blaslib:BOOL=OFF -DCMAKE_BUILD_TYPE:STRING=Release ..
75-
%make_build
81+
%cmake \
82+
-Denable_internal_blaslib:BOOL=NO \
83+
-DXSDK_ENABLE_Fortran:BOOL=OFF \
84+
-DCMAKE_Fortran_FLAGS_RELEASE:STRING="%{__global_fflags}" \
85+
-DTPL_BLAS_LIBRARIES="`pkg-config --libs flexiblas`" \
86+
-DTPL_ENABLE_METISLIB:BOOL=ON \
87+
-DTPL_METIS_INCLUDE_DIRS:PATH=%{_includedir} \
88+
-DTPL_METIS_LIBRARIES:FILEPATH=%{_libdir}/libmetis.so \
89+
-DCMAKE_BUILD_TYPE:STRING=Release \
90+
-DCMAKE_INSTALL_INCLUDEDIR:PATH=include/%{name} \
91+
-DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \
92+
-DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES
93+
%cmake_build
7694

7795
%install
78-
%make_install -C build
96+
%cmake_install
7997

8098
%check
81-
pushd build
82-
ctest3 -V %{?_smp_mflags}
83-
popd
84-
85-
%ldconfig_scriptlets
99+
export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:MATGEN
100+
%ctest
86101

87102
%files
88103
%license License.txt
89-
%{_libdir}/libsuperlu.so.%{libver}*
104+
%{_libdir}/libsuperlu.so.7
105+
%{_libdir}/libsuperlu.so.%{version}
90106

91107
%files devel
92-
%{_includedir}/%{name}/
108+
%{_includedir}/
93109
%{_libdir}/libsuperlu.so
110+
%{_libdir}/cmake/%{genname}/
111+
%{_libdir}/pkgconfig/%{genname}.pc
94112

95113
%files doc
114+
%license License.txt
96115
%doc DOC EXAMPLE FORTRAN
97116

98117
%changelog
118+
* Tue Oct 15 2024 Jyoti Kanase <v-jykanase@microsoft.com> - 7.0.0-1
119+
- Update to 7.0.0
120+
-License verified
121+
99122
* Sat Jul 24 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 5.2.1-10
100123
- Removing unused BR on "atlas".
101124

‎SPECS-EXTENDED/SuperLU/superlu-cmake-includedir.patch‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)