From a7f875a25aa94eac69e934527510863b29fccb783878f592d316843a0f1e7bdf Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Thu, 22 Nov 2018 15:22:04 +0000 Subject: [PATCH 1/2] Accepting request 648807 from home:StefanBruens:branches:science - Build HDF5 C++ bindings also for the MPI variants, there is no reason not to do it. - Enable sz2 support also for MPI variants. OBS-URL: https://build.opensuse.org/request/show/648807 OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=89 --- hdf5.spec | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/hdf5.spec b/hdf5.spec index e04413c..ee7570b 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -314,7 +314,7 @@ managing data. It supports an unlimited variety of datatypes. This package contains the HDF5 runtime libraries. -%{!?with_mpi:%{?with_hpc:%{hpc_master_package -l -n lib%{pname}_cpp%{hpc_package_name_tail} -N %{pname}_cpp}}} +%{?with_hpc:%{hpc_master_package -l -n lib%{pname}_cpp%{hpc_package_name_tail} -N %{pname}_cpp}} %package -n %{libname -l _hl_cpp -s %{sonum_HL_CXX}} Summary: High-level shared libraries for the HDF5 scientific data format @@ -330,7 +330,7 @@ managing data. It supports an unlimited variety of datatypes. This package contains the the high-level HDF5 runtime libraries. -%{!?with_mpi:%{?with_hpc:%{hpc_master_package -l -n lib%{pname}_hl_cpp%{hpc_package_name_tail} -N %{pname}_hl_cpp}}} +%{?with_hpc:%{hpc_master_package -l -n lib%{pname}_hl_cpp%{hpc_package_name_tail} -N %{pname}_hl_cpp}} %package -n %{libname -l _fortran -s %{sonum_F}} Summary: Shared libraries for the HDF5 scientific data format @@ -379,10 +379,8 @@ any version of HDF5. %package devel Summary: Development files for %{name} Group: Development/Libraries/Parallel -%if %{without mpi} Requires: %{libname -l _cpp -s %{sonum_CXX}} = %{version} Requires: %{libname -l _hl_cpp -s %{sonum_HL_CXX}} = %{version} -%endif Requires: %{name} = %{version} Requires: %{pname}-devel-data = %{version} %if 0%{?use_sz2} @@ -463,20 +461,16 @@ libhdf5-%{sonum}%{?my_suffix} libhdf5_hl%{sonum_HL}%{?my_suffix} libhdf5_fortran%{sonum_HL_F}%{?my_suffix} libhdf5hl_fortran%{sonum_HL_F}%{?my_suffix} -%if %{without mpi} libhdf5_cpp%{sonum_CXX}%{?my_suffix} libhdf5_hl_cpp%{sonum_HL_CXX}%{?my_suffix} -%endif hdf5%{?my_suffix}-devel requires %{?my_suffix}- requires "libhdf5-%{sonum}%{?my_suffix}- = " requires "libhdf5_hl%{sonum_HL}%{?my_suffix}- = " requires "libhdf5_fortran%{sonum_HL_F}%{?my_suffix}- = " requires "libhdf5hl_fortran%{sonum_HL_F}%{?my_suffix}- = " -%if %{without mpi} requires "libhdf5_cpp%{sonum_CXX}%{?my_suffix}- = " requires "libhdf5_hl_cpp%{sonum_HL_CXX}%{?my_suffix}- = " -%endif EOF %endif @@ -507,6 +501,7 @@ test -e config/linux-gnueabi || cp config/linux-gnu config/linux-gnueabi %if %{without hpc} %if %{with mpi} export CC="%{my_bindir}/mpicc" +export CXX="%{my_bindir}/mpicxx" export FC="%{my_bindir}/mpif90" export F77="%{my_bindir}/mpif77" export LD_LIBRARY_PATH="%{my_libdir}" @@ -521,7 +516,7 @@ export LD_LIBRARY_PATH="%{my_libdir}" --datadir=%{_datadir} \ %endif --docdir=%{_docdir}/%{name} \ -%else +%else # hpc %global _hpc_exec_prefix %hpc_exec_prefix %global hpc_exec_prefix %_prefix %if %{with mpi} @@ -535,7 +530,7 @@ export MPICXX=mpicxx %endif %hpc_configure \ %define hpc_exec_prefix %{expand:%_hpc_exec_prefix} -%endif +%endif # ?hpc --disable-dependency-tracking \ --enable-fortran \ --enable-unsupported \ @@ -545,11 +540,10 @@ export MPICXX=mpicxx --enable-build-mode=production \ %if %{with mpi} --enable-parallel \ -%else +%endif --enable-cxx \ - %if 0%{?use_sz2} +%if 0%{?use_sz2} --with-szlib \ - %endif %endif --with-pthread @@ -597,10 +591,8 @@ rm -rf %{buildroot}%{_prefix}/share/hdf5_examples %{hpc_write_pkgconfig -n hdf5_hl -l libhdf5_hl} %{hpc_write_pkgconfig -n hdf5_fortran -l libhdf5_fortran} %{hpc_write_pkgconfig -n hdf5_hl_fortran -l libhdfhl_fortran} -%if %{without mpi} %{hpc_write_pkgconfig -n hdf5_cpp -l libhdf5_cpp} %{hpc_write_pkgconfig -n hdf5_hl_cpp -l libhdf5_hl_cpp} -%endif %hpc_write_modules_files #%%Module1.0##################################################################### @@ -662,13 +654,10 @@ export HDF5_Make_Ignore=yes %endif %endif -%if %{without mpi} %post -n %{libname -l _cpp -s %{sonum_CXX}} -p /sbin/ldconfig %postun -n %{libname -l _cpp -s %{sonum_CXX}} -p /sbin/ldconfig %post -n %{libname -l _hl_cpp -s %{sonum_HL_CXX}} -p /sbin/ldconfig %postun -n %{libname -l _hl_cpp -s %{sonum_HL_CXX}} -p /sbin/ldconfig -%endif - %post -n %{libname -s %{sonum}} -p /sbin/ldconfig %postun -n %{libname -s %{sonum}} -p /sbin/ldconfig %post -n %{libname -l _hl -s %{sonum_HL}} -p /sbin/ldconfig @@ -700,7 +689,7 @@ export HDF5_Make_Ignore=yes %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/rpm/macros.hdf5 %endif -%endif +%endif # ?mpi %files -n %{name} %defattr(-,root,root) @@ -751,7 +740,6 @@ export HDF5_Make_Ignore=yes %{my_libdir}/libhdf5_hl.so.%{sonum_HL} %{my_libdir}/libhdf5_hl.so.%{sonum_HL}.* -%if %{without mpi} %files -n %{libname -l _cpp -s %{sonum_CXX}} %defattr(-,root,root) %mylicense COPYING @@ -767,7 +755,6 @@ export HDF5_Make_Ignore=yes %{?with_hpc:%hpc_dirs} %{my_libdir}/libhdf5_hl_cpp.so.%{sonum_HL_CXX} %{my_libdir}/libhdf5_hl_cpp.so.%{sonum_HL_CXX}.* -%endif # flavor == serial %files -n %{libname -l _fortran -s %{sonum_F}} %defattr(-,root,root) @@ -802,10 +789,10 @@ export HDF5_Make_Ignore=yes %{?with_hpc:%{hpc_pkgconfig_file -N -n hdf5_hl}} %{?with_hpc:%{hpc_pkgconfig_file -N -n hdf5_fortran}} %{?with_hpc:%{hpc_pkgconfig_file -N -n hdf5_hl_fortran}} -%if %{without mpi} %{?with_hpc:%{hpc_pkgconfig_file -N -n hdf5_cpp}} %{?with_hpc:%{hpc_pkgconfig_file -N -n hdf5_hl_cpp}} %{my_bindir}/h5c++ +%if %{without mpi} %{my_bindir}/h5cc %{my_bindir}/h5fc %else From e42de3243ca51f5c1e73c7eb73c8553d59fdd5dfeb36c08a0b4c2422ff2ce2d8 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Thu, 22 Nov 2018 18:17:04 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=90 --- hdf5.changes | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hdf5.changes b/hdf5.changes index cc9c4e1..ab271ef 100644 --- a/hdf5.changes +++ b/hdf5.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Nov 22 18:15:55 UTC 2018 - Stefan Brüns + +- Build HDF5 C++ bindings also for the MPI variants, there is no reason + not to do it. +- Enable sz2 support also for MPI variants. + +------------------------------------------------------------------- Mon Nov 19 08:52:43 UTC 2018 - eich@suse.com - Replace git-archive generated by downloaded tar-ball.