From 6372baa7b9a40aeec81851c91c4e917aeac69d22 Mon Sep 17 00:00:00 2001
From: Rolf vandeVaart <rvandevaart@nvidia.com>
Date: Wed, 8 Jul 2015 10:17:35 -0400
Subject: [PATCH] Some minor cleanup and renaming of query function.

---
 ...CUDA_SUPPORT.3in => MPIX_Query_cuda_support.3in} | 13 +++----------
 ompi/mpiext/cuda/c/Makefile.am                      |  2 +-
 ompi/mpiext/cuda/c/mpiext_cuda.c                    |  6 ++++--
 3 files changed, 8 insertions(+), 13 deletions(-)
 rename ompi/mpiext/cuda/c/{MPIx_CUDA_SUPPORT.3in => MPIX_Query_cuda_support.3in} (74%)

diff --git a/ompi/mpiext/cuda/c/MPIx_CUDA_SUPPORT.3in b/ompi/mpiext/cuda/c/MPIX_Query_cuda_support.3in
similarity index 74%
rename from ompi/mpiext/cuda/c/MPIx_CUDA_SUPPORT.3in
rename to ompi/mpiext/cuda/c/MPIX_Query_cuda_support.3in
index 40629b4d4b..676ec570bc 100644
--- a/ompi/mpiext/cuda/c/MPIx_CUDA_SUPPORT.3in
+++ b/ompi/mpiext/cuda/c/MPIX_Query_cuda_support.3in
@@ -4,7 +4,7 @@
 .\" Copyright (c) 2015 NVIDIA, Inc. All rights reserved.
 .TH MPIx_CUDA_SUPPORT 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
-\fBMPIx_CUDA_SUPPORT\fP \- Obtain prettyprint strings of processor affinity information for this process
+\fBMPIX_Query_cuda_support\fP \- Returns 1 if there is CUDA aware support and 0 if there is not.
 
 .SH SYNTAX
 .ft R
@@ -13,7 +13,7 @@
 #include <mpi.h>
 #include <mpi-ext.h>
 
-int MPIx_CUDA_SUPPORT(void)
+int MPIX_Query_cuda_support(void)
 .fi
 .SH Fortran Syntax
 There is no Fortran binding for this function.
@@ -21,13 +21,6 @@ There is no Fortran binding for this function.
 .SH C++ Syntax
 There is no C++ binding for this function.
 .
-.SH INPUT PARAMETERS
-.ft R
-.
-.SH OUTPUT PARAMETERS
-.ft R
-.TP 1i
-
 .SH DESCRIPTION
 .ft R
 
@@ -37,5 +30,5 @@ There is no C++ binding for this function.
 .SH See Also
 .ft R
 .nf
-JeffIsAToad(1)
+
 .fi
diff --git a/ompi/mpiext/cuda/c/Makefile.am b/ompi/mpiext/cuda/c/Makefile.am
index 704a989556..41f0ab5fd5 100644
--- a/ompi/mpiext/cuda/c/Makefile.am
+++ b/ompi/mpiext/cuda/c/Makefile.am
@@ -39,7 +39,7 @@ libmpiext_cuda_c_la_SOURCES = \
 libmpiext_cuda_c_la_LDFLAGS = -module -avoid-version
 
 # Man page installation
-nodist_man_MANS = MPIx_CUDA_SUPPORT.3
+nodist_man_MANS = MPIX_Query_cuda_support.3
 
 # Man page sources
 EXTRA_DIST = $(nodist_man_MANS:.3=.3in)
diff --git a/ompi/mpiext/cuda/c/mpiext_cuda.c b/ompi/mpiext/cuda/c/mpiext_cuda.c
index 1e17e3f257..22b4a27253 100644
--- a/ompi/mpiext/cuda/c/mpiext_cuda.c
+++ b/ompi/mpiext/cuda/c/mpiext_cuda.c
@@ -23,7 +23,9 @@
 #include "opal/constants.h"
 #include "ompi/mpiext/cuda/c/mpiext_cuda_c.h"
 
-int MPIx_CUDA_SUPPORT(void)
+/* The fact that this code is configured and compiled means that we have CUDA aware
+   support.  We may expand on this API to return more features in the future. */
+int MPIX_Query_cuda_support(void)
 {
-    return OPAL_ERR_NOT_SUPPORTED;
+    return OMPI_SUCCESS;
 }