Removed vector_class_t, use std::vector throughout

Author: oleksandr-pavlyk

dpctl-capi/source/dpctl_sycl_context_interface.cpp

@@ -27,8 +27,8 @@
 #include "dpctl_sycl_context_interface.h"
 #include "../helper/include/dpctl_async_error_handler.h"
 #include "Support/CBindingWrapping.h"
-#include "vector_type.hpp"
 #include <CL/sycl.hpp>
+#include <vector>
 
 using namespace cl::sycl;
 
@@ -37,7 +37,7 @@ namespace
 // Create wrappers for C Binding types (see CBindingWrapping.h).
 DEFINE_SIMPLE_CONVERSION_FUNCTIONS(context, DPCTLSyclContextRef)
 DEFINE_SIMPLE_CONVERSION_FUNCTIONS(device, DPCTLSyclDeviceRef)
-DEFINE_SIMPLE_CONVERSION_FUNCTIONS(vector_class_t<DPCTLSyclDeviceRef>,
+DEFINE_SIMPLE_CONVERSION_FUNCTIONS(std::vector<DPCTLSyclDeviceRef>,
                                    DPCTLDeviceVectorRef)
 } /* end of anonymous namespace */
 
@@ -68,7 +68,7 @@ DPCTLContext_CreateFromDevices(__dpctl_keep const DPCTLDeviceVectorRef DVRef,
                                int /**/)
 {
     DPCTLSyclContextRef CRef = nullptr;
-    vector_class_t<device> Devices;
+    std::vector<device> Devices;
     auto DeviceRefs = unwrap(DVRef);
     if (!DeviceRefs)
         return CRef;
@@ -126,9 +126,9 @@ DPCTLContext_GetDevices(__dpctl_keep const DPCTLSyclContextRef CRef)
                      "input is a nullptr\n";
         return nullptr;
     }
