JavaCL: added Primitive.getRequiredPragmas()

ochafik · ochafik · commit a036a5792f56 · 2012-04-14T16:46:28.000+01:00
diff --git a/Blas/src/main/java/com/nativelibs4java/opencl/blas/CLKernels.java b/Blas/src/main/java/com/nativelibs4java/opencl/blas/CLKernels.java
@@ -37,8 +37,6 @@ public class CLKernels {
 
     private static volatile CLKernels instance;
     
-    private static final String PRAGMA_DOUBLE = "#pragma OPENCL EXTENSION cl_khr_fp64 : enable\n";
-                    
     public static synchronized void setInstance(CLKernels kernels) {
         instance = kernels;
     }
@@ -120,7 +118,7 @@ public <V> boolean containsValue(Primitive primitive, CLBuffer<V> buffer, long l
             kernel = containsValueKernels.get(primitive);
             if (kernel == null) {
                 kernel = context.createProgram((
-                	(primitive.primitiveType == double.class ? Primitive. PRAGMA_DOUBLE : "") +
+                	primitive.getRequiredPragmas() +
                     "__kernel void containsValue(   \n" +
                     "	__global const double* a,   \n" +
                     "	int length,              \n" +
@@ -153,7 +151,7 @@ public <V> CLEvent clear(Primitive primitive, CLBuffer<V> buffer, long length, C
             kernel = clearKernels.get(primitive);
             if (kernel == null) {
                 kernel = context.createProgram((
-                	(primitive.primitiveType == double.class ? Primitive. PRAGMA_DOUBLE : "") +
+                	primitive.getRequiredPragmas() +
                     "__kernel void clear_buffer(    \n" +
                     "	__global double* a,         \n" +
                     "	int length                  \n" +
@@ -188,7 +186,7 @@ public <T> CLEvent matrixMultiply(Primitive prim, CLBuffer<T> a, long aRows, lon
             kernel = matrixMultiplyKernels.get(prim);
             if (kernel == null) {
                 String src =
-                	(prim.primitiveType == double.class ? Primitive. PRAGMA_DOUBLE : "") +
+                	prim.getRequiredPragmas() +
                     "__kernel void mulMat(                                  " +
                     "   __global const double* a, int aRows, int aColumns,   " +
                     "   __global const double* b, int bColumns,                 " +
@@ -231,7 +229,7 @@ public <T> CLEvent matrixTranspose(Primitive prim, CLBuffer<T> a, long aRows, lo
             kernels = matrixTransposeKernels.get(prim);
             if (kernels == null) {
                 String src =
-                	(prim.primitiveType == double.class ? Primitive. PRAGMA_DOUBLE : "") +
+                	prim.getRequiredPragmas() +
                     "__kernel void transposeSelf(                                   \n" +
                     "   __global double* a, int aRows, int aColumns                 \n" +
                     ") {                                                            \n" +
diff --git a/JavaCL/src/main/java/com/nativelibs4java/opencl/util/Primitive.java b/JavaCL/src/main/java/com/nativelibs4java/opencl/util/Primitive.java
@@ -59,4 +59,9 @@ public enum Primitive {
     public String clTypeName() {
         return name().toLowerCase();
     }
+    public String getRequiredPragmas() {
+    	if (primitiveType == Double.class)
+    		return "#pragma OPENCL EXTENSION cl_khr_fp64 : enable\n";
+    	return "";
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -59,4 +59,9 @@ public enum Primitive {`
`59`	`59`	`public String clTypeName() {`
`60`	`60`	`return name().toLowerCase();`
`61`	`61`	`}`
	`62`	`+ public String getRequiredPragmas() {`
	`63`	`+ if (primitiveType == Double.class)`
	`64`	`+ return "#pragma OPENCL EXTENSION cl_khr_fp64 : enable\n";`
	`65`	`+ return "";`
	`66`	`+ }`
`62`	`67`	`}`