ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Merge pull request #6408 from ggouaillardet/topic/orte_cleanup

Просмотр исходного кода 
Misc ORTE related cleanups
Этот коммит содержится в:
Gilles Gouaillardet 2019-02-20 17:00:13 +09:00 коммит произвёл GitHub
родитель 18f679efac ad114be28c
Коммит 8d12bb25c2
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
48 изменённых файлов: 282 добавлений и 274 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
autogen.pl
Просмотреть файл

@ -5,8 +5,8 @@
# Copyright (c) 2013 Mellanox Technologies, Inc. # Copyright (c) 2013 Mellanox Technologies, Inc.
# All rights reserved. # All rights reserved.
# Copyright (c) 2013-2014 Intel, Inc. All rights reserved. # Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
# Copyright (c) 2015-2016 Research Organization for Information Science # Copyright (c) 2015-2019 Research Organization for Information Science
# and Technology (RIST). All rights reserved. # and Technology (RIST). All rights reserved.
# Copyright (c) 2015 IBM Corporation. All rights reserved. # Copyright (c) 2015 IBM Corporation. All rights reserved.
# #
# $COPYRIGHT$ # $COPYRIGHT$
@ -1347,7 +1347,7 @@ push(@{$projects}, { name => "orte", dir => "orte", need_base => 1 })
push(@{$projects}, { name => "ompi", dir => "ompi", need_base => 1 }) push(@{$projects}, { name => "ompi", dir => "ompi", need_base => 1 })
if (!$no_ompi_arg); if (!$no_ompi_arg);
push(@{$projects}, { name => "oshmem", dir => "oshmem", need_base => 1 }) push(@{$projects}, { name => "oshmem", dir => "oshmem", need_base => 1 })
if (!$no_ompi_arg && !$no_orte_arg && !$no_oshmem_arg); if (!$no_ompi_arg && !$no_oshmem_arg);
push(@{$projects}, { name => "orcm", dir => "orcm", need_base => 1 }) push(@{$projects}, { name => "orcm", dir => "orcm", need_base => 1 })
if (-e "orcm"); if (-e "orcm");

4
ompi/mca/rte/orte/Makefile.am
Просмотреть файл

@ -3,6 +3,8 @@
# All rights reserved. # All rights reserved.
# Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2016-2018 Intel, Inc. All rights reserved. # Copyright (c) 2016-2018 Intel, Inc. All rights reserved.
# Copyright (c) 2019 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow
@ -31,6 +33,7 @@ libmca_rte_orte_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la
man_pages = mpirun.1 mpiexec.1 ompi-clean.1 ompi-server.1 man_pages = mpirun.1 mpiexec.1 ompi-clean.1 ompi-server.1
if OPAL_INSTALL_BINARIES if OPAL_INSTALL_BINARIES
if PROJECT_ORTE
nodist_man_MANS = $(man_pages) nodist_man_MANS = $(man_pages)
install-exec-hook: install-exec-hook:
@ -45,6 +48,7 @@ uninstall-local:
$(DESTDIR)$(bindir)/ompi-clean$(EXEEXT) \ $(DESTDIR)$(bindir)/ompi-clean$(EXEEXT) \
$(DESTDIR)$(bindir)/ompi-server$(EXEEXT) $(DESTDIR)$(bindir)/ompi-server$(EXEEXT)
endif # PROJECT_ORTE
endif # OPAL_INSTALL_BINARIES endif # OPAL_INSTALL_BINARIES
$(top_builddir)/orte/tools/orterun/orterun.1: $(top_builddir)/orte/tools/orterun/orterun.1:

24
ompi/mca/rte/orte/configure.m4
Просмотреть файл

@ -2,8 +2,9 @@
# #
# Copyright (c) 2012 Los Alamos National Security, LLC. All rights reserved. # Copyright (c) 2012 Los Alamos National Security, LLC. All rights reserved.
# Copyright (c) 2013 Sandia National Laboratories. All rights reserved. # Copyright (c) 2013 Sandia National Laboratories. All rights reserved.
#
# Copyright (c) 2017 Intel, Inc. All rights reserved. # Copyright (c) 2017 Intel, Inc. All rights reserved.
# Copyright (c) 2019 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow
@ -36,13 +37,16 @@ AC_DEFUN([MCA_ompi_rte_orte_POST_CONFIG],[
AC_DEFUN([MCA_ompi_rte_orte_CONFIG],[ AC_DEFUN([MCA_ompi_rte_orte_CONFIG],[
AC_CONFIG_FILES([ompi/mca/rte/orte/Makefile]) AC_CONFIG_FILES([ompi/mca/rte/orte/Makefile])
# This will need to get more complicated when we can build against m4_ifdef([project_orte],
# an external ORTE. [# This will need to get more complicated when we can build against
AC_ARG_WITH([orte], # an external ORTE.
AC_HELP_STRING([--with-orte], AC_ARG_WITH([orte],
[Use ORTE run-time environment (default: yes)])) AC_HELP_STRING([--with-orte],
AS_IF([test "$with_orte" != "no"], [Use ORTE run-time environment (default: yes)]))
[$1], AS_IF([test "$with_orte" != "no"],
[AC_MSG_NOTICE([ORTE disabled by user]) [$1],
$2]) [AC_MSG_NOTICE([ORTE disabled by user])
$2])
],
[$2])
]) ])

19
ompi/mca/rte/pmix/configure.m4
Просмотреть файл

@ -2,8 +2,9 @@
# #
# Copyright (c) 2012 Los Alamos National Security, LLC. All rights reserved. # Copyright (c) 2012 Los Alamos National Security, LLC. All rights reserved.
# Copyright (c) 2013 Sandia National Laboratories. All rights reserved. # Copyright (c) 2013 Sandia National Laboratories. All rights reserved.
#
# Copyright (c) 2017 Intel, Inc. All rights reserved. # Copyright (c) 2017 Intel, Inc. All rights reserved.
# Copyright (c) 2019 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow
@ -35,11 +36,13 @@ AC_DEFUN([MCA_ompi_rte_pmix_POST_CONFIG],[
AC_DEFUN([MCA_ompi_rte_pmix_CONFIG],[ AC_DEFUN([MCA_ompi_rte_pmix_CONFIG],[
AC_CONFIG_FILES([ompi/mca/rte/pmix/Makefile]) AC_CONFIG_FILES([ompi/mca/rte/pmix/Makefile])
AC_ARG_WITH([ompi-pmix-rte], m4_ifdef([project_orte],
AC_HELP_STRING([--with-ompi-pmix-rte], [AC_ARG_WITH([ompi-pmix-rte],
[Use PMIx as the OMPI run-time environment (default: no)])) AC_HELP_STRING([--with-ompi-pmix-rte],
AS_IF([test "$with_ompi_pmix_rte" == "yes"], [Use PMIx as the OMPI run-time environment (default: no)]))
[$1 AS_IF([test "$with_ompi_pmix_rte" == "yes"],
AC_MSG_NOTICE([PMIx RTE selected by user])], [$1
[$2]) AC_MSG_NOTICE([PMIx RTE selected by user])],
[$2])],
[$1])
]) ])

4
ompi/mca/rte/pmix/rte_pmix_module.c
Просмотреть файл

@ -10,6 +10,8 @@
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved. * Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
* Copyright (c) 2018 Triad National Security, LLC. All rights * Copyright (c) 2018 Triad National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
*/ */
#include "ompi_config.h" #include "ompi_config.h"
@ -758,12 +760,12 @@ int ompi_rte_init(int *pargc, char ***pargv)
return OPAL_SUCCESS; return OPAL_SUCCESS;
error: error:
opal_show_help_finalize();
if (OPAL_ERR_SILENT != ret ) { if (OPAL_ERR_SILENT != ret ) {
opal_show_help("help-ompi-rte-pmix.txt", opal_show_help("help-ompi-rte-pmix.txt",
"internal-failure", "internal-failure",
true, error, opal_strerror(ret), ret); true, error, opal_strerror(ret), ret);
} }
opal_finalize();
return ret; return ret;
} }

