1
1

Merge pull request #6970 from ggouaillardet/topic/cuda_no_orte

coll/cuda: remove unnecessary references to ORTE
Этот коммит содержится в:
Austen Lauria 2020-01-27 13:12:32 -05:00 коммит произвёл GitHub
родитель 4f6978466d 531171ca50
Коммит 969eb0286c
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23

Просмотреть файл

@ -3,6 +3,8 @@
* of Tennessee Research Foundation. All rights * of Tennessee Research Foundation. All rights
* reserved. * reserved.
* Copyright (c) 2014 NVIDIA Corporation. All rights reserved. * Copyright (c) 2014 NVIDIA Corporation. 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,8 @@
#include "mpi.h" #include "mpi.h"
#include "orte/util/show_help.h" #include "opal/util/show_help.h"
#include "orte/util/proc_info.h" #include "ompi/mca/rte/rte.h"
#include "ompi/constants.h" #include "ompi/constants.h"
#include "ompi/communicator/communicator.h" #include "ompi/communicator/communicator.h"
@ -146,8 +148,8 @@ int mca_coll_cuda_module_enable(mca_coll_base_module_t *module,
if (good) { if (good) {
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }
orte_show_help("help-mpi-coll-cuda.txt", "missing collective", true, opal_show_help("help-mpi-coll-cuda.txt", "missing collective", true,
orte_process_info.nodename, ompi_process_info.nodename,
mca_coll_cuda_component.priority, msg); mca_coll_cuda_component.priority, msg);
return OMPI_ERR_NOT_FOUND; return OMPI_ERR_NOT_FOUND;
} }