From d7eaa774118468dd0b3232a95c5749d867aac685 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 15 Feb 2020 15:47:32 -0700 Subject: [PATCH 01/11] Rebuild From 5e7920089c430a9a78e70c81b5e3548e673de80a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 20:20:13 +0000 Subject: [PATCH 02/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- openmpi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openmpi.spec b/openmpi.spec index ab4ece2..2bca505 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -41,7 +41,7 @@ Name: openmpi%{?_cc_name_suffix} Version: 4.0.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Open Message Passing Interface License: BSD and MIT and Romio URL: http://www.open-mpi.org/ @@ -369,6 +369,9 @@ make check %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 4.0.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Dec 10 2019 Dominik Mierzejewski - 4.0.2-4 - disable rdma on ARM 32-bit (bz#1780584) From 4b9e9d107c025b85ae0c986b446e2fbd79c3c209 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 1 Feb 2020 20:41:53 -0700 Subject: [PATCH 03/11] Update to 4.0.3rc3 --- .gitignore | 1 + openmpi.spec | 10 +++++----- sources | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8a5e418..8bc2a8b 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ openmpi-1.4.1-RH.tar.bz2 /openmpi-4.0.2rc1.tar.bz2 /openmpi-4.0.2rc2.tar.bz2 /openmpi-4.0.2.tar.bz2 +/openmpi-4.0.3rc3.tar.bz2 diff --git a/openmpi.spec b/openmpi.spec index 2bca505..451b187 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -40,8 +40,8 @@ %endif Name: openmpi%{?_cc_name_suffix} -Version: 4.0.2 -Release: 5%{?dist} +Version: 4.0.3rc3 +Release: 1%{?dist} Summary: Open Message Passing Interface License: BSD and MIT and Romio URL: http://www.open-mpi.org/ @@ -53,9 +53,6 @@ Source2: openmpi.pth.py2 Source3: openmpi.pth.py3 Source4: macros.openmpi -# fcoll/two_phase: fix error in calculating aggregators in 32bit mode -Patch0: https://patch-diff.githubusercontent.com/raw/open-mpi/ompi/pull/7126.patch - BuildRequires: gcc-c++ BuildRequires: gcc-gfortran BuildRequires: valgrind-devel @@ -369,6 +366,9 @@ make check %changelog +* Sat Feb 1 2020 Orion Poplawski - 4.0.3rc3-1 +- Update to 4.0.3rc3 + * Wed Jan 29 2020 Fedora Release Engineering - 4.0.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index dd00f76..901a157 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openmpi-4.0.2.tar.bz2) = 634d45d989f1e0b8848bfb4eb4527c7edd76d4fccd77a5f8d85a46a5822f97ba653adf13df857c87ae56a8117b4ae2d45ec24249c6ee41a562446d4112ddb770 +SHA512 (openmpi-4.0.3rc3.tar.bz2) = db39986a156f082db97501d6b40c18e9c8de392e00863d100b422c106783b982db0178f9edc602baabf8694853d78aecaca2d931bac15516c020d3c466ef707e From 7f4692ed9dcb939d86034fe483da4e6ec49721e6 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 1 Mar 2020 16:19:52 -0700 Subject: [PATCH 04/11] Update to 4.0.3rc4 --- .gitignore | 1 + 7126.patch | 77 ---------------------------------------------------- openmpi.spec | 5 +++- sources | 2 +- 4 files changed, 6 insertions(+), 79 deletions(-) delete mode 100644 7126.patch diff --git a/.gitignore b/.gitignore index 8bc2a8b..1d91101 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ openmpi-1.4.1-RH.tar.bz2 /openmpi-4.0.2rc2.tar.bz2 /openmpi-4.0.2.tar.bz2 /openmpi-4.0.3rc3.tar.bz2 +/openmpi-4.0.3rc4.tar.bz2 diff --git a/7126.patch b/7126.patch deleted file mode 100644 index 72e0e64..0000000 --- a/7126.patch +++ /dev/null @@ -1,77 +0,0 @@ -From ea1355beae918b3acd67d5c0ccc44afbcc5b7ca9 Mon Sep 17 00:00:00 2001 -From: Edgar Gabriel -Date: Tue, 29 Oct 2019 15:21:22 -0500 -Subject: [PATCH] fcoll/two_phase: fix error in calculating aggregators in - 32bit mode - -In fcoll_two_phase_supprot_fns.c: calculation of the aggregator index -failed for large offsets on 32bit machine, due to improper handling of -64bit offsets. - -Fixes Issue #7110 - -Signed-off-by: Edgar Gabriel ---- - .../two_phase/fcoll_two_phase_support_fns.c | 25 +++++++++++-------- - 1 file changed, 14 insertions(+), 11 deletions(-) - -diff --git a/ompi/mca/fcoll/two_phase/fcoll_two_phase_support_fns.c b/ompi/mca/fcoll/two_phase/fcoll_two_phase_support_fns.c -index 777cf08b9ae..69a56f2c6c7 100644 ---- a/ompi/mca/fcoll/two_phase/fcoll_two_phase_support_fns.c -+++ b/ompi/mca/fcoll/two_phase/fcoll_two_phase_support_fns.c -@@ -10,7 +10,7 @@ - * University of Stuttgart. All rights reserved. - * Copyright (c) 2004-2005 The Regents of the University of California. - * All rights reserved. -- * Copyright (c) 2008-2011 University of Houston. All rights reserved. -+ * Copyright (c) 2008-2019 University of Houston. All rights reserved. - * Copyright (c) 2014-2018 Research Organization for Information Science - * and Technology (RIST). All rights reserved. - * Copyright (c) 2015 Los Alamos National Security, LLC. All rights -@@ -156,23 +156,26 @@ int mca_fcoll_two_phase_calc_aggregator(ompio_file_t *fh, - { - - -- int rank_index, rank; -+ int rank_index, rank; - OMPI_MPI_OFFSET_TYPE avail_bytes; -- -- rank_index = (int) ((off - min_off + fd_size)/ fd_size - 1); -- -+ long long off_ll = (long long) off; -+ long long min_off_ll = (long long) min_off; -+ long long fd_size_ll = (long long) fd_size; -+ long long rank_index_ll; -+ -+ rank_index_ll = (((off_ll - min_off_ll + fd_size_ll)/ fd_size_ll) - 1); -+ rank_index = (int) rank_index_ll; - if (striping_unit > 0){ - rank_index = 0; - while (off > fd_end[rank_index]) rank_index++; - } - -- - if (rank_index >= num_aggregators || rank_index < 0) { - fprintf(stderr, -- "Error in ompi_io_ompio_calcl_aggregator():"); -+ "Error in mca_fcoll_two_phase_calc_aggregator:"); - fprintf(stderr, -- "rank_index(%d) >= num_aggregators(%d)fd_size=%lld off=%lld\n", -- rank_index,num_aggregators,fd_size,off); -+ "rank_index(%d) >= num_aggregators(%d) fd_size=%ld off=%ld min_off=%ld striping_unit=%d\n", -+ rank_index, num_aggregators, fd_size, off, min_off, striping_unit); - ompi_mpi_abort(&ompi_mpi_comm_world.comm, 1); - } - -@@ -184,9 +187,9 @@ int mca_fcoll_two_phase_calc_aggregator(ompio_file_t *fh, - - rank = aggregator_list[rank_index]; - -- #if 0 -+#if 0 - printf("rank : %d, rank_index : %d\n",rank, rank_index); -- #endif -+#endif - - return rank; - } diff --git a/openmpi.spec b/openmpi.spec index 451b187..2edfe38 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -40,7 +40,7 @@ %endif Name: openmpi%{?_cc_name_suffix} -Version: 4.0.3rc3 +Version: 4.0.3rc4 Release: 1%{?dist} Summary: Open Message Passing Interface License: BSD and MIT and Romio @@ -366,6 +366,9 @@ make check %changelog +* Sun Mar 01 2020 Orion Poplawski - 4.0.3rc4-1 +- Update to 4.0.3rc4 + * Sat Feb 1 2020 Orion Poplawski - 4.0.3rc3-1 - Update to 4.0.3rc3 diff --git a/sources b/sources index 901a157..cbe90dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openmpi-4.0.3rc3.tar.bz2) = db39986a156f082db97501d6b40c18e9c8de392e00863d100b422c106783b982db0178f9edc602baabf8694853d78aecaca2d931bac15516c020d3c466ef707e +SHA512 (openmpi-4.0.3rc4.tar.bz2) = 01bba4b5040e6a3dbea9f5d39caef0e5fe113f308f4e790c5098d485189543994764dcc329be378f640ed253ebdf04b17613dfc73adaa8563f94369792193bee From 24b77d86b7b68011d6c421fdf99a43062439c456 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 5 Mar 2020 19:55:01 -0700 Subject: [PATCH 05/11] Update to 4.0.3 (use x to avoid epoch) --- .gitignore | 1 + openmpi.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1d91101..d49b85a 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ openmpi-1.4.1-RH.tar.bz2 /openmpi-4.0.2.tar.bz2 /openmpi-4.0.3rc3.tar.bz2 /openmpi-4.0.3rc4.tar.bz2 +/openmpi-4.0.3.tar.bz2 diff --git a/openmpi.spec b/openmpi.spec index 2edfe38..41bc12d 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -40,14 +40,15 @@ %endif Name: openmpi%{?_cc_name_suffix} -Version: 4.0.3rc4 +Version: 4.0.3x Release: 1%{?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-%{version}.tar.bz2 +#Source0: https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-%{version}.tar.bz2 +Source0: https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-4.0.3.tar.bz2 Source1: openmpi.module.in Source2: openmpi.pth.py2 Source3: openmpi.pth.py3 @@ -177,7 +178,7 @@ OpenMPI support for Python 3. %prep -%autosetup -p1 -n openmpi-%{version} +%autosetup -p1 -n openmpi-4.0.3 %build ./configure --prefix=%{_libdir}/%{name} \ @@ -366,6 +367,9 @@ make check %changelog +* Thu Mar 05 2020 Orion Poplawski - 4.0.3x-1 +- Update to 4.0.3 (use x to avoid epoch) + * Sun Mar 01 2020 Orion Poplawski - 4.0.3rc4-1 - Update to 4.0.3rc4 diff --git a/sources b/sources index cbe90dd..74f6dee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openmpi-4.0.3rc4.tar.bz2) = 01bba4b5040e6a3dbea9f5d39caef0e5fe113f308f4e790c5098d485189543994764dcc329be378f640ed253ebdf04b17613dfc73adaa8563f94369792193bee +SHA512 (openmpi-4.0.3.tar.bz2) = 01f773064c575a0fe6ab081c20c5cf07ba1c9eada5ecfe520d14ce2b9fc6d021d0f56a0159fa354fd6c8e2bb7354a272aa8d0063b351f59251deb56474849acc From 19e8b79eedb8f8633e9e07dcdc964f9ca6d377b1 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 10 May 2020 21:09:47 -0600 Subject: [PATCH 06/11] Update to 4.0.4 rc1 --- openmpi.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/openmpi.spec b/openmpi.spec index 41bc12d..1f74629 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -40,15 +40,15 @@ %endif Name: openmpi%{?_cc_name_suffix} -Version: 4.0.3x -Release: 1%{?dist} +Version: 4.0.4 +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-%{version}.tar.bz2 -Source0: https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-4.0.3.tar.bz2 +Source0: https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-4.0.4rc1.tar.bz2 Source1: openmpi.module.in Source2: openmpi.pth.py2 Source3: openmpi.pth.py3 @@ -178,7 +178,7 @@ OpenMPI support for Python 3. %prep -%autosetup -p1 -n openmpi-4.0.3 +%autosetup -p1 -n openmpi-4.0.4rc1 %build ./configure --prefix=%{_libdir}/%{name} \ @@ -367,6 +367,9 @@ make check %changelog +* Sun May 10 2020 Orion Poplawski - 4.0.4-0.1.rc1 +- Update to 4.0.4 rc1 + * Thu Mar 05 2020 Orion Poplawski - 4.0.3x-1 - Update to 4.0.3 (use x to avoid epoch) From a41a5d6e47220e6bcd03614027a5f55abb758d69 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 10 May 2020 21:19:39 -0600 Subject: [PATCH 07/11] Upload source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d49b85a..2d250f5 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ openmpi-1.4.1-RH.tar.bz2 /openmpi-4.0.3rc3.tar.bz2 /openmpi-4.0.3rc4.tar.bz2 /openmpi-4.0.3.tar.bz2 +/openmpi-4.0.4rc1.tar.bz2 diff --git a/sources b/sources index 74f6dee..3a50a34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openmpi-4.0.3.tar.bz2) = 01f773064c575a0fe6ab081c20c5cf07ba1c9eada5ecfe520d14ce2b9fc6d021d0f56a0159fa354fd6c8e2bb7354a272aa8d0063b351f59251deb56474849acc +SHA512 (openmpi-4.0.4rc1.tar.bz2) = fb3901b0a95e198a2e21e72b59123e7c56f3973a22d977fbaa41477fdf1f684e36189e9e87cab14cfff73f227f9e9e00fb1a69dfdf09593d148c53d8765d22a9 From cb293a98752385b69c739905642df30fb0626060 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 24 May 2020 16:08:44 -0600 Subject: [PATCH 08/11] Set OMPI_MCA_rmaps_base_oversubscribe=1 in %_openmpi_load (bz#1839571) --- macros.openmpi | 3 ++- openmpi.spec | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/macros.openmpi b/macros.openmpi index 05e613f..1ee6a3c 100644 --- a/macros.openmpi +++ b/macros.openmpi @@ -1,6 +1,7 @@ %_openmpi_load \ . /etc/profile.d/modules.sh; \ - module load mpi/openmpi-%{_arch}; + module load mpi/openmpi-%{_arch}; \ + export OMPI_MCA_rmaps_base_oversubscribe=1 %_openmpi_unload \ . /etc/profile.d/modules.sh; \ module unload mpi/openmpi-%{_arch}; diff --git a/openmpi.spec b/openmpi.spec index 1f74629..c0a4c54 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -41,7 +41,7 @@ Name: openmpi%{?_cc_name_suffix} Version: 4.0.4 -Release: 0.1.rc1%{?dist} +Release: 0.2.rc1%{?dist} Summary: Open Message Passing Interface License: BSD and MIT and Romio URL: http://www.open-mpi.org/ @@ -367,6 +367,9 @@ make check %changelog +* Sun May 24 2020 Orion Poplawski - 4.0.4-0.2.rc1 +- Set OMPI_MCA_rmaps_base_oversubscribe=1 in %%_openmpi_load (bz#1839571) + * Sun May 10 2020 Orion Poplawski - 4.0.4-0.1.rc1 - Update to 4.0.4 rc1 From 44fa6db1d232787b924d0e319eb02f7c6c89f58c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 25 May 2020 11:46:40 +0200 Subject: [PATCH 09/11] Rebuilt for Python 3.9 --- openmpi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openmpi.spec b/openmpi.spec index c0a4c54..37c2004 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -41,7 +41,7 @@ Name: openmpi%{?_cc_name_suffix} Version: 4.0.4 -Release: 0.2.rc1%{?dist} +Release: 0.3.rc1%{?dist} Summary: Open Message Passing Interface License: BSD and MIT and Romio URL: http://www.open-mpi.org/ @@ -367,6 +367,9 @@ make check %changelog +* Mon May 25 2020 Miro Hrončok - 4.0.4-0.3.rc1 +- Rebuilt for Python 3.9 + * Sun May 24 2020 Orion Poplawski - 4.0.4-0.2.rc1 - Set OMPI_MCA_rmaps_base_oversubscribe=1 in %%_openmpi_load (bz#1839571) From 360a86dd588100a3b9a83df3cdbb37aa6110a807 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 17 Jun 2020 21:35:45 -0600 Subject: [PATCH 10/11] Update to 4.0.4 --- .gitignore | 1 + openmpi.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2d250f5..e74414d 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ openmpi-1.4.1-RH.tar.bz2 /openmpi-4.0.3rc4.tar.bz2 /openmpi-4.0.3.tar.bz2 /openmpi-4.0.4rc1.tar.bz2 +/openmpi-4.0.4.tar.bz2 diff --git a/openmpi.spec b/openmpi.spec index 37c2004..7cdbeef 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -41,14 +41,13 @@ Name: openmpi%{?_cc_name_suffix} Version: 4.0.4 -Release: 0.3.rc1%{?dist} +Release: 1%{?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-%{version}.tar.bz2 -Source0: https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-4.0.4rc1.tar.bz2 +Source0: https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-%{version}.tar.bz2 Source1: openmpi.module.in Source2: openmpi.pth.py2 Source3: openmpi.pth.py3 @@ -178,7 +177,7 @@ OpenMPI support for Python 3. %prep -%autosetup -p1 -n openmpi-4.0.4rc1 +%autosetup -p1 %build ./configure --prefix=%{_libdir}/%{name} \ @@ -367,6 +366,9 @@ make check %changelog +* Wed Jun 17 2020 Orion Poplawski - 4.0.4-1 +- Update to 4.0.4 + * Mon May 25 2020 Miro Hrončok - 4.0.4-0.3.rc1 - Rebuilt for Python 3.9 diff --git a/sources b/sources index 3a50a34..232e629 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openmpi-4.0.4rc1.tar.bz2) = fb3901b0a95e198a2e21e72b59123e7c56f3973a22d977fbaa41477fdf1f684e36189e9e87cab14cfff73f227f9e9e00fb1a69dfdf09593d148c53d8765d22a9 +SHA512 (openmpi-4.0.4.tar.bz2) = 6c193b4b5cbfd9d48fa5efcef01372c424b51ae5e9727ccf4235e3b14556dfeb010865e41a9473419ccda16559139aa469086b1fff9abfd337e87387fdec1c64 From 1c84837765b88772431b2a47cc7bb7662f3d6c77 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 19 Jun 2020 21:09:57 -0600 Subject: [PATCH 11/11] Drop python 2 for RHEL8+ as well; Drop old java conditional --- openmpi.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/openmpi.spec b/openmpi.spec index 7cdbeef..4dcf0bd 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -19,7 +19,7 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) -%if 0%{?fedora} >= 32 +%if 0%{?fedora} >= 32 || 0%{?rhel} >= 8 %bcond_with python2 %else %bcond_without python2 @@ -135,11 +135,7 @@ Contains development headers and libraries for openmpi. %package java Summary: Java library Requires: %{name} = %{version}-%{release} -%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 Requires: java-headless -%else -Requires: java -%endif %description java Java library.