Merge pull request #6970 from ggouaillardet/topic/cuda_no_orte

coll/cuda: remove unnecessary references to ORTE

Author: awlauria

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;
 }