Merge pull request #151 from fixstars/remove_type_pyx

Move device_typeof_size to utility

Author: toru-fukaya

clpy/backend/function.pyx

@@ -14,7 +14,6 @@ cimport clpy.backend.opencl.api
 cimport clpy.backend.opencl.utility
 import clpy.backend.opencl.env
 cimport clpy.backend.opencl.env
-import clpy.backend.opencl.types
 from clpy.backend.opencl.types cimport cl_event
 import clpy.core
 
@@ -87,10 +86,10 @@ cdef void _launch(clpy.backend.opencl.types.cl_kernel kernel, global_work_size,
                 size = a.get_size()
             else:
                 if isinstance(a, clpy.core.core.Size_t):
-                    if clpy.backend.opencl.types.device_typeof_size \
+                    if clpy.backend.opencl.utility.device_typeof_size \
                             == 'uint':
                         a = numpy.uint32(a.val)
-                    elif clpy.backend.opencl.types.device_typeof_size \
+                    elif clpy.backend.opencl.utility.device_typeof_size \
                             == 'ulong':
                         a = numpy.uint64(a.val)
                     else:

clpy/backend/opencl/clblast/clblast.pyx

@@ -1,8 +1,6 @@
 cimport clpy.backend.opencl.api as api
 import clpy.backend.opencl.env
 cimport clpy.backend.opencl.env
-import clpy.backend.opencl.types
-cimport clpy.backend.opencl.types
 from clpy.backend.opencl.types cimport cl_command_queue
 from clpy.backend.opencl.types cimport cl_event
 from clpy.backend.opencl.types cimport cl_mem

clpy/backend/opencl/types.pyx

@@ -5,6 +5,7 @@ import time
 
 cimport api
 cimport env
+import cython
 from cpython cimport array
 from exceptions cimport check_status
 from libc.stdlib cimport malloc
@@ -138,3 +139,19 @@ cdef RunNDRangeKernel(
         event=&event[0]
     )
     api.WaitForEvents(1, &event[0])
+
+cdef __device_typeof_size():
+    host_size_t_bits = cython.sizeof(Py_ssize_t)*8
+    device_address_bits = GetDeviceAddressBits(
+        env.get_primary_device())
+    if host_size_t_bits != device_address_bits:
+        raise "Host's size_t is different from device's size_t."
+
+    if device_address_bits == 32:
+        return 'uint'
+    elif device_address_bits == 64:
+        return 'ulong'
+    else:
+        raise "There is no type of size_t."
+
+device_typeof_size = __device_typeof_size()

clpy/backend/opencl/utility.pyx

@@ -10,7 +10,6 @@ from clpy.backend cimport device
 from clpy.backend cimport function
 
 cimport clpy.backend.opencl.api
-import clpy.backend.opencl.types
 cimport clpy.backend.opencl.utility
 
 cpdef _get_simple_elementwise_kernel(
@@ -306,7 +305,7 @@ cdef class ParameterInfo:
             pass
         elif t == 'kernel_arg_size_t':
             self.dtype = numpy.intp
-            self.ctype = clpy.backend.opencl.types.device_typeof_size
+            self.ctype = clpy.backend.opencl.utility.device_typeof_size
         elif len(t) == 1:
             self.ctype = t
         else:

clpy/core/elementwise.pxi

@@ -7,7 +7,6 @@ import numpy
 from clpy import util
 
 cimport clpy.backend.opencl.api
-import clpy.backend.opencl.types
 cimport clpy.backend.opencl.utility
 
 
@@ -89,7 +88,7 @@ cpdef _get_simple_reduction_kernel(
         output_expr=output_expr,
         output_store=output_store,
         preamble=preamble,
-        typeof_size=clpy.backend.opencl.types.device_typeof_size,
+        typeof_size=clpy.backend.opencl.utility.device_typeof_size,
         clpy_variables_declaration=clpy_variables_declaration)
     module = compile_with_cache(module_code, options)
     return module.get_function(name)

clpy/core/reduction.pxi

@@ -107,7 +107,6 @@ def launch_headercvt():
             # 'clpy.backend.runtime',
             'clpy.backend.opencl.api',
             'clpy.backend.opencl.env',
-            'clpy.backend.opencl.types',
             'clpy.backend.opencl.utility',
             'clpy.backend.opencl.exceptions',
             'clpy.backend.opencl.clblast.clblast',