Switch DPCTLKernelArgTypes to C++11 types.

Author: Diptorup Deb

dpctl/enum_types.py

@@ -113,3 +113,22 @@ class global_mem_cache_type(Enum):
     none = auto()
     read_only = auto()
     read_write = auto()
+
+
+class kernel_arg_type(Enum):
+    """
+    An enumeration of supported kernel argument types in
+    :func:`dpctl.SyclQueue.submit`
+    """
+
+    dpctl_int8 = auto()
+    dpctl_uint8 = auto()
+    dpctl_int16 = auto()
+    dpctl_uint16 = auto()
+    dpctl_int32 = auto()
+    dpctl_uint32 = auto()
+    dpctl_int64 = auto()
+    dpctl_uint64 = auto()
+    dpctl_float32 = auto()
+    dpctl_float64 = auto()
+    dpctl_void_ptr = auto()

libsyclinterface/include/dpctl_sycl_enum_types.h

@@ -87,22 +87,18 @@ typedef enum
  */
 typedef enum
 {
-    DPCTL_CHAR,
-    DPCTL_SIGNED_CHAR,
-    DPCTL_UNSIGNED_CHAR,
-    DPCTL_SHORT,
-    DPCTL_INT,
-    DPCTL_UNSIGNED_INT,
-    DPCTL_UNSIGNED_INT8,
-    DPCTL_LONG,
-    DPCTL_UNSIGNED_LONG,
-    DPCTL_LONG_LONG,
-    DPCTL_UNSIGNED_LONG_LONG,
-    DPCTL_SIZE_T,
-    DPCTL_FLOAT,
-    DPCTL_DOUBLE,
-    DPCTL_LONG_DOUBLE,
-    DPCTL_VOID_PTR
+    DPCTL_INT8_T,
+    DPCTL_UINT8_T,
+    DPCTL_INT16_T,
+    DPCTL_UINT16_T,
+    DPCTL_INT32_T,
+    DPCTL_UINT32_T,
+    DPCTL_INT64_T,
+    DPCTL_UINT64_T,
+    DPCTL_FLOAT32_T,
+    DPCTL_FLOAT64_T,
+    DPCTL_VOID_PTR,
+    DPCTL_UNSUPPORTED_KERNEL_ARG
 } DPCTLKernelArgType;
 
 /*!

libsyclinterface/source/dpctl_sycl_queue_interface.cpp

@@ -65,51 +65,36 @@ bool set_kernel_arg(handler &cgh,
     bool arg_set = true;
 
     switch (ArgTy) {
-    case DPCTL_CHAR:
-        cgh.set_arg(idx, *(char *)Arg);
+    case DPCTL_INT8_T:
+        cgh.set_arg(idx, *(int8_t *)Arg);
         break;
-    case DPCTL_SIGNED_CHAR:
-        cgh.set_arg(idx, *(signed char *)Arg);
-        break;
-    case DPCTL_UNSIGNED_CHAR:
-        cgh.set_arg(idx, *(unsigned char *)Arg);
-        break;
-    case DPCTL_SHORT:
-        cgh.set_arg(idx, *(short *)Arg);
-        break;
-    case DPCTL_INT:
-        cgh.set_arg(idx, *(int *)Arg);
-        break;
-    case DPCTL_UNSIGNED_INT:
-        cgh.set_arg(idx, *(unsigned int *)Arg);
-        break;
-    case DPCTL_UNSIGNED_INT8:
+    case DPCTL_UINT8_T:
         cgh.set_arg(idx, *(uint8_t *)Arg);
         break;
-    case DPCTL_LONG:
-        cgh.set_arg(idx, *(long *)Arg);
+    case DPCTL_INT16_T:
+        cgh.set_arg(idx, *(int16_t *)Arg);
+        break;
+    case DPCTL_UINT16_T:
+        cgh.set_arg(idx, *(uint16_t *)Arg);
         break;
-    case DPCTL_UNSIGNED_LONG:
-        cgh.set_arg(idx, *(unsigned long *)Arg);
+    case DPCTL_INT32_T:
+        cgh.set_arg(idx, *(int32_t *)Arg);
         break;
-    case DPCTL_LONG_LONG:
-        cgh.set_arg(idx, *(long long *)Arg);
+    case DPCTL_UINT32_T:
+        cgh.set_arg(idx, *(uint32_t *)Arg);
         break;
-    case DPCTL_UNSIGNED_LONG_LONG:
-        cgh.set_arg(idx, *(unsigned long long *)Arg);
+    case DPCTL_INT64_T:
+        cgh.set_arg(idx, *(int64_t *)Arg);
         break;
-    case DPCTL_SIZE_T:
-        cgh.set_arg(idx, *(size_t *)Arg);
+    case DPCTL_UINT64_T:
+        cgh.set_arg(idx, *(uint64_t *)Arg);
         break;
-    case DPCTL_FLOAT:
+    case DPCTL_FLOAT32_T:
         cgh.set_arg(idx, *(float *)Arg);
         break;
-    case DPCTL_DOUBLE:
+    case DPCTL_FLOAT64_T:
         cgh.set_arg(idx, *(double *)Arg);
         break;
-    case DPCTL_LONG_DOUBLE:
-        cgh.set_arg(idx, *(long double *)Arg);
-        break;
     case DPCTL_VOID_PTR:
         cgh.set_arg(idx, Arg);
         break;