!10 Update to 4.1.2

From: @lyn1001 
Reviewed-by: @licihua 
Signed-off-by: @licihua
This commit is contained in:
openeuler-ci-bot 2022-05-19 11:09:43 +00:00 committed by Gitee
commit 111b9febd3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 12 additions and 115 deletions

View File

@ -1,88 +0,0 @@
From 7af22e2e8a2d8ee775e56c0cad5dc4426d4951a2 Mon Sep 17 00:00:00 2001
From: caodongxia <315816521@qq.com>
Date: Sat, 18 Sep 2021 11:08:02 +0800
Subject: [PATCH] correct the help information
---
src/tools/pevent/help-pevent.txt | 6 +++---
src/tools/plookup/help-plookup.txt | 6 +++---
src/tools/pps/help-pps.txt | 6 +++---
src/util/cmd_line.c | 5 -----
4 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/tools/pevent/help-pevent.txt b/src/tools/pevent/help-pevent.txt
index fabeafe..a7c0e18 100644
--- a/src/tools/pevent/help-pevent.txt
+++ b/src/tools/pevent/help-pevent.txt
@@ -18,11 +18,11 @@
#
# $HEADER$
#
-# This is the US/English help file for Open MPI PS tool
+# This is the US/English help file for OpenPMIx event tool
#
[usage]
-ompi-ps [OPTIONS]
- Open MPI Job and Process Status Tool
+pevent [OPTIONS]
+ OpenPMIx event generation tool
%s
#
diff --git a/src/tools/plookup/help-plookup.txt b/src/tools/plookup/help-plookup.txt
index fabeafe..0bf2176 100644
--- a/src/tools/plookup/help-plookup.txt
+++ b/src/tools/plookup/help-plookup.txt
@@ -18,11 +18,11 @@
#
# $HEADER$
#
-# This is the US/English help file for Open MPI PS tool
+# This is the US/English help file for OpenPMIx lookup tool
#
[usage]
-ompi-ps [OPTIONS]
- Open MPI Job and Process Status Tool
+plookup [OPTIONS] [KEYS]
+ OpenPMIx lookup tool
%s
#
diff --git a/src/tools/pps/help-pps.txt b/src/tools/pps/help-pps.txt
index fabeafe..97c8a3b 100644
--- a/src/tools/pps/help-pps.txt
+++ b/src/tools/pps/help-pps.txt
@@ -18,11 +18,11 @@
#
# $HEADER$
#
-# This is the US/English help file for Open MPI PS tool
+# This is the US/English help file for OpenPMIx PS tool
#
[usage]
-ompi-ps [OPTIONS]
- Open MPI Job and Process Status Tool
+pps [OPTIONS]
+ OpenPMIx Job and Process Status Tool
%s
#
diff --git a/src/util/cmd_line.c b/src/util/cmd_line.c
index 15a2b61..e0a08f2 100644
--- a/src/util/cmd_line.c
+++ b/src/util/cmd_line.c
@@ -726,11 +726,6 @@ char *pmix_cmd_line_get_usage_msg(pmix_cmd_line_t *cmd)
}
}
}
- if(otype == PMIX_CMD_LINE_OTYPE_NULL || otype == PMIX_CMD_LINE_OTYPE_GENERAL) {
- char *argument_line = "\nFor additional mpirun arguments, run 'mpirun --help <category>'\n\nThe following categories exist: general (Defaults to this option), debug,\n output, input, mapping, ranking, binding, devel (arguments useful to PMIX\n Developers), compatibility (arguments supported for backwards compatibility),\n launch (arguments to modify launch options), and dvm (Distributed Virtual\n Machine arguments).";
-
- pmix_argv_append(&argc, &argv, argument_line);
- }
if (NULL != argv) {
ret = pmix_argv_join(argv, '\n');
pmix_argv_free(argv);
--
2.27.0

Binary file not shown.

BIN
pmix-4.1.2.tar.bz2 Normal file

Binary file not shown.

View File

@ -1,12 +1,11 @@
Name: pmix
Version: 3.1.4
Release: 3
Version: 4.1.2
Release: 1
Summary: Process Management Interface Exascale (PMIx)
License: BSD
URL: https://pmix.org
Source0: https://github.com/openpmix/openpmix/releases/download/v%{version}/pmix-%{version}.tar.bz2
Patch0000: correct-the-help-information.patch
BuildRequires: autoconf automake flex hwloc-devel libevent-devel libtool munge-devel perl-interpreter
BuildRequires: autoconf automake flex hwloc-devel libevent-devel libtool munge-devel perl-interpreter zlib-devel
%description
PMI has been used for quite some time as a means of exchanging wireup information needed
@ -15,23 +14,10 @@ for interprocess communication.
%package devel
Summary: Development files for pmix
Requires: pmix = %{version}-%{release}
Requires: %{name}-tools = %{version}-%{release}
%description devel
Libraries and header files for developing with pmix.
%package pmi
Summary: Pmix implementation of libpmi and libpmi2
Requires: pmix = %{version}-%{release}
Conflicts: slurm-pmi
%description pmi
The pmix implementation of the libpmi and libpmi2 backward-compatibility libraries.
%package pmi-devel
Summary: Development files for pmix-pmi
Requires: pmix-pmi = %{version}-%{release}
Conflicts: slurm-pmi-devel
%description pmi-devel
The development files for the libpmi and libpmi2 backward-compatibility libraries.
%package tools
Summary: Pmix tools
Requires: pmix = %{version}-%{release}
@ -68,24 +54,23 @@ find src -name \*.l -print -exec touch --no-create {} \;
%dir %{_sysconfdir}/pmix
%config(noreplace) %{_sysconfdir}/pmix/*.conf
%{_datadir}/pmix/*.txt
%{_libdir}/{libmca_common_dstore.so.1*,libpmix.so.2*,pmix/*.so}
%{_libdir}/libpmix.so.2*
%{_libdir}/pmix/*.so
%{_mandir}/man1/*.1*
%files devel
%{_datadir}/pmix/*.supp
%{_includedir}/pmix*.h
%{_libdir}/{libmca_common_dstore.so,libpmix.so}
%files pmi
%{_libdir}/{libpmi.so.1*,libpmi2.so.1*}
%files pmi-devel
%{_includedir}/{pmi,pmi2}.h
%{_libdir}/{libpmi.so,libpmi2.so}
%{_libdir}/libpmix.so
%{_libdir}/pkgconfig/*.pc
%files tools
%{_bindir}/*
%changelog
* Thu May 19 2022 liyanan <liyanan32@h-partners.com> - 4.1.2-1
- Update to 4.1.2
* Sat Sep 18 2021 caodongxia <caodongxia@huawei.com> - 3.1.4-3
- Correct the help information