From 0f99f6f50e387d78cbd14aa3d6fce6c3a3d2289f Mon Sep 17 00:00:00 2001 From: jcsiadal Date: Tue, 12 Sep 2023 14:34:14 -0700 Subject: [PATCH] Staged for 5.x --- components/rms/openpbs/SPECS/openpbs.spec | 2 +- components/rms/openpmix/LICENSE | 101 ------------------ components/rms/openpmix/SOURCES/openpmix.lua | 21 ++++ components/rms/openpmix/SPECS/openpmix.spec | 27 +---- components/rms/prrte/SOURCES/prrte.lua | 18 ++++ .../rms/{openpmix => prrte}/SOURCES/rpmlintrc | 0 .../rms/{openpmix => prrte}/SPECS/prrte.spec | 34 +----- components/rms/slurm/SPECS/slurm.spec | 4 +- 8 files changed, 49 insertions(+), 158 deletions(-) delete mode 100644 components/rms/openpmix/LICENSE create mode 100644 components/rms/openpmix/SOURCES/openpmix.lua create mode 100644 components/rms/prrte/SOURCES/prrte.lua rename components/rms/{openpmix => prrte}/SOURCES/rpmlintrc (100%) rename components/rms/{openpmix => prrte}/SPECS/prrte.spec (77%) diff --git a/components/rms/openpbs/SPECS/openpbs.spec b/components/rms/openpbs/SPECS/openpbs.spec index 4f4906ee79..5633ab6ad1 100644 --- a/components/rms/openpbs/SPECS/openpbs.spec +++ b/components/rms/openpbs/SPECS/openpbs.spec @@ -189,7 +189,7 @@ Autoreq: 1 # package is not actually installed on the compute nodes. # As slurm pulls in pmix for Open MPI in slurm deployments, # let's have openpbs pull pmix for openpbs deployments. -Requires: pmix%{PROJ_DELIM} +Requires: openpmix%{PROJ_DELIM} %description -n %{pbs_name}-%{pbs_execution}%{PROJ_DELIM} OpenPBS is a fast, powerful workload manager and diff --git a/components/rms/openpmix/LICENSE b/components/rms/openpmix/LICENSE deleted file mode 100644 index 04a99582f0..0000000000 --- a/components/rms/openpmix/LICENSE +++ /dev/null @@ -1,101 +0,0 @@ -Most files in this release are marked with the copyrights of the -organizations who have edited them. The copyrights below are in no -particular order and generally reflect members of the PMIx and -PRRTE core teams who have contributed code to this release. -The copyrights for code used under license from other parties are -included in the corresponding files. - -Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana - University Research and Technology - Corporation. All rights reserved. -Copyright (c) 2004-2023 The University of Tennessee and The University - of Tennessee Research Foundation. All rights - reserved. -Copyright (c) 2004-2010 High Performance Computing Center Stuttgart, - University of Stuttgart. All rights reserved. -Copyright (c) 2004-2008 The Regents of the University of California. - All rights reserved. -Copyright (c) 2006-2017 Los Alamos National Security, LLC. All rights - reserved. -Copyright (c) 2006-2017 Cisco Systems, Inc. All rights reserved. -Copyright (c) 2006-2010 Voltaire, Inc. All rights reserved. -Copyright (c) 2006-2017 Sandia National Laboratories. All rights reserved. -Copyright (c) 2006-2010 Sun Microsystems, Inc. All rights reserved. - Use is subject to license terms. -Copyright (c) 2006-2017 The University of Houston. All rights reserved. -Copyright (c) 2006-2009 Myricom, Inc. All rights reserved. -Copyright (c) 2007-2017 UT-Battelle, LLC. All rights reserved. -Copyright (c) 2007-2017 IBM Corporation. All rights reserved. -Copyright (c) 1998-2005 Forschungszentrum Juelich, Juelich Supercomputing - Centre, Federal Republic of Germany -Copyright (c) 2005-2008 ZIH, TU Dresden, Federal Republic of Germany -Copyright (c) 2007 Evergrid, Inc. All rights reserved. -Copyright (c) 2008 Chelsio, Inc. All rights reserved. -Copyright (c) 2008-2009 Institut National de Recherche en - Informatique. All rights reserved. -Copyright (c) 2007 Lawrence Livermore National Security, LLC. - All rights reserved. -Copyright (c) 2007-2017 Mellanox Technologies. All rights reserved. -Copyright (c) 2006-2010 QLogic Corporation. All rights reserved. -Copyright (c) 2008-2017 Oak Ridge National Labs. All rights reserved. -Copyright (c) 2006-2012 Oracle and/or its affiliates. All rights reserved. -Copyright (c) 2009-2015 Bull SAS. All rights reserved. -Copyright (c) 2010 ARM ltd. All rights reserved. -Copyright (c) 2016 ARM, Inc. All rights reserved. -Copyright (c) 2010-2011 Alex Brick . All rights reserved. -Copyright (c) 2012 The University of Wisconsin-La Crosse. All rights - reserved. -Copyright (c) 2013-2018 Intel, Inc. All rights reserved. -Copyright (c) 2011-2017 NVIDIA Corporation. All rights reserved. -Copyright (c) 2016 Broadcom Limited. All rights reserved. -Copyright (c) 2011-2017 Fujitsu Limited. All rights reserved. -Copyright (c) 2014-2015 Hewlett-Packard Development Company, LP. All - rights reserved. -Copyright (c) 2013-2017 Research Organization for Information Science (RIST). - All rights reserved. -Copyright (c) 2017-2023 Amazon.com, Inc. or its affiliates. All Rights - reserved. -Copyright (c) 2018 DataDirect Networks. All rights reserved. -Copyright (c) 2020-2023 Nanook Consulting. All rights reserved. -Copyright (c) 2022-2023 Triad National Security, LLC. All rights reserved - -$COPYRIGHT$ - -Additional copyrights may follow - -$HEADER$ - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -- Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -- Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer listed - in this license in the documentation and/or other materials - provided with the distribution. - -- Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -The copyright holders provide no reassurances that the source code -provided does not infringe any patent, copyright, or any other -intellectual property rights of third parties. The copyright holders -disclaim any liability to any recipient for claims brought against -recipient by any third party for infringement of that parties -intellectual property rights. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/components/rms/openpmix/SOURCES/openpmix.lua b/components/rms/openpmix/SOURCES/openpmix.lua new file mode 100644 index 0000000000..dc97854bdd --- /dev/null +++ b/components/rms/openpmix/SOURCES/openpmix.lua @@ -0,0 +1,21 @@ +help([[ +This module loads the %{pname} library. +]]) + +whatis("Name: %{pname}") +whatis("Version: %{version}") + +local version = "%{version}" + +prepend_path("MANPATH", "%{install_path}/share/man") +prepend_path("INCLUDE", "%{install_path}/include") +prepend_path("LD_LIBRARY_PATH", "%{install_path}/lib") + +setenv("%{PNAME}_DIR", "%{install_path}") +setenv("%{PNAME}_LIB", "%{install_path}/lib") +setenv("%{PNAME}_INC", "%{install_path}/include") +setenv("%{SNAME}_DIR", "%{install_path}") +setenv("%{SNAME}_LIB", "%{install_path}/lib") +setenv("%{SNAME}_INC", "%{install_path}/include") + +family("PMIx") \ No newline at end of file diff --git a/components/rms/openpmix/SPECS/openpmix.spec b/components/rms/openpmix/SPECS/openpmix.spec index 269061c1c2..ffa8846946 100644 --- a/components/rms/openpmix/SPECS/openpmix.spec +++ b/components/rms/openpmix/SPECS/openpmix.spec @@ -15,12 +15,13 @@ Summary: An extended/exascale implementation of the PMIx Standard Name: %{pname}%{PROJ_DELIM} -Version: 5.0.0rc1 +Version: 5.0.1 Release: 1%{?dist} License: BSD URL: https://openpmix.github.io/openpmix/ Group: %{PROJ_NAME}/rms Source0: https://github.com/openpmix/openpmix/releases/download/v%{version}/%{sname}-%{version}.tar.gz +Source1: openpmix.lua Obsoletes: pmix-%{PROJ_DELIM} @@ -39,8 +40,6 @@ BuildRequires: hwloc%{PROJ_DELIM} BuildRequires: munge-devel BuildRequires: automake BuildRequires: autoconf -BuildRequires: slurm%{PROJ_DELIM} -BuildRequires: openpbs-server%{PROJ_DELIM} #!BuildIgnore: post-build-checks @@ -96,27 +95,7 @@ make install DESTDIR=${RPM_BUILD_ROOT} # OpenPMIx Module File mkdir -p ${RPM_BUILD_ROOT}%{module_path} cat < ${RPM_BUILD_ROOT}%{module_path}/%{version}.lua -help([[ -This module loads the %{pname} library. -]]) - -whatis("Name: %{pname}") -whatis("Version: %{version}") - -local version = "%{version}" - -prepend_path("MANPATH", "%{install_path}/share/man") -prepend_path("INCLUDE", "%{install_path}/include") -prepend_path("LD_LIBRARY_PATH", "%{install_path}/lib") - -setenv("%{PNAME}_DIR", "%{install_path}") -setenv("%{PNAME}_LIB", "%{install_path}/lib") -setenv("%{PNAME}_INC", "%{install_path}/include") -setenv("%{SNAME}_DIR", "%{install_path}") -setenv("%{SNAME}_LIB", "%{install_path}/lib") -setenv("%{SNAME}_INC", "%{install_path}/include") - -family("PMIx") +%include %{SOURCE1} EOF diff --git a/components/rms/prrte/SOURCES/prrte.lua b/components/rms/prrte/SOURCES/prrte.lua new file mode 100644 index 0000000000..e224b28109 --- /dev/null +++ b/components/rms/prrte/SOURCES/prrte.lua @@ -0,0 +1,18 @@ +help([[ +This module loads the %{pname} library. +]]) + +whatis("Name: %{pname}") +whatis("Version: %{version}") + +local version = "%{version}" + +prepend_path("MANPATH", "%{install_path}/share/man") +prepend_path("INCLUDE", "%{install_path}/include") +prepend_path("LIBRARY_PATH", "%{install_path}/lib") + +setenv("%{PNAME}_DIR", "%{install_path}") +setenv("%{PNAME}_LIB", "%{install_path}/lib") +setenv("%{PNAME}_INC", "%{install_path}/include") + +family("PMIx") diff --git a/components/rms/openpmix/SOURCES/rpmlintrc b/components/rms/prrte/SOURCES/rpmlintrc similarity index 100% rename from components/rms/openpmix/SOURCES/rpmlintrc rename to components/rms/prrte/SOURCES/rpmlintrc diff --git a/components/rms/openpmix/SPECS/prrte.spec b/components/rms/prrte/SPECS/prrte.spec similarity index 77% rename from components/rms/openpmix/SPECS/prrte.spec rename to components/rms/prrte/SPECS/prrte.spec index 34d9868aea..f88026e72d 100644 --- a/components/rms/openpmix/SPECS/prrte.spec +++ b/components/rms/prrte/SPECS/prrte.spec @@ -13,26 +13,17 @@ Summary: Reference RunTime Environment for PMIx Name: %{pname}%{PROJ_DELIM} -Version: 3.0.1rc2 +Version: 3.0.0 Release: 1%{?dist} License: BSD URL: https://openpmix.github.io/openpmix/ Group: %{PROJ_NAME}/rms Source0: https://github.com/openpmix/prrte/releases/download/v%{version}/%{pname}-%{version}.tar.gz +Source1: prrte.lua -Conflicts: libev - -BuildRequires: libevent-devel -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: zlib-devel -BuildRequires: hwloc%{PROJ_DELIM} -BuildRequires: munge-devel -BuildRequires: automake -BuildRequires: autoconf +BuildRequires: openpmix%{PROJ_DELIM} > 5.0.0 BuildRequires: slurm%{PROJ_DELIM} BuildRequires: openpbs-server%{PROJ_DELIM} -BuildRequires: openpmix%{PROJ_DELIM} > 4.2.0 BuildRequires: flex Provides: openpmix-runtime%{PROJ_DELIM} = %{version} @@ -86,24 +77,7 @@ make install DESTDIR=${RPM_BUILD_ROOT} # PRRTE Module File mkdir -p ${RPM_BUILD_ROOT}%{module_path} cat < ${RPM_BUILD_ROOT}%{module_path}/%{version}.lua -help([[ -This module loads the %{pname} library. -]]) - -whatis("Name: %{pname}") -whatis("Version: %{version}") - -local version = "%{version}" - -prepend_path("MANPATH", "%{install_path}/share/man") -prepend_path("INCLUDE", "%{install_path}/include") -prepend_path("LIBRARY_PATH", "%{install_path}/lib") - -setenv("%{PNAME}_DIR", "%{install_path}") -setenv("%{PNAME}_LIB", "%{install_path}/lib") -setenv("%{PNAME}_INC", "%{install_path}/include") - -family("PMIx") +%include %{SOURCE1} EOF diff --git a/components/rms/slurm/SPECS/slurm.spec b/components/rms/slurm/SPECS/slurm.spec index b9cb358c04..6f67311bcc 100644 --- a/components/rms/slurm/SPECS/slurm.spec +++ b/components/rms/slurm/SPECS/slurm.spec @@ -180,8 +180,8 @@ BuildRequires: numactl-devel %endif %if %{with pmix} -BuildRequires: pmix%{PROJ_DELIM} -Requires: pmix%{PROJ_DELIM} +BuildRequires: openpmix%{PROJ_DELIM} +Requires: openpmix%{PROJ_DELIM} %endif %if %{with ucx} && "%{_with_ucx}" == "--with-ucx"