-    vector_class_t<DPCTLSyclDeviceRef> *DevicesVectorPtr = nullptr;
+    std::vector<DPCTLSyclDeviceRef> *DevicesVectorPtr = nullptr;
     try {
-        DevicesVectorPtr = new vector_class_t<DPCTLSyclDeviceRef>();
+        DevicesVectorPtr = new std::vector<DPCTLSyclDeviceRef>();
     } catch (std::bad_alloc const &ba) {
         // \todo log error
         std::cerr << ba.what() << '\n';

dpctl-capi/source/dpctl_sycl_device_interface.cpp

@@ -28,10 +28,10 @@
 #include "../helper/include/dpctl_utils_helper.h"
 #include "Support/CBindingWrapping.h"
 #include "dpctl_sycl_device_manager.h"
-#include "vector_type.hpp"
 #include <CL/sycl.hpp> /* SYCL headers   */
 #include <algorithm>
 #include <cstring>
+#include <vector>
 
 using namespace cl::sycl;
 
@@ -41,7 +41,7 @@ namespace
 DEFINE_SIMPLE_CONVERSION_FUNCTIONS(device, DPCTLSyclDeviceRef)
 DEFINE_SIMPLE_CONVERSION_FUNCTIONS(device_selector, DPCTLSyclDeviceSelectorRef)
 DEFINE_SIMPLE_CONVERSION_FUNCTIONS(platform, DPCTLSyclPlatformRef)
-DEFINE_SIMPLE_CONVERSION_FUNCTIONS(vector_class_t<DPCTLSyclDeviceRef>,
+DEFINE_SIMPLE_CONVERSION_FUNCTIONS(std::vector<DPCTLSyclDeviceRef>,
                                    DPCTLDeviceVectorRef)
 
 } /* end of anonymous namespace */
@@ -609,7 +609,7 @@ __dpctl_give DPCTLDeviceVectorRef
 DPCTLDevice_CreateSubDevicesEqually(__dpctl_keep const DPCTLSyclDeviceRef DRef,
                                     size_t count)
 {
-    vector_class_t<DPCTLSyclDeviceRef> *Devices = nullptr;
+    std::vector<DPCTLSyclDeviceRef> *Devices = nullptr;
     if (DRef) {
         if (count == 0) {
             std::cerr << "Can not create sub-devices with zero compute units"
@@ -620,7 +620,7 @@ DPCTLDevice_CreateSubDevicesEqually(__dpctl_keep const DPCTLSyclDeviceRef DRef,
         try {
             auto subDevices = D->create_sub_devices<
                 info::partition_property::partition_equally>(count);
-            Devices = new vector_class_t<DPCTLSyclDeviceRef>();
+            Devices = new std::vector<DPCTLSyclDeviceRef>();
             for (const auto &sd : subDevices) {
                 Devices->emplace_back(wrap(new device(sd)));
             }
@@ -647,8 +647,8 @@ DPCTLDevice_CreateSubDevicesByCounts(__dpctl_keep const DPCTLSyclDeviceRef DRef,
                                      __dpctl_keep size_t *counts,
                                      size_t ncounts)
 {
-    vector_class_t<DPCTLSyclDeviceRef> *Devices = nullptr;
-    vector_class_t<size_t> vcounts(ncounts);
+    std::vector<DPCTLSyclDeviceRef> *Devices = nullptr;
+    std::vector<size_t> vcounts(ncounts);
     vcounts.assign(counts, counts + ncounts);
     size_t min_elem = *std::min_element(vcounts.begin(), vcounts.end());
     if (min_elem == 0) {
@@ -658,7 +658,7 @@ DPCTLDevice_CreateSubDevicesByCounts(__dpctl_keep const DPCTLSyclDeviceRef DRef,
     }
     if (DRef) {
         auto D = unwrap(DRef);
-        vector_class_t<std::remove_pointer<decltype(D)>::type> subDevices;
+        std::vector<std::remove_pointer<decltype(D)>::type> subDevices;
         try {
             subDevices = D->create_sub_devices<
                 info::partition_property::partition_by_counts>(vcounts);
@@ -671,7 +671,7 @@ DPCTLDevice_CreateSubDevicesByCounts(__dpctl_keep const DPCTLSyclDeviceRef DRef,
             return nullptr;
         }
         try {
-            Devices = new vector_class_t<DPCTLSyclDeviceRef>();
+            Devices = new std::vector<DPCTLSyclDeviceRef>();
             for (const auto &sd : subDevices) {
                 Devices->emplace_back(wrap(new device(sd)));
             }
@@ -693,15 +693,15 @@ __dpctl_give DPCTLDeviceVectorRef DPCTLDevice_CreateSubDevicesByAffinity(
     __dpctl_keep const DPCTLSyclDeviceRef DRef,
     DPCTLPartitionAffinityDomainType PartitionAffinityDomainTy)
 {
-    vector_class_t<DPCTLSyclDeviceRef> *Devices = nullptr;
+    std::vector<DPCTLSyclDeviceRef> *Devices = nullptr;
     auto D = unwrap(DRef);
     if (D) {
         try {
             auto domain = DPCTL_DPCTLPartitionAffinityDomainTypeToSycl(
                 PartitionAffinityDomainTy);
             auto subDevices = D->create_sub_devices<
                 info::partition_property::partition_by_affinity_domain>(domain);
-            Devices = new vector_class_t<DPCTLSyclDeviceRef>();
+            Devices = new std::vector<DPCTLSyclDeviceRef>();
             for (const auto &sd : subDevices) {
                 Devices->emplace_back(wrap(new device(sd)));
             }

dpctl-capi/source/dpctl_sycl_device_manager.cpp

@@ -27,11 +27,11 @@
 #include "../helper/include/dpctl_utils_helper.h"
 #include "Support/CBindingWrapping.h"
 #include "dpctl_sycl_enum_types.h"
-#include "vector_type.hpp"
 #include <CL/sycl.hpp> /* SYCL headers   */
 #include <iomanip>
 #include <iostream>
 #include <unordered_map>
+#include <vector>
 
 using namespace cl::sycl;
 
@@ -143,10 +143,10 @@ DPCTLDeviceMgr_GetCachedContext(__dpctl_keep const DPCTLSyclDeviceRef DRef)
 __dpctl_give DPCTLDeviceVectorRef
 DPCTLDeviceMgr_GetDevices(int device_identifier)
 {
-    vector_class_t<DPCTLSyclDeviceRef> *Devices = nullptr;
+    std::vector<DPCTLSyclDeviceRef> *Devices = nullptr;
 
     try {
-        Devices = new vector_class_t<DPCTLSyclDeviceRef>();
+        Devices = new std::vector<DPCTLSyclDeviceRef>();
     } catch (std::bad_alloc const &ba) {
         delete Devices;
         return nullptr;

dpctl-capi/source/dpctl_sycl_event_interface.cpp

@@ -27,8 +27,8 @@
 #include "dpctl_sycl_event_interface.h"
 #include "../helper/include/dpctl_utils_helper.h"
 #include "Support/CBindingWrapping.h"
-#include "vector_type.hpp"
 #include <CL/sycl.hpp> /* SYCL headers   */
+#include <vector>
 
 using namespace cl::sycl;
 
@@ -197,9 +197,9 @@ DPCTLEvent_GetWaitList(__dpctl_keep DPCTLSyclEventRef ERef)
         std::cerr << "Cannot get wait list as input is a nullptr\n";
         return nullptr;
     }
-    vector_class_t<DPCTLSyclEventRef> *EventsVectorPtr = nullptr;
+    std::vector<DPCTLSyclEventRef> *EventsVectorPtr = nullptr;
     try {
-        EventsVectorPtr = new vector_class_t<DPCTLSyclEventRef>();
+        EventsVectorPtr = new std::vector<DPCTLSyclEventRef>();
     } catch (std::bad_alloc const &ba) {
         // \todo log error
         std::cerr << ba.what() << '\n';

dpctl-capi/source/dpctl_sycl_platform_interface.cpp

@@ -27,20 +27,20 @@
 #include "dpctl_sycl_platform_interface.h"
 #include "../helper/include/dpctl_utils_helper.h"
 #include "Support/CBindingWrapping.h"
-#include "vector_type.hpp"
 #include <CL/sycl.hpp>
 #include <iomanip>
 #include <iostream>
 #include <set>
 #include <sstream>
+#include <vector>
 
 using namespace cl::sycl;
 
 namespace
 {
 DEFINE_SIMPLE_CONVERSION_FUNCTIONS(platform, DPCTLSyclPlatformRef);
 DEFINE_SIMPLE_CONVERSION_FUNCTIONS(device_selector, DPCTLSyclDeviceSelectorRef);
-DEFINE_SIMPLE_CONVERSION_FUNCTIONS(vector_class_t<DPCTLSyclPlatformRef>,
+DEFINE_SIMPLE_CONVERSION_FUNCTIONS(std::vector<DPCTLSyclPlatformRef>,
                                    DPCTLPlatformVectorRef);
 } // namespace
 
@@ -208,12 +208,12 @@ DPCTLPlatform_GetVersion(__dpctl_keep const DPCTLSyclPlatformRef PRef)
 
 __dpctl_give DPCTLPlatformVectorRef DPCTLPlatform_GetPlatforms()
 {
-    vector_class_t<DPCTLSyclPlatformRef> *Platforms = nullptr;
+    std::vector<DPCTLSyclPlatformRef> *Platforms = nullptr;
 
     auto platforms = platform::get_platforms();
 
     try {
-        Platforms = new vector_class_t<DPCTLSyclPlatformRef>();
+        Platforms = new std::vector<DPCTLSyclPlatformRef>();
         Platforms->reserve(platforms.size());
     } catch (std::bad_alloc const &ba) {
         return nullptr;

dpctl-capi/source/dpctl_sycl_queue_manager.cpp

@@ -26,8 +26,8 @@
 #include "dpctl_sycl_queue_manager.h"
 #include "Support/CBindingWrapping.h"
 #include "dpctl_sycl_device_manager.h"
-#include "vector_type.hpp" /* vector_class_t */
-#include <CL/sycl.hpp>     /* SYCL headers   */
+#include <CL/sycl.hpp> /* SYCL headers   */
+#include <vector>
 
 using namespace cl::sycl;
 
@@ -43,7 +43,7 @@ DEFINE_SIMPLE_CONVERSION_FUNCTIONS(context, DPCTLSyclContextRef)
 
 struct QueueManager
 {
-    using QueueStack = vector_class_t<queue>;
+    using QueueStack = std::vector<queue>;
     static QueueStack &getQueueStack()
     {
         thread_local static QueueStack *activeQueues = new QueueStack([] {