The package rpms/openmpi.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/openmpi.git/commit/?id=7231dd36d020c....
Change: +%ifarch aarch64
Thanks.
Full change: ============
commit 8f0e977791d4c753e1d6c8d9e44f85ad2ec20dfe Merge: 8a4d4bc fe46b6f Author: Philip Kovacs pkdevel@yahoo.com Date: Sat Aug 31 16:04:19 2019 -0400
Merge branch 'master' into f31
commit fe46b6f9006fa23c8e67509b1dfc5d9e50c5e60b Author: Philip Kovacs pkdevel@yahoo.com Date: Sat Aug 31 16:02:55 2019 -0400
update comments
Signed-off-by: Philip Kovacs pkdevel@yahoo.com
diff --git a/openmpi.spec b/openmpi.spec index 9a01566..5dd6687 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -7,7 +7,7 @@ #global opt_cflags %global opt_cxx g++ %ifarch aarch64 -# TEMP: hack for F32 aarch64 until they fix gcc PIC flags +# TEMP: hack for aarch64 %global opt_cxxflags -fPIC %else #global opt_cxxflags @@ -355,7 +355,7 @@ make check
%changelog * Fri Aug 30 2019 Philip Kovacs pkdevel@yahoo.com - 4.0.2-0.2.rc1 -- Apply upstream PR 6946 to avoid linking private glibc symbol __mmap +- Apply upstream PR 6946 to avoid linking to __mmap - Add build deps to run upstream autogen.pl - Remove embedded tabs in the spec
commit 04d88995828e555f45a75dc58668927ffe05bd4b Author: Philip Kovacs pkdevel@yahoo.com Date: Fri Aug 30 16:40:36 2019 -0400
Apply upstream PR 6946 to avoid linking private glibc symbol __mmap Add build deps to run upstream autogen.pl Remove embedded tabs in the spec
diff --git a/6946.patch b/6946.patch new file mode 100644 index 0000000..f40430d --- /dev/null +++ b/6946.patch @@ -0,0 +1,46 @@ +From fbbacc1303f02b4c955975911b82e8755ea0721c Mon Sep 17 00:00:00 2001 +From: Harumi Kuno harumi.kuno@hpe.com +Date: Tue, 30 Jul 2019 06:32:27 -0700 +Subject: [PATCH] Fix mmap infinite recurse in memory patcher + +This commit fixes issue #6853 by removing +MacOS/Darwin-specific logic from intercept_mmap. + +Signed-off-by: Harumi Kuno harumi.kuno@hpe.com +--- + opal/mca/memory/patcher/configure.m4 | 4 ---- + opal/mca/memory/patcher/memory_patcher_component.c | 5 ----- + 2 files changed, 9 deletions(-) + +diff --git a/opal/mca/memory/patcher/configure.m4 b/opal/mca/memory/patcher/configure.m4 +index 6881ec69366..0c5d8553259 100644 +--- a/opal/mca/memory/patcher/configure.m4 ++++ b/opal/mca/memory/patcher/configure.m4 +@@ -40,10 +40,6 @@ AC_DEFUN([MCA_opal_memory_patcher_CONFIG],[ + + AC_CHECK_HEADERS([linux/mman.h sys/syscall.h]) + +- AC_CHECK_DECLS([__mmap], [], [], [#include <sys/mman.h>]) +- +- AC_CHECK_FUNCS([__mmap]) +- + AC_CHECK_DECLS([__syscall], [], [], [#include <sys/syscall.h>]) + + AC_CHECK_FUNCS([__syscall]) +diff --git a/opal/mca/memory/patcher/memory_patcher_component.c b/opal/mca/memory/patcher/memory_patcher_component.c +index 5db3a6016f8..687d430fa36 100644 +--- a/opal/mca/memory/patcher/memory_patcher_component.c ++++ b/opal/mca/memory/patcher/memory_patcher_component.c +@@ -125,12 +125,7 @@ static void *_intercept_mmap(void *start, size_t length, int prot, int flags, in + } + + if (!original_mmap) { +-#ifdef HAVE___MMAP +- /* the darwin syscall returns an int not a long so call the underlying __mmap function */ +- result = __mmap (start, length, prot, flags, fd, offset); +-#else + result = (void*)(intptr_t) memory_patcher_syscall(SYS_mmap, start, length, prot, flags, fd, offset); +-#endif + } else { + result = original_mmap (start, length, prot, flags, fd, offset); + } diff --git a/openmpi.spec b/openmpi.spec index da5c4ca..9a01566 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -30,71 +30,77 @@ %bcond_with ucx %endif
-Name: openmpi%{?_cc_name_suffix} -Version: 4.0.2 -Release: 0.1.rc1%{?dist} -Summary: Open Message Passing Interface -License: BSD and MIT and Romio -URL: http://www.open-mpi.org/ +Name: openmpi%{?_cc_name_suffix} +Version: 4.0.2 +Release: 0.2.rc1%{?dist} +Summary: Open Message Passing Interface +License: BSD and MIT and Romio +URL: http://www.open-mpi.org/
# We can't use %%{name} here because of _cc_name_suffix -Source0: https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-%%7Bversion%7D... -Source1: openmpi.module.in -Source2: openmpi.pth.py2 -Source3: openmpi.pth.py3 -Source4: macros.openmpi - -BuildRequires: gcc-c++ -BuildRequires: gcc-gfortran -BuildRequires: valgrind-devel +Source0: https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-%%7Bversion%7D... +Source1: openmpi.module.in +Source2: openmpi.pth.py2 +Source3: openmpi.pth.py3 +Source4: macros.openmpi +# Upstream PR 6946 to avoid linking private glibc symbol __mmap +Patch0: https://patch-diff.githubusercontent.com/raw/open-mpi/ompi/pull/6946.patch + +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc-c++ +BuildRequires: gcc-gfortran +BuildRequires: libtool +BuildRequires: valgrind-devel %ifnarch %{arm} -BuildRequires: opensm-devel > 3.3.0 +BuildRequires: opensm-devel > 3.3.0 %endif -BuildRequires: rdma-core-devel +BuildRequires: rdma-core-devel # Doesn't compile: # vt_dyn.cc:958:28: error: 'class BPatch_basicBlockLoop' has no member named 'getLoopHead' # loop->getLoopHead()->getStartAddress(), loop_stmts ); -#BuildRequires: dyninst-devel -BuildRequires: hwloc-devel +#BuildRequires: dyninst-devel +BuildRequires: hwloc-devel # So configure can find lstopo -BuildRequires: hwloc-gui -BuildRequires: java-devel +BuildRequires: hwloc-gui +BuildRequires: java-devel # Old libevent causes issues %if !0%{?el7} -BuildRequires: libevent-devel +BuildRequires: libevent-devel %endif -BuildRequires: libfabric-devel +BuildRequires: libfabric-devel %ifnarch s390 s390x -BuildRequires: papi-devel +BuildRequires: papi-devel %endif -BuildRequires: orangefs-devel -BuildRequires: perl-generators -BuildRequires: perl(Getopt::Long) -BuildRequires: pmix-devel -BuildRequires: python2 -BuildRequires: python2-devel -BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: orangefs-devel +BuildRequires: perl-generators +BuildRequires: perl-interpreter +BuildRequires: perl(Getopt::Long) +BuildRequires: pmix-devel +BuildRequires: python2 +BuildRequires: python2-devel +BuildRequires: python%{python3_pkgversion}-devel %ifarch x86_64 -BuildRequires: infinipath-psm-devel -BuildRequires: libpsm2-devel +BuildRequires: infinipath-psm-devel +BuildRequires: libpsm2-devel %endif %if %{with ucx} -BuildRequires: ucx-devel +BuildRequires: ucx-devel %endif -BuildRequires: zlib-devel +BuildRequires: zlib-devel %if !0%{?el7} -BuildRequires: rpm-mpi-hooks +BuildRequires: rpm-mpi-hooks %endif
-Provides: mpi +Provides: mpi %if 0%{?rhel} # Need this for /etc/profile.d/modules.sh -Requires: environment-modules +Requires: environment-modules %endif -Requires: environment(modules) +Requires: environment(modules) # openmpi currently requires ssh to run # https://svn.open-mpi.org/trac/ompi/ticket/4228 -Requires: openssh-clients +Requires: openssh-clients
# Private openmpi libraries %global __provides_exclude_from %{_libdir}/openmpi/lib/(lib(mca|ompi|open-(pal|rte|trace))|openmpi/).*.so @@ -125,21 +131,21 @@ Requires: (python(abi) = %{python3_version} if python3) Contains development headers and libraries for openmpi.
%package java -Summary: Java library -Requires: %{name} = %{version}-%{release} +Summary: Java library +Requires: %{name} = %{version}-%{release} %if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 -Requires: java-headless +Requires: java-headless %else -Requires: java +Requires: java %endif
%description java Java library.
%package java-devel -Summary: Java development files for openmpi -Requires: %{name}-java = %{version}-%{release} -Requires: java-devel +Summary: Java development files for openmpi +Requires: %{name}-java = %{version}-%{release} +Requires: java-devel
%description java-devel Contains development wrapper for compiling Java with openmpi. @@ -149,17 +155,17 @@ Contains development wrapper for compiling Java with openmpi. %global namearch openmpi-%{_arch}%{?_cc_name_suffix}
%package -n python2-openmpi -Summary: OpenMPI support for Python 2 -Requires: %{name} = %{version}-%{release} -Requires: python(abi) = %{python2_version} +Summary: OpenMPI support for Python 2 +Requires: %{name} = %{version}-%{release} +Requires: python(abi) = %{python2_version}
%description -n python2-openmpi OpenMPI support for Python 2.
%package -n python%{python3_pkgversion}-openmpi -Summary: OpenMPI support for Python 3 -Requires: %{name} = %{version}-%{release} -Requires: python(abi) = %{python3_version} +Summary: OpenMPI support for Python 3 +Requires: %{name} = %{version}-%{release} +Requires: python(abi) = %{python3_version}
%description -n python%{python3_pkgversion}-openmpi OpenMPI support for Python 3. @@ -169,6 +175,7 @@ OpenMPI support for Python 3. %autosetup -p1 -n openmpi-%{version}rc1
%build +./autogen.pl --force ./configure --prefix=%{_libdir}/%{name} \ --mandir=%{_mandir}/%{namearch} \ --includedir=%{_includedir}/%{namearch} \ @@ -347,6 +354,11 @@ make check
%changelog +* Fri Aug 30 2019 Philip Kovacs pkdevel@yahoo.com - 4.0.2-0.2.rc1 +- Apply upstream PR 6946 to avoid linking private glibc symbol __mmap +- Add build deps to run upstream autogen.pl +- Remove embedded tabs in the spec + * Thu Aug 29 2019 Philip Kovacs pkdevel@yahoo.com - 4.0.2-0.1.rc1 - Update to 4.0.2rc1 - Closes bug #1746564
commit 7231dd36d020c9290e5758d0abe9b7c984db48ad Author: Philip Kovacs pkdevel@yahoo.com Date: Thu Aug 29 23:12:32 2019 -0400
Temp hack for F32 aarch64 until they fix gcc PIC flags
diff --git a/openmpi.spec b/openmpi.spec index 6502202..da5c4ca 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -6,7 +6,12 @@ # so uncomment and define to use #global opt_cflags %global opt_cxx g++ +%ifarch aarch64 +# TEMP: hack for F32 aarch64 until they fix gcc PIC flags +%global opt_cxxflags -fPIC +%else #global opt_cxxflags +%endif %global opt_f77 gfortran #global opt_fflags %global opt_fc gfortran
commit 9d271f4752df5e1ef887c27577c7c382c4b98442 Author: Philip Kovacs pkdevel@yahoo.com Date: Thu Aug 29 17:10:13 2019 -0400
Update to 4.0.2rc1 Closes bug #1746564
diff --git a/.gitignore b/.gitignore index 3aa8772..efefb4e 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ openmpi-1.4.1-RH.tar.bz2 /openmpi-3.1.4.tar.bz2 /openmpi-4.0.0.tar.bz2 /openmpi-4.0.1.tar.bz2 +/openmpi-4.0.2rc1.tar.bz2 diff --git a/6594.patch b/6594.patch deleted file mode 100644 index 3c9e5ba..0000000 --- a/6594.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 68c88e86f2c8ff515a4c54927077143de13516b9 Mon Sep 17 00:00:00 2001 -From: Valentin Petrov valentinp@mellanox.com -Date: Tue, 16 Apr 2019 14:04:11 +0300 -Subject: [PATCH] OSC/UCX: use correct rkey for atomic_fadd in rget/rput - -Signed-off-by: Valentin Petrov valentinp@mellanox.com ---- - ompi/mca/osc/ucx/osc_ucx_comm.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ompi/mca/osc/ucx/osc_ucx_comm.c b/ompi/mca/osc/ucx/osc_ucx_comm.c -index ec760d4fda3..bc3b7f5e7ed 100644 ---- a/ompi/mca/osc/ucx/osc_ucx_comm.c -+++ b/ompi/mca/osc/ucx/osc_ucx_comm.c -@@ -881,7 +881,7 @@ int ompi_osc_ucx_rput(const void *origin_addr, int origin_count, - - CHECK_VALID_RKEY(module, target, target_count); - -- rkey = (module->win_info_array[target]).rkey; -+ rkey = (module->state_info_array[target]).rkey; - - OMPI_OSC_UCX_REQUEST_ALLOC(win, ucx_req); - assert(NULL != ucx_req); -@@ -942,7 +942,7 @@ int ompi_osc_ucx_rget(void *origin_addr, int origin_count, - - CHECK_VALID_RKEY(module, target, target_count); - -- rkey = (module->win_info_array[target]).rkey; -+ rkey = (module->state_info_array[target]).rkey; - - OMPI_OSC_UCX_REQUEST_ALLOC(win, ucx_req); - assert(NULL != ucx_req); diff --git a/6668.patch b/6668.patch deleted file mode 100644 index 0d6fcbc..0000000 --- a/6668.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c6ba949f3a0618e26ce2ef53b052b3d38cbbd0d8 Mon Sep 17 00:00:00 2001 -From: Nathan Hjelm hjelmn@me.com -Date: Wed, 15 May 2019 12:24:22 -0600 -Subject: [PATCH] btl/uct: check for support before disabling UCX memory hooks - -Signed-off-by: Nathan Hjelm hjelmn@me.com ---- - opal/mca/btl/uct/btl_uct_component.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/opal/mca/btl/uct/btl_uct_component.c b/opal/mca/btl/uct/btl_uct_component.c -index 971b31a1d85..830c262325d 100644 ---- a/opal/mca/btl/uct/btl_uct_component.c -+++ b/opal/mca/btl/uct/btl_uct_component.c -@@ -17,6 +17,7 @@ - * Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved. - * Copyright (c) 2018 Triad National Security, LLC. All rights - * reserved. -+ * Copyright (c) 2019 Google, LLC. All rights reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow -@@ -129,7 +130,10 @@ static int mca_btl_uct_component_open(void) - mca_btl_uct_component.num_contexts_per_module = MCA_BTL_UCT_MAX_WORKERS; - } - -- if (mca_btl_uct_component.disable_ucx_memory_hooks) { -+ if (mca_btl_uct_component.disable_ucx_memory_hooks && -+ ((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) == -+ ((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) & -+ opal_mem_hooks_support_level()))) { - ucm_set_external_event(UCM_EVENT_VM_UNMAPPED); - opal_mem_hooks_register_release(mca_btl_uct_mem_release_cb, NULL); - } diff --git a/openmpi.spec b/openmpi.spec index b1b212c..6502202 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -26,22 +26,18 @@ %endif
Name: openmpi%{?_cc_name_suffix} -Version: 4.0.1 -Release: 11%{?dist} +Version: 4.0.2 +Release: 0.1.rc1%{?dist} Summary: Open Message Passing Interface License: BSD and MIT and Romio URL: http://www.open-mpi.org/
# We can't use %%{name} here because of _cc_name_suffix -Source0: https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-%%7Bversion%7D... +Source0: https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-%%7Bversion%7D... Source1: openmpi.module.in Source2: openmpi.pth.py2 Source3: openmpi.pth.py3 Source4: macros.openmpi -# Fix for UCX usage with BTL/UCT -Patch0: https://patch-diff.githubusercontent.com/raw/open-mpi/ompi/pull/6668.patch -# OSC/UCX: use correct rkey for atomic_fadd in rget/rput -Patch1: https://patch-diff.githubusercontent.com/raw/open-mpi/ompi/pull/6594.patch
BuildRequires: gcc-c++ BuildRequires: gcc-gfortran @@ -165,7 +161,7 @@ OpenMPI support for Python 3.
%prep -%autosetup -p1 -n openmpi-%{version} +%autosetup -p1 -n openmpi-%{version}rc1
%build ./configure --prefix=%{_libdir}/%{name} \ @@ -346,6 +342,10 @@ make check
%changelog +* Thu Aug 29 2019 Philip Kovacs pkdevel@yahoo.com - 4.0.2-0.1.rc1 +- Update to 4.0.2rc1 +- Closes bug #1746564 + * Thu Aug 29 2019 Zbigniew Jdrzejewski-Szmek zbyszek@in.waw.pl - 4.0.1-11 - Fix MANPATH so normal modules can still be loaded (#1564899)
diff --git a/sources b/sources index 047b1ea..696ee63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openmpi-4.0.1.tar.bz2) = 09f35dc2e44b4f84aab9c5af9d81f90bbdb030e4d90800a5d3ffae88cb32b7faecc9bea0abb113da53c21f73e9d19db68f961f997bc47bdd28d83a87beee0731 +SHA512 (openmpi-4.0.2rc1.tar.bz2) = 7009b9b9a2ef398195e95735d907171091a13f6287d3290862465720249eac1815d9152f1804adc8ec8129ad858536f759521d392fac8c1e495928e6634372b6
commit 1d457c8c91640225b6c792bf2a080a2d8f286e65 Author: Zbigniew Jdrzejewski-Szmek zbyszek@in.waw.pl Date: Thu Aug 29 10:11:35 2019 +0200
Fix MANPATH so normal modules can still be loaded
diff --git a/openmpi.module.in b/openmpi.module.in index 7e96154..41583c4 100644 --- a/openmpi.module.in +++ b/openmpi.module.in @@ -6,7 +6,7 @@ conflict mpi prepend-path PATH @LIBDIR@/bin prepend-path LD_LIBRARY_PATH @LIBDIR@/lib prepend-path PKG_CONFIG_PATH @LIBDIR@/lib/pkgconfig -prepend-path MANPATH @MANDIR@ +prepend-path MANPATH :@MANDIR@ setenv MPI_BIN @LIBDIR@/bin setenv MPI_SYSCONFIG @ETCDIR@ setenv MPI_FORTRAN_MOD_DIR @FMODDIR@ diff --git a/openmpi.spec b/openmpi.spec index b316385..b1b212c 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -27,7 +27,7 @@
Name: openmpi%{?_cc_name_suffix} Version: 4.0.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Open Message Passing Interface License: BSD and MIT and Romio URL: http://www.open-mpi.org/ @@ -346,6 +346,9 @@ make check
%changelog +* Thu Aug 29 2019 Zbigniew Jdrzejewski-Szmek zbyszek@in.waw.pl - 4.0.1-11 +- Fix MANPATH so normal modules can still be loaded (#1564899) + * Sun Aug 25 2019 Zbigniew Jdrzejewski-Szmek zbyszek@in.waw.pl - 4.0.1-10 - Rebuilt for hwloc-2.0
commit 2ba690820ba7629ffeda5639725c91ceae63bfa6 Author: Zbigniew Jdrzejewski-Szmek zbyszek@in.waw.pl Date: Sun Aug 25 12:51:14 2019 +0200
Rebuilt for hwloc-2.0
diff --git a/openmpi.spec b/openmpi.spec index 82c4dd7..b316385 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -27,7 +27,7 @@
Name: openmpi%{?_cc_name_suffix} Version: 4.0.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Open Message Passing Interface License: BSD and MIT and Romio URL: http://www.open-mpi.org/ @@ -346,6 +346,9 @@ make check
%changelog +* Sun Aug 25 2019 Zbigniew Jdrzejewski-Szmek zbyszek@in.waw.pl - 4.0.1-10 +- Rebuilt for hwloc-2.0 + * Sun Aug 18 2019 Miro Hronok mhroncok@redhat.com - 4.0.1-9 - Rebuilt for Python 3.8
commit 184e65743f4e66e85252d1e4dabea58d4118b785 Author: Zbigniew Jdrzejewski-Szmek zbyszek@in.waw.pl Date: Tue May 7 10:23:38 2019 +0200
Fix warning about macro expanded in comment
diff --git a/openmpi.spec b/openmpi.spec index dc98079..82c4dd7 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -32,7 +32,7 @@ Summary: Open Message Passing Interface License: BSD and MIT and Romio URL: http://www.open-mpi.org/
-# We can't use %{name} here because of _cc_name_suffix +# We can't use %%{name} here because of _cc_name_suffix Source0: https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-%%7Bversion%7D... Source1: openmpi.module.in Source2: openmpi.pth.py2
commit 7d5556a503774957e8698b9db68f3796cf7b394d Author: Miro Hronok miro@hroncok.cz Date: Mon Aug 19 00:13:00 2019 +0200
Rebuilt for Python 3.8
diff --git a/openmpi.spec b/openmpi.spec index 37924bd..dc98079 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -27,7 +27,7 @@
Name: openmpi%{?_cc_name_suffix} Version: 4.0.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Open Message Passing Interface License: BSD and MIT and Romio URL: http://www.open-mpi.org/ @@ -346,6 +346,9 @@ make check
%changelog +* Sun Aug 18 2019 Miro Hronok mhroncok@redhat.com - 4.0.1-9 +- Rebuilt for Python 3.8 + * Fri Aug 9 2019 Philip Kovacs pkdevel@yahoo.com - 4.0.1-8 - Remove torque support (torque retired: bug #1676147)
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org