Skip to content

Commit 9f040aa

Browse files
awlauriaawlauria
authored
Merge pull request #8976 from awlauria/cleanup_orte
pkg-config oshmem files and removing some -lopen-rte references
2 parents b6d7bf1 + ab9535b commit 9f040aa

File tree

109 files changed

+322
-259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+322
-259
lines changed

‎config/opal_mca.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -769,12 +769,12 @@ AC_DEFUN([MCA_PROCESS_COMPONENT],[
769769
else
770770
if test "$2" = "common"; then
771771
# Static libraries in "common" frameworks are installed, and
772-
# therefore must obey the $FRAMEWORK_LIB_PREFIX that was
772+
# therefore must obey the $FRAMEWORK_LIB_NAME that was
773773
# set.
774-
$7="mca/$2/$3/lib${m4_translit([$1], [a-z], [A-Z])_LIB_PREFIX}mca_$2_$3.la $$7"
774+
$7="mca/$2/$3/lib${m4_translit([$1], [a-z], [A-Z])_LIB_NAME}mca_$2_$3.la $$7"
775775
else
776776
# Other frameworks do not have to obey the
777-
# $FRAMEWORK_LIB_PREFIX prefix.
777+
# $FRAMEWORK_LIB_NAME prefix.
778778
$7="mca/$2/$3/libmca_$2_$3.la $$7"
779779
fi
780780
echo "extern const mca_base_component_t mca_$2_$3_component;" >> $outfile.extern

‎config/opal_set_lib_prefix.m4 renamed to ‎config/opal_set_lib_name.m4

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212

1313
# OPAL_SET_LIB_PREFIX([library_prefix]
1414
#
15-
# This macro sets a prefix for the libopen-pal library. Specifically,
16-
# libopen-pal.la becomes libPREFIXopen-pal.la.
15+
# This macro sets a name for the libopen-pal library. Specifically,
16+
# libopen-pal.la becomes libopen-pal.la by default.
1717
#
1818
# --------------------------------------------------------
19-
AC_DEFUN([OPAL_SET_LIB_PREFIX],[
19+
AC_DEFUN([OPAL_SET_LIB_NAME],[
2020
AS_IF([test "$opal_lib_prefix_set" = "yes"],
21-
[AC_MSG_WARN([OPAL lib prefix was already set!])
21+
[AC_MSG_WARN([OPAL lib name was already set!])
2222
AC_MSG_WARN([This is a configury programming error])
2323
AC_MSG_ERROR([Cannot continue])])
2424

25-
OPAL_LIB_PREFIX=$1
25+
OPAL_LIB_NAME=$1
2626
opal_lib_prefix_set=yes
27-
AC_SUBST(OPAL_LIB_PREFIX)
27+
AC_SUBST(OPAL_LIB_NAME)
2828
])dnl
2929

3030
#

‎config/oshmem_config_files.m4

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# Copyright (c) 2013 Mellanox Technologies, Inc.
44
# All rights reserved.
55
# Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
6-
# Copyright (c) 2017 Research Organization for Information Science
7-
# and Technology (RIST). All rights reserved.
6+
# Copyright (c) 2017-2018 Research Organization for Information Science
7+
# and Technology (RIST). All rights reserved.
88
# $COPYRIGHT$
99
#
1010
# Additional copyrights may follow
@@ -27,5 +27,9 @@ AC_DEFUN([OSHMEM_CONFIG_FILES],[
2727
oshmem/tools/wrappers/shmemcc-wrapper-data.txt
2828
oshmem/tools/wrappers/shmemc++-wrapper-data.txt
2929
oshmem/tools/wrappers/shmemfort-wrapper-data.txt
30+
oshmem/tools/wrappers/oshmem.pc
31+
oshmem/tools/wrappers/oshmem-c.pc
32+
oshmem/tools/wrappers/oshmem-cxx.pc
33+
oshmem/tools/wrappers/oshmem-fort.pc
3034
])
3135
])

‎configure.ac

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,9 @@ fi
328328

329329
# The library prefixes must be set before we call OPAL MCA. Here is
330330
# as good a place as any.
331-
OPAL_SET_LIB_PREFIX([])
331+
m4_ifdef([project_opal],
332+
[OPAL_SET_LIB_NAME([open-pal])])
333+
332334
m4_ifdef([project_ompi],
333335
[OMPI_SET_LIB_NAME([])])
334336

‎contrib/libadd_mca_comp_update.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import glob, os, re, shutil
99

10-
projects= {'opal' : ["$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la"],
10+
projects= {'opal' : ["$(top_builddir)/opal/lib@OPAL_LIB_NAME@.la"],
1111
'ompi' : ["$(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la"],
1212
'oshmem' : ["$(top_builddir)/oshmem/liboshmem.la"],
1313
}

‎contrib/scaling/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ mpi_no_op: mpi_no_op.c
1111
mpicc -o mpi_no_op mpi_no_op.c
1212

1313
mpi_memprobe: mpi_memprobe.c
14-
mpicc -o mpi_memprobe mpi_memprobe.c -lopen-pal -lopen-rte
14+
mpicc -o mpi_memprobe mpi_memprobe.c -lopen-pal
1515

1616
clean:
1717
rm -f $(PROGS) *~

‎ompi/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ lib@OMPI_LIBMPI_NAME@_la_LIBADD = \
157157

158158

159159
lib@OMPI_LIBMPI_NAME@_la_LIBADD += \
160-
$(OMPI_TOP_BUILDDIR)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
160+
$(OMPI_TOP_BUILDDIR)/opal/lib@OPAL_LIB_NAME@.la
161161
lib@OMPI_LIBMPI_NAME@_la_DEPENDENCIES = $(lib@OMPI_LIBMPI_NAME@_la_LIBADD)
162162
lib@OMPI_LIBMPI_NAME@_la_LDFLAGS = \
163163
-version-info $(libmpi_so_version) \

‎ompi/debuggers/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ headers = \
4646
dlopen_test_SOURCES = dlopen_test.c
4747
dlopen_test_LDADD = \
4848
$(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \
49-
$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
49+
$(top_builddir)/opal/lib@OPAL_LIB_NAME@.la
5050
dlopen_test_DEPENDENCIES = $(ompi_predefined_LDADD)
5151

5252
predefined_gap_test_SOURCES = predefined_gap_test.c

‎ompi/debuggers/ompi_debuggers.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
* MPI portion of debugger support: initially based on the
2727
* TotalView/Etnus API for debuggers to attach to MPI jobs.
2828
*
29-
* There is a lengthy explanation of how OMPI handles parallel
30-
* debuggers attaching to MPI jobs in orte/tools/orterun/debuggers.c.
3129
*/
3230

3331
#include "ompi_config.h"

‎ompi/dpm/dpm.c

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,7 +1148,7 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
11481148
#endif
11491149

11501150
/* check for 'ompi_prefix' (OMPI-specific -- to effect the same
1151-
* behavior as --prefix option to orterun)
1151+
* behavior as --prefix option to prun)
11521152
*
11531153
* This is a job-level key
11541154
*/
@@ -1217,7 +1217,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
12171217
OPAL_LIST_DESTRUCT(&job_info);
12181218
OPAL_LIST_DESTRUCT(&app_info);
12191219
PMIX_APP_FREE(apps, scount);
1220-
opal_progress_event_users_decrement();
12211220
if (NULL != hostfiles) {
12221221
opal_argv_free(hostfiles);
12231222
}
@@ -1239,7 +1238,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
12391238
OPAL_LIST_DESTRUCT(&job_info);
12401239
OPAL_LIST_DESTRUCT(&app_info);
12411240
PMIX_APP_FREE(apps, scount);
1242-
opal_progress_event_users_decrement();
12431241
if (NULL != hostfiles) {
12441242
opal_argv_free(hostfiles);
12451243
}
@@ -1257,7 +1255,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
12571255
OPAL_LIST_DESTRUCT(&job_info);
12581256
OPAL_LIST_DESTRUCT(&app_info);
12591257
PMIX_APP_FREE(apps, scount);
1260-
opal_progress_event_users_decrement();
12611258
if (NULL != hostfiles) {
12621259
opal_argv_free(hostfiles);
12631260
}
@@ -1275,7 +1272,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
12751272
OPAL_LIST_DESTRUCT(&job_info);
12761273
OPAL_LIST_DESTRUCT(&app_info);
12771274
PMIX_APP_FREE(apps, scount);
1278-
opal_progress_event_users_decrement();
12791275
if (NULL != hostfiles) {
12801276
opal_argv_free(hostfiles);
12811277
}
@@ -1291,7 +1287,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
12911287
OPAL_LIST_DESTRUCT(&job_info);
12921288
OPAL_LIST_DESTRUCT(&app_info);
12931289
PMIX_APP_FREE(apps, scount);
1294-
opal_progress_event_users_decrement();
12951290
if (NULL != hostfiles) {
12961291
opal_argv_free(hostfiles);
12971292
}
@@ -1307,7 +1302,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
13071302
OPAL_LIST_DESTRUCT(&job_info);
13081303
OPAL_LIST_DESTRUCT(&app_info);
13091304
PMIX_APP_FREE(apps, scount);
1310-
opal_progress_event_users_decrement();
13111305
if (NULL != hostfiles) {
13121306
opal_argv_free(hostfiles);
13131307
}
@@ -1327,7 +1321,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
13271321
OPAL_LIST_DESTRUCT(&job_info);
13281322
OPAL_LIST_DESTRUCT(&app_info);
13291323
PMIX_APP_FREE(apps, scount);
1330-
opal_progress_event_users_decrement();
13311324
if (NULL != hostfiles) {
13321325
opal_argv_free(hostfiles);
13331326
}
@@ -1364,7 +1357,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
13641357
OPAL_LIST_DESTRUCT(&job_info);
13651358
OPAL_LIST_DESTRUCT(&app_info);
13661359
PMIX_APP_FREE(apps, scount);
1367-
opal_progress_event_users_decrement();
13681360
return MPI_ERR_SPAWN;
13691361
}
13701362
}
@@ -1395,7 +1387,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
13951387
OPAL_LIST_DESTRUCT(&job_info);
13961388
OPAL_LIST_DESTRUCT(&app_info);
13971389
PMIX_APP_FREE(apps, scount);
1398-
opal_progress_event_users_decrement();
13991390
return MPI_ERR_SPAWN;
14001391
}
14011392
}
@@ -1472,7 +1463,7 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
14721463
}
14731464
#endif
14741465

