diff --git a/superlu-6.0.1.tar.gz b/superlu-6.0.1.tar.gz deleted file mode 100644 index add0bc2..0000000 --- a/superlu-6.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9cf85e6614ba1ebe5a70ecd03e194116f15517155e0742636c853a2ae9923210 -size 2644337 diff --git a/superlu-7.0.0.tar.gz b/superlu-7.0.0.tar.gz new file mode 100644 index 0000000..eb4b882 --- /dev/null +++ b/superlu-7.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3adc75d96869004b8bb8fa44e9ba77c1d90418340c61d302ffac72e9d22f9c1 +size 2460826 diff --git a/superlu-remove-mc64ad.patch b/superlu-remove-mc64ad.patch index ce4f136..a936436 100644 --- a/superlu-remove-mc64ad.patch +++ b/superlu-remove-mc64ad.patch @@ -1,5 +1,4 @@ diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt -index 34c4aa4..7996af0 100644 --- a/SRC/CMakeLists.txt +++ b/SRC/CMakeLists.txt @@ -23,7 +23,6 @@ set(sources @@ -9,8 +8,8 @@ index 34c4aa4..7996af0 100644 - mc64ad.c qselect.c input_error.c - dmach.c -@@ -68,9 +67,7 @@ if(enable_single) + ) +@@ -66,9 +65,7 @@ if(enable_single) smemory.c sutil.c smyblas2.c @@ -20,7 +19,7 @@ index 34c4aa4..7996af0 100644 ilu_sdrop_row.c ilu_ssnode_dfs.c ilu_scolumn_dfs.c -@@ -118,9 +115,7 @@ if(enable_double) +@@ -116,9 +113,7 @@ if(enable_double) dmemory.c dutil.c dmyblas2.c @@ -30,7 +29,7 @@ index 34c4aa4..7996af0 100644 ilu_ddrop_row.c ilu_dsnode_dfs.c ilu_dcolumn_dfs.c -@@ -171,9 +166,7 @@ if(enable_complex) +@@ -169,9 +164,7 @@ if(enable_complex) cmemory.c cutil.c cmyblas2.c @@ -40,7 +39,7 @@ index 34c4aa4..7996af0 100644 ilu_cdrop_row.c ilu_csnode_dfs.c ilu_ccolumn_dfs.c -@@ -222,9 +215,7 @@ if(enable_complex16) +@@ -220,9 +213,7 @@ if(enable_complex16) zmemory.c zutil.c zmyblas2.c diff --git a/superlu.changes b/superlu.changes index 962b623..97e72f2 100644 --- a/superlu.changes +++ b/superlu.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Oct 23 12:11:46 UTC 2024 - Atri Bhattacharya + +- Fix %check for gnu-hpc flavor by loading openblas module before + running ctest. + +------------------------------------------------------------------- +Sat Oct 12 21:07:32 UTC 2024 - Christoph G + +- Update to version 7.0.0 + * To avoid name clashes, use type "singlecomplex" instead of + "complex". + * Rank Deficient Matrices + ------------------------------------------------------------------- Sun Aug 6 08:39:35 UTC 2023 - Christoph G diff --git a/superlu.spec b/superlu.spec index e2908a2..c29561e 100644 --- a/superlu.spec +++ b/superlu.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ # Base package name %define pname superlu -%define ver 6.0.1 +%define ver 7.0.0 %define _ver %(echo %{ver} | tr . _) %if "%flavor" == "" @@ -40,7 +40,7 @@ ExclusiveArch: do_not_build %if "%{flavor}" == "gnu7-hpc" %bcond_without hpc %global compiler_family gnu -%undefine c_f_ver 7 +%define c_f_ver 7 %endif %if "%{flavor}" == "gnu8-hpc" @@ -72,7 +72,7 @@ ExclusiveArch: do_not_build %define p_prefix %_prefix %define p_includedir %_includedir %define p_libdir %_libdir -%define _sover 6 +%define _sover 7 %define libname lib%{name}%{?_sover} %else %{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?ext:-e %{ext}}} @@ -203,6 +203,13 @@ make %{?_smp_mflags} #fix permissions chmod 644 MATLAB/* EXAMPLE/* +%check +%if %{with hpc} +%{?hpc_setup} +module load openblas +%endif +%ctest + # remove all build examples cd EXAMPLE make clean @@ -215,9 +222,6 @@ rm -f examples/.gitignore cp FORTRAN/README README.fortran %fdupes -s examples -%check -%ctest - %if %{with hpc} %{hpc_write_pkgconfig}