Remove tabs for spaces, fix some error messages.

This commit was SVN r28141.

ompi/mca/btl/smcuda/btl_smcuda_component.c

@@ -167,7 +167,12 @@ static int smcuda_register(void)
         mca_btl_smcuda_param_register_int("sm_extra_procs", 0);
 
 #if OMPI_CUDA_SUPPORT
+    /* Lower priority when CUDA support is not requested */
+    if (ompi_mpi_cuda_support) {
         mca_btl_smcuda.super.btl_exclusivity = MCA_BTL_EXCLUSIVITY_HIGH;
+    } else {
+        mca_btl_smcuda.super.btl_exclusivity = MCA_BTL_EXCLUSIVITY_LOW;
+    }
 #else /* OMPI_CUDA_SUPPORT */
     mca_btl_smcuda.super.btl_exclusivity = MCA_BTL_EXCLUSIVITY_HIGH-1;
 #endif /* OMPI_CUDA_SUPPORT */

ompi/mca/common/cuda/common_cuda.c

@@ -99,7 +99,7 @@ static int mca_common_cuda_verbose;
 static int mca_common_cuda_output = 0;
 static bool mca_common_cuda_enabled = false;
 static bool mca_common_cuda_register_memory = true;
-static bool mca_common_cuda_warning = true;
+static bool mca_common_cuda_warning = false;
 static opal_list_t common_cuda_memory_registrations;
 static CUstream ipcStream;
 static CUstream dtohStream;
@@ -286,6 +286,14 @@ static int mca_common_cuda_init(opal_common_cuda_function_table_t *ftable)
                             "CUDA: cuCtxGetCurrent succeeded");
     }
 
+    /* No need to go on at this point.  If we cannot create a context and we are at
+     * the point where we are making MPI calls, it is time to fully disable
+     * CUDA support.
+     */
+    if (false == mca_common_cuda_enabled) {
+        return OMPI_ERROR;
+    }
+
 #if OMPI_CUDA_SUPPORT_41
     if (true == mca_common_cuda_enabled) {
         /* Set up an array to store outstanding IPC async copy events */

ompi/runtime/help-mpi-runtime.txt

@@ -11,6 +11,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2007-2012 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2013      NVIDIA Corporation.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -109,3 +110,7 @@ double check that everything has shut down cleanly.
   Reason:     %s
   Local host: %s
   PID:        %d
+#
+[no cuda support]
+The user requested CUDA support with the --mca mpi_cuda_support 1 flag
+but the library was not compiled with any support.

ompi/runtime/ompi_mpi_params.c

@@ -300,8 +300,7 @@ int ompi_mpi_register_params(void)
             value = 1;
         }
         if (0 == value) {
-            opal_show_help("help-mpi-runtime.txt", 
-                           "CUDA GPU buffer support requested but compiled out",
+            opal_show_help("help-mpi-runtime.txt", "no cuda support",
                            true);
             ompi_mpi_cuda_support = false;
         }