Skip to content

Commit ccf0f83

Browse files
committed
Switch PBS launch support to pbs_tmrsh
Don't link against the TM library as that can introduce library confusion across common dependencies. Instead, use the pbs_tmrsh tool ala ssh to execute a TBON launch. Signed-off-by: Ralph Castain <rhc@pmix.org>
1 parent 6c0b7ba commit ccf0f83

22 files changed

Lines changed: 133 additions & 1529 deletions

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ cov-int
4545
Makefile
4646
Makefile.in
4747
static-components.h
48+
static-components.h.new.extern
49+
static-components.h.new.struct
4850
*\\#
4951
config.cache
5052
aclocal.m4

config/prte_check_pbs.m4

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
# -*- shell-script -*-
2+
#
3+
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
4+
# University Research and Technology
5+
# Corporation. All rights reserved.
6+
# Copyright (c) 2004-2005 The University of Tennessee and The University
7+
# of Tennessee Research Foundation. All rights
8+
# reserved.
9+
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
10+
# University of Stuttgart. All rights reserved.
11+
# Copyright (c) 2004-2005 The Regents of the University of California.
12+
# All rights reserved.
13+
# Copyright (c) 2009-2020 Cisco Systems, Inc. All rights reserved
14+
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights
15+
# reserved.
16+
# Copyright (c) 2017-2019 Intel, Inc. All rights reserved.
17+
# Copyright (c) 2021-2026 Nanook Consulting All rights reserved.
18+
# Copyright (c) 2022 Amazon.com, Inc. or its affiliates.
19+
# All Rights reserved.
20+
# $COPYRIGHT$
21+
#
22+
# Additional copyrights may follow
23+
#
24+
# $HEADER$
25+
#
26+
27+
# PRTE_CHECK_PBS(prefix, [action-if-found], [action-if-not-found])
28+
# --------------------------------------------------------
29+
AC_DEFUN([PRTE_CHECK_PBS],[
30+
PRTE_VAR_SCOPE_PUSH([prte_check_pbs_save_PATH])
31+
32+
AC_ARG_WITH([pbs],
33+
[AS_HELP_STRING([--with-pbs],
34+
[Build PBS scheduler and launch components (default: no)])])
35+
36+
prte_check_pbs_save_PATH="$PATH"
37+
PRTE_PBSTRMSH_PATH=
38+
if test -z "$with_pbs" || test "$with_pbs" = "no" ; then
39+
prte_check_pbs_happy="no"
40+
elif test "$with_pbs" = "" || test "$with_pbs" = "yes"; then
41+
prte_check_pbs_happy="yes"
42+
else
43+
prte_check_pbs_happy="yes"
44+
PATH="$with_pbs/bin:$PATH"
45+
fi
46+
47+
AS_IF([test "$prte_check_pbs_happy" = "yes"],
48+
[ # unless user asked, only build pbs component on linux
49+
# as that is the platforms that PBS supports
50+
case $host in
51+
*-linux*)
52+
prte_check_pbs_happy="yes"
53+
;;
54+
*)
55+
AC_MSG_WARN([PBS support was requested, but we are not on])
56+
AC_MSG_WARN([a supported environment (linux). PBS support])
57+
AC_MSG_WARN([threfore cannot be built. Please correct and])
58+
AC_MSG_WARN([try again.])
59+
AC_MSG_ERROR([Cannot continue])
60+
;;
61+
esac
62+
])
63+
64+
AS_IF([test "$prte_check_pbs_happy" = "yes"],
65+
[AC_MSG_CHECKING([for pbs_tmrsh in PATH])
66+
PRTE_WHICH([pbs_tmrsh], [PRTE_PBSTRMSH_PATH])
67+
if test "$PRTE_PBSTRMSH_PATH" = ""; then
68+
if test "$with_pbs" != "" && test "$with_pbs" != "yes" ; then
69+
AC_MSG_RESULT([no])
70+
AC_MSG_WARN([PBS path was specified, but pbs_tmrsh was not found])
71+
AC_MSG_WARN([in $with_pbs/bin. Please correct the path and try again])
72+
AC_MSG_ERROR([Cannot continue])
73+
else
74+
AC_MSG_RESULT([no])
75+
fi
76+
else
77+
AC_MSG_RESULT([yes: $PRTE_PBSTRMSH_PATH])
78+
fi
79+
])
80+
81+
PATH="$prte_check_pbs_save_PATH"
82+
PRTE_SUMMARY_ADD([Resource Managers], [PBS], [], [$prte_check_pbs_happy])
83+
84+
AC_SUBST(PRTE_PBSTRMSH_PATH)
85+
AS_IF([test "$prte_check_pbs_happy" = "yes"],
86+
[$2],
87+
[$3])
88+
89+
PRTE_VAR_SCOPE_POP
90+
])

config/prte_check_tm.m4

Lines changed: 0 additions & 198 deletions
This file was deleted.

src/mca/ess/tm/Makefile.am

Lines changed: 0 additions & 48 deletions
This file was deleted.

src/mca/ess/tm/configure.m4

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)