Skip to content

Commit 7b3b3b1

Browse files
hppritchahppritcha
authored
Merge pull request #2446 from hppritcha/topic/cray_pmix_dlopen_error
pmix/cray: fix disable-dlopen problem
2 parents 0bbb319 + 2cbc0e8 commit 7b3b3b1

File tree

12 files changed

+74
-65
lines changed

12 files changed

+74
-65
lines changed

‎config/orte_check_alps.m4 renamed to ‎config/opal_check_alps.m4

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ dnl
2222
dnl $HEADER$
2323
dnl
2424

25-
# ORTE_CHECK_ALPS_CLE4([action-if-found], [action-if-not-found])
25+
# OPAL_CHECK_ALPS_CLE4([action-if-found], [action-if-not-found])
2626
# --------------------------------------------------------
27-
AC_DEFUN([ORTE_CHECK_ALPS_CLE4],[
27+
AC_DEFUN([OPAL_CHECK_ALPS_CLE4],[
2828

2929
#
3030
# if we've gotten here, its because we are building on a CLE 4 system
3131
#
32-
orte_check_alps_cle4_libdir_happy="no"
33-
orte_check_alps_cle4_dir_happy="no"
32+
opal_check_alps_cle4_libdir_happy="no"
33+
opal_check_alps_cle4_dir_happy="no"
3434

3535
AC_MSG_CHECKING([Checking for ALPS components on a CLE 4 system with alps $with_alps])
3636

@@ -48,42 +48,42 @@ AC_DEFUN([ORTE_CHECK_ALPS_CLE4],[
4848
AS_IF([test -z "$with_alps_libdir"],
4949
[AS_IF([test "$with_alps" != "yes" && test "$with_alps" != "auto"],
5050
[AS_IF([test -d "$with_alps_libdir/lib64"],
51-
[orte_check_alps_libdir="$with_alps_libdir/lib64"],
52-
[orte_check_alps_libdir="$with_alps_libdir/lib"])],
53-
[ orte_check_alps_libdir="$default_alps_dir/lib/alps"])
51+
[opal_check_alps_libdir="$with_alps_libdir/lib64"],
52+
[opal_check_alps_libdir="$with_alps_libdir/lib"])],
53+
[ opal_check_alps_libdir="$default_alps_dir/lib/alps"])
5454
],[])
5555

5656
AS_IF([test "$with_alps" = "yes" || test "$with_alps" = "auto"],
57-
[orte_check_alps_dir=$default_alps_dir],
58-
[orte_check_alps_dir=$with_alps])
57+
[opal_check_alps_dir=$default_alps_dir],
58+
[opal_check_alps_dir=$with_alps])
5959

60-
AC_MSG_CHECKING([if $orte_check_alps_libdir/libalps.a is present])
61-
AS_IF([test -f "$orte_check_alps_libdir/libalps.a"],
62-
[orte_check_alps_libdir_cle4_happy="yes"],
63-
[orte_check_alps_libdir_cle4_happy="no",
60+
AC_MSG_CHECKING([if $opal_check_alps_libdir/libalps.a is present])
61+
AS_IF([test -f "$opal_check_alps_libdir/libalps.a"],
62+
[opal_check_alps_libdir_cle4_happy="yes"],
63+
[opal_check_alps_libdir_cle4_happy="no",
6464
AC_MSG_RESULT([no])])
6565

66-
AC_MSG_CHECKING([if $orte_check_alps_dir/include/alps/apInfo.h is present])
67-
AS_IF([test -f "$orte_check_alps_dir/include/alps/apInfo.h"],
68-
[orte_check_alps_dir_cle4_happy="yes"],
69-
[orte_check_alps_dir_cle4_happy="no"
66+
AC_MSG_CHECKING([if $opal_check_alps_dir/include/alps/apInfo.h is present])
67+
AS_IF([test -f "$opal_check_alps_dir/include/alps/apInfo.h"],
68+
[opal_check_alps_dir_cle4_happy="yes"],
69+
[opal_check_alps_dir_cle4_happy="no"
7070
AC_MSG_RESULT([no])])
7171

72-
AS_IF([test "$orte_check_alps_libdir_cle4_happy" = "yes" && test "$orte_check_alps_dir_cle4_happy" = "yes"],
73-
[CRAY_ALPSLLI_CFLAGS="-I$orte_check_alps_dir/include"
74-
CRAY_ALPSLLI_LIBS="-L$orte_check_alps_libdir -lalpslli -lalpsutil"
75-
CRAY_ALPSLLI_STATIC_LIBS="-L$orte_check_alps_libdir -lalpslli -lalpsutil"
72+
AS_IF([test "$opal_check_alps_libdir_cle4_happy" = "yes" && test "$opal_check_alps_dir_cle4_happy" = "yes"],
73+
[CRAY_ALPSLLI_CFLAGS="-I$opal_check_alps_dir/include"
74+
CRAY_ALPSLLI_LIBS="-L$opal_check_alps_libdir -lalpslli -lalpsutil"
75+
CRAY_ALPSLLI_STATIC_LIBS="-L$opal_check_alps_libdir -lalpslli -lalpsutil"
7676
$1],
7777
[$2])
7878
])
7979

8080

8181

8282

83-
# ORTE_CHECK_ALPS(prefix, [action-if-found], [action-if-not-found])
83+
# OPAL_CHECK_ALPS(prefix, [action-if-found], [action-if-not-found])
8484
# --------------------------------------------------------
85-
AC_DEFUN([ORTE_CHECK_ALPS],[
86-
if test -z "$orte_check_cray_alps_happy"; then
85+
AC_DEFUN([OPAL_CHECK_ALPS],[
86+
if test -z "$opal_check_cray_alps_happy"; then
8787

8888
AC_ARG_WITH([alps],
8989
[AC_HELP_STRING([--with-alps(=DIR|yes|no)],
@@ -97,24 +97,24 @@ AC_DEFUN([ORTE_CHECK_ALPS],[
9797

9898
AC_MSG_CHECKING([for ALPS support cle level $cle_level])
9999
AS_IF([test "$cle_level" = "4" && test "$with_alps" != "no"],
100-
[ORTE_CHECK_ALPS_CLE4([orte_check_cray_alps_happy="yes"],
101-
[orte_check_cray_alps_happy="no"])],
100+
[OPAL_CHECK_ALPS_CLE4([opal_check_cray_alps_happy="yes"],
101+
[opal_check_cray_alps_happy="no"])],
102102
[AS_IF([test "$with_alps" = "no"],
103103
[AC_MSG_RESULT([no])
104104
$3],
105105
[AS_IF([test "$with_alps" = "auto" || test "$with_alps" = "yes"],
106106
[PKG_CHECK_MODULES_STATIC([CRAY_ALPSLLI], [cray-alpslli],
107-
[orte_check_cray_alps_happy="yes"],
108-
[orte_check_cray_alps_happy="no"]
107+
[opal_check_cray_alps_happy="yes"],
108+
[opal_check_cray_alps_happy="no"]
109109
[AS_IF([test "$with_alps" = "yes"],
110110
[AC_MSG_WARN([ALPS support requested but pkg-config failed.])
111111
AC_MSG_WARN([Need to explicitly indicate ALPS directory])
112112
AC_MSG_WARN([on the configure line using --with-alps option.])
113113
AC_MSG_ERROR([Aborting])],[])]
114114
)
115115
PKG_CHECK_MODULES_STATIC([CRAY_ALPSUTIL], [cray-alpsutil],
116-
[orte_check_cray_alps_happy="yes"],
117-
[orte_check_cray_alps_happy="no"]
116+
[opal_check_cray_alps_happy="yes"],
117+
[opal_check_cray_alps_happy="no"]
118118
[AS_IF([test "$with_alps" = "yes"],
119119
[AC_MSG_WARN([ALPS support requested but pkg-config failed.])
120120
AC_MSG_WARN([Need to explicitly indicate ALPS directory])
@@ -123,20 +123,20 @@ AC_DEFUN([ORTE_CHECK_ALPS],[
123123
)
124124

125125
PKG_CHECK_MODULES_STATIC([CRAY_ALPS], [cray-alps],
126-
[orte_check_cray_alps_happy="yes"],
127-
[orte_check_cray_alps_happy="no"]
126+
[opal_check_cray_alps_happy="yes"],
127+
[opal_check_cray_alps_happy="no"]
128128
[AS_IF([test "$with_alps" = "yes"],
129129
[AC_MSG_WARN([ALPS support requested but pkg-config failed.])
130130
AC_MSG_WARN([Need to explicitly indicate ALPS directory])
131131
AC_MSG_WARN([on the configure line using --with-alps option.])
132132
AC_MSG_ERROR([Aborting])],[])]
133133
)
134134
PKG_CHECK_MODULES_STATIC([CRAY_WLM_DETECT], [cray-wlm_detect],
135-
[orte_check_cray_alps_happy="yes"
135+
[opal_check_cray_alps_happy="yes"
136136
AC_DEFINE_UNQUOTED([CRAY_WLM_DETECT],[1],
137137
[defined to 1 if cray wlm available, 0 otherwise])
138138
],
139-
[orte_check_cray_alps_happy="no"]
139+
[opal_check_cray_alps_happy="no"]
140140
[AS_IF([test "$with_alps" = "yes"],
141141
[AC_MSG_WARN([ALPS support requested but pkg-config failed.])
142142
AC_MSG_WARN([Need to explicitly indicate ALPS directory])
@@ -150,17 +150,17 @@ AC_DEFUN([ORTE_CHECK_ALPS],[
150150
])
151151
])
152152

153-
AC_MSG_RESULT([orte_check_cray_alps_happy = $orte_check_cray_alps_happy])
153+
AC_MSG_RESULT([opal_check_cray_alps_happy = $opal_check_cray_alps_happy])
154154

155-
AS_IF([test "$orte_check_cray_alps_happy" = "yes" && test "$enable_static" = "yes"],
155+
AS_IF([test "$opal_check_cray_alps_happy" = "yes" && test "$enable_static" = "yes"],
156156
[CRAY_ALPSLLI_LIBS = $CRAY_ALPSLLI_STATIC_LIBS
157157
CRAY_ALPSUTIL_LIBS = $CRAY_ALPSUTIL_STATIC_LIBS],
158158
[])
159159

160-
OPAL_SUMMARY_ADD([[Resource Managers]],[[Cray Alps]],[$1],[$orte_check_cray_alps_happy])
160+
OPAL_SUMMARY_ADD([[Resource Managers]],[[Cray Alps]],[$1],[$opal_check_cray_alps_happy])
161161
fi
162162

163-
AS_IF([test "$orte_check_cray_alps_happy" = "yes"],
163+
AS_IF([test "$opal_check_cray_alps_happy" = "yes"],
164164
[$1_LDFLAGS="[$]$1_LDFLAGS $CRAY_ALPSLLI_LIBS $CRAY_ALPSUTIL_LIBS"
165165
$1_CPPFLAGS="[$]$1_CPPFLAGS $CRAY_ALPSLLI_CFLAGS $CRAY_ALPSUTIL_CFLAGS $CRAY_ALPS_CFLAGS $CRAY_WLM_DETECT_CFLAGS"
166166
$1_LIBS="[$]$1_LIBS $CRAY_ALPSLLI_LIBS $CRAY_ALPSUTIL_LIBS $CRAY_WLM_DETECT_LIBS"

‎opal/mca/pmix/cray/Makefile.am

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#
22
# Copyright (c) 2014 Intel, Inc. All rights reserved.
3+
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights
4+
# reserved.
35
# $COPYRIGHT$
46
#
57
# Additional copyrights may follow
@@ -29,12 +31,12 @@ endif
2931
mcacomponentdir = $(opallibdir)
3032
mcacomponent_LTLIBRARIES = $(component_install)
3133
mca_pmix_cray_la_SOURCES = $(sources)
32-
mca_pmix_cray_la_CPPFLAGS = $(pmix_cray_CPPFLAGS)
33-
mca_pmix_cray_la_LDFLAGS = -module -avoid-version $(pmix_cray_LDFLAGS)
34-
mca_pmix_cray_la_LIBADD = $(pmix_cray_LIBS)
34+
mca_pmix_cray_la_CPPFLAGS = $(pmix_cray_CPPFLAGS) $(pmix_alps_CPPFLAGS)
35+
mca_pmix_cray_la_LDFLAGS = -module -avoid-version $(pmix_cray_LDFLAGS) $(pmix_alps_LDFLAGS)
36+
mca_pmix_cray_la_LIBADD = $(pmix_cray_LIBS) $(pmix_alps_LIBS)
3537

3638
noinst_LTLIBRARIES = $(component_noinst)
3739
libmca_pmix_cray_la_SOURCES =$(sources)
38-
libmca_pmix_cray_la_CPPFLAGS = $(pmix_cray_CPPFLAGS)
39-
libmca_pmix_cray_la_LDFLAGS = -module -avoid-version $(pmix_cray_LDFLAGS)
40-
libmca_pmix_cray_la_LIBADD = $(pmix_cray_LIBS)
40+
libmca_pmix_cray_la_CPPFLAGS = $(pmix_cray_CPPFLAGS) $(pmix_alps_CPPFLAGS)
41+
libmca_pmix_cray_la_LDFLAGS = -module -avoid-version $(pmix_cray_LDFLAGS) $(pmix_alps_LDFLAGS)
42+
libmca_pmix_cray_la_LIBADD = $(pmix_cray_LIBS) $(pmix_alps_LIBS)

‎opal/mca/pmix/cray/configure.m4

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# -*- shell-script -*-
22
#
33
# Copyright (c) 2014 Intel, Inc. All rights reserved.
4+
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights
5+
# reserved.
46
# $COPYRIGHT$
57
#
68
# Additional copyrights may follow
@@ -17,18 +19,22 @@ AC_DEFUN([MCA_opal_pmix_cray_CONFIG], [
1719
# check specifically for Cray PMI here
1820
#
1921
OPAL_CHECK_CRAY_PMI([pmix_cray], [pmix_cray_good=1], [pmix_cray_good=0])
22+
OPAL_CHECK_ALPS([pmix_alps], [pmix_alps_happy=1], [pmix_alps_happy=0])
2023

2124
# Evaluate succeed / fail
22-
AS_IF([test "$pmix_cray_good" = 1],
25+
AS_IF([test "$pmix_cray_good" = 1 && test "$pmix_alps_happy" = 1],
2326
[$1
2427
# need to set the wrapper flags for static builds
25-
pmix_cray_WRAPPER_EXTRA_LDFLAGS="$pmix_cray_LDFLAGS"
26-
pmix_cray_WRAPPER_EXTRA_LIBS="$pmix_cray_LIBS"],
28+
pmix_cray_WRAPPER_EXTRA_LDFLAGS="$pmix_cray_LDFLAGS $pmix_alps_LDFLAGS"
29+
pmix_cray_WRAPPER_EXTRA_LIBS="$pmix_cray_LIBS $pmix_alps_LIBS"],
2730
[$2])
2831

2932
# set build flags to use in makefile
3033
AC_SUBST([pmix_cray_CPPFLAGS])
3134
AC_SUBST([pmix_cray_LDFLAGS])
3235
AC_SUBST([pmix_cray_LIBS])
36+
AC_SUBST([pmix_alps_CPPFLAGS])
37+
AC_SUBST([pmix_alps_LDFLAGS])
38+
AC_SUBST([pmix_alps_LIBS])
3339

3440
])

‎opal/mca/pmix/cray/pmix_cray.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ static void cray_get_more_info(void)
207207
/*
208208
* get some items from alps placement file
209209
*/
210+
210211
place_ret = alps_get_placement_info(apid,
211212
&layout,
212213
NULL,

‎orte/mca/common/alps/configure.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# Copyright (c) 2007-2012 Cisco Systems, Inc. All rights reserved.
1414
# Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved.
1515
# Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved.
16-
# Copyright (c) 2014 Los Alamos National Security, LLC.
16+
# Copyright (c) 2014-2016 Los Alamos National Security, LLC.
1717
# All rights reserved.
1818
# $COPYRIGHT$
1919
#
@@ -28,7 +28,7 @@
2828
AC_DEFUN([MCA_orte_common_alps_CONFIG],[
2929
AC_CONFIG_FILES([orte/mca/common/alps/Makefile])
3030

31-
ORTE_CHECK_ALPS([common_alps], [common_alps_happy="yes"], [common_alps_happy="no"])
31+
OPAL_CHECK_ALPS([common_alps], [common_alps_happy="yes"], [common_alps_happy="no"])
3232

3333
AS_IF([test "$common_alps_happy" = "yes"],
3434
[$1

‎orte/mca/ess/alps/configure.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# Copyright (c) 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
1313
# Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
14-
# Copyright (c) 2011 Los Alamos National Security, LLC.
14+
# Copyright (c) 2011-2016 Los Alamos National Security, LLC.
1515
# All rights reserved.
1616
# $COPYRIGHT$
1717
#
@@ -25,7 +25,7 @@
2525
AC_DEFUN([MCA_orte_ess_alps_CONFIG],[
2626
AC_CONFIG_FILES([orte/mca/ess/alps/Makefile])
2727

28-
ORTE_CHECK_ALPS([ess_alps], [ess_alps_happy="yes"], [ess_alps_happy="no"])
28+
OPAL_CHECK_ALPS([ess_alps], [ess_alps_happy="yes"], [ess_alps_happy="no"])
2929

3030
AS_IF([test "$ess_alps_happy" = "yes"],
3131
[$1

‎orte/mca/odls/alps/configure.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# University of Stuttgart. All rights reserved.
1111
# Copyright (c) 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
13-
# Copyright (c) 2011-2014 Los Alamos National Security, LLC.
13+
# Copyright (c) 2011-2016 Los Alamos National Security, LLC.
1414
# All rights reserved.
1515
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
1616
# $COPYRIGHT$
@@ -25,7 +25,7 @@
2525
AC_DEFUN([MCA_orte_odls_alps_CONFIG],[
2626
AC_CONFIG_FILES([orte/mca/odls/alps/Makefile])
2727

28-
ORTE_CHECK_ALPS([odls_alps], [odls_alps_happy="yes"], [odls_alps_happy="no"])
28+
OPAL_CHECK_ALPS([odls_alps], [odls_alps_happy="yes"], [odls_alps_happy="no"])
2929

3030
AS_IF([test "$odls_alps_happy" = "yes"],
3131
[$1

‎orte/mca/oob/alps/configure.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# University of Stuttgart. All rights reserved.
1111
# Copyright (c) 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
13-
# Copyright (c) 2011-2015 Los Alamos National Security, LLC.
13+
# Copyright (c) 2011-2016 Los Alamos National Security, LLC.
1414
# All rights reserved.
1515
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
1616
# $COPYRIGHT$
@@ -25,7 +25,7 @@
2525
AC_DEFUN([MCA_orte_oob_alps_CONFIG],[
2626
AC_CONFIG_FILES([orte/mca/oob/alps/Makefile])
2727

28-
ORTE_CHECK_ALPS([oob_alps], [oob_alps_happy="yes"], [oob_alps_happy="no"])
28+
OPAL_CHECK_ALPS([oob_alps], [oob_alps_happy="yes"], [oob_alps_happy="no"])
2929

3030
AS_IF([test "$oob_alps_happy" = "yes"],
3131
[$1

‎orte/mca/plm/alps/configure.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# Copyright (c) 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
1313
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
14-
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
14+
# Copyright (c) 2011-2016 Los Alamos National Security, LLC.
1515
# All rights reserved.
1616
# $COPYRIGHT$
1717
#
@@ -25,7 +25,7 @@
2525
AC_DEFUN([MCA_orte_plm_alps_CONFIG],[
2626
AC_CONFIG_FILES([orte/mca/plm/alps/Makefile])
2727

28-
ORTE_CHECK_ALPS([plm_alps], [plm_alps_happy="yes"], [plm_alps_happy="no"])
28+
OPAL_CHECK_ALPS([plm_alps], [plm_alps_happy="yes"], [plm_alps_happy="no"])
2929

3030
AS_IF([test "$plm_alps_happy" = "yes"],
3131
[$1

‎orte/mca/plm/slurm/configure.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# Copyright (c) 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
1313
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
14-
# Copyright (c) 2011-2015 Los Alamos National Security, LLC.
14+
# Copyright (c) 2011-2016 Los Alamos National Security, LLC.
1515
# All rights reserved.
1616
# $COPYRIGHT$
1717
#
@@ -41,7 +41,7 @@ AC_DEFUN([MCA_orte_plm_slurm_CONFIG],[
4141
# check to see if this is a Cray nativized slurm env.
4242

4343
slurm_cray_env=0
44-
ORTE_CHECK_ALPS([plm_slurm_cray],
44+
OPAL_CHECK_ALPS([plm_slurm_cray],
4545
[slurm_cray_env=1])
4646

4747
AC_DEFINE_UNQUOTED([SLURM_CRAY_ENV],[$slurm_cray_env],

0 commit comments

Comments
 (0)