Hello community, here is the log from the commit of package netcdf-fortran for openSUSE:Factory checked in at 2018-02-06 16:47:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old) and /work/SRC/openSUSE:Factory/.netcdf-fortran.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcdf-fortran" Tue Feb 6 16:47:00 2018 rev:4 rq:570208 version:4.4.4 Changes: -------- --- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes 2017-11-21 15:33:22.371034298 +0100 +++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new/netcdf-fortran.changes 2018-02-06 16:47:01.398050812 +0100 @@ -1,0 +2,17 @@ +Fri Jan 26 19:39:13 UTC 2018 - [email protected] + +- Fix the module load command for netcdf to reflect the change + to 'pnetcdf' for MPI versions following (boo#1075933). + +------------------------------------------------------------------- +Fri Jan 12 15:43:10 UTC 2018 - [email protected] + +- Disable the openmpi3 flavor in some products. + +------------------------------------------------------------------- +Fri Jan 5 19:12:40 UTC 2018 - [email protected] + +- Switch from gcc6 to gcc7 as additional compiler flavor for HPC on SLES. +- Add support for mpich and openmpi3 for HPC. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcdf-fortran.spec ++++++ --- /var/tmp/diff_new_pack.Fqd3tk/_old 2018-02-06 16:47:02.002022551 +0100 +++ /var/tmp/diff_new_pack.Fqd3tk/_new 2018-02-06 16:47:02.006022364 +0100 @@ -1,7 +1,7 @@ # -# spec file for package netcdf-fortran +# spec file for package netcdf # -# 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 @@ -24,36 +24,74 @@ %global ver 4.4.4 %global _ver 4_4_4 +%if 0%{?is_opensuse} || 0%{?is_backports} +%undefine DisOMPI3 +%else +%define DisOMPI3 ExclusiveArch: do_not_build +%endif + %if "%flavor" == "" ExclusiveArch: do_not_build %define package_name %pname %endif %if "%flavor" == "gnu-openmpi-hpc" +%{?DisOMPI1} %global compiler_family gnu %global mpi_flavor openmpi %global mpi_ver 1 %{bcond_without mpi} %endif +%if "%flavor" == "gnu-openmpi3-hpc" +%{?DisOMPI3} +%global compiler_family gnu +%global mpi_flavor openmpi +%global mpi_ver 3 +%{bcond_without mpi} +%endif + %if "%flavor" == "gnu-mvapich2-hpc" %global compiler_family gnu %global mpi_flavor mvapich2 %{bcond_without mpi} %endif -%if "%flavor" == "gnu6-openmpi-hpc" +%if "%flavor" == "gnu-mpich-hpc" +%global compiler_family gnu +%global mpi_flavor mpich +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu7-openmpi-hpc" +%{?DisOMPI1} %global compiler_family gnu %global mpi_flavor openmpi %global mpi_ver 1 -%global c_f_ver 6 +%global c_f_ver 7 %{bcond_without mpi} %endif -%if "%flavor" == "gnu6-mvapich2-hpc" +%if "%flavor" == "gnu7-openmpi3-hpc" +%{?DisOMPI2} +%global compiler_family gnu +%global mpi_flavor openmpi +%global mpi_ver 3 +%global c_f_ver 7 +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu7-mvapich2-hpc" %global compiler_family gnu %global mpi_flavor mvapich2 -%global c_f_ver 6 +%global c_f_ver 7 +%{bcond_without mpi} +%endif + +%if "%flavor" == "gnu7-mpich-hpc" +%global compiler_family gnu +%global mpi_flavor mpich +%global c_f_ver 7 %{bcond_without mpi} %endif @@ -77,14 +115,14 @@ Source: https://github.com/Unidata/netcdf-fortran/archive/v%{version}.tar.gz Patch0: netcdf4-Return-status-for-non-void-function-always.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gawk +BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: %{compiler_family}-compilers-hpc +BuildRequires: gawk BuildRequires: libcurl-devel >= 7.18.0 +BuildRequires: lua-lmod BuildRequires: pkg-config -BuildRequires: zlib-devel >= 1.2.5 -BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: suse-hpc -BuildRequires: lua-lmod +BuildRequires: zlib-devel >= 1.2.5 %if %{with mpi} BuildRequires: %{mpi_flavor}%{?mpi_ver}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel %endif @@ -150,8 +188,8 @@ Summary: Development files for %{name} Group: Development/Libraries/Parallel Requires: %{libname}%{hpc_package_name_tail %_ver} = %{version} -Requires: pkgconfig Requires: libcurl-devel >= 7.18.0 +Requires: pkgconfig Requires: zlib-devel >= 1.2.5 %hpc_requires_devel Requires: netcdf-%{compiler_family}%{?c_f_ver}%{?with_mpi:-%{mpi_flavor}%{?mpi_ver}}-hpc-devel @@ -192,7 +230,7 @@ %build %{hpc_setup} -module load netcdf +module load pnetcdf export CFLAGS="-I $NETCDF_INC -L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" export CPPFLAGS=$CFLAGS export LDFLAGS="-L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" @@ -215,7 +253,7 @@ %install %{hpc_setup} -module load netcdf +module load pnetcdf export CFLAGS="-I $NETCDF_INC -L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" export CPPFLAGS=$CFLAGS export LDFLAGS="-L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" @@ -259,7 +297,7 @@ if [ expr [ module-info mode load ] || [module-info mode display ] ] { if { ![is-loaded netcdf] } { - module load netcdf + module load pnetcdf } } @@ -289,7 +327,7 @@ %if %_do_check %check %{hpc_setup} - module load netcdf + module load pnetcdf export CFLAGS="-I $NETCDF_INC -L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" export CPPFLAGS=$CFLAGS export LDFLAGS="-L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5" ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.Fqd3tk/_old 2018-02-06 16:47:02.046020493 +0100 +++ /var/tmp/diff_new_pack.Fqd3tk/_new 2018-02-06 16:47:02.046020493 +0100 @@ -1,4 +1,6 @@ <multibuild> <package>gnu-openmpi-hpc</package> + <package>gnu-openmpi3-hpc</package> + <package>gnu-mpich-hpc</package> <!-- <package>gnu-mvapich2-hpc</package> --> </multibuild>
