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

Accepting request 742472 from science:HPC:mpi-cleanup

Browse Source 
- openmpi has been renamed into openmpi1

OBS-URL: https://build.opensuse.org/request/show/742472
OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=118
This commit is contained in:
Atri Bhattacharya 2019-10-31 14:22:04 +00:00 committed by Git OBS Bridge
parent 1c12b5e3a9
commit c3a37573aa
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_multibuild
View File

@ -1,6 +1,6 @@
<multibuild> <multibuild>
<package>serial</package> <package>serial</package>
<package>openmpi</package> <package>openmpi1</package>
<package>openmpi2</package> <package>openmpi2</package>
<package>openmpi3</package> <package>openmpi3</package>
<package>mvapich2</package> <package>mvapich2</package>

5
hdf5.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Oct 24 06:37:26 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
- openmpi has been renamed into openmpi1
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 10 07:54:05 UTC 2019 - Ana Guerrero Lopez <aguerrero@suse.com> Tue Sep 10 07:54:05 UTC 2019 - Ana Guerrero Lopez <aguerrero@suse.com>

4
hdf5.spec
View File

@ -51,7 +51,7 @@ ExclusiveArch: do_not_build
%bcond_with hpc %bcond_with hpc
%endif %endif
%if "%{flavor}" == "openmpi" %if "%{flavor}" == "openmpi1"
%{?DisOMPI1} %{?DisOMPI1}
%global mpi_flavor openmpi %global mpi_flavor openmpi
%define mpi_vers 1 %define mpi_vers 1
@ -173,9 +173,7 @@ ExclusiveArch: do_not_build
%{?with_mpi:%{!?mpi_flavor:error "No MPI family specified!"}} %{?with_mpi:%{!?mpi_flavor:error "No MPI family specified!"}}
# For compatibility package names # For compatibility package names
%if "%{mpi_flavor}" != "openmpi" || "%{mpi_vers}" != "1"
%define mpi_ext %{?mpi_vers} %define mpi_ext %{?mpi_vers}
%endif
%if %{with hpc} %if %{with hpc}
%{hpc_init -c %compiler_family %{?with_mpi:-m %mpi_flavor} %{?c_f_ver:-v %{c_f_ver}} %{?mpi_vers:-V %{mpi_vers}} %{?ext:-e %{ext}}} %{hpc_init -c %compiler_family %{?with_mpi:-m %mpi_flavor} %{?c_f_ver:-v %{c_f_ver}} %{?mpi_vers:-V %{mpi_vers}} %{?ext:-e %{ext}}}