DPCTL C API headers are not always truly C complaint (e.g. -Wstrict-prototype) (#463)

* Changes to make dpctl-capi headers C complaint and satisfy `-Wstrict-prototype`

Co-authored-by: Oleksandr Pavlyk <oleksandr.pavlyk@intel.com>

Author: Diptorup Deb

dpctl-capi/include/dpctl_sycl_device_interface.h

@@ -62,7 +62,7 @@ DPCTLDevice_Copy(__dpctl_keep const DPCTLSyclDeviceRef DRef);
  * @ingroup DeviceInterface
  */
 DPCTL_API
-__dpctl_give DPCTLSyclDeviceRef DPCTLDevice_Create();
+__dpctl_give DPCTLSyclDeviceRef DPCTLDevice_Create(void);
 
 /*!
  * @brief Returns a new DPCTLSyclDeviceRef opaque object created using the

dpctl-capi/include/dpctl_sycl_device_selector_interface.h

@@ -44,7 +44,7 @@ DPCTL_C_EXTERN_C_BEGIN
  * @ingroup DeviceSelectors
  */
 DPCTL_API
-__dpctl_give DPCTLSyclDeviceSelectorRef DPCTLAcceleratorSelector_Create();
+__dpctl_give DPCTLSyclDeviceSelectorRef DPCTLAcceleratorSelector_Create(void);
 
 /*!
  * @brief Returns an opaque wrapper for sycl::default_selector object.
@@ -53,7 +53,7 @@ __dpctl_give DPCTLSyclDeviceSelectorRef DPCTLAcceleratorSelector_Create();
  * @ingroup DeviceSelectors
  */
 DPCTL_API
-__dpctl_give DPCTLSyclDeviceSelectorRef DPCTLDefaultSelector_Create();
+__dpctl_give DPCTLSyclDeviceSelectorRef DPCTLDefaultSelector_Create(void);
 
 /*!
  * @brief Returns an opaque wrapper for sycl::cpu_selector object.
@@ -62,7 +62,7 @@ __dpctl_give DPCTLSyclDeviceSelectorRef DPCTLDefaultSelector_Create();
  * @ingroup DeviceSelectors
  */
 DPCTL_API
-__dpctl_give DPCTLSyclDeviceSelectorRef DPCTLCPUSelector_Create();
+__dpctl_give DPCTLSyclDeviceSelectorRef DPCTLCPUSelector_Create(void);
 
 /*!
  * @brief Returns an opaque wrapper for sycl::ONEAPI::filter_selector object
@@ -84,7 +84,7 @@ DPCTLFilterSelector_Create(__dpctl_keep const char *filter_str);
  * @ingroup DeviceSelectors
  */
 DPCTL_API
-__dpctl_give DPCTLSyclDeviceSelectorRef DPCTLGPUSelector_Create();
+__dpctl_give DPCTLSyclDeviceSelectorRef DPCTLGPUSelector_Create(void);
 
 /*!
  * @brief Returns an opaque wrapper for sycl::host_selector object.
@@ -93,7 +93,7 @@ __dpctl_give DPCTLSyclDeviceSelectorRef DPCTLGPUSelector_Create();
  * @ingroup DeviceSelectors
  */
 DPCTL_API
-__dpctl_give DPCTLSyclDeviceSelectorRef DPCTLHostSelector_Create();
+__dpctl_give DPCTLSyclDeviceSelectorRef DPCTLHostSelector_Create(void);
 
 /*!
  * @brief Deletes the DPCTLSyclDeviceSelectorRef after casting it to a

dpctl-capi/include/dpctl_sycl_enum_types.h

@@ -35,7 +35,7 @@ DPCTL_C_EXTERN_C_BEGIN
  * @brief Redefinition of DPC++-specific Sycl backend types.
  *
  */
-enum DPCTLSyclBackendType
+typedef enum
 {
     // clang-format off
     DPCTL_CUDA            = 1 << 16,
@@ -45,13 +45,13 @@ enum DPCTLSyclBackendType
     DPCTL_UNKNOWN_BACKEND = 0,
     DPCTL_ALL_BACKENDS    = ((1<<5)-1) << 16
     // clang-format on
-};
+} DPCTLSyclBackendType;
 
 /*!
  * @brief DPCTL device types that are equivalent to Sycl's device_type.
  *
  */
-enum DPCTLSyclDeviceType
+typedef enum
 {
     // Note: before adding new values here look at DPCTLSyclBackendType enum.
     // The values should not overlap.
@@ -66,7 +66,7 @@ enum DPCTLSyclDeviceType
     DPCTL_ALL            = (1 << 6) - 1,
     DPCTL_UNKNOWN_DEVICE = 0
     // clang-format on
-};
+} DPCTLSyclDeviceType;
 
 /*!
  * @brief Supported types for kernel arguments to be passed to a Sycl kernel
@@ -100,7 +100,7 @@ typedef enum
  * characteristics of the device.
  *
  */
