Hello community,
here is the log from the commit of package netcdf-fortran for openSUSE:Factory
checked in at 2020-07-21 15:49:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old)
and /work/SRC/openSUSE:Factory/.netcdf-fortran.new.3592 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcdf-fortran"
Tue Jul 21 15:49:16 2020 rev:16 rq:822017 version:4.5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes
2020-07-17 20:50:21.700889720 +0200
+++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new.3592/netcdf-fortran.changes
2020-07-21 15:51:12.404355783 +0200
@@ -1,0 +2,14 @@
+Mon Jul 20 10:35:19 UTC 2020 - Egbert Eich <e...@suse.com>
+
+- Add OpenMPI4 support (disabled < 15.3)
+
+-------------------------------------------------------------------
+Mon Jul 20 05:18:32 UTC 2020 - Egbert Eich <e...@suse.com>
+
+- The convention is to use the module name 'pnetcdf' for
+ Parallel-NetCDF (called PnetCDF now). Revert part of the
+ changes in previous commit to conform to this standard.
+- Fix ldconfig args for HPC packages: no caching should be done
+ as these libs are made available thru LD_LIBRARY_PATH tweaking.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netcdf-fortran.spec ++++++
--- /var/tmp/diff_new_pack.lsYZrz/_old 2020-07-21 15:51:14.840358745 +0200
+++ /var/tmp/diff_new_pack.lsYZrz/_new 2020-07-21 15:51:14.844358750 +0200
@@ -27,8 +27,13 @@
%if 0%{?sle_version} >= 150200
%define DisOMPI1 ExclusiveArch: do_not_build
%endif
-%if !0%{?is_opensuse} && 0%{?sle_version:1} && 0%{?sle_version} < 150200
-%define DisOMPI3 ExclusiveArch: do_not_build
+%if !0%{?is_opensuse} && 0%{?sle_version:1}
+ %if 0%{?sle_version} < 150200
+ %define DisOMPI3 ExclusiveArch: do_not_build
+ %endif
+ %if 0%{?sle_version} < 150300
+ %define DisOMPI4 ExclusiveArch: do_not_build
+ %endif
%endif
%if "%flavor" == ""
@@ -67,6 +72,14 @@
%{bcond_without mpi}
%endif
+%if "%flavor" == "gnu-openmpi4-hpc"
+%{?DisOMPI4}
+%global compiler_family gnu
+%global mpi_flavor openmpi
+%global mpi_ver 4
+%{bcond_without mpi}
+%endif
+
%if "%flavor" == "gnu-mvapich2-hpc"
%global compiler_family gnu
%global mpi_flavor mvapich2
@@ -106,6 +119,15 @@
%{bcond_without mpi}
%endif
+%if "%flavor" == "gnu7-openmpi4-hpc"
+%{?DisOMPI4}
+%global compiler_family gnu
+%global mpi_flavor openmpi
+%global mpi_ver 4
+%global c_f_ver 7
+%{bcond_without mpi}
+%endif
+
%if "%flavor" == "gnu7-mvapich2-hpc"
%global compiler_family gnu
%global mpi_flavor mvapich2
@@ -147,6 +169,15 @@
%{bcond_without mpi}
%endif
+%if "%flavor" == "gnu8-openmpi4-hpc"
+%{?DisOMPI4}
+%global compiler_family gnu
+%global mpi_flavor openmpi
+%global mpi_ver 4
+%global c_f_ver 8
+%{bcond_without mpi}
+%endif
+
%if "%flavor" == "gnu8-mvapich2-hpc"
%global compiler_family gnu
%global mpi_flavor mvapich2
@@ -188,6 +219,15 @@
%{bcond_without mpi}
%endif
+%if "%flavor" == "gnu9-openmpi4-hpc"
+%{?DisOMPI4}
+%global compiler_family gnu
+%global mpi_flavor openmpi
+%global mpi_ver 4
+%global c_f_ver 9
+%{bcond_without mpi}
+%endif
+
%if "%flavor" == "gnu9-mvapich2-hpc"
%global compiler_family gnu
%global mpi_flavor mvapich2
@@ -209,7 +249,6 @@
%if 0%{!?package_name:1}
%define package_name %{hpc_package_name %_ver}
%endif
-%{?with_mpi:%global hpc_module_pname p%{pname}}
Name: %package_name
%define libname libnetcdf-fortran
@@ -336,7 +375,7 @@
%build
%{hpc_setup}
-module load %{?with_mpi:p}netcdf
+module load netcdf
export CFLAGS="-I $NETCDF_INC -L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5"
export FCFLAGS="-std=legacy"
export FFLAGS=$FCFLAGS
@@ -361,7 +400,7 @@
%install
%{hpc_setup}
-module load %{?with_mpi:p}netcdf
+module load netcdf
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"
@@ -404,8 +443,8 @@
# Require generic netcdf
if [ expr [ module-info mode load ] || [module-info mode display ] ] {
- if { ![is-loaded %{?with_mpi:p}netcdf] } {
- module load %{?with_mpi:p}netcdf
+ if { ![is-loaded netcdf] } {
+ module load netcdf
}
}
@@ -435,7 +474,7 @@
%if %_do_check
%check
%{hpc_setup}
- module load %{?with_mpi:p}netcdf
+ module load netcdf
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"
@@ -447,9 +486,11 @@
make check
%endif
-%post -n %{libname}%{hpc_package_name_tail %_ver} -p /sbin/ldconfig
+%post -n %{libname}%{hpc_package_name_tail %_ver}
+/sbin/ldconfig -N %{hpc_libdir}
+
%postun -n %{libname}%{hpc_package_name_tail %_ver}
-/sbin/ldconfig
+/sbin/ldconfig -N %{hpc_libdir}
%hpc_module_delete_if_default
%files
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.lsYZrz/_old 2020-07-21 15:51:14.908358828 +0200
+++ /var/tmp/diff_new_pack.lsYZrz/_new 2020-07-21 15:51:14.912358833 +0200
@@ -3,6 +3,7 @@
<package>gnu-openmpi-hpc</package>
<package>gnu-openmpi2-hpc</package>
<package>gnu-openmpi3-hpc</package>
+ <package>gnu-openmpi4-hpc</package>
<package>gnu-mpich-hpc</package>
<package>gnu-mvapich2-hpc</package>
</multibuild>
