update types in py module

datasig-ac-uk · Aug 18, 2023 · fa0a8d6 · fa0a8d6
1 parent b77c4be
commit fa0a8d6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/roughpy/src/args/dlpack_helpers.h b/roughpy/src/args/dlpack_helpers.h
@@ -23,13 +23,13 @@ convert_to_dl_typecode(scalars::ScalarTypeCode code) noexcept {
     return static_cast<uint8_t>(code);
 }
 
-constexpr scalars::ScalarDeviceType
+constexpr platform::DeviceType
 convert_from_dl_device_type(DLDeviceType type) noexcept {
-    return static_cast<scalars::ScalarDeviceType>(type);
+    return static_cast<platform::DeviceType>(type);
 }
 
 constexpr DLDeviceType
-convert_to_dl_device_type(scalars::ScalarDeviceType type) noexcept
+convert_to_dl_device_type(platform::DeviceType type) noexcept
 {
     return static_cast<DLDeviceType>(type);
 }
@@ -53,7 +53,7 @@ convert_to_dl_datatype(const scalars::BasicScalarInfo& info) noexcept
     };
 }
 
-constexpr scalars::ScalarDeviceInfo
+constexpr platform::DeviceInfo
 convert_from_dl_device_info(const DLDevice& device) noexcept
 {
     return {
@@ -63,7 +63,7 @@ convert_from_dl_device_info(const DLDevice& device) noexcept
 }
 
 constexpr DLDevice
-convert_to_dl_device_info(const scalars::ScalarDeviceInfo& device) noexcept {
+convert_to_dl_device_info(const platform::DeviceInfo& device) noexcept {
     return {
         convert_to_dl_device_type(device.device_type),
         device.device_id

diff --git a/roughpy/src/scalars/scalars.cpp b/roughpy/src/scalars/scalars.cpp
@@ -134,8 +134,11 @@ void python::init_scalars(pybind11::module_& m)
  * objects.
  */
 
+#define DOCASE(NAME)                                                           \
+    case static_cast<uint8_t>(scalars::ScalarTypeCode::NAME):                  \
+        type = scalars::ScalarTypeCode::NAME;                                  \
+        break
 
-d
 static const scalars::ScalarType*
 dlpack_dtype_to_scalar_type(DLDataType dtype, DLDevice device)
 {