-enum DPCTLSyclAspectType
+typedef enum
 {
     host,
     cpu,
@@ -120,13 +120,13 @@ enum DPCTLSyclAspectType
     usm_shared_allocations,
     usm_restricted_shared_allocations,
     usm_system_allocator
-};
+} DPCTLSyclAspectType;
 
 /*!
  * @brief DPCTL analogue of ``sycl::info::partition_affinity_domain`` enum.
  *
  */
-enum DPCTLPartitionAffinityDomainType
+typedef enum
 {
     not_applicable,
     numa,
@@ -135,7 +135,7 @@ enum DPCTLPartitionAffinityDomainType
     L2_cache,
     L1_cache,
     next_partitionable
-};
+} DPCTLPartitionAffinityDomainType;
 
 /*!
  * @brief Enums to depict the properties that can be passed to a sycl::queue

dpctl-capi/include/dpctl_sycl_platform_interface.h

@@ -59,7 +59,7 @@ DPCTLPlatform_Copy(__dpctl_keep const DPCTLSyclPlatformRef PRef);
  * @ingroup PlatformInterface
  */
 DPCTL_API
-__dpctl_give DPCTLSyclPlatformRef DPCTLPlatform_Create();
+__dpctl_give DPCTLSyclPlatformRef DPCTLPlatform_Create(void);
 
 /*!
  * @brief Creates a new DPCTLSyclPlatformRef for a SYCL platform constructed
@@ -140,6 +140,6 @@ DPCTLPlatform_GetVersion(__dpctl_keep const DPCTLSyclPlatformRef PRef);
  * @ingroup PlatformInterface
  */
 DPCTL_API
-__dpctl_give DPCTLPlatformVectorRef DPCTLPlatform_GetPlatforms();
+__dpctl_give DPCTLPlatformVectorRef DPCTLPlatform_GetPlatforms(void);
 
 DPCTL_C_EXTERN_C_END

dpctl-capi/include/dpctl_sycl_queue_manager.h

@@ -55,7 +55,7 @@ DPCTL_C_EXTERN_C_BEGIN
  * @ingroup QueueManager
  */
 DPCTL_API
-__dpctl_give DPCTLSyclQueueRef DPCTLQueueMgr_GetCurrentQueue();
+__dpctl_give DPCTLSyclQueueRef DPCTLQueueMgr_GetCurrentQueue(void);
 
 /*!
  * @brief Returns true if the global queue set for the queue manager is also the
@@ -72,7 +72,7 @@ __dpctl_give DPCTLSyclQueueRef DPCTLQueueMgr_GetCurrentQueue();
  * @ingroup QueueManager
  */
 DPCTL_API
-bool DPCTLQueueMgr_GlobalQueueIsCurrent();
+bool DPCTLQueueMgr_GlobalQueueIsCurrent(void);
 
 /*!
  * @brief Check if the queue argument is also the current queue.
@@ -121,7 +121,7 @@ void DPCTLQueueMgr_PushQueue(__dpctl_keep const DPCTLSyclQueueRef QRef);
  * @ingroup QueueManager
  */
 DPCTL_API
-void DPCTLQueueMgr_PopQueue();
+void DPCTLQueueMgr_PopQueue(void);
 
 /*!
  * @brief A helper function meant for unit testing. Returns the current number
@@ -132,6 +132,6 @@ void DPCTLQueueMgr_PopQueue();
  * @ingroup QueueManager
  */
 DPCTL_API
-size_t DPCTLQueueMgr_GetQueueStackSize();
+size_t DPCTLQueueMgr_GetQueueStackSize(void);
 
 DPCTL_C_EXTERN_C_END

dpctl-capi/include/dpctl_vector.h

@@ -47,7 +47,7 @@ DPCTL_C_EXTERN_C_BEGIN
        @return Returns a new opaque pointer to a vector.                       \
      */                                                                        \
     DPCTL_API                                                                  \
