Accepting request 562255 from home:eeich:branches:fix-compilers-hpc
- Switch from gcc6 to gcc7 as additional compiler flavor for HPC on SLES. - Add support for mpich and openmpi3 for HPC. OBS-URL: https://build.opensuse.org/request/show/562255 OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=59
This commit is contained in:
parent
dc5ff061d4
commit
ebc6475ddd
@ -3,6 +3,8 @@
|
|||||||
<package>openmpi</package>
|
<package>openmpi</package>
|
||||||
<package>mvapich2</package>
|
<package>mvapich2</package>
|
||||||
<package>gnu-openmpi-hpc</package>
|
<package>gnu-openmpi-hpc</package>
|
||||||
|
<package>gnu-openmpi3-hpc</package>
|
||||||
<package>gnu-mvapich2-hpc</package>
|
<package>gnu-mvapich2-hpc</package>
|
||||||
|
<package>gnu-mpich-hpc</package>
|
||||||
<package>gnu-hpc</package>
|
<package>gnu-hpc</package>
|
||||||
</multibuild>
|
</multibuild>
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jan 5 18:34:20 UTC 2018 - eich@suse.com
|
||||||
|
|
||||||
|
- Switch from gcc6 to gcc7 as additional compiler flavor for HPC on SLES.
|
||||||
|
- Add support for mpich and openmpi3 for HPC.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Nov 9 15:02:35 UTC 2017 - normand@linux.vnet.ibm.com
|
Thu Nov 9 15:02:35 UTC 2017 - normand@linux.vnet.ibm.com
|
||||||
|
|
||||||
|
44
hdf5.spec
44
hdf5.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package hdf5
|
# spec file for package hdf5
|
||||||
#
|
#
|
||||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -72,28 +72,58 @@ ExclusiveArch: do_not_build
|
|||||||
%global mpi_flavor mvapich2
|
%global mpi_flavor mvapich2
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if "%{flavor}" == "gnu6-hpc"
|
%if "%{flavor}" == "gnu-openmpi3-hpc"
|
||||||
%bcond_without hpc
|
%bcond_without hpc
|
||||||
%define compiler_family gnu
|
%define compiler_family gnu
|
||||||
%define c_f_ver 6
|
%undefine c_f_ver
|
||||||
|
%global mpi_flavor openmpi
|
||||||
|
%define mpi_vers 3
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu-mpich-hpc"
|
||||||
|
%bcond_without hpc
|
||||||
|
%define compiler_family gnu
|
||||||
|
%undefine c_f_ver
|
||||||
|
%global mpi_flavor mpich
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu7-hpc"
|
||||||
|
%bcond_without hpc
|
||||||
|
%define compiler_family gnu
|
||||||
|
%define c_f_ver 7
|
||||||
%undefine mpi_flavor
|
%undefine mpi_flavor
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if "%{flavor}" == "gnu6-openmpi-hpc"
|
%if "%{flavor}" == "gnu7-openmpi-hpc"
|
||||||
%bcond_without hpc
|
%bcond_without hpc
|
||||||
%define compiler_family gnu
|
%define compiler_family gnu
|
||||||
%define c_f_ver 6
|
%define c_f_ver 7
|
||||||
%global mpi_flavor openmpi
|
%global mpi_flavor openmpi
|
||||||
%define mpi_vers 1
|
%define mpi_vers 1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if "%{flavor}" == "gnu6-mvapich2-hpc"
|
%if "%{flavor}" == "gnu7-mvapich2-hpc"
|
||||||
%bcond_without hpc
|
%bcond_without hpc
|
||||||
%define compiler_family gnu
|
%define compiler_family gnu
|
||||||
%define c_f_ver 6
|
%define c_f_ver 7
|
||||||
%global mpi_flavor mvapich2
|
%global mpi_flavor mvapich2
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu7-openmpi3-hpc"
|
||||||
|
%bcond_without hpc
|
||||||
|
%define compiler_family gnu
|
||||||
|
%define c_f_ver 7
|
||||||
|
%global mpi_flavor openmpi
|
||||||
|
%define mpi_vers 3
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if "%{flavor}" == "gnu7-mpich-hpc"
|
||||||
|
%bcond_without hpc
|
||||||
|
%define compiler_family gnu
|
||||||
|
%define c_f_ver 7
|
||||||
|
%global mpi_flavor mpich
|
||||||
|
%endif
|
||||||
|
|
||||||
# Disable until resource issue is resolved.
|
# Disable until resource issue is resolved.
|
||||||
%if "%mpi_flavor" == "openmpi"
|
%if "%mpi_flavor" == "openmpi"
|
||||||
%define _do_check 0
|
%define _do_check 0
|
||||||
|
Loading…
Reference in New Issue
Block a user