Merge branch 'issue68' into 'master'

Fix issue #68 - Move the check of ncuda to the init function instead of doing it in timings

Closes #68

See merge request !145

control/control.c

@@ -103,6 +103,13 @@ int __chameleon_initpar(int ncpus, int ncudas, int nthreads_per_worker)
 #  endif
 #endif
 
+#if !defined(CHAMELEON_USE_CUDA)
+    if ( ncudas != 0 ) {
+        chameleon_warning("CHAMELEON_Init", "CHAMELEON_USE_CUDA is not defined, ncudas is forced to 0");
+        ncudas = 0;
+    }
+#endif
+
     RUNTIME_init( chamctxt, ncpus, ncudas, nthreads_per_worker );
 
 #if defined(CHAMELEON_USE_MPI)

timing/timing.c

@@ -730,20 +730,12 @@ main(int argc, char *argv[]) {
     int stop  = 5000;
     int step  =  500;
     int iparam[IPARAM_SIZEOF];
+    int return_code;
 
     set_iparam_default(iparam);
 
     parse_arguments(&argc, &argv, iparam, &start, &stop, &step);
 
-#if !defined(CHAMELEON_USE_CUDA)
-    if (iparam[IPARAM_NCUDAS] != 0){
-        fprintf(stderr, "ERROR: CHAMELEON_USE_CUDA is not defined. "
-                "The number of CUDA devices must be set to 0 (--gpus=0).\n");
-        return EXIT_FAILURE;
-    }
-#endif
-    int return_code;
-
     /* Initialize CHAMELEON */
     CHAMELEON_Init( iparam[IPARAM_THRDNBR],
                     iparam[IPARAM_NCUDAS] );