[cig-commits] r15432 - mc/3D/CitcomS/trunk/lib

[leif at geodynamics.org]

Author: leif
Date: 2009-07-06 15:13:05 -0700 (Mon, 06 Jul 2009)
New Revision: 15432

Modified:
   mc/3D/CitcomS/trunk/lib/General_matrix_functions.c
   mc/3D/CitcomS/trunk/lib/cgrad_kernel.cu
   mc/3D/CitcomS/trunk/lib/multigrid_kernel.cu
Log:
Make sure "-arch sm_13" is given -- for double-precision
floating-point.  Added missing #ifndef USE_CUDA.


Modified: mc/3D/CitcomS/trunk/lib/General_matrix_functions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/General_matrix_functions.c	2009-07-06 17:14:42 UTC (rev 15431)
+++ mc/3D/CitcomS/trunk/lib/General_matrix_functions.c	2009-07-06 22:13:05 UTC (rev 15432)
@@ -304,6 +304,7 @@
     ===========================================================  */
 
 
+#ifndef USE_CUDA
 double conj_grad(E,d0,F,acc,cycles,level)
      struct All_variables *E;
      double **d0;
@@ -422,6 +423,7 @@
     }
 
     return(residual);   }
+#endif /* !USE_CUDA */
 
 
 /* ========================================================================================

Modified: mc/3D/CitcomS/trunk/lib/cgrad_kernel.cu
===================================================================
--- mc/3D/CitcomS/trunk/lib/cgrad_kernel.cu	2009-07-06 17:14:42 UTC (rev 15431)
+++ mc/3D/CitcomS/trunk/lib/cgrad_kernel.cu	2009-07-06 22:13:05 UTC (rev 15432)
@@ -1,6 +1,12 @@
 /* -*- C -*- */
 /* vim:set ft=c: */
 
+#if __CUDA_ARCH__ < 130
+/* for double-precision floating-point */
+#error This code requires compute capability 1.3 or higher; try giving "-arch sm_13".
+#endif
+
+
 #include <math.h>
 #include "global_defs.h"
 

Modified: mc/3D/CitcomS/trunk/lib/multigrid_kernel.cu
===================================================================
--- mc/3D/CitcomS/trunk/lib/multigrid_kernel.cu	2009-07-06 17:14:42 UTC (rev 15431)
+++ mc/3D/CitcomS/trunk/lib/multigrid_kernel.cu	2009-07-06 22:13:05 UTC (rev 15432)
@@ -1,6 +1,12 @@
 /* -*- C -*- */
 /* vim:set ft=c: */
 
+#if __CUDA_ARCH__ < 130
+/* for double-precision floating-point */
+#error This code requires compute capability 1.3 or higher; try giving "-arch sm_13".
+#endif
+
+
 #include "global_defs.h"
 #include "element_definitions.h"
 #include <assert.h>