From 221fad6862a792ecbe12a65a2cbaa5990ce623ea Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Tue, 10 Sep 2019 13:55:59 +0900 Subject: [PATCH] coll/cuda: remove unnecessary references to ORTE Signed-off-by: Gilles Gouaillardet (cherry picked from commit 531171ca50955f8b7762f932388f633852454e6f) Signed-off-by: Brian Barrett --- ompi/mca/coll/cuda/coll_cuda_module.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ompi/mca/coll/cuda/coll_cuda_module.c b/ompi/mca/coll/cuda/coll_cuda_module.c index d8702dd378..137f55a763 100644 --- a/ompi/mca/coll/cuda/coll_cuda_module.c +++ b/ompi/mca/coll/cuda/coll_cuda_module.c @@ -3,6 +3,8 @@ * of Tennessee Research Foundation. 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$ * * Additional copyrights may follow @@ -19,8 +21,8 @@ #include "mpi.h" -#include "orte/util/show_help.h" -#include "orte/util/proc_info.h" +#include "opal/util/show_help.h" +#include "ompi/mca/rte/rte.h" #include "ompi/constants.h" #include "ompi/communicator/communicator.h" @@ -146,8 +148,8 @@ int mca_coll_cuda_module_enable(mca_coll_base_module_t *module, if (good) { return OMPI_SUCCESS; } - orte_show_help("help-mpi-coll-cuda.txt", "missing collective", true, - orte_process_info.nodename, + opal_show_help("help-mpi-coll-cuda.txt", "missing collective", true, + ompi_process_info.nodename, mca_coll_cuda_component.priority, msg); return OMPI_ERR_NOT_FOUND; }