pool/mumps
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 833596 from home:eeich:branches:science

Browse Source 
- Add build support for gcc10 to HPC build (bsc#1174439). 
  * Remove explicit build dependency for libgomp1.
  * Add missing compiler versions to openblas and scalapack
    build dependencies.
- Add build support for openmpi4.

OBS-URL: https://build.opensuse.org/request/show/833596
OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=49
This commit is contained in:
Egbert Eich 2020-09-11 08:25:00 +00:00 committed by Git OBS Bridge
parent b192b198d2
commit 59720eb484
2 changed files with 121 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mumps.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Jul 23 16:29:56 UTC 2020 - Egbert Eich <eich@suse.com>
- Add build support for gcc10 to HPC build (bsc#1174439).
* Remove explicit build dependency for libgomp1.
* Add missing compiler versions to openblas and scalapack
build dependencies.
- Add build support for openmpi4.
-------------------------------------------------------------------
Tue Jun 30 20:05:56 UTC 2020 - Egbert Eich <eich@suse.com>

115
mumps.spec
View File

@ -74,6 +74,13 @@ ExclusiveArch: do_not_build
%bcond_with hpc
%endif
%if "%{flavor}" == "openmpi4"
%define mpi_family openmpi
%define mumps_f77_mpilibs -lmpi_mpifh -lmpi
%define mpi_ver 4
%bcond_with hpc
%endif
%if "%{flavor}" == "mvapich2"
%define mpi_family mvapich2
%define mumps_f77_mpilibs -lfmpich -lmpich
@ -105,6 +112,14 @@ ExclusiveArch: do_not_build
%bcond_without scotch
%endif
%if "%{flavor}" == "scotch-openmpi4"
%define mpi_family openmpi
%define mpi_ver 4
%define mumps_f77_mpilibs -lmpi_mpifh -lmpi
%bcond_with hpc
%bcond_without scotch
%endif
%if "%{flavor}" == "scotch-mvapich2"
%define mpi_family mvapich2
%define mumps_f77_mpilibs -lfmpich -lmpich
@ -142,6 +157,16 @@ ExclusiveArch: do_not_build
%bcond_without hpc
%endif
%if "%{flavor}" == "gnu-openmpi4-hpc"
%{?DisOMPI3}
%undefine c_f_ver
# macro mpi is used by macros for master package
%global mpi_family openmpi
%define mumps_f77_mpilibs -lmpi_mpifh -lmpi
%define mpi_ver 4
%bcond_without hpc
%endif
%if "%{flavor}" == "gnu-mvapich2-hpc"
%undefine c_f_ver
# macro mpi is used by macros for master package
@ -187,6 +212,16 @@ ExclusiveArch: do_not_build
%bcond_without hpc
%endif
%if "%{flavor}" == "gnu7-openmpi4-hpc"
%{?DisOMPI3}
%define c_f_ver 7
# macro mpi is used by macros for master package
%global mpi_family openmpi
%define mumps_f77_mpilibs -lmpi_mpifh -lmpi
%define mpi_ver 4
%bcond_without hpc
%endif
%if "%{flavor}" == "gnu7-mvapich2-hpc"
%define c_f_ver 7
# macro mpi is used by macros for master package
@ -232,6 +267,16 @@ ExclusiveArch: do_not_build
%bcond_without hpc
%endif
%if "%{flavor}" == "gnu8-openmpi4-hpc"
%{?DisOMPI3}
%define c_f_ver 8
# macro mpi is used by macros for master package
%global mpi_family openmpi
%define mumps_f77_mpilibs -lmpi_mpifh -lmpi
%define mpi_ver 4
%bcond_without hpc
%endif
%if "%{flavor}" == "gnu8-mvapich2-hpc"
%define c_f_ver 8
# macro mpi is used by macros for master package
@ -277,6 +322,16 @@ ExclusiveArch: do_not_build
%bcond_without hpc
%endif
%if "%{flavor}" == "gnu9-openmpi4-hpc"
%{?DisOMPI3}
%define c_f_ver 9
# macro mpi is used by macros for master package
%global mpi_family openmpi
%define mumps_f77_mpilibs -lmpi_mpifh -lmpi
%define mpi_ver 4
%bcond_without hpc
%endif
%if "%{flavor}" == "gnu9-mvapich2-hpc"
%define c_f_ver 9
# macro mpi is used by macros for master package
@ -292,6 +347,61 @@ ExclusiveArch: do_not_build
%bcond_without hpc
%endif
%if "%{flavor}" == "gnu10-openmpi-hpc"
%{?DisOMPI1}
%define c_f_ver 10
# macro mpi is used by macros for master package
%global mpi_family openmpi
%define mumps_f77_mpilibs -lmpi_mpifh -lmpi
%define mpi_ver 1
%bcond_without hpc
%endif
%if "%{flavor}" == "gnu10-openmpi2-hpc"
%{?DisOMPI2}
%define c_f_ver 10
# macro mpi is used by macros for master package
%global mpi_family openmpi
%define mumps_f77_mpilibs -lmpi_mpifh -lmpi
%define mpi_ver 2
%bcond_without hpc
%endif
%if "%{flavor}" == "gnu10-openmpi3-hpc"
%{?DisOMPI3}
%define c_f_ver 10
# macro mpi is used by macros for master package
%global mpi_family openmpi
%define mumps_f77_mpilibs -lmpi_mpifh -lmpi
%define mpi_ver 3
%bcond_without hpc
%endif
%if "%{flavor}" == "gnu10-openmpi4-hpc"
%{?DisOMPI3}
%define c_f_ver 10
# macro mpi is used by macros for master package
%global mpi_family openmpi
%define mumps_f77_mpilibs -lmpi_mpifh -lmpi
%define mpi_ver 4
%bcond_without hpc
%endif
%if "%{flavor}" == "gnu10-mvapich2-hpc"
%define c_f_ver 10
# macro mpi is used by macros for master package
%global mpi_family mvapich2
%define mumps_f77_mpilibs -lfmpich -lmpich
%undefine mpi_ver
%bcond_without hpc
%endif
%if "%{flavor}" == "gnu10-mpich-hpc"
%define c_f_ver 10
%global mpi_family mpich
%bcond_without hpc
%endif
%ifarch i586 s390 ppc armv7l
ExclusiveArch: do_not_build
%endif
@ -370,9 +480,8 @@ BuildRequires: lapack-devel
BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
BuildRequires: %{mpi_family}%{?mpi_ver}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel
BuildRequires: fdupes
BuildRequires: libgomp1
BuildRequires: libopenblas-%{compiler_family}-hpc >= %{openblas_vers}
BuildRequires: libscalapack2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc-devel
BuildRequires: libopenblas-%{compiler_family}%{?c_f_ver}-hpc >= %{openblas_vers}
BuildRequires: libscalapack2-%{compiler_family}%{?c_f_ver}-%{mpi_family}%{?mpi_ver}-hpc-devel
BuildRequires: suse-hpc
%endif # hpc