93
oshmem/include/oshmem/constants.h
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2013 Mellanox Technologies, Inc. * Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -11,60 +13,61 @@
#ifndef OSHMEM_CONSTANTS_H #ifndef OSHMEM_CONSTANTS_H
#define OSHMEM_CONSTANTS_H #define OSHMEM_CONSTANTS_H
#include "orte/constants.h" #include "opal/constants.h"
#include "oshmem/include/shmem.h" #include "oshmem/include/shmem.h"
#define OSHMEM_ERR_BASE ORTE_ERR_MAX #define OSHMEM_ERR_BASE OPAL_ERR_MAX
/* error codes */ /* error codes */
enum { enum {
/* Error codes inherited from ORTE/OPAL. Still enum values so /* Error codes inherited from OPAL. Still enum values so
that we might get nice debugger help */ that we might get nice debugger help */
OSHMEM_SUCCESS = ORTE_SUCCESS, OSHMEM_SUCCESS = OPAL_SUCCESS,
OSHMEM_ERROR = ORTE_ERROR, OSHMEM_ERROR = OPAL_ERROR,
OSHMEM_ERR_OUT_OF_RESOURCE = ORTE_ERR_OUT_OF_RESOURCE, OSHMEM_ERR_OUT_OF_RESOURCE = OPAL_ERR_OUT_OF_RESOURCE,
OSHMEM_ERR_TEMP_OUT_OF_RESOURCE = ORTE_ERR_TEMP_OUT_OF_RESOURCE, OSHMEM_ERR_TEMP_OUT_OF_RESOURCE = OPAL_ERR_TEMP_OUT_OF_RESOURCE,
OSHMEM_ERR_RESOURCE_BUSY = ORTE_ERR_RESOURCE_BUSY, OSHMEM_ERR_RESOURCE_BUSY = OPAL_ERR_RESOURCE_BUSY,
OSHMEM_ERR_BAD_PARAM = ORTE_ERR_BAD_PARAM, OSHMEM_ERR_BAD_PARAM = OPAL_ERR_BAD_PARAM,
OSHMEM_ERR_FATAL = ORTE_ERR_FATAL, OSHMEM_ERR_FATAL = OPAL_ERR_FATAL,
OSHMEM_ERR_NOT_IMPLEMENTED = ORTE_ERR_NOT_IMPLEMENTED, OSHMEM_ERR_NOT_IMPLEMENTED = OPAL_ERR_NOT_IMPLEMENTED,
OSHMEM_ERR_NOT_SUPPORTED = ORTE_ERR_NOT_SUPPORTED, OSHMEM_ERR_NOT_SUPPORTED = OPAL_ERR_NOT_SUPPORTED,
OSHMEM_ERR_INTERUPTED = ORTE_ERR_INTERUPTED, OSHMEM_ERR_INTERUPTED = OPAL_ERR_INTERRUPTED,
OSHMEM_ERR_WOULD_BLOCK = ORTE_ERR_WOULD_BLOCK, OSHMEM_ERR_WOULD_BLOCK = OPAL_ERR_WOULD_BLOCK,
OSHMEM_ERR_IN_ERRNO = ORTE_ERR_IN_ERRNO, OSHMEM_ERR_IN_ERRNO = OPAL_ERR_IN_ERRNO,
OSHMEM_ERR_UNREACH = ORTE_ERR_UNREACH, OSHMEM_ERR_UNREACH = OPAL_ERR_UNREACH,
OSHMEM_ERR_NOT_FOUND = ORTE_ERR_NOT_FOUND, OSHMEM_ERR_NOT_FOUND = OPAL_ERR_NOT_FOUND,
OSHMEM_EXISTS = ORTE_EXISTS, /* indicates that the specified object already exists */ OSHMEM_EXISTS = OPAL_EXISTS, /* indicates that the specified object already exists */
OSHMEM_ERR_TIMEOUT = ORTE_ERR_TIMEOUT, OSHMEM_ERR_TIMEOUT = OPAL_ERR_TIMEOUT,
OSHMEM_ERR_NOT_AVAILABLE = ORTE_ERR_NOT_AVAILABLE, OSHMEM_ERR_NOT_AVAILABLE = OPAL_ERR_NOT_AVAILABLE,
OSHMEM_ERR_PERM = ORTE_ERR_PERM, OSHMEM_ERR_PERM = OPAL_ERR_PERM,
OSHMEM_ERR_VALUE_OUT_OF_BOUNDS = ORTE_ERR_VALUE_OUT_OF_BOUNDS, OSHMEM_ERR_VALUE_OUT_OF_BOUNDS = OPAL_ERR_VALUE_OUT_OF_BOUNDS,
OSHMEM_ERR_FILE_READ_FAILURE = ORTE_ERR_FILE_READ_FAILURE, OSHMEM_ERR_FILE_READ_FAILURE = OPAL_ERR_FILE_READ_FAILURE,
OSHMEM_ERR_FILE_WRITE_FAILURE = ORTE_ERR_FILE_WRITE_FAILURE, OSHMEM_ERR_FILE_WRITE_FAILURE = OPAL_ERR_FILE_WRITE_FAILURE,
OSHMEM_ERR_FILE_OPEN_FAILURE = ORTE_ERR_FILE_OPEN_FAILURE, OSHMEM_ERR_FILE_OPEN_FAILURE = OPAL_ERR_FILE_OPEN_FAILURE,
OSHMEM_ERR_RECV_LESS_THAN_POSTED = ORTE_ERR_RECV_LESS_THAN_POSTED, OSHMEM_ERR_RECV_LESS_THAN_POSTED = (OSHMEM_ERR_BASE - 1),
OSHMEM_ERR_RECV_MORE_THAN_POSTED = ORTE_ERR_RECV_MORE_THAN_POSTED, OSHMEM_ERR_RECV_MORE_THAN_POSTED = (OSHMEM_ERR_BASE - 2),
OSHMEM_ERR_NO_MATCH_YET = ORTE_ERR_NO_MATCH_YET, OSHMEM_ERR_NO_MATCH_YET = (OSHMEM_ERR_BASE - 3),
OSHMEM_ERR_BUFFER = ORTE_ERR_BUFFER, OSHMEM_ERR_BUFFER = OPAL_ERR_BUFFER,
OSHMEM_ERR_REQUEST = ORTE_ERR_REQUEST, OSHMEM_ERR_REQUEST = (OSHMEM_ERR_BASE - 4),
OSHMEM_ERR_NO_CONNECTION_ALLOWED = ORTE_ERR_NO_CONNECTION_ALLOWED, OSHMEM_ERR_NO_CONNECTION_ALLOWED = (OSHMEM_ERR_BASE - 5),
OSHMEM_ERR_CONNECTION_REFUSED = ORTE_ERR_CONNECTION_REFUSED , OSHMEM_ERR_CONNECTION_REFUSED = (OSHMEM_ERR_BASE - 6),
OSHMEM_ERR_CONNECTION_FAILED = ORTE_ERR_CONNECTION_FAILED, OSHMEM_ERR_CONNECTION_FAILED = OPAL_ERR_CONNECTION_FAILED,
OSHMEM_PACK_MISMATCH = ORTE_ERR_PACK_MISMATCH, OSHMEM_PACK_MISMATCH = OPAL_ERR_PACK_MISMATCH,
OSHMEM_ERR_PACK_FAILURE = ORTE_ERR_PACK_FAILURE, OSHMEM_ERR_PACK_FAILURE = OPAL_ERR_PACK_FAILURE,
OSHMEM_ERR_UNPACK_FAILURE = ORTE_ERR_UNPACK_FAILURE, OSHMEM_ERR_UNPACK_FAILURE = OPAL_ERR_UNPACK_FAILURE,
OSHMEM_ERR_COMM_FAILURE = ORTE_ERR_COMM_FAILURE, OSHMEM_ERR_COMM_FAILURE = OPAL_ERR_COMM_FAILURE,
OSHMEM_UNPACK_INADEQUATE_SPACE = ORTE_ERR_UNPACK_INADEQUATE_SPACE, OSHMEM_UNPACK_INADEQUATE_SPACE = OPAL_ERR_UNPACK_INADEQUATE_SPACE,
OSHMEM_UNPACK_READ_PAST_END_OF_BUFFER = ORTE_ERR_UNPACK_READ_PAST_END_OF_BUFFER, OSHMEM_UNPACK_READ_PAST_END_OF_BUFFER = OPAL_ERR_UNPACK_READ_PAST_END_OF_BUFFER,
OSHMEM_ERR_TYPE_MISMATCH = ORTE_ERR_TYPE_MISMATCH, OSHMEM_ERR_TYPE_MISMATCH = OPAL_ERR_TYPE_MISMATCH,
OSHMEM_ERR_COMPARE_FAILURE = ORTE_ERR_COMPARE_FAILURE, OSHMEM_ERR_COMPARE_FAILURE = (OSHMEM_ERR_BASE - 9),
OSHMEM_ERR_COPY_FAILURE = ORTE_ERR_COPY_FAILURE, OSHMEM_ERR_COPY_FAILURE = (OSHMEM_ERR_BASE - 10),
OSHMEM_ERR_UNKNOWN_DATA_TYPE = ORTE_ERR_UNKNOWN_DATA_TYPE, OSHMEM_ERR_UNKNOWN_DATA_TYPE = OPAL_ERR_UNKNOWN_DATA_TYPE,
OSHMEM_ERR_DATA_TYPE_REDEF = ORTE_ERR_DATA_TYPE_REDEF, OSHMEM_ERR_DATA_TYPE_REDEF = OPAL_ERR_DATA_TYPE_REDEF,
OSHMEM_ERR_DATA_OVERWRITE_ATTEMPT = ORTE_ERR_DATA_OVERWRITE_ATTEMPT OSHMEM_ERR_DATA_OVERWRITE_ATTEMPT = OPAL_ERR_DATA_OVERWRITE_ATTEMPT
}; };

16
oshmem/info/info.c
Просмотреть файл

