Merge pull request #558 from adrianreber/ompi3

Update pmix to 2.0.1 and Open MPI to 3.0.0

components/mpi-families/openmpi/SOURCES/openmpi-3.0-pbs-config.patch

@@ -0,0 +1,11 @@
+--- x/configure	2017-06-27 21:16:42.000000000 -0400
++++ a/configure	2017-06-30 11:35:21.492498617 -0400
+@@ -191390,7 +191390,7 @@
+                 orte_check_tm_LIBS="$orte_check_tm_LIBS $orte_check_tm_val"
+             fi
+         else
+-            if test "LIBS" = "LDFLAGS"; then
++            if test "LIBS" = "LIBS"; then
+                 orte_check_tm_LIBS="$orte_check_tm_LIBS $orte_check_tm_val"
+             fi
+         fi

components/mpi-families/openmpi/SPECS/openmpi.spec

@@ -18,34 +18,30 @@
 
 %ifarch aarch64
 %define with_psm 0
+%define with_psm2 0
 %else
 %define with_psm 1
+%define with_psm2 1
 %endif
 
 %define with_lustre 0
 %define with_slurm 1
 
-# Default build is without psm2, but can be overridden
-%{!?with_psm2: %global with_psm2 0}
 %{!?with_tm: %global with_tm 1}
 
 Summary:   A powerful implementation of MPI
 
-%if 0%{with_psm2}
-Name:      %{pname}-psm2-%{compiler_family}%{PROJ_DELIM}
-%else
 Name:      %{pname}-%{compiler_family}%{PROJ_DELIM}
-%endif
 
-Version:   1.10.7
+Version:   3.0.0
 Release:   1%{?dist}
 License:   BSD-3-Clause
 Group:     %{PROJ_NAME}/mpi-families
 URL:       http://www.open-mpi.org
-Source0:   http://www.open-mpi.org/software/ompi/v1.10/downloads/%{pname}-%{version}.tar.bz2
+Source0:   http://www.open-mpi.org/software/ompi/v3.0/downloads/%{pname}-%{version}.tar.bz2
 Source1:   OHPC_macros
 Source3:   pbs-config
-Patch0:    config.pbs.patch
+Patch0:    openmpi-3.0-pbs-config.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -54,6 +50,8 @@ BuildRequires:  postfix
 BuildRequires:  opensm
 BuildRequires:  opensm-devel
 BuildRequires:  numactl
+BuildRequires:  libevent-devel
+BuildRequires:  pmix%{PROJ_DELIM}
 %if 0%{with_slurm}
 BuildRequires:  slurm-devel%{PROJ_DELIM}
 #!BuildIgnore:  slurm%{PROJ_DELIM}
@@ -88,9 +86,6 @@ BuildRequires:  openssl-devel
 
 %if %{with_psm2}
 BuildRequires:  libpsm2-devel >= 10.2.0
-Requires:       libpsm2 >= 10.2.0
-Provides: %{pname}-%{compiler_family}%{PROJ_DELIM}
-Conflicts: %{pname}-%{compiler_family}%{PROJ_DELIM}
 %endif
 
 Requires: prun%{PROJ_DELIM}
@@ -111,14 +106,19 @@ Open MPI jobs.
 %prep
 
 %setup -q -n %{pname}-%{version}
-%patch0 -p0
+%patch0 -p1
 
 %build
 # OpenHPC compiler designation
 %ohpc_setup_compiler
 
 
 BASEFLAGS="--prefix=%{install_path} --disable-static --enable-builtin-atomics --with-sge --enable-mpi-cxx"
+
+# build against external pmix and libevent
+BASEFLAGS="$BASEFLAGS --with-pmix=/opt/ohpc/pub/libs/pmix/2.0.1"
+BASEFLAGS="$BASEFLAGS --with-libevent=external"
+
 %if %{with_psm}
   BASEFLAGS="$BASEFLAGS --with-psm"
 %endif
@@ -196,19 +196,25 @@ EOF
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}/%{_docdir}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
-%{OHPC_PUB}
+%{install_path}
+%{OHPC_MODULEDEPS}/%{compiler_family}/%{pname}
 %doc NEWS
 %doc README
 %doc LICENSE
 %doc AUTHORS
 %doc README.JAVA.txt
 
 %changelog
+* Thu Sep 21 2017 Adrian Reber <areber@redhat.com> - 3.0.0-1
+- update to 3.0.0
+- use the OpenHPC pmix package
+- use the same libevent as pmix (external)
+- small cleanups
+
+* Thu Sep 21 2017 Adrian Reber <areber@redhat.com> - 1.10.7-1
+- default to building with PSM and PSM2 at the same time
+
 * Fri May 12 2017 Karl W Schulz <karl.w.schulz@intel.com> - 1.10.4-1
 - switch to ohpc_compiler_dependent flag