Re-fix fp64 warning avoidance

inducer · Jun 29, 2014 · 3a4f4d8 · 3a4f4d8
1 parent d1d4f1e
commit 3a4f4d8
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 15 deletions.
diff --git a/pyopencl/_cluda.py b/pyopencl/_cluda.py
@@ -20,9 +20,6 @@
 THE SOFTWARE.
 """
 
-
-
-
 CLUDA_PREAMBLE = """
 #define local_barrier() barrier(CLK_LOCAL_MEM_FENCE);
 
@@ -50,12 +47,8 @@
 #define GDIM_2 get_num_groups(2)
 
 % if double_support:
-    #if __OPENCL_VERSION__ <= CL_VERSION_1_1
+    #if __OPENCL_C_VERSION__ < 120
     #pragma OPENCL EXTENSION cl_khr_fp64: enable
     #endif
 % endif
 """
-
-
-
-
diff --git a/pyopencl/algorithm.py b/pyopencl/algorithm.py
@@ -558,7 +558,7 @@ def __call__(self, *args, **kwargs):
 
 _LIST_BUILDER_TEMPLATE = Template("""//CL//
 % if double_support:
-    #if __OPENCL_VERSION__ <= CL_VERSION_1_1
+    #if __OPENCL_C_VERSION__ < 120
     #pragma OPENCL EXTENSION cl_khr_fp64: enable
     #endif
     #define PYOPENCL_DEFINE_CDOUBLE

diff --git a/pyopencl/clrandom.py b/pyopencl/clrandom.py
@@ -168,7 +168,7 @@ def generate_settings_defines(self, include_double_pragma=True):
         lines = []
         if include_double_pragma and self.support_double:
             lines.append("""
-                #if __OPENCL_VERSION__ <= CL_VERSION_1_1
+                #if __OPENCL_C_VERSION__ < 120
                 #pragma OPENCL EXTENSION cl_khr_fp64: enable
                 #endif
                 """)

diff --git a/pyopencl/elementwise.py b/pyopencl/elementwise.py
@@ -127,7 +127,7 @@ def get_elwise_kernel_and_types(context, arguments, operation,
             if arg.dtype in [np.float64, np.complex128]:
                 if not have_double_pragma:
                     pragmas.append("""
-                        #if __OPENCL_VERSION__ <= CL_VERSION_1_1
+                        #if __OPENCL_C_VERSION__ < 120
                         #pragma OPENCL EXTENSION cl_khr_fp64: enable
                         #endif
                         #define PYOPENCL_DEFINE_CDOUBLE
@@ -846,7 +846,7 @@ def get_float_binary_func_kernel(context, func_name, x_dtype, y_dtype,
     if (np.array(0, x_dtype) * np.array(0, y_dtype)).itemsize > 4:
         arg_type = 'double'
         preamble = """
-        #if __OPENCL_VERSION__ <= CL_VERSION_1_1
+        #if __OPENCL_C_VERSION__ < 120
         #pragma OPENCL EXTENSION cl_khr_fp64: enable
         #endif
         #define PYOPENCL_DEFINE_CDOUBLE
@@ -920,7 +920,7 @@ def get_bessel_kernel(context, which_func, out_dtype=np.float64,
         "z[i] = bessel_%sn(ord_n, x[i])" % which_func,
         name="bessel_%sn_kernel" % which_func,
         preamble="""
-        #if __OPENCL_VERSION__ <= CL_VERSION_1_1
+        #if __OPENCL_C_VERSION__ < 120
         #pragma OPENCL EXTENSION cl_khr_fp64: enable
         #endif
         #define PYOPENCL_DEFINE_CDOUBLE

diff --git a/pyopencl/reduction.py b/pyopencl/reduction.py
@@ -47,7 +47,7 @@
     #define REDUCE(a, b) (${reduce_expr})
 
     % if double_support:
-        #if __OPENCL_VERSION__ <= CL_VERSION_1_1
+        #if __OPENCL_C_VERSION__ < 120
         #pragma OPENCL EXTENSION cl_khr_fp64: enable
         #endif
         #define PYOPENCL_DEFINE_CDOUBLE

diff --git a/pyopencl/tools.py b/pyopencl/tools.py
@@ -506,7 +506,7 @@ def get_declarations(self):
         if self.saw_double:
             result = (
                     """
-                    #if __OPENCL_VERSION__ <= CL_VERSION_1_1
+                    #if __OPENCL_C_VERSION__ < 120
                     #pragma OPENCL EXTENSION cl_khr_fp64: enable
                     #endif
                     #define PYOPENCL_DEFINE_CDOUBLE