[mir_caffe2] Rename DTYPE to DataType (#6245)

Replace deprecated `DTYPE` with `DataType`.

Signed-off-by: Sergei Barannikov <s.barannikov@samsung.com>

diff --git a/compiler/mir-caffe2-importer/caffe2_op_creator.cpp b/compiler/mir-caffe2-importer/caffe2_op_creator.cpp
index 3851796..3b3d9ec 100644 (file)
--- a/compiler/mir-caffe2-importer/caffe2_op_creator.cpp
+++ b/compiler/mir-caffe2-importer/caffe2_op_creator.cpp
@@ -88,7 +88,7 @@ static mir::TensorVariant fixGroupedKernel(int groups, const mir::TensorVariant
     else
     {
       // fill element of output kernel with zero element
-      assert(folded_kernel.getDataType() == mir::DTYPE::FLOAT32 &&
+      assert(folded_kernel.getDataType() == mir::DataType::FLOAT32 &&
              "unsupported data type, add appropriate zero element creation");
       auto elem = reinterpret_cast<float *>(unfold_kernel.at(idx));
       *elem = 0.0f;
@@ -147,7 +147,7 @@ getPadding(const ::caffe2::OperatorDef &op)
 
   int32_t pad = getSingleArgument(op, "pad", 0);
   return {{pad, pad}, {pad, pad}};
-};
+}
 
 static std::vector<int32_t> getStrides(const ::caffe2::OperatorDef &op)
 {
@@ -279,12 +279,12 @@ static mir::TensorVariant createTensor(const OperatorDef &op)
   const auto &shape = findArgumentByName(op.arg(), "shape");
   const auto &values = findArgumentByName(op.arg(), "values");
 
-  mir::DTYPE element_type;
+  mir::DataType element_type;
   const void *src_data;
   // if values on floats
   if (!values.floats().empty())
   {
-    element_type = mir::DTYPE::FLOAT32;
+    element_type = mir::DataType::FLOAT32;
     src_data = values.floats().data();
   }
   else
@@ -292,11 +292,11 @@ static mir::TensorVariant createTensor(const OperatorDef &op)
     assert(!values.ints().empty());
     if (op.type() == "GivenTensorInt64Fill")
     {
-      element_type = mir::DTYPE::INT64;
+      element_type = mir::DataType::INT64;
     }
     else
     {
-      element_type = mir::DTYPE::INT32;
+      element_type = mir::DataType::INT32;
     }
     src_data = values.ints().data();
   }