@ -2,6 +2,8 @@
* Copyright (c) 2015 Mellanox Technologies, Inc. * Copyright (c) 2015 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved. * Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -15,13 +17,13 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include "orte/runtime/orte_globals.h"
#include "orte/util/show_help.h"
#include "opal/util/opal_environ.h" #include "opal/util/opal_environ.h"
#include "opal/util/show_help.h"
#include "opal/util/output.h" #include "opal/util/output.h"
#include "opal/util/printf.h" #include "opal/util/printf.h"
#include "ompi/mca/rte/rte.h"
#include "oshmem/version.h" #include "oshmem/version.h"
#include "oshmem/constants.h" #include "oshmem/constants.h"
#include "oshmem/info/info.h" #include "oshmem/info/info.h"
@ -65,7 +67,7 @@ int oshmem_info_init(void)
goto out; goto out;
} }
} }
if (oshmem_shmem_info_env.print_version && 0 == ORTE_PROC_MY_NAME->vpid) { if (oshmem_shmem_info_env.print_version && 0 == OMPI_PROC_MY_NAME->vpid) {
char version[OSHMEM_MAX_LIBRARY_VERSION_STRING]; char version[OSHMEM_MAX_LIBRARY_VERSION_STRING];
int len; int len;
@ -73,7 +75,7 @@ int oshmem_info_init(void)
if (OSHMEM_SUCCESS != ret || 0 == len) { if (OSHMEM_SUCCESS != ret || 0 == len) {
goto out; goto out;
} }
orte_show_help("help-shmem-runtime.txt", opal_show_help("help-shmem-runtime.txt",
"oshmem_init:print-version", "oshmem_init:print-version",
true, true,
version); version);
@ -85,8 +87,8 @@ int oshmem_info_init(void)
goto out; goto out;
} }
} }
if (oshmem_shmem_info_env.print_info && 0 == ORTE_PROC_MY_NAME->vpid) { if (oshmem_shmem_info_env.print_info && 0 == OMPI_PROC_MY_NAME->vpid) {
orte_show_help("help-shmem-runtime.txt", opal_show_help("help-shmem-runtime.txt",
"oshmem_init:print-info", "oshmem_init:print-info",
true, true,
OSHMEM_ENV_VERSION, OSHMEM_ENV_VERSION,

20
oshmem/mca/memheap/base/memheap_base_mkey.c
Просмотреть файл

@ -2,8 +2,8 @@
/* /*
* Copyright (c) 2013-2015 Mellanox Technologies, Inc. * Copyright (c) 2013-2015 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2015-2016 Research Organization for Information Science * Copyright (c) 2015-2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2015 Intel, Inc. All rights reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights * Copyright (c) 2015 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
@ -202,7 +202,7 @@ static void do_recv(int source_pe, opal_buffer_t* buffer)
MEMHEAP_VERBOSE(5, "unpacking %d of %d", cnt, OPAL_UINT8); MEMHEAP_VERBOSE(5, "unpacking %d of %d", cnt, OPAL_UINT8);
rc = opal_dss.unpack(buffer, &msg_type, &cnt, OPAL_UINT8); rc = opal_dss.unpack(buffer, &msg_type, &cnt, OPAL_UINT8);
if (OPAL_SUCCESS != rc) { if (OPAL_SUCCESS != rc) {
ORTE_ERROR_LOG(rc); OMPI_ERROR_LOG(rc);
goto send_fail; goto send_fail;
} }
@ -219,7 +219,7 @@ static void do_recv(int source_pe, opal_buffer_t* buffer)
msg = OBJ_NEW(opal_buffer_t); msg = OBJ_NEW(opal_buffer_t);
if (!msg) { if (!msg) {
MEMHEAP_ERROR("failed to get msg buffer"); MEMHEAP_ERROR("failed to get msg buffer");
ORTE_ERROR_LOG(rc); OMPI_ERROR_LOG(rc);
return; return;
} }
@ -234,7 +234,7 @@ static void do_recv(int source_pe, opal_buffer_t* buffer)
rc = send_buffer(source_pe, msg); rc = send_buffer(source_pe, msg);
if (MPI_SUCCESS != rc) { if (MPI_SUCCESS != rc) {
MEMHEAP_ERROR("FAILED to send rml message %d", rc); MEMHEAP_ERROR("FAILED to send rml message %d", rc);
ORTE_ERROR_LOG(rc); OMPI_ERROR_LOG(rc);
goto send_fail; goto send_fail;
} }
break; break;
@ -264,7 +264,7 @@ static void do_recv(int source_pe, opal_buffer_t* buffer)
send_fail: msg = OBJ_NEW(opal_buffer_t); send_fail: msg = OBJ_NEW(opal_buffer_t);
if (!msg) { if (!msg) {
MEMHEAP_ERROR("failed to get msg buffer"); MEMHEAP_ERROR("failed to get msg buffer");
ORTE_ERROR_LOG(rc); OMPI_ERROR_LOG(rc);
return; return;
} }
msg_type = MEMHEAP_RKEY_RESP_FAIL; msg_type = MEMHEAP_RKEY_RESP_FAIL;
@ -273,7 +273,7 @@ static void do_recv(int source_pe, opal_buffer_t* buffer)
rc = send_buffer(source_pe, msg); rc = send_buffer(source_pe, msg);
if (MPI_SUCCESS != rc) { if (MPI_SUCCESS != rc) {
MEMHEAP_ERROR("FAILED to send rml message %d", rc); MEMHEAP_ERROR("FAILED to send rml message %d", rc);
ORTE_ERROR_LOG(rc); OMPI_ERROR_LOG(rc);
} }
} }
@ -340,14 +340,14 @@ static int oshmem_mkey_recv_cb(void)
tmp_buf = malloc(size); tmp_buf = malloc(size);
if (NULL == tmp_buf) { if (NULL == tmp_buf) {
MEMHEAP_ERROR("not enough memory"); MEMHEAP_ERROR("not enough memory");
ORTE_ERROR_LOG(0); OMPI_ERROR_LOG(0);
return n; return n;
} else { } else {
memcpy(tmp_buf, (void*)&r->buf, size); memcpy(tmp_buf, (void*)&r->buf, size);
msg = OBJ_NEW(opal_buffer_t); msg = OBJ_NEW(opal_buffer_t);
if (NULL == msg) { if (NULL == msg) {
MEMHEAP_ERROR("not enough memory"); MEMHEAP_ERROR("not enough memory");
ORTE_ERROR_LOG(0); OMPI_ERROR_LOG(0);
free(tmp_buf); free(tmp_buf);
return n; return n;
} }
@ -366,7 +366,7 @@ static int oshmem_mkey_recv_cb(void)
rc = PMPI_Start(&r->recv_req); rc = PMPI_Start(&r->recv_req);
if (MPI_SUCCESS != rc) { if (MPI_SUCCESS != rc) {
MEMHEAP_ERROR("Failed to post recv request %d", rc); MEMHEAP_ERROR("Failed to post recv request %d", rc);
ORTE_ERROR_LOG(rc); OMPI_ERROR_LOG(rc);
return n; return n;
} }
opal_list_append(&memheap_oob.req_list, &r->super); opal_list_append(&memheap_oob.req_list, &r->super);

5
oshmem/mca/memheap/base/memheap_base_select.c
Просмотреть файл

@ -1,8 +1,8 @@
/* /*
* Copyright (c) 2013-2015 Mellanox Technologies, Inc. * Copyright (c) 2013-2015 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science * Copyright (c) 2015-2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -21,7 +21,6 @@
#include "oshmem/util/oshmem_util.h" #include "oshmem/util/oshmem_util.h"
#include "oshmem/mca/memheap/memheap.h" #include "oshmem/mca/memheap/memheap.h"
#include "oshmem/mca/memheap/base/base.h" #include "oshmem/mca/memheap/base/base.h"
#include "orte/mca/errmgr/errmgr.h"
mca_memheap_base_module_t mca_memheap = {0}; mca_memheap_base_module_t mca_memheap = {0};

4
oshmem/mca/memheap/buddy/memheap_buddy.c
Просмотреть файл

@ -1,5 +1,7 @@
/* Copyright (c) 2013 Mellanox Technologies, Inc. /* Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -14,10 +16,8 @@
#include "oshmem/mca/memheap/buddy/memheap_buddy.h" #include "oshmem/mca/memheap/buddy/memheap_buddy.h"
#include "oshmem/mca/memheap/buddy/memheap_buddy_component.h" #include "oshmem/mca/memheap/buddy/memheap_buddy_component.h"
#include "oshmem/mca/memheap/base/base.h" #include "oshmem/mca/memheap/base/base.h"
#include "orte/mca/grpcomm/grpcomm.h"
#include "opal/class/opal_hash_table.h" #include "opal/class/opal_hash_table.h"
#include "opal/class/opal_object.h" #include "opal/class/opal_object.h"
#include "orte/util/name_fns.h"
static int buddy_init(mca_memheap_buddy_module_t* buddy); static int buddy_init(mca_memheap_buddy_module_t* buddy);

4
oshmem/mca/memheap/ptmalloc/memheap_ptmalloc.c
Просмотреть файл

@ -1,5 +1,7 @@
/* Copyright (c) 2013 Mellanox Technologies, Inc. /* Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -14,10 +16,8 @@
#include "oshmem/mca/memheap/ptmalloc/memheap_ptmalloc.h" #include "oshmem/mca/memheap/ptmalloc/memheap_ptmalloc.h"
#include "oshmem/mca/memheap/ptmalloc/memheap_ptmalloc_component.h" #include "oshmem/mca/memheap/ptmalloc/memheap_ptmalloc_component.h"
#include "oshmem/mca/memheap/base/base.h" #include "oshmem/mca/memheap/base/base.h"
#include "orte/mca/grpcomm/grpcomm.h"
#include "opal/class/opal_hash_table.h" #include "opal/class/opal_hash_table.h"
#include "opal/class/opal_object.h" #include "opal/class/opal_object.h"
#include "orte/util/name_fns.h"
mca_memheap_ptmalloc_module_t memheap_ptmalloc = { mca_memheap_ptmalloc_module_t memheap_ptmalloc = {
{ {

4
oshmem/mca/scoll/basic/scoll_basic_barrier.c
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2013-2015 Mellanox Technologies, Inc. * Copyright (c) 2013-2015 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -12,8 +14,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "orte/mca/grpcomm/grpcomm.h"
#include "oshmem/constants.h" #include "oshmem/constants.h"
#include "oshmem/mca/spml/spml.h" #include "oshmem/mca/spml/spml.h"
#include "oshmem/mca/scoll/scoll.h" #include "oshmem/mca/scoll/scoll.h"

4
oshmem/mca/scoll/basic/scoll_basic_broadcast.c
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2013 Mellanox Technologies, Inc. * Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -12,8 +14,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "orte/mca/grpcomm/grpcomm.h"
#include "opal/util/bit_ops.h" #include "opal/util/bit_ops.h"
#include "oshmem/constants.h" #include "oshmem/constants.h"

4
oshmem/mca/scoll/basic/scoll_basic_collect.c
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2013-2015 Mellanox Technologies, Inc. * Copyright (c) 2013-2015 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -12,8 +14,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "orte/mca/grpcomm/grpcomm.h"
#include "oshmem/constants.h" #include "oshmem/constants.h"
#include "oshmem/mca/spml/spml.h" #include "oshmem/mca/spml/spml.h"
#include "oshmem/mca/scoll/scoll.h" #include "oshmem/mca/scoll/scoll.h"

18
oshmem/mca/scoll/mpi/scoll_mpi.h
Просмотреть файл

@ -1,10 +1,12 @@
/** /*
Copyright (c) 2011 Mellanox Technologies. All rights reserved. * Copyright (c) 2011 Mellanox Technologies. All rights reserved.
$COPYRIGHT$ * Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
Additional copyrights may follow * $COPYRIGHT$
*
$HEADER$ * Additional copyrights may follow
*
* $HEADER$
*/ */
#ifndef MCA_SCOLL_MPI_H #ifndef MCA_SCOLL_MPI_H
@ -20,8 +22,6 @@
#include "oshmem/proc/proc.h" #include "oshmem/proc/proc.h"
#include "ompi/communicator/communicator.h" #include "ompi/communicator/communicator.h"
#include "orte/runtime/orte_globals.h"
#include "scoll_mpi_debug.h" #include "scoll_mpi_debug.h"
BEGIN_C_DECLS BEGIN_C_DECLS

4
oshmem/mca/spml/base/spml_base.c
Просмотреть файл

@ -2,6 +2,8 @@
* Copyright (c) 2013 Mellanox Technologies, Inc. * Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2017 ARM, Inc. All rights reserved. * Copyright (c) 2017 ARM, Inc. All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -12,8 +14,6 @@
#include "oshmem_config.h" #include "oshmem_config.h"
#include "ompi/mca/bml/base/base.h" #include "ompi/mca/bml/base/base.h"
#include "opal/datatype/opal_convertor.h" #include "opal/datatype/opal_convertor.h"
#include "orte/include/orte/types.h"
#include "orte/runtime/orte_globals.h"
#include "oshmem/proc/proc.h" #include "oshmem/proc/proc.h"
#include "oshmem/mca/spml/base/base.h" #include "oshmem/mca/spml/base/base.h"
#include "opal/mca/btl/btl.h" #include "opal/mca/btl/btl.h"

10
oshmem/mca/spml/base/spml_base_select.c
Просмотреть файл

@ -1,8 +1,8 @@
/* /*
* Copyright (c) 2013 Mellanox Technologies, Inc. * Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science * Copyright (c) 2014-2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -18,8 +18,6 @@
#include "opal/mca/base/base.h" #include "opal/mca/base/base.h"
#include "opal/runtime/opal.h" #include "opal/runtime/opal.h"
#include "orte/mca/errmgr/errmgr.h"
#include "oshmem/util/oshmem_util.h" #include "oshmem/util/oshmem_util.h"
#include "oshmem/constants.h" #include "oshmem/constants.h"
#include "oshmem/mca/spml/spml.h" #include "oshmem/mca/spml/spml.h"
@ -147,10 +145,10 @@ int mca_spml_base_select(bool enable_progress_threads, bool enable_mpi_threads)
if (NULL == tmp_val) { if (NULL == tmp_val) {
continue; continue;
} }
orte_errmgr.abort(1, "SPML %s cannot be selected", tmp_val); ompi_rte_abort(1, "SPML %s cannot be selected", tmp_val);
} }
if (0 == i) { if (0 == i) {
orte_errmgr.abort(2, ompi_rte_abort(2,
"No spml component available. This shouldn't happen."); "No spml component available. This shouldn't happen.");
} }
} }

12
oshmem/mca/spml/ikrit/spml_ikrit.c
Просмотреть файл

@ -2,8 +2,8 @@
/* /*
* Copyright (c) 2013-2015 Mellanox Technologies, Inc. * Copyright (c) 2013-2015 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2014-2016 Research Organization for Information Science * Copyright (c) 2014-2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights * Copyright (c) 2015 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* $COPYRIGHT$ * $COPYRIGHT$
@ -23,8 +23,7 @@
#include "oshmem_config.h" #include "oshmem_config.h"
#include "opal/datatype/opal_convertor.h" #include "opal/datatype/opal_convertor.h"
#include "opal/mca/memchecker/base/base.h" #include "opal/mca/memchecker/base/base.h"
#include "orte/include/orte/types.h" #include "opal/util/show_help.h"
#include "orte/runtime/orte_globals.h"
#include "oshmem/mca/spml/ikrit/spml_ikrit.h" #include "oshmem/mca/spml/ikrit/spml_ikrit.h"
#include "oshmem/include/shmem.h" #include "oshmem/include/shmem.h"
#include "oshmem/mca/memheap/memheap.h" #include "oshmem/mca/memheap/memheap.h"
@ -33,7 +32,6 @@
#include "oshmem/mca/spml/base/base.h" #include "oshmem/mca/spml/base/base.h"
#include "oshmem/mca/spml/base/spml_base_putreq.h" #include "oshmem/mca/spml/base/spml_base_putreq.h"
#include "oshmem/runtime/runtime.h" #include "oshmem/runtime/runtime.h"
#include "orte/util/show_help.h"
#include "oshmem/mca/sshmem/sshmem.h" #include "oshmem/mca/sshmem/sshmem.h"
#include "oshmem/mca/spml/ikrit/spml_ikrit_component.h" #include "oshmem/mca/spml/ikrit/spml_ikrit_component.h"
@ -351,7 +349,7 @@ int mca_spml_ikrit_add_procs(ompi_proc_t** procs, size_t nprocs)
if (mca_spml_ikrit.hw_rdma_channel) { if (mca_spml_ikrit.hw_rdma_channel) {
err = mxm_ep_get_address(mca_spml_ikrit.mxm_hw_rdma_ep, &my_ep_info.addr.ep_addr, &mxm_addr_len); err = mxm_ep_get_address(mca_spml_ikrit.mxm_hw_rdma_ep, &my_ep_info.addr.ep_addr, &mxm_addr_len);
if (MXM_OK != err) { if (MXM_OK != err) {
orte_show_help("help-oshmem-spml-ikrit.txt", "unable to get endpoint address", true, opal_show_help("help-oshmem-spml-ikrit.txt", "unable to get endpoint address", true,
mxm_error_string(err)); mxm_error_string(err));
rc = OSHMEM_ERROR; rc = OSHMEM_ERROR;
goto bail; goto bail;
@ -361,7 +359,7 @@ int mca_spml_ikrit_add_procs(ompi_proc_t** procs, size_t nprocs)
} }
err = mxm_ep_get_address(mca_spml_ikrit.mxm_ep, &my_ep_info.addr.ep_addr, &mxm_addr_len); err = mxm_ep_get_address(mca_spml_ikrit.mxm_ep, &my_ep_info.addr.ep_addr, &mxm_addr_len);
if (MXM_OK != err) { if (MXM_OK != err) {
orte_show_help("help-oshmem-spml-ikrit.txt", "unable to get endpoint address", true, opal_show_help("help-oshmem-spml-ikrit.txt", "unable to get endpoint address", true,
mxm_error_string(err)); mxm_error_string(err));
rc = OSHMEM_ERROR; rc = OSHMEM_ERROR;
goto bail; goto bail;

5
oshmem/mca/spml/ikrit/spml_ikrit.h
Просмотреть файл

@ -4,8 +4,8 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights * Copyright (c) 2015 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2016 Research Organization for Information Science * Copyright (c) 2016-2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -32,7 +32,6 @@
#include "opal/class/opal_free_list.h" #include "opal/class/opal_free_list.h"
#include "opal/class/opal_list.h" #include "opal/class/opal_list.h"
#include "orte/runtime/orte_globals.h"
#include "oshmem/mca/memheap/base/base.h" #include "oshmem/mca/memheap/base/base.h"
#include <mxm/api/mxm_api.h> #include <mxm/api/mxm_api.h>

20
oshmem/mca/spml/ikrit/spml_ikrit_component.c
Просмотреть файл

@ -5,6 +5,8 @@
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights * Copyright (c) 2015 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved. * Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -18,8 +20,8 @@
#include <unistd.h> #include <unistd.h>
#include "opal/util/printf.h" #include "opal/util/printf.h"
#include "opal/util/show_help.h"
#include "oshmem_config.h" #include "oshmem_config.h"
#include "orte/util/show_help.h"
#include "shmem.h" #include "shmem.h"
#include "oshmem/runtime/params.h" #include "oshmem/runtime/params.h"
#include "oshmem/mca/spml/spml.h" #include "oshmem/mca/spml/spml.h"
@ -27,8 +29,6 @@
#include "spml_ikrit_component.h" #include "spml_ikrit_component.h"
#include "oshmem/mca/spml/ikrit/spml_ikrit.h" #include "oshmem/mca/spml/ikrit/spml_ikrit.h"
#include "orte/util/show_help.h"
static int mca_spml_ikrit_component_register(void); static int mca_spml_ikrit_component_register(void);
static int mca_spml_ikrit_component_open(void); static int mca_spml_ikrit_component_open(void);
static int mca_spml_ikrit_component_close(void); static int mca_spml_ikrit_component_close(void);
@ -76,7 +76,7 @@ static inline int check_mxm_tls(char *var)
"%s=%s", "%s=%s",
var, getenv(var) var, getenv(var)
)) { )) {
orte_show_help("help-oshmem-spml-ikrit.txt", "mxm shm tls", true, opal_show_help("help-oshmem-spml-ikrit.txt", "mxm shm tls", true,
str); str);
free(str); free(str);
} }
@ -133,7 +133,7 @@ static inline int check_mxm_hw_tls(char *v, char *tls)
} }
} }
orte_show_help("help-oshmem-spml-ikrit.txt", "mxm tls", true, opal_show_help("help-oshmem-spml-ikrit.txt", "mxm tls", true,
v, tls); v, tls);
return OSHMEM_ERROR; return OSHMEM_ERROR;
} }
@ -260,7 +260,7 @@ int spml_ikrit_progress(void)
err = mxm_progress(mca_spml_ikrit.mxm_context); err = mxm_progress(mca_spml_ikrit.mxm_context);
if ((MXM_OK != err) && (MXM_ERR_NO_PROGRESS != err)) { if ((MXM_OK != err) && (MXM_ERR_NO_PROGRESS != err)) {
orte_show_help("help-oshmem-spml-ikrit.txt", opal_show_help("help-oshmem-spml-ikrit.txt",
"errors during mxm_progress", "errors during mxm_progress",
true, true,
mxm_error_string(err)); mxm_error_string(err));
@ -317,7 +317,7 @@ static int mca_spml_ikrit_component_open(void)
SPML_VERBOSE(1, SPML_VERBOSE(1,
"No supported device found, disqualifying spml/ikrit"); "No supported device found, disqualifying spml/ikrit");
} else { } else {
orte_show_help("help-oshmem-spml-ikrit.txt", opal_show_help("help-oshmem-spml-ikrit.txt",
"mxm init", "mxm init",
true, true,
mxm_error_string(err)); mxm_error_string(err));
@ -329,7 +329,7 @@ static int mca_spml_ikrit_component_open(void)
MXM_SHMEM_MQ_ID, MXM_SHMEM_MQ_ID,
&mca_spml_ikrit.mxm_mq); &mca_spml_ikrit.mxm_mq);
if (MXM_OK != err) { if (MXM_OK != err) {
orte_show_help("help-oshmem-spml-ikrit.txt", opal_show_help("help-oshmem-spml-ikrit.txt",
"mxm mq create", "mxm mq create",
true, true,
mxm_error_string(err)); mxm_error_string(err));
@ -365,7 +365,7 @@ static int spml_ikrit_mxm_init(void)
mca_spml_ikrit.mxm_ep_opts, mca_spml_ikrit.mxm_ep_opts,
&mca_spml_ikrit.mxm_ep); &mca_spml_ikrit.mxm_ep);
if (MXM_OK != err) { if (MXM_OK != err) {
orte_show_help("help-oshmem-spml-ikrit.txt", opal_show_help("help-oshmem-spml-ikrit.txt",
"unable to create endpoint", "unable to create endpoint",
true, true,
mxm_error_string(err)); mxm_error_string(err));
@ -376,7 +376,7 @@ static int spml_ikrit_mxm_init(void)
mca_spml_ikrit.mxm_ep_hw_rdma_opts, mca_spml_ikrit.mxm_ep_hw_rdma_opts,
&mca_spml_ikrit.mxm_hw_rdma_ep); &mca_spml_ikrit.mxm_hw_rdma_ep);
if (MXM_OK != err) { if (MXM_OK != err) {
orte_show_help("help-oshmem-spml-ikrit.txt", opal_show_help("help-oshmem-spml-ikrit.txt",
"unable to create endpoint", "unable to create endpoint",
true, true,
mxm_error_string(err)); mxm_error_string(err));

7
oshmem/mca/spml/ucx/spml_ucx.c
Просмотреть файл

@ -1,8 +1,8 @@
/* /*
* Copyright (c) 2013 Mellanox Technologies, Inc. * Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2014-2018 Research Organization for Information Science * Copyright (c) 2014-2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2016 ARM, Inc. All rights reserved. * Copyright (c) 2016 ARM, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -21,8 +21,6 @@
#include "oshmem_config.h" #include "oshmem_config.h"
#include "opal/datatype/opal_convertor.h" #include "opal/datatype/opal_convertor.h"
#include "opal/mca/common/ucx/common_ucx.h" #include "opal/mca/common/ucx/common_ucx.h"
#include "orte/include/orte/types.h"
#include "orte/runtime/orte_globals.h"
#include "ompi/datatype/ompi_datatype.h" #include "ompi/datatype/ompi_datatype.h"
#include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/pml.h"
@ -35,7 +33,6 @@
#include "oshmem/mca/spml/base/base.h" #include "oshmem/mca/spml/base/base.h"
#include "oshmem/mca/spml/base/spml_base_putreq.h" #include "oshmem/mca/spml/base/spml_base_putreq.h"
#include "oshmem/runtime/runtime.h" #include "oshmem/runtime/runtime.h"
#include "orte/util/show_help.h"
#include "oshmem/mca/spml/ucx/spml_ucx_component.h" #include "oshmem/mca/spml/ucx/spml_ucx_component.h"

5
oshmem/mca/spml/ucx/spml_ucx.h
Просмотреть файл

@ -1,8 +1,8 @@
/* /*
* Copyright (c) 2013 Mellanox Technologies, Inc. * Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2016 Research Organization for Information Science * Copyright (c) 2016-2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2016 ARM, Inc. All rights reserved. * Copyright (c) 2016 ARM, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -34,7 +34,6 @@
#include "opal/class/opal_free_list.h" #include "opal/class/opal_free_list.h"
#include "opal/class/opal_list.h" #include "opal/class/opal_list.h"
#include "orte/runtime/orte_globals.h"
#include "opal/mca/common/ucx/common_ucx.h" #include "opal/mca/common/ucx/common_ucx.h"
#include <ucp/api/ucp.h> #include <ucp/api/ucp.h>

4
oshmem/mca/spml/ucx/spml_ucx_component.c
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2015 Mellanox Technologies, Inc. * Copyright (c) 2015 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -14,7 +16,6 @@
#include <unistd.h> #include <unistd.h>
#include "oshmem_config.h" #include "oshmem_config.h"
#include "orte/util/show_help.h"
#include "shmem.h" #include "shmem.h"
#include "oshmem/runtime/params.h" #include "oshmem/runtime/params.h"
#include "oshmem/mca/spml/spml.h" #include "oshmem/mca/spml/spml.h"
@ -22,7 +23,6 @@
#include "spml_ucx_component.h" #include "spml_ucx_component.h"
#include "oshmem/mca/spml/ucx/spml_ucx.h" #include "oshmem/mca/spml/ucx/spml_ucx.h"
#include "orte/util/show_help.h"
#include "opal/util/opal_environ.h" #include "opal/util/opal_environ.h"
static int mca_spml_ucx_component_register(void); static int mca_spml_ucx_component_register(void);

6
oshmem/mca/sshmem/base/base.h
Просмотреть файл

@ -1,7 +1,9 @@
/* /*
* Copyright (c) 2014 Mellanox Technologies, Inc. * Copyright (c) 2014 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -18,8 +20,6 @@
#include "opal/mca/base/mca_base_framework.h" #include "opal/mca/base/mca_base_framework.h"
#include "orte/runtime/orte_globals.h"
BEGIN_C_DECLS BEGIN_C_DECLS
extern void* mca_sshmem_base_start_address; extern void* mca_sshmem_base_start_address;

4
oshmem/mca/sshmem/base/sshmem_base_wrappers.c
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2014 Mellanox Technologies, Inc. * Copyright (c) 2014 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -68,7 +70,7 @@ char * oshmem_get_unique_file_name(uint64_t pe)
return NULL; return NULL;
} }
snprintf(file_name, OPAL_PATH_MAX, "%s/shmem_job_%u_pe_%llu", mca_sshmem_base_backing_file_dir, ORTE_PROC_MY_NAME->jobid, (unsigned long long)pe); snprintf(file_name, OPAL_PATH_MAX, "%s/shmem_job_%u_pe_%llu", mca_sshmem_base_backing_file_dir, OMPI_PROC_MY_NAME->jobid, (unsigned long long)pe);
return file_name; return file_name;
} }

5
oshmem/mca/sshmem/mmap/sshmem_mmap_module.c
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2014 Mellanox Technologies, Inc. * Copyright (c) 2014 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -36,7 +38,6 @@
#include "opal/util/output.h" #include "opal/util/output.h"
#include "opal/util/path.h" #include "opal/util/path.h"
#include "opal/util/show_help.h" #include "opal/util/show_help.h"
#include "orte/util/show_help.h"
#include "oshmem/proc/proc.h" #include "oshmem/proc/proc.h"
#include "oshmem/mca/sshmem/sshmem.h" #include "oshmem/mca/sshmem/sshmem.h"
@ -137,7 +138,7 @@ segment_create(map_segment_t *ds_buf,
"create segment failure", "create segment failure",
true, true,
"mmap", "mmap",
orte_process_info.nodename, (unsigned long long) size, ompi_process_info.nodename, (unsigned long long) size,
strerror(errno), errno); strerror(errno), errno);
opal_show_help("help-oshmem-sshmem-mmap.txt", opal_show_help("help-oshmem-sshmem-mmap.txt",
"mmap:create segment failure", "mmap:create segment failure",

9
oshmem/mca/sshmem/sysv/sshmem_sysv_module.c
Просмотреть файл

@ -1,7 +1,9 @@
/* /*
* Copyright (c) 2014 Mellanox Technologies, Inc. * Copyright (c) 2014 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -43,7 +45,6 @@
#include "opal/util/output.h" #include "opal/util/output.h"
#include "opal/util/path.h" #include "opal/util/path.h"
#include "opal/util/show_help.h" #include "opal/util/show_help.h"
#include "orte/util/show_help.h"
#include "oshmem/proc/proc.h" #include "oshmem/proc/proc.h"
#include "oshmem/mca/sshmem/sshmem.h" #include "oshmem/mca/sshmem/sshmem.h"
@ -156,7 +157,7 @@ retry_alloc:
"create segment failure", "create segment failure",
true, true,
"sysv", "sysv",
orte_process_info.nodename, (unsigned long long) size, ompi_process_info.nodename, (unsigned long long) size,
strerror(errno), errno); strerror(errno), errno);
opal_show_help("help-oshmem-sshmem-sysv.txt", opal_show_help("help-oshmem-sshmem-sysv.txt",
"sysv:create segment failure", "sysv:create segment failure",
@ -171,7 +172,7 @@ retry_alloc:
"create segment failure", "create segment failure",
true, true,
"sysv", "sysv",
orte_process_info.nodename, (unsigned long long) size, ompi_process_info.nodename, (unsigned long long) size,
strerror(errno), errno); strerror(errno), errno);
opal_show_help("help-oshmem-sshmem-sysv.txt", opal_show_help("help-oshmem-sshmem-sysv.txt",
"sysv:create segment failure", "sysv:create segment failure",

3
oshmem/mca/sshmem/ucx/sshmem_ucx_module.c
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2017 Mellanox Technologies, Inc. * Copyright (c) 2017 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -14,7 +16,6 @@
#include "opal/util/output.h" #include "opal/util/output.h"
#include "opal/util/path.h" #include "opal/util/path.h"
#include "opal/util/show_help.h" #include "opal/util/show_help.h"
#include "orte/util/show_help.h"
#include "oshmem/proc/proc.h" #include "oshmem/proc/proc.h"
#include "oshmem/mca/sshmem/sshmem.h" #include "oshmem/mca/sshmem/sshmem.h"

9
oshmem/op/op.c
Просмотреть файл

@ -2,8 +2,8 @@
* Copyright (c) 2013 Mellanox Technologies, Inc. * Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science * Copyright (c) 2015-2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -14,8 +14,7 @@
#include "oshmem_config.h" #include "oshmem_config.h"
#include <complex.h> #include <complex.h>
#include "orte/runtime/orte_globals.h" #include "opal/datatype/opal_datatype.h"
#include "opal/datatype/opal_datatype_internal.h" #include "opal/datatype/opal_datatype_internal.h"
#include "opal/class/opal_pointer_array.h" #include "opal/class/opal_pointer_array.h"
@ -330,7 +329,7 @@ int oshmem_op_init(void)
if (OPAL_SUCCESS if (OPAL_SUCCESS
!= opal_pointer_array_init(&oshmem_op_array, != opal_pointer_array_init(&oshmem_op_array,
0, 0,
ORTE_GLOBAL_ARRAY_MAX_SIZE, INT_MAX,
1)) { 1)) {
return OSHMEM_ERROR; return OSHMEM_ERROR;
} }

4
oshmem/op/op.h
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2013 Mellanox Technologies, Inc. * Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -19,8 +21,6 @@
#include "opal/class/opal_list.h" #include "opal/class/opal_list.h"
#include "opal/dss/dss_types.h" #include "opal/dss/dss_types.h"
#include "orte/types.h"
BEGIN_C_DECLS BEGIN_C_DECLS
/* ******************************************************************** */ /* ******************************************************************** */

17
oshmem/proc/proc.c
Просмотреть файл

@ -1,8 +1,8 @@
/* /*
* Copyright (c) 2013-2018 Mellanox Technologies, Inc. * Copyright (c) 2013-2018 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2014-2016 Research Organization for Information Science * Copyright (c) 2014-2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2016 ARM, Inc. All rights reserved. * Copyright (c) 2016 ARM, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
@ -23,13 +23,6 @@
#include <strings.h> #include <strings.h>
#endif #endif
#include "orte/mca/errmgr/errmgr.h"
#include "orte/mca/ess/ess.h"
#include "orte/util/proc_info.h"
#include "orte/util/name_fns.h"
#include "orte/util/show_help.h"
#include "orte/runtime/orte_globals.h"
#include "opal/datatype/opal_convertor.h" #include "opal/datatype/opal_convertor.h"
#include "opal/threads/mutex.h" #include "opal/threads/mutex.h"
#include "opal/dss/dss.h" #include "opal/dss/dss.h"
@ -82,7 +75,7 @@ int oshmem_proc_group_init(void)
OBJ_CONSTRUCT(&oshmem_group_array, opal_pointer_array_t); OBJ_CONSTRUCT(&oshmem_group_array, opal_pointer_array_t);
rc = opal_pointer_array_init(&oshmem_group_array, 0, rc = opal_pointer_array_init(&oshmem_group_array, 0,
ORTE_GLOBAL_ARRAY_MAX_SIZE, 1); INT_MAX, 1);
if (OPAL_SUCCESS != rc) { if (OPAL_SUCCESS != rc) {
goto err1; goto err1;
} }
@ -215,10 +208,10 @@ oshmem_group_t* oshmem_proc_group_create(int pe_start, int pe_stride, int pe_siz
/* Prepare peers list */ /* Prepare peers list */
OBJ_CONSTRUCT(&(group->peer_list), opal_list_t); OBJ_CONSTRUCT(&(group->peer_list), opal_list_t);
{ {
orte_namelist_t *peer = NULL; ompi_namelist_t *peer = NULL;
for (i = 0; i < group->proc_count; i++) { for (i = 0; i < group->proc_count; i++) {
peer = OBJ_NEW(orte_namelist_t); peer = OBJ_NEW(ompi_namelist_t);
peer->name.jobid = OSHMEM_PROC_JOBID(group->proc_array[i]); peer->name.jobid = OSHMEM_PROC_JOBID(group->proc_array[i]);
peer->name.vpid = OSHMEM_PROC_VPID(group->proc_array[i]); peer->name.vpid = OSHMEM_PROC_VPID(group->proc_array[i]);
opal_list_append(&(group->peer_list), &peer->super); opal_list_append(&(group->peer_list), &peer->super);

21
oshmem/proc/proc.h
Просмотреть файл

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2013-2018 Mellanox Technologies, Inc. * Copyright (c) 2013-2018 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2016 Research Organization for Information Science * Copyright (c) 2016-2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2017 Cisco Systems, Inc. All rights reserved
* $COPYRIGHT$ * $COPYRIGHT$
@ -22,9 +22,6 @@
#include "opal/dss/dss_types.h" #include "opal/dss/dss_types.h"
#include "opal/mca/hwloc/hwloc-internal.h" #include "opal/mca/hwloc/hwloc-internal.h"
#include "orte/types.h"
#include "orte/runtime/orte_globals.h"
#include "ompi/proc/proc.h" #include "ompi/proc/proc.h"
#include "ompi/communicator/communicator.h" #include "ompi/communicator/communicator.h"
@ -138,27 +135,27 @@ static inline ompi_proc_t *oshmem_proc_local(void)
* *
* @return Pointer to the process instance for \c name * @return Pointer to the process instance for \c name
*/ */
static inline ompi_proc_t *oshmem_proc_for_find(const orte_process_name_t name) static inline ompi_proc_t *oshmem_proc_for_find(const ompi_process_name_t name)
{ {
return (ompi_proc_t *)ompi_proc_for_name(name); return (ompi_proc_t *)ompi_proc_for_name(name);
} }
static inline ompi_proc_t *oshmem_proc_find(int pe) static inline ompi_proc_t *oshmem_proc_find(int pe)
{ {
orte_process_name_t name; ompi_process_name_t name;
name.jobid = ORTE_PROC_MY_NAME->jobid; name.jobid = OMPI_PROC_MY_NAME->jobid;
name.vpid = pe; name.vpid = pe;
return oshmem_proc_for_find(name); return oshmem_proc_for_find(name);
} }
static inline int oshmem_proc_pe(ompi_proc_t *proc) static inline int oshmem_proc_pe(ompi_proc_t *proc)
{ {
return (proc ? (int) ((orte_process_name_t*)&proc->super.proc_name)->vpid : -1); return (proc ? (int) ((ompi_process_name_t*)&proc->super.proc_name)->vpid : -1);
} }
#define OSHMEM_PROC_JOBID(PROC) (((orte_process_name_t*)&((PROC)->super.proc_name))->jobid) #define OSHMEM_PROC_JOBID(PROC) (((ompi_process_name_t*)&((PROC)->super.proc_name))->jobid)
#define OSHMEM_PROC_VPID(PROC) (((orte_process_name_t*)&((PROC)->super.proc_name))->vpid) #define OSHMEM_PROC_VPID(PROC) (((ompi_process_name_t*)&((PROC)->super.proc_name))->vpid)
/** /**
* Initialize the OSHMEM process predefined groups * Initialize the OSHMEM process predefined groups
@ -259,9 +256,9 @@ static inline ompi_proc_t *oshmem_proc_group_find(oshmem_group_t* group,
} }
} }
} else { } else {
orte_process_name_t name; ompi_process_name_t name;
name.jobid = ORTE_PROC_MY_NAME->jobid; name.jobid = OMPI_PROC_MY_NAME->jobid;
name.vpid = pe; name.vpid = pe;
proc = oshmem_proc_for_find(name); proc = oshmem_proc_for_find(name);
} }

32
oshmem/runtime/oshmem_shmem_abort.c
Просмотреть файл

@ -1,7 +1,9 @@
/* /*
* Copyright (c) 2013 Mellanox Technologies, Inc. * Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2017 FUJITSU LIMITED. All rights reserved. * Copyright (c) 2017 FUJITSU LIMITED. All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -27,13 +29,7 @@
#include "opal/mca/backtrace/backtrace.h" #include "opal/mca/backtrace/backtrace.h"
#include "opal/util/error.h" #include "opal/util/error.h"
#include "opal/runtime/opal_params.h" #include "opal/runtime/opal_params.h"
#include "opal/util/show_help.h"
#include "orte/util/proc_info.h"
#include "orte/runtime/runtime.h"
#include "orte/runtime/orte_globals.h"
#include "orte/util/name_fns.h"
#include "orte/util/show_help.h"
#include "orte/mca/errmgr/errmgr.h"
#include "oshmem/runtime/params.h" #include "oshmem/runtime/params.h"
#include "oshmem/runtime/runtime.h" #include "oshmem/runtime/runtime.h"
@ -56,18 +52,20 @@ int oshmem_shmem_abort(int errcode)
/* If ORTE is initialized, use its nodename. Otherwise, call /* If ORTE is initialized, use its nodename. Otherwise, call
gethostname. */ gethostname. */
if (orte_initialized) { /* If MPI is initialized, we know we have a runtime nodename, so
host = orte_process_info.nodename; use that. Otherwise, call gethostname. */
if (ompi_rte_initialized) {
host = ompi_process_info.nodename;
} else { } else {
gethostname(hostname, sizeof(hostname)); gethostname(hostname, sizeof(hostname));
host = hostname; host = hostname;
} }
pid = getpid(); pid = getpid();
orte_show_help("help-shmem-api.txt", opal_show_help("help-shmem-api.txt",
"shmem-abort", "shmem-abort",
true, true,
ORTE_PROC_MY_NAME->vpid, OMPI_PROC_MY_NAME->vpid,
pid, pid,
host, host,
errcode); errcode);
@ -100,10 +98,10 @@ int oshmem_shmem_abort(int errcode)
/* Wait for a while before aborting */ /* Wait for a while before aborting */
opal_delay_abort(); opal_delay_abort();
if (!orte_initialized || !oshmem_shmem_initialized) { if (!oshmem_shmem_initialized) {
if (orte_show_help_is_available()) { if (!opal_initialized) {
/* TODO help message from SHMEM not from MPI is needed*/ /* TODO help message from SHMEM not from MPI is needed*/
orte_show_help("help-shmem-runtime.txt", opal_show_help("help-shmem-runtime.txt",
"oshmem shmem abort:cannot guarantee all killed", "oshmem shmem abort:cannot guarantee all killed",
true, true,
host, host,
@ -125,7 +123,7 @@ int oshmem_shmem_abort(int errcode)
oshmem_shmem_aborted = true; oshmem_shmem_aborted = true;
/* now that we've aborted everyone else, gracefully die. */ /* now that we've aborted everyone else, gracefully die. */
orte_errmgr.abort(errcode, NULL ); ompi_rte_abort(errcode, NULL );
return OSHMEM_SUCCESS; return OSHMEM_SUCCESS;
} }

10
oshmem/runtime/oshmem_shmem_finalize.c
Просмотреть файл

@ -1,8 +1,8 @@
/* /*
* Copyright (c) 2013-2018 Mellanox Technologies, Inc. * Copyright (c) 2013-2018 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science * Copyright (c) 2015-2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2018 Cisco Systems, Inc. All rights reserved * Copyright (c) 2018 Cisco Systems, Inc. All rights reserved
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -32,12 +32,6 @@
#include "opal/sys/atomic.h" #include "opal/sys/atomic.h"
#include "opal/runtime/opal.h" #include "opal/runtime/opal.h"
#include "orte/util/show_help.h"
#include "orte/mca/errmgr/errmgr.h"
#include "orte/mca/grpcomm/grpcomm.h"
#include "orte/runtime/runtime.h"
#include "orte/runtime/orte_globals.h"
#include "opal/mca/rcache/base/base.h" #include "opal/mca/rcache/base/base.h"
#include "opal/mca/mpool/base/base.h" #include "opal/mca/mpool/base/base.h"
#include "opal/mca/allocator/base/base.h" #include "opal/mca/allocator/base/base.h"

16
oshmem/runtime/oshmem_shmem_init.c
Просмотреть файл

@ -1,8 +1,8 @@
/* /*
* Copyright (c) 2013-2018 Mellanox Technologies, Inc. * Copyright (c) 2013-2018 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2015-2016 Research Organization for Information Science * Copyright (c) 2015-2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2015-2018 Cisco Systems, Inc. All rights reserved * Copyright (c) 2015-2018 Cisco Systems, Inc. All rights reserved
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -35,16 +35,6 @@
#include "opal/util/show_help.h" #include "opal/util/show_help.h"
#include "opal/runtime/opal.h" #include "opal/runtime/opal.h"
#include "orte/util/proc_info.h"
#include "orte/runtime/runtime.h"
#include "orte/mca/grpcomm/grpcomm.h"
#include "orte/runtime/orte_globals.h"
#include "orte/util/show_help.h"
#include "orte/mca/ess/ess.h"
#include "orte/runtime/orte_globals.h"
#include "orte/mca/errmgr/errmgr.h"
#include "orte/util/name_fns.h"
#include "ompi/datatype/ompi_datatype.h" #include "ompi/datatype/ompi_datatype.h"
#include "opal/mca/rcache/base/base.h" #include "opal/mca/rcache/base/base.h"
#include "opal/mca/mpool/base/base.h" #include "opal/mca/mpool/base/base.h"
@ -376,7 +366,7 @@ static int _shmem_init(int argc, char **argv, int requested, int *provided)
error: if (ret != OSHMEM_SUCCESS) { error: if (ret != OSHMEM_SUCCESS) {
const char *err_msg = opal_strerror(ret); const char *err_msg = opal_strerror(ret);
orte_show_help("help-shmem-runtime.txt", opal_show_help("help-shmem-runtime.txt",
"shmem_init:startup:internal-failure", "shmem_init:startup:internal-failure",
true, true,
"SHMEM_INIT", "SHMEM_INIT",

9
oshmem/runtime/runtime.h
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2013 Mellanox Technologies, Inc. * Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -23,7 +25,6 @@
#include "opal/class/opal_list.h" #include "opal/class/opal_list.h"
#include "opal/class/opal_hash_table.h" #include "opal/class/opal_hash_table.h"
#include "orte/runtime/orte_globals.h"
#include "ompi/include/mpi.h" #include "ompi/include/mpi.h"
#include <pthread.h> #include <pthread.h>
@ -153,8 +154,8 @@ OSHMEM_DECLSPEC int oshmem_shmem_register_params(void);
#define RUNTIME_CHECK_ERROR(...) \ #define RUNTIME_CHECK_ERROR(...) \
do { \ do { \
fprintf(stderr, "[%s]%s[%s:%d:%s] ", \ fprintf(stderr, "[%s]%s[%s:%d:%s] ", \
orte_process_info.nodename, \ ompi_process_info.nodename, \
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), \ OMPI_NAME_PRINT(OMPI_PROC_MY_NAME), \
__FILE__, __LINE__, __func__); \ __FILE__, __LINE__, __func__); \
fprintf(stderr, __VA_ARGS__); \ fprintf(stderr, __VA_ARGS__); \
} while(0); } while(0);
@ -184,7 +185,7 @@ OSHMEM_DECLSPEC int oshmem_shmem_register_params(void);
*/ */
#define RUNTIME_CHECK_PE(x) \ #define RUNTIME_CHECK_PE(x) \
if (OPAL_UNLIKELY(((x) < 0) || \ if (OPAL_UNLIKELY(((x) < 0) || \
((int)(x) > (int)(orte_process_info.num_procs - 1)))) \ ((int)(x) > (int)(ompi_process_info.num_procs - 1)))) \
{ \ { \
RUNTIME_CHECK_ERROR("Target PE #%d is not in valid range\n", (x)); \ RUNTIME_CHECK_ERROR("Target PE #%d is not in valid range\n", (x)); \
oshmem_shmem_abort(-1); \ oshmem_shmem_abort(-1); \

4
oshmem/shmem/c/shmem_alltoall.c
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2016-2018 Mellanox Technologies, Inc. * Copyright (c) 2016-2018 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -12,8 +14,6 @@
#include "oshmem/constants.h" #include "oshmem/constants.h"
#include "oshmem/include/shmem.h" #include "oshmem/include/shmem.h"
#include "orte/mca/grpcomm/grpcomm.h"
#include "oshmem/runtime/runtime.h" #include "oshmem/runtime/runtime.h"
#include "oshmem/mca/scoll/scoll.h" #include "oshmem/mca/scoll/scoll.h"

4
oshmem/shmem/c/shmem_broadcast.c
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2013-2018 Mellanox Technologies, Inc. * Copyright (c) 2013-2018 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -12,8 +14,6 @@
#include "oshmem/constants.h" #include "oshmem/constants.h"
#include "oshmem/include/shmem.h" #include "oshmem/include/shmem.h"
#include "orte/mca/grpcomm/grpcomm.h"
#include "oshmem/runtime/runtime.h" #include "oshmem/runtime/runtime.h"
#include "oshmem/mca/scoll/scoll.h" #include "oshmem/mca/scoll/scoll.h"

4
oshmem/shmem/c/shmem_clear_lock.c
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2013-2016 Mellanox Technologies, Inc. * Copyright (c) 2013-2016 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -13,8 +15,6 @@
#include "oshmem/constants.h" #include "oshmem/constants.h"
#include "oshmem/include/shmem.h" #include "oshmem/include/shmem.h"
#include "orte/util/show_help.h"
#include "oshmem/shmem/shmem_api_logger.h" #include "oshmem/shmem/shmem_api_logger.h"
#include "oshmem/runtime/runtime.h" #include "oshmem/runtime/runtime.h"
#include "oshmem/shmem/shmem_lock.h" #include "oshmem/shmem/shmem_lock.h"

4
oshmem/shmem/c/shmem_collect.c
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2013-2018 Mellanox Technologies, Inc. * Copyright (c) 2013-2018 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -12,8 +14,6 @@
#include "oshmem/constants.h" #include "oshmem/constants.h"
#include "oshmem/include/shmem.h" #include "oshmem/include/shmem.h"
#include "orte/mca/grpcomm/grpcomm.h"
#include "oshmem/runtime/runtime.h" #include "oshmem/runtime/runtime.h"
#include "oshmem/mca/scoll/scoll.h" #include "oshmem/mca/scoll/scoll.h"

4
oshmem/shmem/c/shmem_context.c
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2013-2018 Mellanox Technologies, Inc. * Copyright (c) 2013-2018 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -12,8 +14,6 @@
#include <stdlib.h> #include <stdlib.h>
#include "orte/util/show_help.h"
#include "opal/runtime/opal_cr.h" #include "opal/runtime/opal_cr.h"
#include "opal/util/output.h" #include "opal/util/output.h"

6
oshmem/shmem/c/shmem_global_exit.c
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2012-2015 Mellanox Technologies, Inc. * Copyright (c) 2012-2015 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -12,8 +14,6 @@
#include "oshmem/include/shmem.h" #include "oshmem/include/shmem.h"
#include "oshmem/runtime/runtime.h" #include "oshmem/runtime/runtime.h"
#include "orte/mca/errmgr/errmgr.h"
#if OSHMEM_PROFILING #if OSHMEM_PROFILING
#include "oshmem/include/pshmem.h" #include "oshmem/include/pshmem.h"
#pragma weak shmem_global_exit = pshmem_global_exit #pragma weak shmem_global_exit = pshmem_global_exit
@ -38,7 +38,7 @@ static inline void _globalexit(int status)
{ {
oshmem_shmem_inglobalexit++; oshmem_shmem_inglobalexit++;
orte_errmgr.abort(status, NULL); ompi_rte_abort(status, NULL);
oshmem_shmem_aborted = true; oshmem_shmem_aborted = true;
exit(status); exit(status);

6
oshmem/shmem/c/shmem_init.c
Просмотреть файл

@ -1,8 +1,8 @@
/* /*
* Copyright (c) 2013-2015 Mellanox Technologies, Inc. * Copyright (c) 2013-2015 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2016 Research Organization for Information Science * Copyright (c) 2016-2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -14,8 +14,6 @@
#include <stdlib.h> #include <stdlib.h>
#include "orte/util/show_help.h"
#include "opal/runtime/opal_cr.h" #include "opal/runtime/opal_cr.h"
#include "opal/util/output.h" #include "opal/util/output.h"

4
oshmem/shmem/c/shmem_pe_accessible.c
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2013 Mellanox Technologies, Inc. * Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -12,8 +14,6 @@
#include <stdlib.h> #include <stdlib.h>
#include "orte/util/show_help.h"
#include "oshmem/constants.h" #include "oshmem/constants.h"
#include "oshmem/include/shmem.h" #include "oshmem/include/shmem.h"

4
oshmem/shmem/c/shmem_ptr.c
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2013 Mellanox Technologies, Inc. * Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -12,8 +14,6 @@
#include <stdlib.h> #include <stdlib.h>
#include "orte/util/show_help.h"
#include "oshmem/constants.h" #include "oshmem/constants.h"
#include "oshmem/include/shmem.h" #include "oshmem/include/shmem.h"
#include "oshmem/shmem/shmem_api_logger.h" #include "oshmem/shmem/shmem_api_logger.h"

4
oshmem/shmem/c/shmem_set_lock.c
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2013-2016 Mellanox Technologies, Inc. * Copyright (c) 2013-2016 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -13,8 +15,6 @@
#include "oshmem/constants.h" #include "oshmem/constants.h"
#include "oshmem/include/shmem.h" #include "oshmem/include/shmem.h"
#include "orte/util/show_help.h"
#include "oshmem/shmem/shmem_api_logger.h" #include "oshmem/shmem/shmem_api_logger.h"
#include "oshmem/runtime/runtime.h" #include "oshmem/runtime/runtime.h"
#include "oshmem/shmem/shmem_lock.h" #include "oshmem/shmem/shmem_lock.h"

4
oshmem/shmem/c/shmem_test_lock.c
Просмотреть файл

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2013-2016 Mellanox Technologies, Inc. * Copyright (c) 2013-2016 Mellanox Technologies, Inc.
* All rights reserved. * All rights reserved.
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -12,8 +14,6 @@
#include <stdlib.h> #include <stdlib.h>
#include "orte/util/show_help.h"
#include "oshmem/constants.h" #include "oshmem/constants.h"
#include "oshmem/include/shmem.h" #include "oshmem/include/shmem.h"
#include "oshmem/shmem/shmem_api_logger.h" #include "oshmem/shmem/shmem_api_logger.h"

67
oshmem/tools/wrappers/Makefile.am
Просмотреть файл

@ -2,8 +2,8 @@
# All rights reserved. # All rights reserved.
# Copyright (c) 2013-2014 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2013-2014 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2014 Intel, Inc. All rights reserved. # Copyright (c) 2014 Intel, Inc. All rights reserved.
# Copyright (c) 2014-2017 Research Organization for Information Science # Copyright (c) 2014-2019 Research Organization for Information Science
# and Technology (RIST). All rights reserved. # and Technology (RIST). All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow
@ -12,7 +12,11 @@
include $(top_srcdir)/Makefile.ompi-rules include $(top_srcdir)/Makefile.ompi-rules
man_pages = oshcc.1 shmemcc.1 oshc++.1 shmemc++.1 oshcxx.1 shmemcxx.1 oshfort.1 shmemfort.1 oshrun.1 shmemrun.1 man_pages = oshcc.1 shmemcc.1 oshc++.1 shmemc++.1 oshcxx.1 shmemcxx.1 oshfort.1 shmemfort.1
if PROJECT_ORTE
man_pages += oshrun.1 shmemrun.1
endif
if PROJECT_OSHMEM if PROJECT_OSHMEM
man_MANS = $(man_pages) man_MANS = $(man_pages)
@ -22,11 +26,17 @@ nodist_oshmemdata_DATA = \
shmemc++-wrapper-data.txt \ shmemc++-wrapper-data.txt \
shmemfort-wrapper-data.txt shmemfort-wrapper-data.txt
# Only install / uninstall if we're building oshmem targets_install_exec = install-exec-always
install-exec-hook-always: targets_install_data = install-data-always
targets_uninstall_local = uninstall-local-always
mk_bindir:
test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
(cd $(DESTDIR)$(bindir); rm -f shmemrun$(EXEEXT); $(LN_S) mpirun$(EXEEXT) shmemrun$(EXEEXT))
(cd $(DESTDIR)$(bindir); rm -f oshrun$(EXEEXT); $(LN_S) mpirun$(EXEEXT) oshrun$(EXEEXT)) mk_pkgdatadir:
test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
install-exec-always: mk_bindir
(cd $(DESTDIR)$(bindir); rm -f shmemcc$(EXEEXT); $(LN_S) opal_wrapper$(EXEEXT) shmemcc$(EXEEXT)) (cd $(DESTDIR)$(bindir); rm -f shmemcc$(EXEEXT); $(LN_S) opal_wrapper$(EXEEXT) shmemcc$(EXEEXT))
(cd $(DESTDIR)$(bindir); rm -f oshcc$(EXEEXT); $(LN_S) opal_wrapper$(EXEEXT) oshcc$(EXEEXT)) (cd $(DESTDIR)$(bindir); rm -f oshcc$(EXEEXT); $(LN_S) opal_wrapper$(EXEEXT) oshcc$(EXEEXT))
(cd $(DESTDIR)$(bindir); rm -f shmemc++$(EXEEXT); $(LN_S) opal_wrapper$(EXEEXT) shmemc++$(EXEEXT)) (cd $(DESTDIR)$(bindir); rm -f shmemc++$(EXEEXT); $(LN_S) opal_wrapper$(EXEEXT) shmemc++$(EXEEXT))
@ -36,7 +46,11 @@ install-exec-hook-always:
(cd $(DESTDIR)$(bindir); rm -f shmemfort$(EXEEXT); $(LN_S) opal_wrapper$(EXEEXT) shmemfort$(EXEEXT)) (cd $(DESTDIR)$(bindir); rm -f shmemfort$(EXEEXT); $(LN_S) opal_wrapper$(EXEEXT) shmemfort$(EXEEXT))
(cd $(DESTDIR)$(bindir); rm -f oshfort$(EXEEXT); $(LN_S) opal_wrapper$(EXEEXT) oshfort$(EXEEXT)) (cd $(DESTDIR)$(bindir); rm -f oshfort$(EXEEXT); $(LN_S) opal_wrapper$(EXEEXT) oshfort$(EXEEXT))
install-data-hook-always: install-exec-rte: mk_bindir
(cd $(DESTDIR)$(bindir); rm -f shmemrun$(EXEEXT); $(LN_S) mpirun$(EXEEXT) shmemrun$(EXEEXT))
(cd $(DESTDIR)$(bindir); rm -f oshrun$(EXEEXT); $(LN_S) mpirun$(EXEEXT) oshrun$(EXEEXT))
install-data-always: mk_pkgdatadir
(cd $(DESTDIR)$(pkgdatadir); rm -f oshcc-wrapper-data.txt; $(LN_S) shmemcc-wrapper-data.txt oshcc-wrapper-data.txt) (cd $(DESTDIR)$(pkgdatadir); rm -f oshcc-wrapper-data.txt; $(LN_S) shmemcc-wrapper-data.txt oshcc-wrapper-data.txt)
(cd $(DESTDIR)$(pkgdatadir); rm -f shmemcxx-wrapper-data.txt; $(LN_S) shmemc++-wrapper-data.txt shmemcxx-wrapper-data.txt) (cd $(DESTDIR)$(pkgdatadir); rm -f shmemcxx-wrapper-data.txt; $(LN_S) shmemc++-wrapper-data.txt shmemcxx-wrapper-data.txt)
(cd $(DESTDIR)$(pkgdatadir); rm -f oshc++-wrapper-data.txt; $(LN_S) shmemc++-wrapper-data.txt oshc++-wrapper-data.txt) (cd $(DESTDIR)$(pkgdatadir); rm -f oshc++-wrapper-data.txt; $(LN_S) shmemc++-wrapper-data.txt oshc++-wrapper-data.txt)
@ -44,9 +58,7 @@ install-data-hook-always:
(cd $(DESTDIR)$(pkgdatadir); rm -f oshfort-wrapper-data.txt; $(LN_S) shmemfort-wrapper-data.txt oshfort-wrapper-data.txt) (cd $(DESTDIR)$(pkgdatadir); rm -f oshfort-wrapper-data.txt; $(LN_S) shmemfort-wrapper-data.txt oshfort-wrapper-data.txt)
uninstall-local-always: uninstall-local-always:
rm -f $(DESTDIR)$(bindir)/shmemrun$(EXEEXT) \ rm -f $(DESTDIR)$(bindir)/shmemcc$(EXEEXT) \
$(DESTDIR)$(bindir)/oshrun$(EXEEXT) \
$(DESTDIR)$(bindir)/shmemcc$(EXEEXT) \
$(DESTDIR)$(bindir)/oshcc$(EXEEXT) \ $(DESTDIR)$(bindir)/oshcc$(EXEEXT) \
$(DESTDIR)$(bindir)/shmemcxx$(EXEEXT) \ $(DESTDIR)$(bindir)/shmemcxx$(EXEEXT) \
$(DESTDIR)$(bindir)/oshcxx$(EXEEXT) \ $(DESTDIR)$(bindir)/oshcxx$(EXEEXT) \
@ -59,19 +71,19 @@ uninstall-local-always:
$(DESTDIR)$(pkgdatadir)/shmemfort-wrapper-data.txt \ $(DESTDIR)$(pkgdatadir)/shmemfort-wrapper-data.txt \
$(DESTDIR)$(pkgdatadir)/oshfort-wrapper-data.txt $(DESTDIR)$(pkgdatadir)/oshfort-wrapper-data.txt
uninstall-local-rte:
rm -f $(DESTDIR)$(bindir)/shmemrun$(EXEEXT) \
$(DESTDIR)$(bindir)/oshrun$(EXEEXT)
if CASE_SENSITIVE_FS install-exec-cs: mk_bindir
man_MANS += oshCC.1 shmemCC.1
install-exec-hook: install-exec-hook-always
(cd $(DESTDIR)$(bindir); rm -f shmemCC$(EXEEXT); $(LN_S) opal_wrapper$(EXEEXT) shmemCC$(EXEEXT)) (cd $(DESTDIR)$(bindir); rm -f shmemCC$(EXEEXT); $(LN_S) opal_wrapper$(EXEEXT) shmemCC$(EXEEXT))
(cd $(DESTDIR)$(bindir); rm -f oshCC$(EXEEXT); $(LN_S) opal_wrapper$(EXEEXT) oshCC$(EXEEXT)) (cd $(DESTDIR)$(bindir); rm -f oshCC$(EXEEXT); $(LN_S) opal_wrapper$(EXEEXT) oshCC$(EXEEXT))
install-data-hook: install-data-hook-always install-data-cs: mk_pkgdatadir
(cd $(DESTDIR)$(pkgdatadir); rm -f shmemCC-wrapper-data.txt; $(LN_S) shmemcxx-wrapper-data.txt shmemCC-wrapper-data.txt) (cd $(DESTDIR)$(pkgdatadir); rm -f shmemCC-wrapper-data.txt; $(LN_S) shmemcxx-wrapper-data.txt shmemCC-wrapper-data.txt)
(cd $(DESTDIR)$(pkgdatadir); rm -f oshCC-wrapper-data.txt; $(LN_S) oshcxx-wrapper-data.txt oshCC-wrapper-data.txt) (cd $(DESTDIR)$(pkgdatadir); rm -f oshCC-wrapper-data.txt; $(LN_S) oshcxx-wrapper-data.txt oshCC-wrapper-data.txt)
uninstall-local: uninstall-local-always uninstall-local-cs:
rm -f $(DESTDIR)$(bindir)/shmemCC$(EXEEXT) \ rm -f $(DESTDIR)$(bindir)/shmemCC$(EXEEXT) \
$(DESTDIR)$(mandir)/man1/shmemCC.1 \ $(DESTDIR)$(mandir)/man1/shmemCC.1 \
$(DESTDIR)$(pkgdatadir)/shmemCC-wrapper-data.txt $(DESTDIR)$(pkgdatadir)/shmemCC-wrapper-data.txt
@ -87,13 +99,26 @@ shmemCC.1: $(top_builddir)/opal/tools/wrappers/generic_wrapper.1
rm -f shmemCC.1 rm -f shmemCC.1
sed -e 's/#COMMAND#/shmemCC/g' -e 's/#PROJECT#/Open SHMEM/g' -e 's/#PROJECT_SHORT#/OSHMEM/g' -e 's/#LANGUAGE#/C++/g' < $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 > shmemCC.1 sed -e 's/#COMMAND#/shmemCC/g' -e 's/#PROJECT#/Open SHMEM/g' -e 's/#PROJECT_SHORT#/OSHMEM/g' -e 's/#LANGUAGE#/C++/g' < $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 > shmemCC.1
else # CASE_SENSITIVE_FS if CASE_SENSITIVE_FS
install-exec-hook: install-exec-hook-always man_MANS += oshCC.1 shmemCC.1
install-data-hook: install-data-hook-always
uninstall-local: uninstall-local-always
targets_install_exec += install-exec-cs
targets_install_data += install-data-cs
targets_uninstall_local += uninstall-local-cs
endif # CASE_SENSITIVE_FS endif # CASE_SENSITIVE_FS
if PROJECT_ORTE
targets_install_exec += install-exec-rte
targets_uninstall_local += uninstall-rte
endif # PROJECT_ORTE
install-exec-hook: $(targets_install_exec)
install-data-hook: $(targets_install_data)
uninstall-local: $(targets_uninstall_local)
######################################################## ########################################################
# #
# Man page generation / handling # Man page generation / handling