1475-
/* see if this is a non-mpi job - if so, then set the flag so ORTE
1466+
/* see if this is a non-mpi job - if so, then set the flag so PRTE
14761467
* knows what to do - job-level key
14771468
*/
14781469
ompi_info_get_bool(array_of_info[i], "ompi_non_mpi", &non_mpi, &flag);
@@ -1551,7 +1542,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
15511542
if (OMPI_SUCCESS != (rc = opal_getcwd(cwd, OPAL_PATH_MAX))) {
15521543
OMPI_ERROR_LOG(rc);
15531544
PMIX_APP_FREE(apps, (size_t)count);
1554-
opal_progress_event_users_decrement();
15551545
if (NULL != hostfiles) {
15561546
opal_argv_free(hostfiles);
15571547
}
@@ -1608,7 +1598,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
16081598
PMIX_INFO_FREE(pinfo, ninfo);
16091599
}
16101600
PMIX_APP_FREE(apps, scount);
1611-
opal_progress_event_users_decrement();
16121601
if (NULL != hostfiles) {
16131602
opal_argv_free(hostfiles);
16141603
}
@@ -1633,7 +1622,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
16331622
PMIX_APP_FREE(apps, scount);
16341623

16351624
if (OPAL_SUCCESS != rc) {
1636-
opal_progress_event_users_decrement();
16371625
return MPI_ERR_SPAWN;
16381626
}
16391627

