Make Memory::dataType static

> > Remove an unnecesary default template implementation which was causing all types to be treated as eCustom > Should fix the release build
KomputeProject · Aug 22, 2024 · ac52d6c · ac52d6c
1 parent 1bfc6d5
commit ac52d6c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/src/include/kompute/Memory.hpp b/src/include/kompute/Memory.hpp
@@ -69,10 +69,7 @@ class Memory
      * @return Data type of T of type kp::Memory::DataTypes
      */
     template<typename T>
-    DataTypes dataType()
-    {
-        return DataTypes::eCustom;
-    }
+    static DataTypes dataType();
 
     /**
      * Retrieve the data type of the tensor (int, float, unsigned short etc.)

diff --git a/src/include/kompute/Tensor.hpp b/src/include/kompute/Tensor.hpp
@@ -222,7 +222,7 @@ class TensorT : public Tensor
                device,
                size,
                sizeof(T),
-               this->dataType(),
+               Memory::dataType<T>(),
                tensorType)
     {
         KP_LOG_DEBUG("Kompute TensorT constructor with data size {}", size);

diff --git a/test/TestOpShadersFromStringAndFile.cpp b/test/TestOpShadersFromStringAndFile.cpp
@@ -25,7 +25,7 @@ struct TestStruct
 // Custom struct needs to be mapped the eCustom datatype
 template<>
 kp::Memory::DataTypes
-kp::TensorT<TestStruct>::dataType()
+kp::Memory::dataType<TestStruct>()
 {
     return Memory::DataTypes::eCustom;
 }

diff --git a/test/TestOpTensorCopy.cpp b/test/TestOpTensorCopy.cpp
@@ -158,7 +158,7 @@ TEST(TestOpTensorCopy, SingleTensorShouldFail)
                  std::runtime_error);
 }
 
-TEST(TestOpImageCopy, ImageShouldFail)
+TEST(TestOpTensorCopy, ImageShouldFail)
 {
     kp::Manager mgr;
 

diff --git a/test/TestTensor.cpp b/test/TestTensor.cpp
@@ -21,7 +21,7 @@ struct TensorTestStruct
 // Custom struct needs to be mapped the eCustom datatype
 template<>
 kp::Memory::DataTypes
-kp::TensorT<TensorTestStruct>::dataType()
+kp::Memory::dataType<TensorTestStruct>()
 {
     return kp::Memory::DataTypes::eCustom;
 }