rpm/fftw3
SHA256
1
0
Fork 0
forked from pool/fftw3
Code Pull Requests Activity

Accepting request 562254 from home:eeich:branches:fix-compilers-hpc

Browse Source 
- Add gcc7 as additional compiler flavor for HPC on SLES.
- Fix library package requires - use HPC macro (boo#1074890).
- Add support for mpich and openmpi3 for HPC.

OBS-URL: https://build.opensuse.org/request/show/562254
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=57
This commit is contained in:
OBS User mrdocs 2018-01-07 18:18:12 +00:00 committed by Git OBS Bridge
parent 0fbe2cf834
commit bf54f8a87e
3 changed files with 68 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_multibuild
View File

@ -2,5 +2,7 @@
<package>standard</package>
<package>gnu-hpc</package>
<package>gnu-openmpi-hpc</package>
<package>gnu-openmpi3-hpc</package>
<package>gnu-mvapich2-hpc</package>
<package>gnu-mpich-hpc</package>
</multibuild>

7
fftw3.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jan 5 18:32:30 UTC 2018 - eich@suse.com
- Add gcc7 as additional compiler flavor for HPC on SLES.
- Fix library package requires - use HPC macro (boo#1074890).
- Add support for mpich and openmpi3 for HPC.
-------------------------------------------------------------------
Tue Nov 14 16:23:54 UTC 2017 - eich@suse.com

61
fftw3.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package fftw3
#
# 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
# remain the property of their copyright owners, unless otherwise agreed
@ -63,6 +63,15 @@ ExclusiveArch: do_not_build
%bcond_without mpi
%endif
%if "%{flavor}" == "gnu-openmpi3-hpc"
%global compiler_family gnu
%undefine c_f_ver
%global mpi_flavor openmpi
%define mpi_vers 3
%bcond_without hpc
%bcond_without mpi
%endif
%if "%{flavor}" == "gnu-mvapich2-hpc"
%global compiler_family gnu
%undefine c_f_ver
@ -71,6 +80,55 @@ ExclusiveArch: do_not_build
%bcond_without mpi
%endif
%if "%{flavor}" == "gnu-mpich-hpc"
%global compiler_family gnu
%undefine c_f_ver
%define mpi_flavor mpich
%bcond_without hpc
%bcond_without mpi
%endif
%if "%flavor" == "gnu7-hpc"
%define compiler_family gnu
%undefine c_f_ver 7
%bcond_with mpi
%bcond_without hpc
%endif
%if "%{flavor}" == "gnu7-openmpi-hpc"
%global compiler_family gnu
%define c_f_ver 7
%global mpi_flavor openmpi
%define mpi_vers 1
%bcond_without hpc
%bcond_without mpi
%endif
%if "%{flavor}" == "gnu7-openmpi3-hpc"
%global compiler_family gnu
%define c_f_ver 7
%global mpi_flavor openmpi
%define mpi_vers 3
%bcond_without hpc
%bcond_without mpi
%endif
%if "%{flavor}" == "gnu7-mvapich2-hpc"
%global compiler_family gnu
%define c_f_ver 7
%define mpi_flavor mvapich2
%bcond_without hpc
%bcond_without mpi
%endif
%if "%{flavor}" == "gnu7-mpich-hpc"
%global compiler_family gnu
%define c_f_ver 7
%define mpi_flavor mpich
%bcond_without hpc
%bcond_without mpi
%endif
# now exchange the paths
%if %{with hpc}
%{?mpi_flavor:%{bcond_without mpi}}%{!?mpi_flavor:%{bcond_with mpi}}
@ -172,7 +230,6 @@ Group: System/Libraries
Provides: fftw3 = %{version}-%{release}
Obsoletes: fftw3 < 3.3
%if %{with hpc}
Requires: lua-lmod
%hpc_requires
%endif