From b3a50d366bfd675c24d8a6464a3d1a6bfaa0bbb53ac68d06b3448e1c1b34feff Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Mon, 23 Oct 2023 19:02:07 +0000 Subject: [PATCH 1/3] Accepting request 1119626 from home:NMorey:branches:science - Drop support for obsolete openmpi[123] - Prepare support for openmpi5 OBS-URL: https://build.opensuse.org/request/show/1119626 OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=66 --- _multibuild | 9 -- mumps.changes | 6 ++ mumps.spec | 274 +++++++++++++------------------------------------- 3 files changed, 76 insertions(+), 213 deletions(-) diff --git a/_multibuild b/_multibuild index d478520..ebafd49 100644 --- a/_multibuild +++ b/_multibuild @@ -1,18 +1,9 @@ serial - openmpi1 - openmpi2 - openmpi3 openmpi4 mvapich2 scotch-serial - scotch-openmpi1 - scotch-openmpi2 - scotch-openmpi3 scotch-openmpi4 - gnu-openmpi-hpc - gnu-openmpi2-hpc - gnu-openmpi3-hpc gnu-openmpi4-hpc gnu-mvapich2-hpc gnu-mpich-hpc diff --git a/mumps.changes b/mumps.changes index bf67e67..765e577 100644 --- a/mumps.changes +++ b/mumps.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 23 11:55:43 UTC 2023 - Nicolas Morey + +- Drop support for obsolete openmpi[123] +- Prepare support for openmpi5 + ------------------------------------------------------------------- Tue Sep 6 17:23:51 UTC 2022 - Stefan Brüns diff --git a/mumps.spec b/mumps.spec index 4226ea9..37b78e9 100644 --- a/mumps.spec +++ b/mumps.spec @@ -1,7 +1,7 @@ # -# spec file for package mumps +# spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -55,30 +55,6 @@ ExclusiveArch: do_not_build %bcond_without scotch %endif -%if "%{flavor}" == "openmpi1" -%{?DisOMPI1} -%define mpi_family openmpi -%define mumps_f77_mpilibs -lmpi_mpifh -lmpi -%define mpi_ver 1 -%bcond_with hpc -%endif - -%if "%{flavor}" == "openmpi2" -%{?DisOMPI2} -%define mpi_family openmpi -%define mumps_f77_mpilibs -lmpi_mpifh -lmpi -%define mpi_ver 2 -%bcond_with hpc -%endif - -%if "%{flavor}" == "openmpi3" -%{?DisOMPI3} -%define mpi_family openmpi -%define mumps_f77_mpilibs -lmpi_mpifh -lmpi -%define mpi_ver 3 -%bcond_with hpc -%endif - %if "%{flavor}" == "openmpi4" %{?DisOMPI4} %define mpi_family openmpi @@ -87,39 +63,20 @@ ExclusiveArch: do_not_build %bcond_with hpc %endif +%if "%{flavor}" == "openmpi5" +%{?DisOMPI5} +%define mpi_family openmpi +%define mumps_f77_mpilibs -lmpi_mpifh -lmpi +%define mpi_ver 5 +%bcond_with hpc +%endif + %if "%{flavor}" == "mvapich2" %define mpi_family mvapich2 %define mumps_f77_mpilibs -lfmpich -lmpich %bcond_with hpc %endif -%if "%{flavor}" == "scotch-openmpi1" -%{?DisOMPI1} -%define mpi_family openmpi -%define mumps_f77_mpilibs -lmpi_mpifh -lmpi -%define mpi_ver 1 -%bcond_with hpc -%bcond_without scotch -%endif - -%if "%{flavor}" == "scotch-openmpi2" -%{?DisOMPI2} -%define mpi_family openmpi -%define mpi_ver 2 -%define mumps_f77_mpilibs -lmpi_mpifh -lmpi -%bcond_with hpc -%bcond_without scotch -%endif - -%if "%{flavor}" == "scotch-openmpi3" -%{?DisOMPI3} -%define mpi_family openmpi -%define mpi_ver 3 -%define mumps_f77_mpilibs -lmpi_mpifh -lmpi -%bcond_with hpc -%bcond_without scotch -%endif - %if "%{flavor}" == "scotch-openmpi4" %{?DisOMPI4} %define mpi_family openmpi @@ -129,6 +86,15 @@ ExclusiveArch: do_not_build %bcond_without scotch %endif +%if "%{flavor}" == "scotch-openmpi5" +%{?DisOMPI5} +%define mpi_family openmpi +%define mpi_ver 5 +%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 @@ -136,36 +102,6 @@ ExclusiveArch: do_not_build %bcond_without scotch %endif -%if "%{flavor}" == "gnu-openmpi-hpc" -%{?DisOMPI1} -%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 1 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu-openmpi2-hpc" -%{?DisOMPI2} -%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 2 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu-openmpi3-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 3 -%bcond_without hpc -%endif - %if "%{flavor}" == "gnu-openmpi4-hpc" %{?DisOMPI4} %undefine c_f_ver @@ -176,6 +112,16 @@ ExclusiveArch: do_not_build %bcond_without hpc %endif +%if "%{flavor}" == "gnu-openmpi5-hpc" +%{?DisOMPI5} +%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 5 +%bcond_without hpc +%endif + %if "%{flavor}" == "gnu-mvapich2-hpc" %undefine c_f_ver # macro mpi is used by macros for master package @@ -191,36 +137,6 @@ ExclusiveArch: do_not_build %bcond_without hpc %endif -%if "%{flavor}" == "gnu7-openmpi-hpc" -%{?DisOMPI1} -%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 1 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu7-openmpi2-hpc" -%{?DisOMPI2} -%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 2 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu7-openmpi3-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 3 -%bcond_without hpc -%endif - %if "%{flavor}" == "gnu7-openmpi4-hpc" %{?DisOMPI4} %define c_f_ver 7 @@ -231,6 +147,16 @@ ExclusiveArch: do_not_build %bcond_without hpc %endif +%if "%{flavor}" == "gnu7-openmpi5-hpc" +%{?DisOMPI5} +%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 5 +%bcond_without hpc +%endif + %if "%{flavor}" == "gnu7-mvapich2-hpc" %define c_f_ver 7 # macro mpi is used by macros for master package @@ -246,36 +172,6 @@ ExclusiveArch: do_not_build %bcond_without hpc %endif -%if "%{flavor}" == "gnu8-openmpi-hpc" -%{?DisOMPI1} -%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 1 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu8-openmpi2-hpc" -%{?DisOMPI2} -%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 2 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu8-openmpi3-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 3 -%bcond_without hpc -%endif - %if "%{flavor}" == "gnu8-openmpi4-hpc" %{?DisOMPI4} %define c_f_ver 8 @@ -286,6 +182,16 @@ ExclusiveArch: do_not_build %bcond_without hpc %endif +%if "%{flavor}" == "gnu8-openmpi5-hpc" +%{?DisOMPI5} +%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 5 +%bcond_without hpc +%endif + %if "%{flavor}" == "gnu8-mvapich2-hpc" %define c_f_ver 8 # macro mpi is used by macros for master package @@ -301,36 +207,6 @@ ExclusiveArch: do_not_build %bcond_without hpc %endif -%if "%{flavor}" == "gnu9-openmpi-hpc" -%{?DisOMPI1} -%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 1 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu9-openmpi2-hpc" -%{?DisOMPI2} -%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 2 -%bcond_without hpc -%endif - -%if "%{flavor}" == "gnu9-openmpi3-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 3 -%bcond_without hpc -%endif - %if "%{flavor}" == "gnu9-openmpi4-hpc" %{?DisOMPI4} %define c_f_ver 9 @@ -341,6 +217,16 @@ ExclusiveArch: do_not_build %bcond_without hpc %endif +%if "%{flavor}" == "gnu9-openmpi5-hpc" +%{?DisOMPI5} +%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 5 +%bcond_without hpc +%endif + %if "%{flavor}" == "gnu9-mvapich2-hpc" %define c_f_ver 9 # macro mpi is used by macros for master package @@ -356,36 +242,6 @@ 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" %{?DisOMPI4} %define c_f_ver 10 @@ -396,6 +252,16 @@ ExclusiveArch: do_not_build %bcond_without hpc %endif +%if "%{flavor}" == "gnu10-openmpi5-hpc" +%{?DisOMPI5} +%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 5 +%bcond_without hpc +%endif + %if "%{flavor}" == "gnu10-mvapich2-hpc" %define c_f_ver 10 # macro mpi is used by macros for master package @@ -508,7 +374,7 @@ Group: System/Libraries Requires: lua-lmod >= 7.6.1 %endif %if %{without hpc} -Conflicts: lib%{pname}%{?scotch:-%{scotch}}5%{?my_suffix} >= 5.3.5 +Conflicts: lib%{pname}%{?scotch:-%{scotch}}5%{?my_suffix} >= 5.3.5 %endif %description -n %{libname} From b54f233342f21e2eb0f17e83842964b6fb5490048dec7def95469e78c81fcb14 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Mon, 23 Oct 2023 20:36:11 +0000 Subject: [PATCH 2/3] Accepting request 1119727 from home:eeich:branches:science - Disable HPC flavors on i586 OBS-URL: https://build.opensuse.org/request/show/1119727 OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=67 --- mumps.changes | 5 +++++ mumps.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/mumps.changes b/mumps.changes index 765e577..a8a57a5 100644 --- a/mumps.changes +++ b/mumps.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 23 19:17:11 UTC 2023 - Egbert Eich + +- Disable HPC flavors on i586 + ------------------------------------------------------------------- Mon Oct 23 11:55:43 UTC 2023 - Nicolas Morey diff --git a/mumps.spec b/mumps.spec index 37b78e9..d26b305 100644 --- a/mumps.spec +++ b/mumps.spec @@ -313,6 +313,9 @@ ExclusiveArch: do_not_build %define package_name %{pname}%{?scotch:-%{scotch}}%{?my_suffix} %define libname lib%{pname}%{?scotch:-%{scotch}}%{?so_ver}%{?my_suffix} %else +%ifarch %ix86 +ExclusiveArch: do_not_build +%endif %{!?compiler_family:%global compiler_family gnu} %{?with_mpi:%{!?mpi_family:error "No MPI family specified!"}} From cf24c2d5b4895d45035250098dbb7694c84c20fec87181bac1413f433955e4c7 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Tue, 24 Oct 2023 07:32:01 +0000 Subject: [PATCH 3/3] - Use ExcludeArch instead of ExclusiveArch: do_not_build construct. OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=68 --- mumps.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mumps.spec b/mumps.spec index d26b305..99783a1 100644 --- a/mumps.spec +++ b/mumps.spec @@ -313,9 +313,7 @@ ExclusiveArch: do_not_build %define package_name %{pname}%{?scotch:-%{scotch}}%{?my_suffix} %define libname lib%{pname}%{?scotch:-%{scotch}}%{?so_ver}%{?my_suffix} %else -%ifarch %ix86 -ExclusiveArch: do_not_build -%endif +ExcludeArch: %ix86 %{!?compiler_family:%global compiler_family gnu} %{?with_mpi:%{!?mpi_family:error "No MPI family specified!"}}