Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package trilinos for openSUSE:Factory checked in at 2023-11-02 20:22:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/trilinos (Old) and /work/SRC/openSUSE:Factory/.trilinos.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trilinos" Thu Nov 2 20:22:34 2023 rev:19 rq:1120042 version:14.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/trilinos/trilinos.changes 2023-03-29 23:28:37.503913914 +0200 +++ /work/SRC/openSUSE:Factory/.trilinos.new.17445/trilinos.changes 2023-11-02 20:23:07.679496316 +0100 @@ -1,0 +2,17 @@ +Tue Oct 24 15:02:59 UTC 2023 - Egbert Eich <[email protected]> + +- Disable HPC flavors on %ix86 + +------------------------------------------------------------------- +Tue Oct 24 08:04:53 UTC 2023 - Nicolas Morey <[email protected]> + +- Drop support for obsolete openmpi[123] +- Prepare support for openmpi5 + +------------------------------------------------------------------- +Fri Jun 23 09:32:28 UTC 2023 - Guillaume GARDET <[email protected]> + +- Increase memory required to build trilinos:gnu-mpich-hpc and + trilinos:gnu-mvapich2-hpc to avoid OOM failures + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trilinos.spec ++++++ --- /var/tmp/diff_new_pack.bRHf4H/_old 2023-11-02 20:23:08.759536057 +0100 +++ /var/tmp/diff_new_pack.bRHf4H/_new 2023-11-02 20:23:08.763536204 +0100 @@ -62,35 +62,19 @@ %{bcond_with hpc} %endif -%if "%{flavor}" == "openmpi" -%{?DisOMPI1} -%undefine c_f_ver -%global mpi_family openmpi -%define mpi_ver 1 -%{bcond_with hpc} -%endif - -%if "%{flavor}" == "openmpi2" -%{?DisOMPI2} +%if "%{flavor}" == "openmpi4" +%{?DisOMPI4} %undefine c_f_ver %global mpi_family openmpi -%define mpi_ver 2 +%define mpi_ver 4 %{bcond_with hpc} %endif -%if "%{flavor}" == "openmpi3" -%{?DisOMPI3} +%if "%{flavor}" == "openmpi5" +%{?DisOMPI5} %undefine c_f_ver %global mpi_family openmpi -%define mpi_ver 3 -%{bcond_with hpc} -%endif - -%if "%{flavor}" == "openmpi4" -%{?DisOMPI4} -%undefine c_f_ver -%global mpi_family openmpi -%define mpi_ver 4 +%define mpi_ver 5 %{bcond_with hpc} %endif @@ -108,39 +92,21 @@ %{bcond_without hpc} %endif -%if "%{flavor}" == "gnu-openmpi-hpc" -%{?DisOMPI1} -%undefine c_f_ver -%global mpi_family openmpi -%global compiler_family gnu -%define mpi_ver 1 -%{bcond_without hpc} -%endif - -%if "%{flavor}" == "gnu-openmpi2-hpc" -%{?DisOMPI2} -%undefine c_f_ver -%global mpi_family openmpi -%global compiler_family gnu -%define mpi_ver 2 -%{bcond_without hpc} -%endif - -%if "%{flavor}" == "gnu-openmpi3-hpc" -%{?DisOMPI3} +%if "%{flavor}" == "gnu-openmpi4-hpc" +%{?DisOMPI4} %undefine c_f_ver %global mpi_family openmpi %global compiler_family gnu -%define mpi_ver 3 +%define mpi_ver 4 %{bcond_without hpc} %endif -%if "%{flavor}" == "gnu-openmpi4-hpc" -%{?DisOMPI4} +%if "%{flavor}" == "gnu-openmpi5-hpc" +%{?DisOMPI5} %undefine c_f_ver %global mpi_family openmpi %global compiler_family gnu -%define mpi_ver 4 +%define mpi_ver 5 %{bcond_without hpc} %endif @@ -158,39 +124,21 @@ %{bcond_without hpc} %endif -%if "%{flavor}" == "gnu7-openmpi-hpc" -%{?DisOMPI1} -%define c_f_ver 7 -%global mpi_family openmpi -%global compiler_family gnu -%define mpi_ver 1 -%{bcond_without hpc} -%endif - -%if "%{flavor}" == "gnu7-openmpi2-hpc" -%{?DisOMPI2} -%define c_f_ver 7 -%global mpi_family openmpi -%global compiler_family gnu -%define mpi_ver 2 -%{bcond_without hpc} -%endif - -%if "%{flavor}" == "gnu7-openmpi3-hpc" -%{?DisOMPI3} +%if "%{flavor}" == "gnu7-openmpi4-hpc" +%{?DisOMPI4} %define c_f_ver 7 %global mpi_family openmpi %global compiler_family gnu -%define mpi_ver 3 +%define mpi_ver 4 %{bcond_without hpc} %endif -%if "%{flavor}" == "gnu7-openmpi4-hpc" -%{?DisOMPI4} +%if "%{flavor}" == "gnu7-openmpi5-hpc" +%{?DisOMPI5} %define c_f_ver 7 %global mpi_family openmpi %global compiler_family gnu -%define mpi_ver 4 +%define mpi_ver 5 %{bcond_without hpc} %endif @@ -208,39 +156,21 @@ %{bcond_without hpc} %endif -%if "%{flavor}" == "gnu8-openmpi-hpc" -%{?DisOMPI1} -%define c_f_ver 8 -%global mpi_family openmpi -%global compiler_family gnu -%define mpi_ver 1 -%{bcond_without hpc} -%endif - -%if "%{flavor}" == "gnu8-openmpi2-hpc" -%{?DisOMPI2} +%if "%{flavor}" == "gnu8-openmpi4-hpc" +%{?DisOMPI4} %define c_f_ver 8 %global mpi_family openmpi %global compiler_family gnu -%define mpi_ver 2 +%define mpi_ver 4 %{bcond_without hpc} %endif -%if "%{flavor}" == "gnu8-openmpi3-hpc" -%{?DisOMPI3} +%if "%{flavor}" == "gnu8-openmpi5-hpc" +%{?DisOMPI5} %define c_f_ver 8 %global mpi_family openmpi %global compiler_family gnu -%define mpi_ver 3 -%{bcond_without hpc} -%endif - -%if "%{flavor}" == "gnu8-openmpi4-hpc" -%{?DisOMPI4} -%define c_f_ver 8 -%global mpi_family openmpi -%global compiler_family gnu -%define mpi_ver 4 +%define mpi_ver 5 %{bcond_without hpc} %endif @@ -258,39 +188,21 @@ %{bcond_without hpc} %endif -%if "%{flavor}" == "gnu9-openmpi-hpc" -%{?DisOMPI1} -%define c_f_ver 9 -%global mpi_family openmpi -%global compiler_family gnu -%define mpi_ver 1 -%{bcond_without hpc} -%endif - -%if "%{flavor}" == "gnu9-openmpi2-hpc" -%{?DisOMPI2} -%define c_f_ver 9 -%global mpi_family openmpi -%global compiler_family gnu -%define mpi_ver 2 -%{bcond_without hpc} -%endif - -%if "%{flavor}" == "gnu9-openmpi3-hpc" -%{?DisOMPI3} +%if "%{flavor}" == "gnu9-openmpi4-hpc" +%{?DisOMPI4} %define c_f_ver 9 %global mpi_family openmpi %global compiler_family gnu -%define mpi_ver 3 +%define mpi_ver 4 %{bcond_without hpc} %endif -%if "%{flavor}" == "gnu9-openmpi4-hpc" -%{?DisOMPI4} +%if "%{flavor}" == "gnu9-openmpi5-hpc" +%{?DisOMPI5} %define c_f_ver 9 %global mpi_family openmpi %global compiler_family gnu -%define mpi_ver 4 +%define mpi_ver 5 %{bcond_without hpc} %endif @@ -308,39 +220,21 @@ %{bcond_without hpc} %endif -%if "%{flavor}" == "gnu10-openmpi-hpc" -%{?DisOMPI1} -%define c_f_ver 10 -%global mpi_family openmpi -%global compiler_family gnu -%define mpi_ver 1 -%{bcond_without hpc} -%endif - -%if "%{flavor}" == "gnu10-openmpi2-hpc" -%{?DisOMPI2} -%define c_f_ver 10 -%global mpi_family openmpi -%global compiler_family gnu -%define mpi_ver 2 -%{bcond_without hpc} -%endif - -%if "%{flavor}" == "gnu10-openmpi3-hpc" -%{?DisOMPI3} +%if "%{flavor}" == "gnu10-openmpi4-hpc" +%{?DisOMPI4} %define c_f_ver 10 %global mpi_family openmpi %global compiler_family gnu -%define mpi_ver 3 +%define mpi_ver 4 %{bcond_without hpc} %endif -%if "%{flavor}" == "gnu10-openmpi4-hpc" -%{?DisOMPI4} +%if "%{flavor}" == "gnu10-openmpi5-hpc" +%{?DisOMPI5} %define c_f_ver 10 %global mpi_family openmpi %global compiler_family gnu -%define mpi_ver 4 +%define mpi_ver 5 %{bcond_without hpc} %endif @@ -364,9 +258,7 @@ %{?with_mpi:%{!?mpi_family:error "No MPI family specified!"}} # For compatibility package names -%if "%{mpi_family}" != "openmpi" || "%{mpi_ver}" != "1" || 0%{?suse_version} >= 1550 %define mpi_ext %{?mpi_ver} -%endif %if 0%{?sle_version} && 0%{?sle_version} < 150400 %define python_flavor python%{use_python_version} @@ -393,6 +285,7 @@ print(s.get_paths(vars={'base': \\"$var\\"}).get('purelib'));")} %endif %else +ExcludeArch: %ix86 %{hpc_init %{?compiler_family:-c %compiler_family %{?c_f_ver:-v %{c_f_ver}}} %{?with_mpi:-m {%mpi_family}} %{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}} %define package_name %{hpc_package_name %_ver} %define p_prefix %{hpc_prefix} ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.bRHf4H/_old 2023-11-02 20:23:08.791537234 +0100 +++ /var/tmp/diff_new_pack.bRHf4H/_new 2023-11-02 20:23:08.795537381 +0100 @@ -14,6 +14,17 @@ </hardware> <overwrite> <conditions> + <package>trilinos:gnu-mpich-hpc</package> + <package>trilinos:gnu-mvapich2-hpc</package> + </conditions> + <hardware> + <memory> + <size unit="G">10</size> + </memory> + </hardware> + </overwrite> + <overwrite> + <conditions> <arch>riscv64</arch> <package>trilinos:gnu-mpich-hpc</package> <package>trilinos:gnu-mvapich2-hpc</package> ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.bRHf4H/_old 2023-11-02 20:23:08.815538117 +0100 +++ /var/tmp/diff_new_pack.bRHf4H/_new 2023-11-02 20:23:08.815538117 +0100 @@ -2,10 +2,7 @@ <package>documentation</package> <package>documentation-hpc</package> <package>serial</package> - <package>openmpi2</package> <package>openmpi4</package> - <package>gnu-openmpi2-hpc</package> - <package>gnu-openmpi3-hpc</package> <package>gnu-openmpi4-hpc</package> <package>gnu-mvapich2-hpc</package> <package>gnu-mpich-hpc</package>