@@ -2057,7 +2045,7 @@ static int start_dvm(char **hostfiles, char **dash_host)
20572045
will) reset them. If we don't do this, the event
20582046
library may have left some set that, at least on some
20592047
OS's, don't get reset via fork() or exec(). Hence, the
2060-
orted could be unkillable (for example). */
2048+
prted could be unkillable (for example). */
20612049
set_handler_default(SIGTERM);
20622050
set_handler_default(SIGINT);
20632051
set_handler_default(SIGHUP);
@@ -2067,9 +2055,9 @@ static int start_dvm(char **hostfiles, char **dash_host)
20672055
/* Unblock all signals, for many of the same reasons that
20682056
we set the default handlers, above. This is noticable
20692057
on Linux where the event library blocks SIGTERM, but we
2070-
don't want that blocked by the orted (or, more
2058+
don't want that blocked by the prted (or, more
20712059
specifically, we don't want it to be blocked by the
2072-
orted and then inherited by the ORTE processes that it
2060+
prted and then inherited by the PRTE processes that it
20732061
forks, making them unkillable by SIGTERM). */
20742062
sigprocmask(0, 0, &sigs);
20752063
sigprocmask(SIG_UNBLOCK, &sigs, 0);
@@ -2130,7 +2118,6 @@ static int start_dvm(char **hostfiles, char **dash_host)
21302118
pret = PMIx_Init(NULL, &info, 1);
21312119
rc = opal_pmix_convert_status(pret);
21322120
if (OPAL_SUCCESS != rc) {
2133-
opal_progress_event_users_decrement();
21342121
return MPI_ERR_SPAWN;
21352122
}
21362123
/* decrement the PMIx init refcount */

0 commit comments

Comments
 (0)