Accepting request 1119555 from home:NMorey:branches:science:HPC

- Drop support for openmpi[123] (jsc#PED-7111)
- Prepare support for openmpi5

OBS-URL: https://build.opensuse.org/request/show/1119555
OBS-URL: https://build.opensuse.org/package/show/science:HPC/mpiP?expand=0&rev=44

_multibuild

@@ -1,7 +1,4 @@
 <multibuild>
-  <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>

mpiP.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct 20 10:25:56 UTC 2023 - Nicolas Morey <nicolas.morey@suse.com>
+
+- Drop support for openmpi[123] (jsc#PED-7111)
+- Prepare support for openmpi5
+
 -------------------------------------------------------------------
 Tue Oct 10 09:40:37 UTC 2023 - Nicolas Morey <nicolas.morey@suse.com>
 

mpiP.spec

@@ -32,30 +32,6 @@
 ExclusiveArch:  do_not_build
 %endif
 
-%if "%{flavor}" == "gnu-openmpi-hpc"
-%{?DisOMPI1}
-%global compiler_family gnu
-%undefine c_f_ver
-%define mpi_family openmpi
-%define mpi_ver 1
-%endif
-
-%if "%{flavor}" == "gnu-openmpi2-hpc"
-%{?DisOMPI2}
-%global compiler_family gnu
-%undefine c_f_ver
-%define mpi_family openmpi
-%define mpi_ver 2
-%endif
-
-%if "%{flavor}" == "gnu-openmpi3-hpc"
-%{?DisOMPI3}
-%global compiler_family gnu
-%undefine c_f_ver
-%define mpi_family openmpi
-%define mpi_ver 3
-%endif
-
 %if "%{flavor}" == "gnu-openmpi4-hpc"
 %{?DisOMPI4}
 %global compiler_family gnu
@@ -64,6 +40,14 @@ ExclusiveArch:  do_not_build
 %define mpi_ver 4
 %endif
 
+%if "%{flavor}" == "gnu-openmpi5-hpc"
+%{?DisOMPI5}
+%global compiler_family gnu
+%undefine c_f_ver
+%define mpi_family openmpi
+%define mpi_ver 5
+%endif
+
 %if "%{flavor}" == "gnu-mvapich2-hpc"
 %global compiler_family gnu
 %undefine c_f_ver
@@ -76,30 +60,6 @@ ExclusiveArch:  do_not_build
 %define mpi_family mpich
 %endif
 
-%if "%{flavor}" == "gnu7-openmpi-hpc"
-%{?DisOMPI1}
-%global compiler_family gnu
-%define c_f_ver 7
-%define mpi_family openmpi
-%define mpi_ver 1
-%endif
-
-%if "%{flavor}" == "gnu7-openmpi2-hpc"
-%{?DisOMPI3}
-%global compiler_family gnu
-%define c_f_ver 7
-%define mpi_family openmpi
-%define mpi_ver 2
-%endif
-
-%if "%{flavor}" == "gnu7-openmpi3-hpc"
-%{?DisOMPI3}
-%global compiler_family gnu
-%define c_f_ver 7
-%define mpi_family openmpi
-%define mpi_ver 3
-%endif
-
 %if "%{flavor}" == "gnu7-openmpi4-hpc"
 %{?DisOMPI4}
 %global compiler_family gnu
@@ -108,6 +68,14 @@ ExclusiveArch:  do_not_build
 %define mpi_ver 4
 %endif
 
+%if "%{flavor}" == "gnu7-openmpi5-hpc"
+%{?DisOMPI5}
+%global compiler_family gnu
+%define c_f_ver 7
+%define mpi_family openmpi
+%define mpi_ver 5
+%endif
+
 %if "%{flavor}" == "gnu7-mvapich2-hpc"
 %global compiler_family gnu
 %define c_f_ver 7
@@ -120,30 +88,6 @@ ExclusiveArch:  do_not_build
 %define mpi_family mpich
 %endif
 
-%if "%{flavor}" == "gnu8-openmpi-hpc"
-%{?DisOMPI1}
-%global compiler_family gnu
-%define c_f_ver 8
-%define mpi_family openmpi
-%define mpi_ver 1
-%endif
-
-%if "%{flavor}" == "gnu8-openmpi2-hpc"
-%{?DisOMPI2}
-%global compiler_family gnu
-%define c_f_ver 8
-%define mpi_family openmpi
-%define mpi_ver 2
-%endif
-
-%if "%{flavor}" == "gnu8-openmpi3-hpc"
-%{?DisOMPI3}
-%global compiler_family gnu
-%define c_f_ver 8
-%define mpi_family openmpi
-%define mpi_ver 3
-%endif
-
 %if "%{flavor}" == "gnu8-openmpi4-hpc"
 %{?DisOMPI4}
 %global compiler_family gnu
@@ -152,6 +96,14 @@ ExclusiveArch:  do_not_build
 %define mpi_ver 4
 %endif
 
+%if "%{flavor}" == "gnu8-openmpi5-hpc"
+%{?DisOMPI5}
+%global compiler_family gnu
+%define c_f_ver 8
+%define mpi_family openmpi
+%define mpi_ver 5
+%endif
+
 %if "%{flavor}" == "gnu8-mvapich2-hpc"
 %global compiler_family gnu
 %define c_f_ver 8
@@ -164,30 +116,6 @@ ExclusiveArch:  do_not_build
 %define mpi_family mpich
 %endif
 
-%if "%{flavor}" == "gnu9-openmpi-hpc"
-%{?DisOMPI1}
-%global compiler_family gnu
-%define c_f_ver 9
-%define mpi_family openmpi
-%define mpi_ver 1
-%endif
-
-%if "%{flavor}" == "gnu9-openmpi2-hpc"
-%{?DisOMPI2}
-%global compiler_family gnu
-%define c_f_ver 9
-%define mpi_family openmpi
-%define mpi_ver 2
-%endif
-
-%if "%{flavor}" == "gnu9-openmpi3-hpc"
-%{?DisOMPI3}
-%global compiler_family gnu
-%define c_f_ver 9
-%define mpi_family openmpi
-%define mpi_ver 3
-%endif
-
 %if "%{flavor}" == "gnu9-openmpi4-hpc"
 %{?DisOMPI4}
 %global compiler_family gnu
@@ -196,6 +124,14 @@ ExclusiveArch:  do_not_build
 %define mpi_ver 4
 %endif
 
+%if "%{flavor}" == "gnu9-openmpi5-hpc"
+%{?DisOMPI5}
+%global compiler_family gnu
+%define c_f_ver 9
+%define mpi_family openmpi
+%define mpi_ver 5
+%endif
+
 %if "%{flavor}" == "gnu9-mvapich2-hpc"
 %global compiler_family gnu
 %define c_f_ver 9
@@ -208,30 +144,6 @@ ExclusiveArch:  do_not_build
 %define mpi_family mpich
 %endif
 
-%if "%{flavor}" == "gnu10-openmpi-hpc"
-%{?DisOMPI1}
-%global compiler_family gnu
-%define c_f_ver 10
-%define mpi_family openmpi
-%define mpi_ver 1
-%endif
-
-%if "%{flavor}" == "gnu10-openmpi2-hpc"
-%{?DisOMPI2}
-%global compiler_family gnu
-%define c_f_ver 10
-%define mpi_family openmpi
-%define mpi_ver 2
-%endif
-
-%if "%{flavor}" == "gnu10-openmpi3-hpc"
-%{?DisOMPI3}
-%global compiler_family gnu
-%define c_f_ver 10
-%define mpi_family openmpi
-%define mpi_ver 3
-%endif
-
 %if "%{flavor}" == "gnu10-openmpi4-hpc"
 %{?DisOMPI4}
 %global compiler_family gnu
@@ -240,6 +152,14 @@ ExclusiveArch:  do_not_build
 %define mpi_ver 4
 %endif
 
+%if "%{flavor}" == "gnu10-openmpi5-hpc"
+%{?DisOMPI5}
+%global compiler_family gnu
+%define c_f_ver 10
+%define mpi_family openmpi
+%define mpi_ver 5
+%endif
+
 %if "%{flavor}" == "gnu10-mvapich2-hpc"
 %global compiler_family gnu
 %define c_f_ver 10