Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mvapich3 for openSUSE:Factory
checked in at 2025-04-03 16:46:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mvapich3 (Old)
and /work/SRC/openSUSE:Factory/.mvapich3.new.1907 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mvapich3"
Thu Apr 3 16:46:48 2025 rev:3 rq:1265558 version:3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/mvapich3/mvapich3.changes 2024-09-09
14:44:42.171348674 +0200
+++ /work/SRC/openSUSE:Factory/.mvapich3.new.1907/mvapich3.changes
2025-04-03 16:47:20.240454389 +0200
@@ -1,0 +2,10 @@
+Sat Mar 29 14:31:42 UTC 2025 - Nicolas Morey <nicolas.mo...@suse.com>
+
+- Remove support of gnu-hpc build flavours.
+
+-------------------------------------------------------------------
+Mon Mar 24 12:51:51 UTC 2025 - Nicolas Morey <nicolas.mo...@suse.com>
+
+- Disable gnu-hpc build flavours (bsc#1239982)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mvapich3.spec ++++++
--- /var/tmp/diff_new_pack.CwKQkH/_old 2025-04-03 16:47:21.084489937 +0200
+++ /var/tmp/diff_new_pack.CwKQkH/_new 2025-04-03 16:47:21.084489937 +0200
@@ -1,7 +1,7 @@
#
-# spec file
+# spec file for package mvapich3
#
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,118 +24,30 @@
# % define build_static_devel 1
%define pname mvapich3
-%define vers 3.0
-%define _vers 3_0
%define rc_ver %nil
%if "%{flavor}" == ""
ExclusiveArch: do_not_build
-%{bcond_with hpc}
%endif
%if "%{flavor}" == "ucx"
%define build_flavor ucx
-%{bcond_with hpc}
%endif
%if "%{flavor}" == "ucx-testsuite"
%define build_flavor ucx
%define testsuite 1
-%{bcond_with hpc}
%endif
%if "%{flavor}" == "ofi"
%define build_flavor ofi
-%{bcond_with hpc}
%endif
%if "%{flavor}" == "ofi-testsuite"
%define build_flavor ofi
%define testsuite 1
-%{bcond_with hpc}
-%endif
-
-%if "%flavor" == "gnu-hpc-ucx"
-%define compiler_family gnu
-%undefine c_f_ver
-%define build_flavor ucx
-%define build_static_devel 1
-%{bcond_without hpc}
-%endif
-
-%if "%flavor" == "gnu-hpc-ofi"
-%define compiler_family gnu
-%undefine c_f_ver
-%define build_flavor ofi
-%define build_static_devel 1
-%{bcond_without hpc}
-%endif
-
-%if "%flavor" == "gnu7-hpc-ucx"
-%define compiler_family gnu
-%define c_f_ver 7
-%define build_flavor ucx
-%define build_static_devel 1
-%{bcond_without hpc}
-%endif
-
-%if "%flavor" == "gnu7-hpc-ofi"
-%define compiler_family gnu
-%define c_f_ver 7
-%define build_flavor ofi
-%define build_static_devel 1
-%{bcond_without hpc}
-%endif
-
-%if "%flavor" == "gnu8-hpc-ucx"
-%define compiler_family gnu
-%define c_f_ver 8
-%define build_flavor ucx
-%define build_static_devel 1
-%{bcond_without hpc}
-%endif
-
-%if "%flavor" == "gnu8-hpc-ofi"
-%define compiler_family gnu
-%define c_f_ver 8
-%define build_flavor ofi
-%define build_static_devel 1
-%{bcond_without hpc}
-%endif
-
-%if "%flavor" == "gnu9-hpc-ucx"
-%define compiler_family gnu
-%define c_f_ver 9
-%define build_flavor ucx
-%define build_static_devel 1
-%{bcond_without hpc}
-%endif
-
-%if "%flavor" == "gnu9-hpc-ofi"
-%define compiler_family gnu
-%define c_f_ver 9
-%define build_flavor ofi
-%define build_static_devel 1
-%{bcond_without hpc}
-%endif
-
-%if "%flavor" == "gnu10-hpc-ucx"
-%define compiler_family gnu
-%define c_f_ver 10
-%define build_flavor ucx
-%define build_static_devel 1
-%{bcond_without hpc}
-%endif
-
-%if "%flavor" == "gnu10-hpc-ofi"
-%define compiler_family gnu
-%define c_f_ver 10
-%define build_flavor psm2
-%define build_static_devel 1
-%{bcond_without hpc}
%endif
%define pack_suff %{?build_flavor:-%{build_flavor}}
-%if %{without hpc}
%define module_name mvapich3%{?pack_suff}
%define p_prefix /usr/%_lib/mpi/gcc/%{module_name}
%define p_bindir %{p_prefix}/bin
@@ -148,36 +60,12 @@
%define package_name mvapich3%{?pack_suff}
%{bcond_with pmix}
%{bcond_with hwloc}
-%else
-%{hpc_init -M -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} -m mvapich3
%{?pack_suff:-e %{build_flavor}}}
-%define p_prefix %{hpc_prefix}
-%define p_bindir %{hpc_bindir}
-%define p_datadir %{hpc_datadir}
-%define p_includedir %{hpc_includedir}
-%define p_mandir %{hpc_mandir}
-%define p_libdir %{hpc_libdir}
-%define p_libexecdir %{hpc_libexecdir}
-%define package_name %{hpc_package_name %{_vers}}
-
-%global hpc_mvapich3_dep_version %(VER=%{?m_f_ver}; echo -n ${VER})
-%global hpc_mvapich3_dir mvapich3
-%global hpc_mvapich3_pack_version %{hpc_mvapich3_dep_version}
-%{bcond_without pmix}
-%{bcond_without hwloc}
-%endif
-
-# Disable hpc builds for SLE12
-%if 0%{?sle_version} > 120200 && 0%{?sle_version} < 150000 && %{with hpc}
-%{bcond_with skip_hpc_build}
-%else
-%{bcond_without skip_hpc_build}
-%endif
Name: %{package_name}
Summary: OSU MVAPICH3 MPI package
License: BSD-3-Clause
Group: Development/Libraries/Parallel
-Version: %{vers}
+Version: 3.0
Release: 0
Source0:
http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich-%{version}%{?rc_ver}.tar.gz
Source1: mpivars.sh
@@ -198,9 +86,6 @@
# Exclude 32b archs
ExcludeArch: %{arm} %ix86
-%if %{without skip_hpc_build}
-ExclusiveArch: do_not_build
-%endif
BuildRequires: autoconf
BuildRequires: autoconf
@@ -212,26 +97,20 @@
%ifnarch s390 s390x %{arm}
BuildRequires: libnuma-devel
%endif
+BuildRequires: gcc-c++
+BuildRequires: gcc-fortran
BuildRequires: libjson-c-devel
BuildRequires: libtool
+BuildRequires: mpi-selector
BuildRequires: python3
BuildRequires: sysfsutils
-%if %{without hpc}
-BuildRequires: gcc-c++
-BuildRequires: gcc-fortran
-BuildRequires: mpi-selector
-%else
-BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
-BuildRequires: lua-lmod
-BuildRequires: suse-hpc
-%endif
%if %{with hwloc}
BuildRequires: hwloc-devel
%endif
%if %{with pmix}
BuildRequires: pmix-devel
%endif
-%if "%{build_flavor}" == "ofi" && %{with skip_hpc_build}
+%if "%{build_flavor}" == "ofi"
BuildRequires: libfabric-devel
%endif
%if "%{build_flavor}" == "ucx"
@@ -242,38 +121,25 @@
# UCX is only available for 64b archs
ExcludeArch: %ix86 %arm
%endif
-
-%if %{without hpc}
Requires: mpi-selector
-%else
-%hpc_requires
-%endif
%description
This is an MPI-3 implementation which includes all MPI-1 and MPI-2 features. It
is based on MPICH3 and MVICH.
-%{!?testsuite:%{?with_hpc:%{hpc_master_package -a -L}}}
-
%if 0%{!?testsuite:1}
%package devel
Summary: OSU MVAPICH3 MPI package
Group: Development/Libraries/Parallel
Requires: %{name} = %{version}
-%if %{without hpc}
Requires: gcc-c++
Requires: gcc-fortran
-%else
-%hpc_requires_devel
-%endif
%description devel
This is an MPI-3 implementation which includes all MPI-1 and MPI-2 features.
It
is based on MPICH3 and MVICH.
-%{?with_hpc:%{hpc_master_package -a devel}}
-
%if 0%{?build_static_devel}
%package devel-static
Summary: OSU MVAPICH3 MPI package - static libraries
@@ -294,26 +160,10 @@
This is an MPI-3 implementation which includes all MPI-1 and MPI-2 features.
It
is based on MPICH3 and MVICH. This package contains the static libraries
-%{?with_hpc:%{hpc_master_package doc}}
-
-%package macros-devel
-Summary: OSU MVAPICH3 MPI package - HPC build macros
-Group: Development/Libraries/Parallel
-Requires: %{name}-devel = %{version}
-Provides: %{pname}-hpc-macros-devel = %{version}
-Conflicts: otherproviders(%{pname}-hpc-macros-devel)
-
-%description macros-devel
-This is an MPI-3 implementation which includes all MPI-1 and MPI-2 features.
It
-is based on MPICH2 and MVICH. This package contains the static libraries
-
-%{?with_hpc:%{hpc_master_package macros-devel}}
-
%endif # ! testsuite
%prep
-%{?with_hpc:%hpc_debug}
%setup -q -n mvapich-%{version}%{?rc_ver}
%autopatch -p0
@@ -323,15 +173,11 @@
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
# GCC10 needs an extra flag to allow badly passed parameters
-%if 0%{?suse_version} > 1500 || 0%{?hpc_gnu_dep_version} >= 10
+%if 0%{?suse_version} > 1500
export FFLAGS="-fallow-argument-mismatch $FFLAGS"
%endif
./autogen.sh --without-ucx --without-ofi --without-json
-%if %{with hpc}
-%{hpc_setup}
-%{hpc_configure} \
-%else
%configure \
--prefix=%{p_prefix} \
--exec-prefix=%{p_prefix} \
@@ -341,7 +187,6 @@
--libdir=%{p_libdir} \
--libexecdir=%{p_libexecdir} \
--mandir=%{p_mandir} \
-%endif
--docdir=%{_datadir}/doc/%{name} \
--disable-rpath \
--disable-wrapper-rpath \
@@ -395,7 +240,6 @@
install -m 0644 COPYRIGHT* %{buildroot}%{_datadir}/doc/%{name}
install -m 0644 CHANGE* %{buildroot}%{_datadir}/doc/%{name}
-%if %{without hpc}
# make and install mpivars files
install -m 0755 -d %{buildroot}%{_bindir}
sed -e 's,prefix,%p_prefix,g' -e 's,libdir,%{p_libdir},g' %{S:1} >
%{buildroot}%{p_bindir}/mpivars.sh
@@ -425,63 +269,18 @@
set ModulesVersion "%{version}"
EOF
-%else # with hpc
-
-install -d -m 755 %{buildroot}%{_rpmmacrodir}
-cp %{S:3} %{buildroot}%{_rpmmacrodir}
-
-%hpc_write_modules_files
-#%%Module1.0#####################################################################
-
-proc ModulesHelp { } {
-
-puts stderr " "
-puts stderr "This module loads the %{pname} library built with the
%{compiler_family} toolchain."
-puts stderr "\nVersion %{version}\n"
-
-}
-module-whatis "Name: %{pname} built with %{compiler_family} toolchain"
-module-whatis "Version: %{version}"
-module-whatis "Category: runtime library"
-module-whatis "Description: %{SUMMARY:0}"
-module-whatis "URL: %{url}"
-
-set version %{version}
-
-prepend-path PATH %{hpc_bindir}
-prepend-path MANPATH %{hpc_mandir}
-prepend-path LD_LIBRARY_PATH %{hpc_libdir}
-prepend-path MODULEPATH %{hpc_modulepath}
-prepend-path MPI_DIR %{hpc_prefix}
-%{hpc_modulefile_add_pkgconfig_path}
-
-family "MPI"
-EOF
-cat <<EOF > %{buildroot}/%{p_bindir}/mpivars.sh
-%hpc_setup_compiler
-module load %{hpc_mpi_family}%{?pack_suff}/%{version}
-EOF
-sed -e "s/export/setenv/" -e "s/=/ /" \
- %{buildroot}/%{p_bindir}/mpivars.sh > \
- %{buildroot}/%{p_bindir}/mpivars.csh
-mkdir -p %{buildroot}%{_sysconfdir}/rpm
-
-%endif # with hpc
%post
/sbin/ldconfig
-%if %{without hpc}
# Always register. We might be already registered in the case of an udate
# but mpi-selector handles it fine
/usr/bin/mpi-selector \
--register %{name}%{?pack_suff} \
--source-dir %{p_bindir} \
--yes
-%endif
%postun
/sbin/ldconfig
-%if %{without hpc}
# Only unregister when uninstalling
if [ "$1" = "0" ]; then
/usr/bin/mpi-selector --unregister %{name}%{?pack_suff} --yes
@@ -490,23 +289,15 @@
/usr/bin/mpi-selector --system --unset --yes
fi
fi
-%else
-%hpc_module_delete_if_default
-%endif
%files
%defattr(-, root, root)
%doc CHANGES CHANGELOG COPYRIGHT README README.envvar README-MVAPICH
README_MVP.envvar
-%if %{without hpc}
%dir /usr/%_lib/mpi
%dir /usr/%_lib/mpi/gcc
%dir /usr/share/modules
%dir %{_moduledir}
%{_moduledir}
-%else
-%hpc_mpi_dirs
-%hpc_modules_files
-%endif
%dir %{p_prefix}
%dir %{p_bindir}
%dir %{p_datadir}
@@ -543,11 +334,5 @@
%{p_libdir}/*.a
%endif
-%if %{with hpc}
-%files macros-devel
-%defattr(-,root,root)
-%config %{_rpmmacrodir}/macros.hpc-mvapich3
-%endif # with hpc
-
%endif # !testsuite
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.CwKQkH/_old 2025-04-03 16:47:21.124491621 +0200
+++ /var/tmp/diff_new_pack.CwKQkH/_new 2025-04-03 16:47:21.128491790 +0200
@@ -3,7 +3,5 @@
<package>ofi-testsuite</package>
<package>ucx</package>
<package>ucx-testsuite</package>
- <package>gnu-hpc-ofi</package>
- <package>gnu-hpc-ucx</package>
</multibuild>
