Hello community, here is the log from the commit of package scalapack for openSUSE:Factory checked in at 2019-07-05 13:48:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scalapack (Old) and /work/SRC/openSUSE:Factory/.scalapack.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scalapack" Fri Jul 5 13:48:37 2019 rev:12 rq:678390 version:2.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/scalapack/scalapack.changes 2018-12-13 19:49:17.548635160 +0100 +++ /work/SRC/openSUSE:Factory/.scalapack.new.4615/scalapack.changes 2019-07-05 13:48:38.681446510 +0200 @@ -1,0 +2,14 @@ +Fri Feb 22 19:17:17 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de> + +- spec file cleanup: + * Use %license, remove %defattr + * Shorten descriptions and fix some typos + * Remove redundant (and wrong) pointer to test data install dir + +------------------------------------------------------------------- +Wed Feb 13 10:52:29 UTC 2019 - Egbert Eich <eich@suse.com> + +- Consolidate use of openmpi1, openmpi2, openmpi3 for non-HPC builds. +- Disable openmpi1/3 and non-HPC builds on SLE. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scalapack.spec ++++++ --- /var/tmp/diff_new_pack.Jo3qZZ/_old 2019-07-05 13:48:39.521447806 +0200 +++ /var/tmp/diff_new_pack.Jo3qZZ/_new 2019-07-05 13:48:39.525447812 +0200 @@ -1,7 +1,7 @@ # # spec file for package scalapack # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,8 +23,12 @@ %define _vers 2_0_2 %if 0%{?is_opensuse} || 0%{?is_backports} +%undefine DisOMPI1 +%undefine DisOMPI2 %undefine DisOMPI3 %else +%define DisOMPI1 ExclusiveArch: do_not_build +%undefine DisOMPI2 %define DisOMPI3 ExclusiveArch: do_not_build %endif @@ -34,23 +38,29 @@ %endif %if "%flavor" == "openmpi" +%{?DisOMPI1} %define mpi_flavor openmpi +%define mpi_vers 1 %{bcond_with hpc} -%{bcond_without blacs_devel_headers} -%else -# Only build header back on one multibuild for non-HPC. -# Note: For HPC the headers need to be built always. -%{bcond_with blacs_devel_headers} %endif %if "%flavor" == "openmpi2" -%define mpi_flavor openmpi2 +%{?DisOMPI2} +%define mpi_flavor openmpi +%define mpi_vers 2 %{bcond_with hpc} %endif %if "%flavor" == "openmpi3" -%define mpi_flavor openmpi3 +%{?DisOMPI3} +%define mpi_flavor openmpi +%define mpi_vers 3 %{bcond_with hpc} +%{bcond_without blacs_devel_headers} +%else +# Only build header back on one multibuild for non-HPC. +# Note: For HPC the headers need to be built always. +%{bcond_with blacs_devel_headers} %endif %if "%flavor" == "mvapich2" @@ -131,17 +141,26 @@ %{bcond_without hpc} %endif +%if !0%{?is_opensuse} && !0%{?with_hpc:1} +ExclusiveArch: do_not_build +%endif + +# For compatibility package names +%if "%{mpi_flavor}" != "openmpi" || "%{mpi_vers}" != "1" +%define mpi_ext %{?mpi_vers} +%endif + %define so_ver 2 %if %{without hpc} %if 0%{!?package_name:1} -%define package_name %{pname}-%{mpi_flavor} +%define package_name %{pname}-%{mpi_flavor}%{?mpi_ext} %endif -%define libname() lib%{pname}%{so_ver}-%{mpi_flavor} -%define libblacsname() libblacs%{so_ver}-%{mpi_flavor} -%define installdir %{_libdir}/mpi/gcc/%{mpi_flavor} +%define libname() lib%{pname}%{so_ver}-%{mpi_flavor}%{?mpi_ext} +%define libblacsname() libblacs%{so_ver}-%{mpi_flavor}%{?mpi_ext} +%define installdir %{_libdir}/mpi/gcc/%{mpi_flavor}%{?mpi_ext} %define p_includedir %{_includedir} %else -%{hpc_init -c %compiler_family -m %mpi_flavor %{?c_f_ver:-v %{c_f_ver}} %{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}} +%{hpc_init -c %compiler_family -m %mpi_flavor %{?c_f_ver:-v %{c_f_ver}} %{?mpi_vers:-V %{mpi_vers}} %{?ext:-e %{ext}}} %define package_name %{hpc_package_name %{?_vers}} %define libname() lib%{pname}%{so_ver}%{expand:%%{hpc_package_name_tail %{**}}} @@ -166,7 +185,7 @@ # PATCH-FIX-OPENSUSE scalapack-2.0.2-shared-blacs.patch -- build shared blacs library Patch1: scalapack-2.0.2-shared-blacs.patch %if %{without hpc} -BuildRequires: %{mpi_flavor}-devel +BuildRequires: %{mpi_flavor}%{?mpi_ext}-devel BuildRequires: blas-devel BuildRequires: gcc-fortran BuildRequires: lapack-devel @@ -214,7 +233,7 @@ This package contains headers for BLACS. %package -n %{libname %_vers} -Summary: ScaLAPACK libraries compiled against %{mpi_flavor} +Summary: ScaLAPACK libraries compiled against %{mpi_flavor}%{?mpi_vers} Group: Development/Libraries/Parallel Obsoletes: %{name} < %{version} Provides: %{name} = %{version} @@ -250,16 +269,16 @@ BLACS. One of the design goals of ScaLAPACK was to have the ScaLAPACK routines resemble their LAPACK equivalents as much as possible. -This package contains ScaLAPACK libraries compiled with %{mpi_flavor}. +This package contains ScaLAPACK libraries compiled with %{mpi_flavor}%{?mpi_vers}. %{?with_hpc:%{hpc_master_package -s %so_ver -n %{libname_plain} -L}} %package -n %{libname %_vers}-devel -Summary: Development libraries for ScaLAPACK (%{mpi_flavor}) +Summary: Development libraries for ScaLAPACK (%{mpi_flavor}%{?mpi_vers}) Group: Development/Libraries/Parallel Requires: %{libname %_vers} = %{version} %if %{without hpc} -Requires: %{mpi_flavor}-devel +Requires: %{mpi_flavor}%{?mpi_ext}-devel %else %hpc_requires_devel Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel @@ -268,28 +287,27 @@ Provides: %{name}-devel = %{version} %description -n %{libname %_vers}-devel -This package contains development libraries for ScaLAPACK, compiled against %{mpi_flavor}. +This package contains development libraries for ScaLAPACK, compiled against %{mpi_flavor}%{?mpi_vers}. %{?with_hpc:%{hpc_master_package -n %{libname_plain}-devel -s %so_ver devel}} %package -n %{libname %_vers}-devel-static -Summary: Static libraries for ScaLAPACK (%{mpi_flavor}) +Summary: Static libraries for ScaLAPACK (%{mpi_flavor}%{?mpi_vers}) Group: Development/Libraries/Parallel Requires: %{libname %_vers}-devel = %{version} Obsoletes: %{name}-devel-static < %{version} Provides: %{name}-devel-static = %{version} %description -n %{libname %_vers}-devel-static -This package contains static libraries for ScaLAPACK, compiled against %{mpi_flavor}. +This package contains static libraries for ScaLAPACK, compiled against %{mpi_flavor}%{?mpi_vers}. %package test -Summary: Test programs for ScaLAPACK (%{mpi_flavor}) +Summary: Test programs for ScaLAPACK (%{mpi_flavor}%{?mpi_vers}) Group: Development/Libraries/Parallel %description test -This packages contains the few tests programs for ScaLAPACK compiled against -%{mpi_flavor}. These programs needs data files which are provided with this package -in the directory /usr/share/doc/packages/scalapack-test-%{mpi_flavor}. +This packages contains some test programs for ScaLAPACK compiled against +%{mpi_flavor}%{?mpi_vers}. %package -n %{libblacsname %_vers} Summary: Basic Linear Algebra Communication Subprograms @@ -300,43 +318,42 @@ %endif %description -n %{libblacsname %_vers} -The BLACS (Basic Linear Algebra Communication Subprograms) project is -an ongoing investigation whose purpose is to create a linear algebra -oriented message passing interface that may be implemented efficiently -and uniformly across a large range of distributed memory platforms. +The BLACS (Basic Linear Algebra Communication Subprograms) project +provides a linear algebra oriented message passing interface for +a large range of distributed memory platforms. The length of time required to implement efficient distributed memory -algorithms makes it impractical to rew/mpi/gccrite programs for every new +algorithms makes it impractical to rewrite programs for every new parallel machine. The BLACS exist in order to make linear algebra applications both easier to program and more portable. %{?with_hpc:%{hpc_master_package -l -n %{libblacs_plain} -N blacs -s %so_ver}} %package -n %{libblacsname %_vers}-devel -Summary: Development libraries for BLACS (%{mpi_flavor}) +Summary: Development libraries for BLACS (%{mpi_flavor}%{?mpi_vers}) Group: Development/Libraries/Parallel Requires: %{libblacsname %_vers} = %{version} %if %{without hpc} -Requires: %{mpi_flavor}-devel +Requires: %{mpi_flavor}%{?mpi_ext}-devel Requires: blacs-devel-headers -Obsoletes: blacs-%{mpi_flavor}-devel < %{version} -Provides: blacs-%{mpi_flavor}-devel = %{version} +Obsoletes: blacs-%{mpi_flavor}%{?mpi_ext}-devel < %{version} +Provides: blacs-%{mpi_flavor}%{?mpi_ext}-devel = %{version} %else %hpc_requires_devel %endif %description -n %{libblacsname %_vers}-devel -This package contains development libraries for BLACS, compiled against %{mpi_flavor}. +This package contains development libraries for BLACS, compiled against %{mpi_flavor}%{?mpi_vers}. %package -n %{libblacsname %_vers}-devel-static -Summary: Development libraries for BLACS (%{mpi_flavor}) +Summary: Development libraries for BLACS (%{mpi_flavor}%{?mpi_vers}) Group: Development/Libraries/Parallel Requires: %{libblacsname %_vers}-devel = %{version} %{?with_hpc:%{hpc_master_package -n %{libblacs_plain}-devel -N blacs -s %so_ver -a devel}} %description -n %{libblacsname %_vers}-devel-static -This package contains static libraries for BLACS, compiled against %{mpi_flavor}. +This package contains static libraries for BLACS, compiled against %{mpi_flavor}%{?mpi_vers}. %if %{with hpc} %package module @@ -344,7 +361,7 @@ Group: Development/Libraries/Parallel %description module -This package contains module files required buy SCALAPACK and BLACS, compiled against %{mpi_flavor}. +This package contains module files required by SCALAPACK and BLACS, compiled against %{mpi_flavor}%{?mpi_vers}. %endif %prep @@ -358,7 +375,7 @@ cat > %{_sourcedir}/baselibs.conf <<EOF %{libname %{?_vers}} %{libname %{?_vers}}-devel - requires -%{mpi_flavor}-<targettype> + requires -%{mpi_flavor}%{?mpi_ext}-<targettype> requires "%{libname %{?_vers}}-<targettype> = <version>" EOF %endif @@ -373,8 +390,8 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" cd %{pname}-%{version}; %if %{without hpc} -echo $PATH | grep -q %{mpi_flavor} || PATH=/usr/%_lib/mpi/gcc/%{mpi_flavor}/bin:$PATH -%define makeargs CC=/usr/%_lib/mpi/gcc/%{mpi_flavor}/bin/mpicc FC=/usr/%_lib/mpi/gcc/%{mpi_flavor}/bin/mpif90 %{?_smp_flags} +echo $PATH | grep -q %{mpi_flavor}%{?mpi_ext} || PATH=/usr/%_lib/mpi/gcc/%{mpi_flavor}%{?mpi_ext}/bin:$PATH +%define makeargs CC=/usr/%_lib/mpi/gcc/%{mpi_flavor}%{?mpi_ext}/bin/mpicc FC=/usr/%_lib/mpi/gcc/%{mpi_flavor}%{?mpi_ext}/bin/mpif90 %{?_smp_flags} %else %define makeargs FCFLAGS+="$(pkg-config --cflags openblas)" LIBS="$(pkg-config --libs openblas)" %{?_smp_flags} %endif @@ -475,38 +492,32 @@ %endif %files -n %{libname %_vers} -%defattr(-,root,root,-) -%doc README LICENSE +%license LICENSE +%doc README %{installdir}/%_lib/libscalapack.so.* %{?with_hpc:%hpc_dirs} %files test -%defattr(-,root,root,-) %{installdir}/%_lib/TESTING %files -n %{libname %_vers}-devel -%defattr(-,root,root,-) %{installdir}/%_lib/libscalapack.so %{?with_hpc:%hpc_pkgconfig_file} %files -n %{libname %_vers}-devel-static -%defattr(-,root,root,-) %{installdir}/%_lib/libscalapack.a %if %{without hpc} %if %{with blacs_devel_headers} %files -n blacs-devel-headers -%defattr(-,root,root,-) %{p_includedir}/blacs/ %endif %endif %files -n %{libblacsname %_vers} -%defattr(-,root,root,-) %{installdir}/%_lib/libblacs.so.* %files -n %{libblacsname %_vers}-devel -%defattr(-,root,root,-) %{installdir}/%_lib/libblacs.so %if %{with hpc} %{hpc_pkgconfig_file -n blacs} @@ -515,7 +526,6 @@ %endif %files -n %{libblacsname %_vers}-devel-static -%defattr(-,root,root,-) %{installdir}/%_lib/libblacs.a %if %{with hpc}