-    __dpctl_give DPCTL##EL##VectorRef DPCTL##EL##Vector_Create();              \
+    __dpctl_give DPCTL##EL##VectorRef DPCTL##EL##Vector_Create(void);          \
     /*!                                                                        \
        @brief Create an opaque pointer to a std::vector created from the       \
        input raw array. The elements of the input array are deep copied before \

dpctl/_backend.pxd

@@ -34,17 +34,15 @@ cdef extern from "dpctl_utils.h":
 
 
 cdef extern from "dpctl_sycl_enum_types.h":
-    cdef enum _backend_type 'DPCTLSyclBackendType':
+    ctypedef enum _backend_type 'DPCTLSyclBackendType':
         _ALL_BACKENDS    'DPCTL_ALL_BACKENDS'
         _CUDA            'DPCTL_CUDA'
         _HOST            'DPCTL_HOST'
         _LEVEL_ZERO      'DPCTL_LEVEL_ZERO'
         _OPENCL          'DPCTL_OPENCL'
         _UNKNOWN_BACKEND 'DPCTL_UNKNOWN_BACKEND'
 
-    ctypedef _backend_type DPCTLSyclBackendType
-
-    cdef enum _device_type 'DPCTLSyclDeviceType':
+    ctypedef enum _device_type 'DPCTLSyclDeviceType':
         _ACCELERATOR    'DPCTL_ACCELERATOR'
         _ALL_DEVICES    'DPCTL_ALL'
         _AUTOMATIC      'DPCTL_AUTOMATIC'
@@ -54,9 +52,7 @@ cdef extern from "dpctl_sycl_enum_types.h":
         _HOST_DEVICE    'DPCTL_HOST_DEVICE'
         _UNKNOWN_DEVICE 'DPCTL_UNKNOWN_DEVICE'
 
-    ctypedef _device_type DPCTLSyclDeviceType
-
-    cdef enum _arg_data_type 'DPCTLKernelArgType':
+    ctypedef enum _arg_data_type 'DPCTLKernelArgType':
         _CHAR               'DPCTL_CHAR',
         _SIGNED_CHAR        'DPCTL_SIGNED_CHAR',
         _UNSIGNED_CHAR      'DPCTL_UNSIGNED_CHAR',
@@ -74,14 +70,12 @@ cdef extern from "dpctl_sycl_enum_types.h":
         _LONG_DOUBLE        'DPCTL_DOUBLE',
         _VOID_PTR           'DPCTL_VOID_PTR'
 
-    ctypedef _arg_data_type DPCTLKernelArgType
-
     ctypedef enum _queue_property_type 'DPCTLQueuePropertyType':
         _DEFAULT_PROPERTY   'DPCTL_DEFAULT_PROPERTY'
         _ENABLE_PROFILING   'DPCTL_ENABLE_PROFILING'
         _IN_ORDER           'DPCTL_IN_ORDER'
 
-    cdef enum _aspect_type 'DPCTLSyclAspectType':
+    ctypedef enum _aspect_type 'DPCTLSyclAspectType':
         _host                               'host',
         _cpu                                'cpu',
         _gpu                                'gpu',
@@ -101,10 +95,7 @@ cdef extern from "dpctl_sycl_enum_types.h":
         _usm_restricted_shared_allocations  'usm_restricted_shared_allocations',
         _usm_system_allocator               'usm_system_allocator'
 
-    ctypedef _aspect_type DPCTLSyclAspectType
-
-
-    cdef enum _partition_affinity_domain_type 'DPCTLPartitionAffinityDomainType':
+    ctypedef enum _partition_affinity_domain_type 'DPCTLPartitionAffinityDomainType':
         _not_applicable                     'not_applicable',
         _numa                               'numa',
         _L4_cache                           'L4_cache',
@@ -113,8 +104,6 @@ cdef extern from "dpctl_sycl_enum_types.h":
         _L1_cache                           'L1_cache',
         _next_partitionable                 'next_partitionable',
 
-    ctypedef _partition_affinity_domain_type DPCTLPartitionAffinityDomainType
-
 
 cdef extern from "dpctl_sycl_types.h":
     cdef struct DPCTLOpaqueSyclContext
@@ -151,10 +140,8 @@ cdef extern from "dpctl_sycl_device_interface.h":
     cdef DPCTLSyclDeviceRef DPCTLDevice_CreateFromSelector(
         const DPCTLSyclDeviceSelectorRef DSRef)
     cdef void DPCTLDevice_Delete(DPCTLSyclDeviceRef DRef)
-    cdef DPCTLSyclBackendType DPCTLDevice_GetBackend(
-        const DPCTLSyclDeviceRef DRef)
-    cdef DPCTLSyclDeviceType DPCTLDevice_GetDeviceType(
-        const DPCTLSyclDeviceRef DRef)
+    cdef _backend_type DPCTLDevice_GetBackend(const DPCTLSyclDeviceRef)
+    cdef _device_type DPCTLDevice_GetDeviceType(const DPCTLSyclDeviceRef)
     cdef const char *DPCTLDevice_GetDriverVersion(const DPCTLSyclDeviceRef DRef)
     cdef uint32_t DPCTLDevice_GetMaxComputeUnits(const DPCTLSyclDeviceRef DRef)
     cdef uint32_t DPCTLDevice_GetMaxNumSubGroups(const DPCTLSyclDeviceRef DRef)
@@ -178,8 +165,7 @@ cdef extern from "dpctl_sycl_device_interface.h":
     cdef uint32_t DPCTLDevice_GetPreferredVectorWidthFloat(const DPCTLSyclDeviceRef DRef)
     cdef uint32_t DPCTLDevice_GetPreferredVectorWidthDouble(const DPCTLSyclDeviceRef DRef)
     cdef uint32_t DPCTLDevice_GetPreferredVectorWidthHalf(const DPCTLSyclDeviceRef DRef)
-    cpdef bool DPCTLDevice_HasAspect(
-        const DPCTLSyclDeviceRef DRef, DPCTLSyclAspectType AT)
+    cpdef bool DPCTLDevice_HasAspect(const DPCTLSyclDeviceRef, _aspect_type)
     cdef uint32_t DPCTLDevice_GetMaxReadImageArgs(const DPCTLSyclDeviceRef DRef)
     cdef uint32_t DPCTLDevice_GetMaxWriteImageArgs(const DPCTLSyclDeviceRef DRef)
     cdef size_t DPCTLDevice_GetImage2dMaxWidth(const DPCTLSyclDeviceRef DRef)
@@ -193,7 +179,7 @@ cdef extern from "dpctl_sycl_device_interface.h":
         const DPCTLSyclDeviceRef DRef, size_t *counts, size_t ncounts)
     cdef DPCTLDeviceVectorRef DPCTLDevice_CreateSubDevicesByAffinity(
         const DPCTLSyclDeviceRef DRef,
-        DPCTLPartitionAffinityDomainType PartitionAffinityDomainTy)
+        _partition_affinity_domain_type PartitionAffinityDomainTy)
     cdef DPCTLSyclDeviceRef DPCTLDevice_GetParentDevice(const DPCTLSyclDeviceRef DRef)
 
 
@@ -259,8 +245,7 @@ cdef extern from "dpctl_sycl_platform_interface.h":
     cdef DPCTLSyclPlatformRef DPCTLPlatform_CreateFromSelector(
         const DPCTLSyclDeviceSelectorRef)
     cdef void DPCTLPlatform_Delete(DPCTLSyclPlatformRef)
-    cdef DPCTLSyclBackendType DPCTLPlatform_GetBackend(
-        const DPCTLSyclPlatformRef)
+    cdef _backend_type DPCTLPlatform_GetBackend(const DPCTLSyclPlatformRef)
     cdef const char *DPCTLPlatform_GetName(const DPCTLSyclPlatformRef)
     cdef const char *DPCTLPlatform_GetVendor(const DPCTLSyclPlatformRef)
     cdef const char *DPCTLPlatform_GetVersion(const DPCTLSyclPlatformRef)
@@ -283,8 +268,7 @@ cdef extern from "dpctl_sycl_context_interface.h":
     cdef size_t DPCTLContext_DeviceCount(const DPCTLSyclContextRef CRef)
     cdef bool DPCTLContext_AreEq(const DPCTLSyclContextRef CtxRef1,
                                  const DPCTLSyclContextRef CtxRef2)
-    cdef DPCTLSyclBackendType DPCTLContext_GetBackend(
-        const DPCTLSyclContextRef CtxRef)
+    cdef _backend_type DPCTLContext_GetBackend(const DPCTLSyclContextRef)
     cdef void DPCTLContext_Delete(DPCTLSyclContextRef CtxRef)
 
 
@@ -320,14 +304,14 @@ cdef extern from "dpctl_sycl_queue_interface.h":
         int properties)
     cdef void DPCTLQueue_Delete(DPCTLSyclQueueRef QRef)
     cdef DPCTLSyclQueueRef DPCTLQueue_Copy(DPCTLSyclQueueRef QRef)
-    cdef DPCTLSyclBackendType DPCTLQueue_GetBackend(const DPCTLSyclQueueRef Q)
+    cdef _backend_type DPCTLQueue_GetBackend(const DPCTLSyclQueueRef Q)
     cdef DPCTLSyclContextRef DPCTLQueue_GetContext(const DPCTLSyclQueueRef Q)
     cdef DPCTLSyclDeviceRef DPCTLQueue_GetDevice(const DPCTLSyclQueueRef Q)
     cdef DPCTLSyclEventRef  DPCTLQueue_SubmitRange(
         const DPCTLSyclKernelRef Ref,
         const DPCTLSyclQueueRef QRef,
         void **Args,
-        const DPCTLKernelArgType *ArgTypes,
+        const _arg_data_type *ArgTypes,
         size_t NArgs,
         const size_t Range[3],
         size_t NDims,
@@ -337,7 +321,7 @@ cdef extern from "dpctl_sycl_queue_interface.h":
         const DPCTLSyclKernelRef Ref,
         const DPCTLSyclQueueRef QRef,
         void **Args,
-        const DPCTLKernelArgType *ArgTypes,
+        const _arg_data_type *ArgTypes,
         size_t NArgs,
         const size_t gRange[3],
         const size_t lRange[3],