Hello community, here is the log from the commit of package scalapack for openSUSE:Factory checked in at 2020-07-17 20:49:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scalapack (Old) and /work/SRC/openSUSE:Factory/.scalapack.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scalapack" Fri Jul 17 20:49:27 2020 rev:21 rq:821325 version:2.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/scalapack/scalapack.changes 2020-06-17 14:57:21.686424206 +0200 +++ /work/SRC/openSUSE:Factory/.scalapack.new.3592/scalapack.changes 2020-07-17 20:50:15.348883094 +0200 @@ -1,0 +2,6 @@ +Thu Jul 16 09:10:54 UTC 2020 - Egbert Eich <[email protected]> + +- Add openmpi4 spport (provided by Alin M Elena) +- Replace -fallow-argument-mismatch by -std=legacy + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scalapack.spec ++++++ --- /var/tmp/diff_new_pack.YT8Hmx/_old 2020-07-17 20:50:16.800884609 +0200 +++ /var/tmp/diff_new_pack.YT8Hmx/_new 2020-07-17 20:50:16.804884612 +0200 @@ -32,6 +32,10 @@ %define DisOMPI3 ExclusiveArch: do_not_build %endif +%if 0%{?sle_version:1} && 0%{?sle_version} < 150300 +%define DisOMPI4 ExclusiveArch: do_not_build +%endif + %if "%flavor" == "" ExclusiveArch: do_not_build %define package_name %pname @@ -63,6 +67,18 @@ %{bcond_with blacs_devel_headers} %endif +%if "%flavor" == "openmpi4" +%{?DisOMPI4} +%define mpi_flavor openmpi +%define mpi_vers 4 +%{bcond_with hpc} +%{bcond_without blacs_devel_headers} +%else +# Only build header back on one multibuild for non-HPC. +# Note: For HPC the headers need to be built always. +%{bcond_with blacs_devel_headers} +%endif + %if "%flavor" == "mvapich2" %define mpi_flavor mvapich2 %{bcond_with hpc} @@ -95,6 +111,15 @@ %{bcond_without hpc} %endif +%if "%flavor" == "gnu-openmpi4-hpc" +%{?DisOMPI4} +%define mpi_flavor openmpi +%define compiler_family gnu +%undefine c_f_ver +%define mpi_vers 4 +%{bcond_without hpc} +%endif + %if "%flavor" == "gnu-mpich-hpc" %define mpi_flavor mpich %define compiler_family gnu @@ -136,6 +161,15 @@ %{bcond_without hpc} %endif +%if "%flavor" == "gnu7-openmpi4-hpc" +%{?DisOMPI4} +%define mpi_flavor openmpi +%define compiler_family gnu +%define c_f_ver 7 +%define mpi_vers 4 +%{bcond_without hpc} +%endif + %if "%flavor" == "gnu7-mvapich2-hpc" %define mpi_flavor mvapich2 %define compiler_family gnu @@ -177,6 +211,15 @@ %{bcond_without hpc} %endif +%if "%flavor" == "gnu8-openmpi4-hpc" +%{?DisOMPI4} +%define mpi_flavor openmpi +%define compiler_family gnu +%define c_f_ver 8 +%define mpi_vers 4 +%{bcond_without hpc} +%endif + %if "%flavor" == "gnu8-mvapich2-hpc" %define mpi_flavor mvapich2 %define compiler_family gnu @@ -218,6 +261,15 @@ %{bcond_without hpc} %endif +%if "%flavor" == "gnu9-openmpi4-hpc" +%{?DisOMPI4} +%define mpi_flavor openmpi +%define compiler_family gnu +%define c_f_ver 9 +%define mpi_vers 4 +%{bcond_without hpc} +%endif + %if "%flavor" == "gnu9-mvapich2-hpc" %define mpi_flavor mvapich2 %define compiler_family gnu @@ -481,14 +533,7 @@ module load openblas %endif -%if "%version" == "2.1.0" -XTRA_FCFLAGS=-fallow-argument-mismatch -%else -# On version update check whether -fallow-argument-mismatch is -# still required for gcc10. New versions may set this in the code. -%error "Check if -fallow-argument-mismatch is still required for gcc10" -%endif -RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing $XTRA_FCFLAGS" +RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -std=legacy" %if %{without hpc} echo $PATH | grep -q %{mpi_flavor}%{?mpi_ext} || \ PATH=/usr/%_lib/mpi/gcc/%{mpi_flavor}%{?mpi_ext}/bin:$PATH ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.YT8Hmx/_old 2020-07-17 20:50:16.848884659 +0200 +++ /var/tmp/diff_new_pack.YT8Hmx/_new 2020-07-17 20:50:16.848884659 +0200 @@ -2,10 +2,12 @@ <package>openmpi</package> <package>openmpi2</package> <package>openmpi3</package> + <package>openmpi4</package> <package>mvapich2</package> <package>gnu-openmpi-hpc</package> <package>gnu-openmpi2-hpc</package> <package>gnu-openmpi3-hpc</package> + <package>gnu-openmpi4-hpc</package> <package>gnu-mvapich2-hpc</package> <package>gnu-mpich-hpc</package> </multibuild>
