Merge pull request #18 from mvafin/pdpd/assert_rename

Rename MY_ASSERT
mvafin · Apr 20, 2021 · 45ae3ce · 45ae3ce
2 parents 3da2b6a + dc28c3b
commit 45ae3ce
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/ngraph/frontend/paddlepaddle/include/paddlepaddle_frontend/utility.hpp b/ngraph/frontend/paddlepaddle/include/paddlepaddle_frontend/utility.hpp
@@ -21,7 +21,7 @@
 namespace ngraph {
 namespace frontend {
 
-inline void MY_ASSERT(bool ex, const std::string& msg = "Unspecified error.") {
+inline void PDPD_ASSERT(bool ex, const std::string& msg = "Unspecified error.") {
     if (!ex) throw std::runtime_error(msg);
 }
 

diff --git a/ngraph/frontend/paddlepaddle/src/frontend.cpp b/ngraph/frontend/paddlepaddle/src/frontend.cpp
@@ -51,7 +51,7 @@ std::shared_ptr<ngraph::Node> make_ng_node(std::map<std::string, Output<Node>>&
     const auto& op = op_place->getDesc();
     std::cout << "Making node: " << op->type() << std::endl;
 
-    MY_ASSERT(CREATORS_MAP.find(op->type()) != CREATORS_MAP.end(), "No creator found");
+    PDPD_ASSERT(CREATORS_MAP.find(op->type()) != CREATORS_MAP.end(), "No creator found");
     std::map<std::string, OutputVector> named_inputs;
     const auto& input_ports = op_place->getInputPorts();
     for (const auto& name_to_ports : input_ports) {
@@ -82,7 +82,7 @@ std::shared_ptr<Constant> FrontEndPDPD::read_tensor(const std::shared_ptr<Tensor
 {
     const auto& var_desc = tensor_place->getDesc();
     std::cout << "Reading tensor " << var_desc->name() << std::endl;
-    MY_ASSERT(var_desc->type().type() == paddle::framework::proto::VarType::LOD_TENSOR);
+    PDPD_ASSERT(var_desc->type().type() == paddle::framework::proto::VarType::LOD_TENSOR);
     const auto& tensor = var_desc->type().lod_tensor().tensor();
     const auto& tensor_length = std::accumulate(
         tensor.dims().cbegin(), tensor.dims().cend(), 1, std::multiplies<int64_t>());

diff --git a/ngraph/frontend/paddlepaddle/src/node_context.hpp b/ngraph/frontend/paddlepaddle/src/node_context.hpp
@@ -48,7 +48,7 @@ class NodeContext
     /// Returns exactly one input with a given name; throws if there is no inputs or there are more than one input
     Output<Node> get_ng_input (const std::string& name) const
     {
-        MY_ASSERT(name_map.at(name).size() == 1);
+        PDPD_ASSERT(name_map.at(name).size() == 1);
         return name_map.at(name).at(0);
     }
 

diff --git a/ngraph/frontend/paddlepaddle/src/op/elementwise_ops.cpp b/ngraph/frontend/paddlepaddle/src/op/elementwise_ops.cpp
@@ -30,8 +30,8 @@ OutputVector elementwise_ops (const NodeContext& node) {
 
     auto axis = node.get_attribute<int>("axis");
 
-    MY_ASSERT(x.get_partial_shape().rank().is_static(), "elementwise_ops: X rank must be static!");
-    MY_ASSERT(y.get_partial_shape().rank().is_static()), "elementwise_ops: Y rank must be static!";
+    PDPD_ASSERT(x.get_partial_shape().rank().is_static(), "elementwise_ops: X rank must be static!");
+    PDPD_ASSERT(y.get_partial_shape().rank().is_static()), "elementwise_ops: Y rank must be static!";
     int64_t x_rank = x.get_partial_shape().rank().get_length();
     int64_t y_rank = y.get_partial_shape().rank().get_length();
 

diff --git a/ngraph/frontend/paddlepaddle/src/op/mul.cpp b/ngraph/frontend/paddlepaddle/src/op/mul.cpp
@@ -26,9 +26,9 @@ namespace op {
 OutputVector mul (const NodeContext& node) {
     auto x = node.get_ng_input("X");
     auto y = node.get_ng_input("Y");
-    MY_ASSERT(x.get_partial_shape().rank().is_static(), "matmul: X rank must be static!");
+    PDPD_ASSERT(x.get_partial_shape().rank().is_static(), "matmul: X rank must be static!");
     int64_t x_rank = x.get_partial_shape().rank().get_length();
-    MY_ASSERT(y.get_partial_shape().rank().is_static() &&
+    PDPD_ASSERT(y.get_partial_shape().rank().is_static() &&
               y.get_partial_shape().rank().get_length() == 2, "matmul: Y rank must be static, and 2!");
     if (x_rank > 2) {
         auto shape = std::make_shared<ngraph::opset6::ShapeOf>(x);

diff --git a/ngraph/frontend/paddlepaddle/src/op/softmax.cpp b/ngraph/frontend/paddlepaddle/src/op/softmax.cpp
@@ -27,7 +27,7 @@ namespace op {
         auto axis = node.get_attribute<int32_t>("axis");
         if (axis < 0)
         {
-            MY_ASSERT(data.get_partial_shape().rank().is_static(), "Softmax rank must be static");
+            PDPD_ASSERT(data.get_partial_shape().rank().is_static(), "Softmax rank must be static");
             auto data_rank = data.get_partial_shape().rank().get_length();
             axis = data_rank + axis;
         }

diff --git a/ngraph/frontend/paddlepaddle/src/op/transpose2.cpp b/ngraph/frontend/paddlepaddle/src/op/transpose2.cpp
@@ -31,7 +31,7 @@ OutputVector transpose2 (const NodeContext& node) {
     std::cout << perm.size() << std::endl; 
     std::cout << data.get_partial_shape().rank() << ":" << rank << std::endl;
 
-    MY_ASSERT(perm.size() == rank, "transpose2: axis size must equal to data rank!");
+    PDPD_ASSERT(perm.size() == rank, "transpose2: axis size must equal to data rank!");
 
     auto input_order = ngraph::opset6::Constant::create(ngraph::element::i64, {rank}, perm);
     return {std::make_shared<ngraph::opset6::Transpose>(data, input_order)};

diff --git a/ngraph/frontend/paddlepaddle/src/place.cpp b/ngraph/frontend/paddlepaddle/src/place.cpp
@@ -74,37 +74,37 @@ std::vector<Place::Ptr> TensorPlacePDPD::getConsumingPorts() const {
         if (const auto& locked = consuming_port.lock()) {
             consuming_ports.push_back(locked);
         } else {
-            MY_ASSERT(false, "Consuming Port has expired.");
+            PDPD_ASSERT(false, "Consuming Port has expired.");
         }
     }
     return consuming_ports;
 }
 
 Place::Ptr TensorPlacePDPD::getProducingPort() const {
-    MY_ASSERT(m_producing_ports.size() > 1, "Only one producing port is supported.");
+    PDPD_ASSERT(m_producing_ports.size() > 1, "Only one producing port is supported.");
     if (const auto& producing_port = m_producing_ports[0].lock()) {
         return producing_port;
     }
-    MY_ASSERT(false, "Producing Port has expired.");
+    PDPD_ASSERT(false, "Producing Port has expired.");
 }
 
 std::shared_ptr<TensorPlacePDPD> InPortPlacePDPD::getSourceTensorPDPD() const {
     if (const auto& tensor = m_source_tensor.lock()) {
         return tensor;
     }
-    MY_ASSERT(false, "Source Tensor has expired.");
+    PDPD_ASSERT(false, "Source Tensor has expired.");
 }
 
 std::shared_ptr<OpPlacePDPD> InPortPlacePDPD::getOp() {
     if (const auto& op = m_op.lock()) {
         return op;
     }
-    MY_ASSERT(false, "Operation has expired.");
+    PDPD_ASSERT(false, "Operation has expired.");
 }
 
 std::shared_ptr<TensorPlacePDPD> OutPortPlacePDPD::getTargetTensorPDPD() const {
     if (const auto& target_tensor = m_target_tensor.lock()) {
         return target_tensor;
     }
-    MY_ASSERT(false, "Target Tensor has expired.");
+    PDPD_ASSERT(false, "Target Tensor has expired.");
 }