Hello community, here is the log from the commit of package openmpi3 for openSUSE:Leap:15.2 checked in at 2020-05-06 20:39:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/openmpi3 (Old) and /work/SRC/openSUSE:Leap:15.2/.openmpi3.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openmpi3" Wed May 6 20:39:40 2020 rev:27 rq:800294 version:3.1.6 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/openmpi3/openmpi3.changes 2020-01-15 15:37:00.123009896 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.openmpi3.new.2738/openmpi3.changes 2020-05-06 20:39:57.400591273 +0200 @@ -1,0 +2,184 @@ +Fri Mar 20 11:26:15 UTC 2020 - Nicolas Morey-Chaisemartin <[email protected]> + +- Update to openmpi3 3.1.6 + - See changelog in NEWS +- Remove add-gen-p5-chip-pci-id-to-ini-file.patch that was merged upstream +- Add patch memory-patcher-fix-compiler-warning.patch to fix cast warning + causing RPM to fail building + +------------------------------------------------------------------- +Thu Mar 19 08:26:16 UTC 2020 - Nicolas Morey-Chaisemartin <[email protected]> + +- Drop different package string between SLES and Leap (jsc#SLE-11848) + +------------------------------------------------------------------- +Mon Jan 13 09:56:29 UTC 2020 - Nicolas Morey-Chaisemartin <[email protected]> + +- Have openmpi3-config provide pmix-runtime-config + +------------------------------------------------------------------- +Thu Dec 5 10:36:33 UTC 2019 - Michel Normand <[email protected]> + +- Add _constraints file for ppc64le for disk > 4G + +------------------------------------------------------------------- +Thu Oct 31 16:54:27 UTC 2019 - Nicolas Morey-Chaisemartin <[email protected]> + +- Link against libnuma (bsc#1155120) + +------------------------------------------------------------------- +Tue Oct 22 09:11:49 UTC 2019 - Christian Goll <[email protected]> + +- added --with-slurm (its enabled by default), but if this behavior + is changed the binding should not away + +------------------------------------------------------------------- +Thu Oct 10 06:09:30 UTC 2019 - Nicolas Morey-Chaisemartin <[email protected]> + +- Add missing Provides when openmpi3 is the default openmpi +- Add conflict with the older hpc-macros-devel providers to avoid issues during updates +- Add openmpi_prefix macro to openmpi-macros-devel + +------------------------------------------------------------------- +Fri Sep 27 11:17:24 UTC 2019 - Nicolas Morey-Chaisemartin <[email protected]> + +- Add macro file for non-hpc flavour +- Enable build on ppc64 + +------------------------------------------------------------------- +Fri Sep 6 11:14:12 UTC 2019 - Nicolas Morey-Chaisemartin <[email protected]> + +- Use FAT LTO objects in order to provide proper static library. +- Mark LICENSE with %license + +------------------------------------------------------------------- +Tue Apr 23 07:42:08 UTC 2019 - Nicolas Morey-Chaisemartin <[email protected]> + +- Fix bad INCLUDE path in module (bsc#1132949) + +------------------------------------------------------------------- +Fri Apr 19 05:56:35 UTC 2019 - Nicolas Morey-Chaisemartin <[email protected]> + +- Update to openmpi 3.1.4 + - See changelog in NEWS + +------------------------------------------------------------------- +Mon Apr 1 05:20:04 UTC 2019 - Nicolas Morey-Chaisemartin <[email protected]> + +- Add add-gen-p5-chip-pci-id-to-ini-file.patch: + - Adds support for Broadcom 57500 adapters (bsc#1125651) +- Update to openmpi 3.1.3 + - See changelog in NEWS + +------------------------------------------------------------------- +Sun Nov 18 14:27:03 UTC 2018 - [email protected] + +- Add macro _hpc_openmpi_modules for modules support (bsc#1116458). + +------------------------------------------------------------------- +Mon Sep 10 12:15:48 UTC 2018 - [email protected] + +- Remove bashism in preun scriptlet + +------------------------------------------------------------------- +Wed Sep 5 06:53:37 UTC 2018 - [email protected] + +- Fix handling of mpi-selector during updates (bsc#1098653) + +------------------------------------------------------------------- +Mon Sep 3 08:47:46 UTC 2018 - [email protected] + +- Add reproducible.patch to drop build time and hostname to make + package build reproducible (boo#1047218, boo#1084909) + +------------------------------------------------------------------- +Sun Aug 19 09:25:46 UTC 2018 - [email protected] + +- macros.hpc-openmpi3: + replace %%compiler_family by %%hpc_compiler_family + +------------------------------------------------------------------- +Thu Jul 5 12:29:43 UTC 2018 - [email protected] + +- Update to openmpi 3.1.1 + 3.1.1 -- June, 2018 + ------------------- + - Fix potential hang in UCX PML during MPI_FINALIZE + - Update internal PMIx to v2.1.2rc2 to fix forward version compatibility. + - Add new MCA parameter osc_sm_backing_store to allow users to specify + where in the filesystem the backing file for the shared memory + one-sided component should live. Defaults to /dev/shm on Linux. + - Fix potential hang on non-x86 platforms when using builds with + optimization flags turned off. + - Disable osc/pt2pt when using MPI_THREAD_MULTIPLE due to numerous + race conditions in the component. + - Fix dummy variable names for the mpi and mpi_f08 Fortran bindings to + match the MPI standard. This may break applications which use + name-based parameters in Fortran which used our internal names + rather than those documented in the MPI standard. + - Revamp Java detection to properly handle new Java versions which do + not provide a javah wrapper. + - Fix RMA function signatures for use-mpi-f08 bindings to have the + asynchonous property on all buffers. + - Improved configure logic for finding the UCX library. + + 3.1.0 -- May, 2018 + ------------------ + - Various OpenSHMEM bug fixes. + - Properly handle array_of_commands argument to Fortran version of + MPI_COMM_SPAWN_MULTIPLE. + - Fix bug with MODE_SEQUENTIAL and the sharedfp MPI-IO component. + - Use "javac -h" instead of "javah" when building the Java bindings + with a recent version of Java. + - Fix mis-handling of jostepid under SLURM that could cause problems + with PathScale/OmniPath NICs. + - Disable the POWER 7/BE block in configure. Note that POWER 7/BE is + still not a supported platform, but it is no longer automatically + disabled. See + https://github.com/open-mpi/ompi/issues/4349#issuecomment-374970982 + for more information. + - The output-filename option for mpirun is now converted to an + absolute path before being passed to other nodes. + - Add monitoring component for PML, OSC, and COLL to track data + movement of MPI applications. See + ompi/mca/commmon/monitoring/HowTo_pml_monitoring.tex for more + information about the monitoring framework. + - Add support for communicator assertions: mpi_assert_no_any_tag, + mpi_assert_no_any_source, mpi_assert_exact_length, and + mpi_assert_allow_overtaking. + - Update PMIx to version 2.1.1. + - Update hwloc to 1.11.7. + - Many one-sided behavior fixes. + - Improved performance for Reduce and Allreduce using Rabenseifner's algorithm. + - Revamped mpirun --help output to make it a bit more manageable. + - Portals4 MTL improvements: Fix race condition in rendezvous protocol and + retry logic. + - UCX OSC: initial implementation. + - UCX PML improvements: add multi-threading support. + - Yalla PML improvements: Fix error with irregular contiguous datatypes. + - Openib BTL: disable XRC support by default. + - TCP BTL: Add check to detect and ignore connections from processes + that aren't MPI (such as IDS probes) and verify that source and + destination are using the same version of Open MPI, fix issue with very + large message transfer. + - ompi_info parsable output now escapes double quotes in values, and + also quotes values can contains colons. Thanks to Lev Givon for the + suggestion. + - CUDA-aware support can now handle GPUs within a node that do not + support CUDA IPC. Earlier versions would get error and abort. + - Add a mca parameter ras_base_launch_orted_on_hn to allow for launching + MPI processes on the same node where mpirun is executing using a separate + orte daemon, rather than the mpirun process. This may be useful to set to + true when using SLURM, as it improves interoperability with SLURM's signal + propagation tools. By default it is set to false, except for Cray XC systems. + - Remove LoadLeveler RAS support. + - Remove IB XRC support from the OpenIB BTL due to lack of support. + - Add functionality for IBM s390 platforms. Note that regular + regression testing does not occur on the s390 and it is not + considered a supported platform. + - Remove support for big endian PowerPC. + - Remove support for XL compilers older than v13.1. + - Remove support for atomic operations using MacOS atomics library. +- Drop btl-vader-change-the-way-fast-boxes-are-used.patch which was merged upstream +- Add Build-warning-stringop-overflow-in.patch to fix a potential buffer overflow warning. +------------------------------------------------------------------- Old: ---- btl-vader-change-the-way-fast-boxes-are-used.patch openmpi-3.0.0.0.1cbdf5d279.tar.bz2 New: ---- Build-warning-stringop-overflow-in.patch _constraints memory-patcher-fix-compiler-warning.patch openmpi-3.1.6.0.ea348728b4c8.tar.bz2 reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openmpi3.spec ++++++ --- /var/tmp/diff_new_pack.qNR5tG/_old 2020-05-06 20:39:58.116592756 +0200 +++ /var/tmp/diff_new_pack.qNR5tG/_new 2020-05-06 20:39:58.120592764 +0200 @@ -1,7 +1,7 @@ # # spec file for package openmpi3 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana # University Research and Technology # Corporation. All rights reserved. @@ -30,7 +30,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/ # @@ -42,8 +42,8 @@ # % define build_static_devel 1 %define pname openmpi -%define vers 3.0.0 -%define _vers 3_0_0 +%define vers 3.1.6 +%define _vers 3_1_6 %define m_f_ver 3 %bcond_with ringdisabled @@ -103,6 +103,9 @@ %endif %endif +# Detect whether we are the default openMPI implemantation or not +%define default_openmpi 0 + %if %{with hpc} %{!?compiler_family:%global compiler_family gnu} %{hpc_init -M -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} -m openmpi %{?mpi_f_ver:-V %{mpi_f_ver}}} @@ -112,7 +115,7 @@ %global hpc_openmpi_pack_version %{hpc_openmpi_dep_version} %endif -%define git_ver .0.1cbdf5d279 +%define git_ver .0.ea348728b4c8 ############################################################################# # @@ -126,13 +129,15 @@ Summary: An implementation of MPI/SHMEM License: BSD-3-Clause Group: Development/Libraries/Parallel -Url: http://www.open-mpi.org/ +URL: http://www.open-mpi.org/ Source0: openmpi-%{version}%{git_ver}.tar.bz2 Source2: openmpi3-rpmlintrc Source3: macros.hpc-openmpi Source4: mpivars.sh Source5: mpivars.csh -Patch0: btl-vader-change-the-way-fast-boxes-are-used.patch +Patch0: Build-warning-stringop-overflow-in.patch +Patch1: reproducible.patch +Patch2: memory-patcher-fix-compiler-warning.patch Provides: mpi BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf @@ -144,7 +149,6 @@ BuildRequires: libtool # net-tools is required to run hostname BuildRequires: net-tools -ExcludeArch: ppc64 %if 0%{?testsuite} BuildArch: noarch BuildRequires: %{package_name} = %{version} @@ -179,12 +183,16 @@ %endif %ifarch x86_64 +BuildRequires: libnuma-devel BuildRequires: libpsm2-devel BuildRequires: numactl %endif Requires: openmpi-runtime-config Recommends: openmpi%{m_f_ver}-config +%if 0%{?default_openmpi} +Provides: openmpi = %{version} +%endif # OpenMPI requires ssh (or rsh) to run even on a single host # Force ssh to make sure the install works out of the box Requires: openssh @@ -236,6 +244,9 @@ Summary: OpenMPI runtime libraries for OpenMPI %{?with_hpc:HPC} version %{version} Group: System/Libraries Requires: %{name} = %{version} +%if 0%{?default_openmpi} +Provides: openmpi-libs = %{version} +%endif %{?with_hpc:%hpc_requires} %description %{!?with_hpc:libs}%{?with_hpc:-n lib%{name}} @@ -259,6 +270,9 @@ Requires: libibverbs-devel %if %{without hpc} Requires: libstdc++-devel +%if 0%{?default_openmpi} +Provides: openmpi-devel = %{version} +%endif %else %hpc_requires_devel %endif @@ -299,23 +313,32 @@ This subpackage provides the documentation for Open MPI/OpenSHMEM. -%if %{with hpc} %package macros-devel -Summary: HPC Macros for openMPI version %{version} +Summary: Macros for openMPI version %{version} Group: Development/Libraries/Parallel Requires: %{name}-devel = %{version} -Provides: %{pname}-hpc-macros-devel = %{version} +# Make sure no two openmpi macro file can be installed at once +Provides: %{pname}-macros-provider = %{version} +Conflicts: otherproviders(%{pname}-macros-provider) +# Conflict (without providing) with the older openmpi-hpc-macros-devel flag +# to avoid issue with older packages Conflicts: otherproviders(%{pname}-hpc-macros-devel) -%description macros-devel -HPC Macros for building RPM packages for OpenMPI version %{version}. +%if 0%{?default_openmpi} +Provides: openmpi-macros-devel = %{version} %endif +%description macros-devel +Macros for building RPM packages for OpenMPI version %{version}. + %if 0%{?build_static_devel} %package devel-static Summary: Static libraries for openMPI %{?with_hpc:HPC} version %{version} Group: Development/Libraries/Parallel Requires: %{name}-devel = %{version} +%if 0%{?default_openmpi} +Provides: openmpi-devel-static = %{version} +%endif %description devel-static OpenMPI is an implementation of the Message Passing Interface, a @@ -334,6 +357,9 @@ Group: Development/Libraries/Parallel Provides: openmpi-runtime-config = %{version} Conflicts: otherproviders(openmpi-runtime-config) +# OpenMPI3 is PMIx enabled +Provides: pmix-runtime-config = %{version} +Conflicts: otherproviders(pmix-runtime-config) %description -n %{pname}%{m_f_ver}-config OpenMPI is an implementation of the Message Passing Interface, a @@ -375,6 +401,8 @@ openmpi%{m_f_ver}-libs EOF %endif +%patch1 -p1 +%patch2 # Live patch the VERSION file sed -i -e 's/^greek=.*$/greek=%{git_ver}/' -e 's/^repo_rev=.*$/repo_rev=%{version}%{git_ver}/' \ -e 's/^date=.*$/date="OpenMPI %{version} Distribution for SUSE"/' VERSION @@ -386,6 +414,9 @@ ############################################################################# %build +export USER=OBS +export HOSTNAME=OBS +%global _lto_cflags %{_lto_cflags} -ffat-lto-objects %{?with_hpc:%hpc_debug} ./autogen.pl --force %if %{with hpc} @@ -408,6 +439,7 @@ --with-verbs \ --enable-mpi-thread-multiple \ --disable-wrapper-rpath \ + --with-slurm \ %if 0%{?with_ucx} --with-ucx \ --with-ucx-libdir=/usr/%_lib \ @@ -420,8 +452,8 @@ %endif --disable-silent-rules \ --enable-mpirun-prefix-by-default \ - --with-package-string="Open MPI Distribution for %{?is_opensuse:openSUSE}%{!?is_opensuse:SLE}" \ - --disable-wrapper-rpath + --with-package-string="Open MPI Distribution for SUSE" \ + --disable-wrapper-runpath make %{?_smp_mflags} %if 0%{?testsuite} @@ -496,12 +528,24 @@ conflict gnu-openmpi prepend-path PATH %{mpi_bindir} prepend-path INCLUDE %{mpi_includedir} -prepend-path INCLUDE %{mpi_libdir}/lib64 +prepend-path INCLUDE %{mpi_libdir} prepend-path MANPATH %{mpi_mandir} prepend-path LD_LIBRARY_PATH %{mpi_libdir} EOF +mkdir -p %{buildroot}%{_sysconfdir}/rpm +cat <<EOF >%{buildroot}%{_sysconfdir}/rpm/macros.openmpi +# +# openmpi +# +%openmpi_prefix %{mpi_prefix} +%setup_openmpi source %{mpi_bindir}/mpivars.sh + +%openmpi_requires Requires: %{name}-libs +%openmpi_devel_requires Requires: %{name}-devel + +EOF %else %hpc_write_modules_files #%%Module1.0##################################################################### @@ -546,20 +590,26 @@ rm -f %{buildroot}%{_sysconfdir}/openmpi-default-hostfile rm -f %{buildroot}%{_sysconfdir}/openmpi-mca-params.conf rm -f %{buildroot}%{_sysconfdir}/openmpi-totalview.tcl +rm -f %{buildroot}%{_sysconfdir}/pmix-mca-params.conf %endif %if %{without hpc} %post +# 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}-%{version} \ + --register %{name} \ --source-dir %{mpi_bindir} \ --yes %preun -/usr/bin/mpi-selector --unregister %{name}-%{version} --yes -/usr/bin/mpi-selector --system --query -if [ ! -z "`/usr/bin/mpi-selector --system --query`" ]; then - /usr/bin/mpi-selector --system --unset --yes %{name}-%{version} +# Only unregister when uninstalling +if [ "$1" = "0" ]; then + /usr/bin/mpi-selector --unregister %{name} --yes + # Deregister the default if we are uninstalling it + if [ "$(/usr/bin/mpi-selector --system --query)" = "%{name}" ]; then + /usr/bin/mpi-selector --system --unset --yes + fi fi %post libs -p /sbin/ldconfig @@ -575,7 +625,8 @@ %files %defattr(-, root, root) -%doc NEWS README LICENSE +%doc NEWS README +%license LICENSE %dir %{mpi_prefix} %dir %{mpi_bindir} %dir %{mpi_libdir} @@ -611,7 +662,12 @@ %{mpi_bindir}/orterun %{mpi_bindir}/oshmem_info %{mpi_bindir}/oshrun +%{mpi_bindir}/prun %{mpi_bindir}/shmemrun +%if %{without hpc} +%{mpi_bindir}/aggregate_profile.pl +%{mpi_bindir}/profile2mat.pl +%endif %dir %{mpi_datadir}/openmpi %dir %{mpi_datadir}/openmpi/amca-param-sets @@ -673,10 +729,12 @@ %defattr(-, root, root, -) %{mpi_mandir} -%if %{with hpc} %files macros-devel %defattr(-,root,root,-) +%if %{with hpc} %config %{_sysconfdir}/rpm/macros.hpc-openmpi +%else +%config %{_sysconfdir}/rpm/macros.openmpi %endif %if 0%{?build_static_devel} @@ -692,6 +750,7 @@ %files -n %{pname}%{m_f_ver}-config %config %{_sysconfdir}/openmpi-default-hostfile %config %{_sysconfdir}/openmpi-mca-params.conf +%config %{_sysconfdir}/pmix-mca-params.conf %{_sysconfdir}/openmpi-totalview.tcl %endif ++++++ Build-warning-stringop-overflow-in.patch ++++++ commit 8c2b56a209b309e07058c48780339804cb4bdbb0 Author: John L. Jolly <[email protected]> Date: Tue May 22 10:04:40 2018 -0600 - Build warning: stringop-overflow in get_dynamic_win_info() at osc_ucx_comm.c In file included from /usr/include/string.h:494:0, from ../../../../ompi/info/info.h:29, from ../../../../ompi/mca/osc/base/base.h:24, from osc_ucx_comm.c:13: In function 'memcpy', inlined from 'get_dynamic_win_info' at osc_ucx_comm.c:359:5, inlined from 'ompi_osc_ucx_put' at osc_ucx_comm.c:401:18: /usr/include/bits/string_fortified.h:34:10: warning: '__builtin___memcpy_chk' writing 8 bytes into a region of size 4 overflows the destination [-Wstringop-overflow=] return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This is caused by a type size mismatch in a call to memcpy This fix corrects the type definition of the win_count variable. Signed-off-by: John Jolly <[email protected]> diff --git ompi/mca/osc/ucx/osc_ucx_comm.c ompi/mca/osc/ucx/osc_ucx_comm.c index 22f4ce1e9430..e9e2b40f8222 100644 --- ompi/mca/osc/ucx/osc_ucx_comm.c +++ ompi/mca/osc/ucx/osc_ucx_comm.c @@ -332,7 +332,8 @@ static inline int get_dynamic_win_info(uint64_t remote_addr, ompi_osc_ucx_module size_t len = sizeof(uint64_t) + sizeof(ompi_osc_dynamic_win_info_t) * OMPI_OSC_UCX_ATTACH_MAX; char *temp_buf = malloc(len); ompi_osc_dynamic_win_info_t *temp_dynamic_wins; - int win_count, contain, insert = -1; + uint64_t win_count; + int contain, insert = -1; ucs_status_t status; if ((module->win_info_array[target]).rkey_init == true) { ++++++ _constraints ++++++ <constraints> <overwrite> <conditions> <arch>ppc64le</arch> </conditions> <hardware> <disk> <size unit="G">4</size> </disk> </hardware> </overwrite> </constraints> ++++++ _service ++++++ --- /var/tmp/diff_new_pack.qNR5tG/_old 2020-05-06 20:39:58.208592946 +0200 +++ /var/tmp/diff_new_pack.qNR5tG/_new 2020-05-06 20:39:58.208592946 +0200 @@ -8,7 +8,7 @@ <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="versionrewrite-replacement">\1</param> - <param name="revision">1cbdf5d279ee2b5338211331d00026e643d611f8</param> + <param name="revision">ea348728b4c856973b48252c8b843078b4784cc3</param> </service> <service name="recompress" mode="disabled"> <param name="file">openmpi*.tar</param> ++++++ macros.hpc-openmpi ++++++ --- /var/tmp/diff_new_pack.qNR5tG/_old 2020-05-06 20:39:58.228592988 +0200 +++ /var/tmp/diff_new_pack.qNR5tG/_new 2020-05-06 20:39:58.228592988 +0200 @@ -6,15 +6,16 @@ %{-V: %define _mf_ver %{-V*}} \ %{expand: %%global hpc_openmpi_dep_version %%{?_mf_ver}%%{?!_mf_ver:3}} \ %{expand: %%global hpc_openmpi_dir openmpi%{hpc_openmpi_dep_version}} \ - %{expand: %%global hpc_openmpi_pack_version %{hpc_openmpi_dep_version}} + %{expand: %%global hpc_openmpi_pack_version %{hpc_openmpi_dep_version}} \ + %{expand: %%global _hpc_openmpi_modules openmpi} # We may have to add a version here. %hpc_setup_openmpi \ module load openmpi %hpc_openmpi_requires \ -Requires: libopenmpi%{hpc_openmpi_dep_version}-%{compiler_family}%{hpc_cf_pack_version}-hpc +Requires: libopenmpi%{hpc_openmpi_dep_version}-%{hpc_compiler_family}%{hpc_cf_pack_version}-hpc %hpc_openmpi_requires_devel \ -Requires: openmpi%{hpc_openmpi_dep_version}-%{compiler_family}%{hpc_cf_pack_version}-hpc-devel +Requires: openmpi%{hpc_openmpi_dep_version}-%{hpc_compiler_family}%{hpc_cf_pack_version}-hpc-devel ++++++ memory-patcher-fix-compiler-warning.patch ++++++ commit a0242346788a31050effb025b43da5f3e6a1bb9b Author: Maxwell Coil <[email protected]> Date: Sun Dec 8 13:56:00 2019 -0500 memory/patcher: fix compiler warning syscall() returns a long, but we are invoking shmat(), which returns a void*. Signed-off-by: Maxwell Coil <[email protected]> diff --git opal/mca/memory/patcher/memory_patcher_component.c opal/mca/memory/patcher/memory_patcher_component.c index 687d430fa362..272ec721225b 100644 --- opal/mca/memory/patcher/memory_patcher_component.c +++ opal/mca/memory/patcher/memory_patcher_component.c @@ -440,7 +440,7 @@ static void *_intercept_shmat(int shmid, const void *shmaddr, int shmflg) if (!original_shmat) { #if defined(SYS_shmat) - result = memory_patcher_syscall(SYS_shmat, shmid, shmaddr, shmflg); + result = (void*) memory_patcher_syscall(SYS_shmat, shmid, shmaddr, shmflg); #else // IPCOP_shmat unsigned long ret; ret = memory_patcher_syscall(SYS_ipc, IPCOP_shmat, ++++++ openmpi-3.0.0.0.1cbdf5d279.tar.bz2 -> openmpi-3.1.6.0.ea348728b4c8.tar.bz2 ++++++ ++++ 236431 lines of diff (skipped) ++++++ reproducible.patch ++++++ Author: Bernhard M. Wiedemann <bwiedemann suse de> Date: 2017-06-29 make package build reproducible by using fixed date + hostname https://github.com/open-mpi/ompi/issues/3759 https://bugzilla.opensuse.org/show_bug.cgi?id=1047218 packages do not build reproducibly from including build time https://bugzilla.opensuse.org/show_bug.cgi?id=1084909 +hostname Index: openmpi-3.1.1.0.155d2134a776/autogen.pl =================================================================== --- openmpi-3.1.1.0.155d2134a776.orig/autogen.pl +++ openmpi-3.1.1.0.155d2134a776/autogen.pl @@ -85,7 +85,7 @@ if ($^O eq "solaris") { } $username = getpwuid($>); -$full_hostname = `hostname`; +$full_hostname = "openSUSEnohostname"; chomp($full_hostname); $hostname = $full_hostname; $hostname =~ s/^([\w\-]+)\..+/\1/; @@ -1190,7 +1190,7 @@ if (-e "orcm") { #--------------------------------------------------------------------------- -$full_hostname = `hostname`; +$full_hostname = "openSUSEnohostname"; chomp($full_hostname); $m4 = "dnl Index: openmpi-3.1.1.0.155d2134a776/config/opal_functions.m4 =================================================================== --- openmpi-3.1.1.0.155d2134a776.orig/config/opal_functions.m4 +++ openmpi-3.1.1.0.155d2134a776/config/opal_functions.m4 @@ -94,9 +94,9 @@ EOF # Save some stats about this build # -OPAL_CONFIGURE_USER="`whoami`" -OPAL_CONFIGURE_HOST="`(hostname || uname -n) 2> /dev/null | sed 1q`" -OPAL_CONFIGURE_DATE="`date`" +OPAL_CONFIGURE_USER="openSUSEnowhoami" +OPAL_CONFIGURE_HOST="openSUSEnohostname" +OPAL_CONFIGURE_DATE="openSUSEnodate" OPAL_LIBNL_SANITY_INIT @@ -116,9 +116,9 @@ AC_DEFUN([OPAL_BASIC_SETUP],[ # Save some stats about this build # -OPAL_CONFIGURE_USER="`whoami`" -OPAL_CONFIGURE_HOST="`(hostname || uname -n) 2> /dev/null | sed 1q`" -OPAL_CONFIGURE_DATE="`date`" +OPAL_CONFIGURE_USER="openSUSEnowhoami" +OPAL_CONFIGURE_HOST="openSUSEnohostname" +OPAL_CONFIGURE_DATE="openSUSEnodate" # # Make automake clean emacs ~ files for "make clean" Index: openmpi-3.1.1.0.155d2134a776/config/opal_get_version.m4 =================================================================== --- openmpi-3.1.1.0.155d2134a776.orig/config/opal_get_version.m4 +++ openmpi-3.1.1.0.155d2134a776/config/opal_get_version.m4 @@ -91,7 +91,7 @@ m4_define([OPAL_GET_VERSION],[ $2_REPO_REV=`git describe --tags --always` fi else - $2_REPO_REV="date`date '+%Y-%m-%d'`" + $2_REPO_REV="date" fi fi Index: openmpi-3.1.1.0.155d2134a776/ompi/tools/ompi_info/Makefile.am =================================================================== --- openmpi-3.1.1.0.155d2134a776.orig/ompi/tools/ompi_info/Makefile.am +++ openmpi-3.1.1.0.155d2134a776/ompi/tools/ompi_info/Makefile.am @@ -27,9 +27,9 @@ AM_CFLAGS = \ -DOPAL_CONFIGURE_USER="\"@OPAL_CONFIGURE_USER@\"" \ -DOPAL_CONFIGURE_HOST="\"@OPAL_CONFIGURE_HOST@\"" \ -DOPAL_CONFIGURE_DATE="\"@OPAL_CONFIGURE_DATE@\"" \ - -DOMPI_BUILD_USER="\"$$USER\"" \ - -DOMPI_BUILD_HOST="\"`(hostname || uname -n) 2> /dev/null | sed 1q`\"" \ - -DOMPI_BUILD_DATE="\"`date`\"" \ + -DOMPI_BUILD_USER="\"USER\"" \ + -DOMPI_BUILD_HOST="\"openSUSEnohostname\"" \ + -DOMPI_BUILD_DATE="\"`date -u -r ../../../NEWS`\"" \ -DOMPI_BUILD_CFLAGS="\"@CFLAGS@\"" \ -DOMPI_BUILD_CPPFLAGS="\"@CPPFLAGS@\"" \ -DOMPI_BUILD_CXXFLAGS="\"@CXXFLAGS@\"" \ Index: openmpi-3.1.1.0.155d2134a776/orte/tools/orte-info/Makefile.am =================================================================== --- openmpi-3.1.1.0.155d2134a776.orig/orte/tools/orte-info/Makefile.am +++ openmpi-3.1.1.0.155d2134a776/orte/tools/orte-info/Makefile.am @@ -24,9 +24,9 @@ AM_CFLAGS = \ -DOPAL_CONFIGURE_USER="\"@OPAL_CONFIGURE_USER@\"" \ -DOPAL_CONFIGURE_HOST="\"@OPAL_CONFIGURE_HOST@\"" \ -DOPAL_CONFIGURE_DATE="\"@OPAL_CONFIGURE_DATE@\"" \ - -DOMPI_BUILD_USER="\"$$USER\"" \ - -DOMPI_BUILD_HOST="\"`(hostname || uname -n) | sed 1q`\"" \ - -DOMPI_BUILD_DATE="\"`date`\"" \ + -DOMPI_BUILD_USER="\"USER\"" \ + -DOMPI_BUILD_HOST="\"openSUSEnohostname\"" \ + -DOMPI_BUILD_DATE="\"`date -u -r ../../../NEWS`\"" \ -DOMPI_BUILD_CFLAGS="\"@CFLAGS@\"" \ -DOMPI_BUILD_CPPFLAGS="\"@CPPFLAGS@\"" \ -DOMPI_BUILD_CXXFLAGS="\"@CXXFLAGS@\"" \ Index: openmpi-3.1.1.0.155d2134a776/oshmem/tools/oshmem_info/Makefile.am =================================================================== --- openmpi-3.1.1.0.155d2134a776.orig/oshmem/tools/oshmem_info/Makefile.am +++ openmpi-3.1.1.0.155d2134a776/oshmem/tools/oshmem_info/Makefile.am @@ -16,9 +16,9 @@ AM_CPPFLAGS = \ -DOPAL_CONFIGURE_USER="\"@OPAL_CONFIGURE_USER@\"" \ -DOPAL_CONFIGURE_HOST="\"@OPAL_CONFIGURE_HOST@\"" \ -DOPAL_CONFIGURE_DATE="\"@OPAL_CONFIGURE_DATE@\"" \ - -DOMPI_BUILD_USER="\"$$USER\"" \ - -DOMPI_BUILD_HOST="\"`(hostname || uname -n) 2> /dev/null | sed 1q`\"" \ - -DOMPI_BUILD_DATE="\"`date`\"" \ + -DOMPI_BUILD_USER="\"USER\"" \ + -DOMPI_BUILD_HOST="\"openSUSEnohostname\"" \ + -DOMPI_BUILD_DATE="\"`date -u -r ../../../NEWS`\"" \ -DOMPI_BUILD_CFLAGS="\"@CFLAGS@\"" \ -DOMPI_BUILD_CPPFLAGS="\"@CPPFLAGS@\"" \ -DOMPI_BUILD_CXXFLAGS="\"@CXXFLAGS@\"" \
