[nnc] Reorganize the ModelIR include directory (#3065)

Move `contrib/nnc/include/core/modelIR` to `contrib/nnc/include/mir` in preparation for moving the MIR component to `contrib` directory.
Update `#include` directives.

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

diff --git a/contrib/nnc/core/modelIR/Deserializer.cpp b/contrib/nnc/core/modelIR/Deserializer.cpp
index b8ba2ec..c63d733 100644 (file)
--- a/contrib/nnc/core/modelIR/Deserializer.cpp
+++ b/contrib/nnc/core/modelIR/Deserializer.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/Deserializer.h"
+#include "mir/Deserializer.h"
 #include "model_ir.pb.h"
 
-#include "core/modelIR/ShapeRange.h"
+#include "mir/ShapeRange.h"
 
 namespace mir
 {

diff --git a/contrib/nnc/core/modelIR/Graph.cpp b/contrib/nnc/core/modelIR/Graph.cpp
index f67fc78..abeedaa 100644 (file)
--- a/contrib/nnc/core/modelIR/Graph.cpp
+++ b/contrib/nnc/core/modelIR/Graph.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/Graph.h"
+#include "mir/Graph.h"
 
 #include <deque>
 #include <set>

diff --git a/contrib/nnc/core/modelIR/GraphPatternMatcher.cpp b/contrib/nnc/core/modelIR/GraphPatternMatcher.cpp
index c161fc3..04d6c7a 100644 (file)
--- a/contrib/nnc/core/modelIR/GraphPatternMatcher.cpp
+++ b/contrib/nnc/core/modelIR/GraphPatternMatcher.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/GraphPatternMatcher.h"
+#include "mir/GraphPatternMatcher.h"
 
 #include <algorithm>
 #include <vector>

diff --git a/contrib/nnc/core/modelIR/Index.cpp b/contrib/nnc/core/modelIR/Index.cpp
index 7c127e9..90a5b0d 100644 (file)
--- a/contrib/nnc/core/modelIR/Index.cpp
+++ b/contrib/nnc/core/modelIR/Index.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/Index.h"
+#include "mir/Index.h"
 
 #include <algorithm>
 #include <cassert>

diff --git a/contrib/nnc/core/modelIR/IrDotDumper.cpp b/contrib/nnc/core/modelIR/IrDotDumper.cpp
index 6b93b73..190bec9 100644 (file)
--- a/contrib/nnc/core/modelIR/IrDotDumper.cpp
+++ b/contrib/nnc/core/modelIR/IrDotDumper.cpp
@@ -14,39 +14,39 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/IrDotDumper.h"
-
-#include "core/modelIR/operations/BatchNormOp.h"
-#include "core/modelIR/operations/BiasAddOp.h"
-#include "core/modelIR/operations/CappedReluOp.h"
-#include "core/modelIR/operations/ConcatOp.h"
-#include "core/modelIR/operations/ConstantOp.h"
-#include "core/modelIR/operations/Conv2DOp.h"
-#include "core/modelIR/operations/Deconv2DOp.h"
-#include "core/modelIR/operations/DepthwiseConv2DOp.h"
-#include "core/modelIR/operations/DropoutOp.h"
-#include "core/modelIR/operations/ElementwiseOp.h"
-#include "core/modelIR/operations/EluOp.h"
-#include "core/modelIR/operations/FullyConnectedOp.h"
-#include "core/modelIR/operations/GatherOp.h"
-#include "core/modelIR/operations/GemmOp.h"
-#include "core/modelIR/operations/InputOp.h"
-#include "core/modelIR/operations/LeakyReluOp.h"
-#include "core/modelIR/operations/OutputOp.h"
-#include "core/modelIR/operations/PadOp.h"
-#include "core/modelIR/operations/PoolOp.h"
-#include "core/modelIR/operations/ReduceFOp.h"
-#include "core/modelIR/operations/ReluOp.h"
-#include "core/modelIR/operations/ReshapeOp.h"
-#include "core/modelIR/operations/ResizeOp.h"
-#include "core/modelIR/operations/ScaleOp.h"
-#include "core/modelIR/operations/SigmoidOp.h"
-#include "core/modelIR/operations/SliceOp.h"
-#include "core/modelIR/operations/SoftmaxOp.h"
-#include "core/modelIR/operations/SqrtOp.h"
-#include "core/modelIR/operations/SqueezeOp.h"
-#include "core/modelIR/operations/TanhOp.h"
-#include "core/modelIR/operations/TransposeOp.h"
+#include "mir/IrDotDumper.h"
+
+#include "mir/ops/BatchNormOp.h"
+#include "mir/ops/BiasAddOp.h"
+#include "mir/ops/CappedReluOp.h"
+#include "mir/ops/ConcatOp.h"
+#include "mir/ops/ConstantOp.h"
+#include "mir/ops/Conv2DOp.h"
+#include "mir/ops/Deconv2DOp.h"
+#include "mir/ops/DepthwiseConv2DOp.h"
+#include "mir/ops/DropoutOp.h"
+#include "mir/ops/ElementwiseOp.h"
+#include "mir/ops/EluOp.h"
+#include "mir/ops/FullyConnectedOp.h"
+#include "mir/ops/GatherOp.h"
+#include "mir/ops/GemmOp.h"
+#include "mir/ops/InputOp.h"
+#include "mir/ops/LeakyReluOp.h"
+#include "mir/ops/OutputOp.h"
+#include "mir/ops/PadOp.h"
+#include "mir/ops/PoolOp.h"
+#include "mir/ops/ReduceFOp.h"
+#include "mir/ops/ReluOp.h"
+#include "mir/ops/ReshapeOp.h"
+#include "mir/ops/ResizeOp.h"
+#include "mir/ops/ScaleOp.h"
+#include "mir/ops/SigmoidOp.h"
+#include "mir/ops/SliceOp.h"
+#include "mir/ops/SoftmaxOp.h"
+#include "mir/ops/SqrtOp.h"
+#include "mir/ops/SqueezeOp.h"
+#include "mir/ops/TanhOp.h"
+#include "mir/ops/TransposeOp.h"
 
 #include <iostream>
 #include <map>

diff --git a/contrib/nnc/core/modelIR/Operation.cpp b/contrib/nnc/core/modelIR/Operation.cpp
index 73c0533..e091d03 100644 (file)
--- a/contrib/nnc/core/modelIR/Operation.cpp
+++ b/contrib/nnc/core/modelIR/Operation.cpp
@@ -14,38 +14,38 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/Operation.h"
-#include "core/modelIR/operations/BatchNormOp.h"
-#include "core/modelIR/operations/BiasAddOp.h"
-#include "core/modelIR/operations/CappedReluOp.h"
-#include "core/modelIR/operations/ConcatOp.h"
-#include "core/modelIR/operations/ConstantOp.h"
-#include "core/modelIR/operations/Conv2DOp.h"
-#include "core/modelIR/operations/Deconv2DOp.h"
-#include "core/modelIR/operations/DepthwiseConv2DOp.h"
-#include "core/modelIR/operations/DropoutOp.h"
-#include "core/modelIR/operations/ElementwiseOp.h"
-#include "core/modelIR/operations/EluOp.h"
-#include "core/modelIR/operations/FullyConnectedOp.h"
-#include "core/modelIR/operations/GatherOp.h"
-#include "core/modelIR/operations/GemmOp.h"
-#include "core/modelIR/operations/InputOp.h"
-#include "core/modelIR/operations/LeakyReluOp.h"
-#include "core/modelIR/operations/OutputOp.h"
-#include "core/modelIR/operations/PadOp.h"
-#include "core/modelIR/operations/PoolOp.h"
-#include "core/modelIR/operations/ReduceFOp.h"
-#include "core/modelIR/operations/ReluOp.h"
-#include "core/modelIR/operations/ReshapeOp.h"
-#include "core/modelIR/operations/ResizeOp.h"
-#include "core/modelIR/operations/ScaleOp.h"
-#include "core/modelIR/operations/SigmoidOp.h"
-#include "core/modelIR/operations/SliceOp.h"
-#include "core/modelIR/operations/SoftmaxOp.h"
-#include "core/modelIR/operations/SqueezeOp.h"
-#include "core/modelIR/operations/SqrtOp.h"
-#include "core/modelIR/operations/TanhOp.h"
-#include "core/modelIR/operations/TransposeOp.h"
+#include "mir/Operation.h"
+#include "mir/ops/BatchNormOp.h"
+#include "mir/ops/BiasAddOp.h"
+#include "mir/ops/CappedReluOp.h"
+#include "mir/ops/ConcatOp.h"
+#include "mir/ops/ConstantOp.h"
+#include "mir/ops/Conv2DOp.h"
+#include "mir/ops/Deconv2DOp.h"
+#include "mir/ops/DepthwiseConv2DOp.h"
+#include "mir/ops/DropoutOp.h"
+#include "mir/ops/ElementwiseOp.h"
+#include "mir/ops/EluOp.h"
+#include "mir/ops/FullyConnectedOp.h"
+#include "mir/ops/GatherOp.h"
+#include "mir/ops/GemmOp.h"
+#include "mir/ops/InputOp.h"
+#include "mir/ops/LeakyReluOp.h"
+#include "mir/ops/OutputOp.h"
+#include "mir/ops/PadOp.h"
+#include "mir/ops/PoolOp.h"
+#include "mir/ops/ReduceFOp.h"
+#include "mir/ops/ReluOp.h"
+#include "mir/ops/ReshapeOp.h"
+#include "mir/ops/ResizeOp.h"
+#include "mir/ops/ScaleOp.h"
+#include "mir/ops/SigmoidOp.h"
+#include "mir/ops/SliceOp.h"
+#include "mir/ops/SoftmaxOp.h"
+#include "mir/ops/SqueezeOp.h"
+#include "mir/ops/SqrtOp.h"
+#include "mir/ops/TanhOp.h"
+#include "mir/ops/TransposeOp.h"
 
 namespace mir {
 
@@ -65,7 +65,7 @@ void Operation::accept(IVisitor* v) {
     case Type::OpType: \
       v->visit(static_cast<ops::OpClass&>(*this)); \
       break;
-#include "core/modelIR/operations/operations.lst.h"
+#include "mir/ops/operations.lst.h"
 #undef HANDLE_OP
     default:
       assert(false && "OP not defined!");

diff --git a/contrib/nnc/core/modelIR/Serializer.cpp b/contrib/nnc/core/modelIR/Serializer.cpp
index 2710c2b..fbd037a 100644 (file)
--- a/contrib/nnc/core/modelIR/Serializer.cpp
+++ b/contrib/nnc/core/modelIR/Serializer.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/Serializer.h"
+#include "mir/Serializer.h"
 #include "model_ir.pb.h"
 
-#include "core/modelIR/ShapeRange.h"
+#include "mir/ShapeRange.h"
 
 namespace mir
 {

diff --git a/contrib/nnc/core/modelIR/Shape.cpp b/contrib/nnc/core/modelIR/Shape.cpp
index 7f077b5..5830496 100644 (file)
--- a/contrib/nnc/core/modelIR/Shape.cpp
+++ b/contrib/nnc/core/modelIR/Shape.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/Shape.h"
+#include "mir/Shape.h"
 
 #include <algorithm>
 #include <cassert>

diff --git a/contrib/nnc/core/modelIR/Tensor.cpp b/contrib/nnc/core/modelIR/Tensor.cpp
index 6611074..d0e860b 100644 (file)
--- a/contrib/nnc/core/modelIR/Tensor.cpp
+++ b/contrib/nnc/core/modelIR/Tensor.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/Tensor.h"
+#include "mir/Tensor.h"
 
 namespace mir
 {

diff --git a/contrib/nnc/core/modelIR/TensorVariant.cpp b/contrib/nnc/core/modelIR/TensorVariant.cpp
index d2e0716..6caf1ca 100644 (file)
--- a/contrib/nnc/core/modelIR/TensorVariant.cpp
+++ b/contrib/nnc/core/modelIR/TensorVariant.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/TensorVariant.h"
+#include "mir/TensorVariant.h"
 #include <cstring>
 
 namespace mir

diff --git a/contrib/nnc/core/modelIR/Visitor.cpp b/contrib/nnc/core/modelIR/Visitor.cpp
index 8194cc4..d36c5a4 100644 (file)
--- a/contrib/nnc/core/modelIR/Visitor.cpp
+++ b/contrib/nnc/core/modelIR/Visitor.cpp
@@ -15,12 +15,12 @@
  */
 
 
-#include "core/modelIR/Visitor.h"
+#include "mir/Visitor.h"
 
 namespace mir {
 
 #define HANDLE_OP(OpType, OpClass) void Visitor::visit(ops::OpClass&) {}
-#include "core/modelIR/operations/operations.lst.h"
+#include "mir/ops/operations.lst.h"
 #undef HANDLE_OP
 
 } // namespace mir

diff --git a/contrib/nnc/core/modelIR/ir_dot_builder.cpp b/contrib/nnc/core/modelIR/ir_dot_builder.cpp
index 82e504d..1023ca3 100644 (file)
--- a/contrib/nnc/core/modelIR/ir_dot_builder.cpp
+++ b/contrib/nnc/core/modelIR/ir_dot_builder.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/ir_dot_builder.h"
+#include "mir/ir_dot_builder.h"
 
 namespace mir {
 

diff --git a/contrib/nnc/core/modelIR/ir_dot_node_info.cpp b/contrib/nnc/core/modelIR/ir_dot_node_info.cpp
index ddd6ef6..97a0a0a 100644 (file)
--- a/contrib/nnc/core/modelIR/ir_dot_node_info.cpp
+++ b/contrib/nnc/core/modelIR/ir_dot_node_info.cpp
@@ -17,7 +17,7 @@
 #include <sstream>
 #include <iostream>
 
-#include "core/modelIR/ir_dot_node_info.h"
+#include "mir/ir_dot_node_info.h"
 
 namespace mir
 {

diff --git a/contrib/nnc/core/modelIR/operations/ConcatOp.cpp b/contrib/nnc/core/modelIR/operations/ConcatOp.cpp
index 0158448..464b7a0 100644 (file)
--- a/contrib/nnc/core/modelIR/operations/ConcatOp.cpp
+++ b/contrib/nnc/core/modelIR/operations/ConcatOp.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/operations/ConcatOp.h"
+#include "mir/ops/ConcatOp.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/core/modelIR/operations/Conv2DOp.cpp b/contrib/nnc/core/modelIR/operations/Conv2DOp.cpp
index 0dd48b8..a43e541 100644 (file)
--- a/contrib/nnc/core/modelIR/operations/Conv2DOp.cpp
+++ b/contrib/nnc/core/modelIR/operations/Conv2DOp.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/operations/Conv2DOp.h"
+#include "mir/ops/Conv2DOp.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/core/modelIR/operations/DeConv2DOp.cpp b/contrib/nnc/core/modelIR/operations/DeConv2DOp.cpp
index b583411..2ea548a 100644 (file)
--- a/contrib/nnc/core/modelIR/operations/DeConv2DOp.cpp
+++ b/contrib/nnc/core/modelIR/operations/DeConv2DOp.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/operations/Deconv2DOp.h"
+#include "mir/ops/Deconv2DOp.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/core/modelIR/operations/DepthwiseConv2DOp.cpp b/contrib/nnc/core/modelIR/operations/DepthwiseConv2DOp.cpp
index 2903615..d152a35 100644 (file)
--- a/contrib/nnc/core/modelIR/operations/DepthwiseConv2DOp.cpp
+++ b/contrib/nnc/core/modelIR/operations/DepthwiseConv2DOp.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/operations/DepthwiseConv2DOp.h"
+#include "mir/ops/DepthwiseConv2DOp.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/core/modelIR/operations/ElementwiseOp.cpp b/contrib/nnc/core/modelIR/operations/ElementwiseOp.cpp
index a3e36b8..f0b3cda 100644 (file)
--- a/contrib/nnc/core/modelIR/operations/ElementwiseOp.cpp
+++ b/contrib/nnc/core/modelIR/operations/ElementwiseOp.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/operations/ElementwiseOp.h"
+#include "mir/ops/ElementwiseOp.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/core/modelIR/operations/FullyConnectedOp.cpp b/contrib/nnc/core/modelIR/operations/FullyConnectedOp.cpp
index a94486c..33ec957 100644 (file)
--- a/contrib/nnc/core/modelIR/operations/FullyConnectedOp.cpp
+++ b/contrib/nnc/core/modelIR/operations/FullyConnectedOp.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/operations/FullyConnectedOp.h"
+#include "mir/ops/FullyConnectedOp.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/core/modelIR/operations/GatherOp.cpp b/contrib/nnc/core/modelIR/operations/GatherOp.cpp
index bc5fc6e..0c887c7 100644 (file)
--- a/contrib/nnc/core/modelIR/operations/GatherOp.cpp
+++ b/contrib/nnc/core/modelIR/operations/GatherOp.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/operations/GatherOp.h"
+#include "mir/ops/GatherOp.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/core/modelIR/operations/GemmOp.cpp b/contrib/nnc/core/modelIR/operations/GemmOp.cpp
index 82fcaa8..3b239cb 100644 (file)
--- a/contrib/nnc/core/modelIR/operations/GemmOp.cpp
+++ b/contrib/nnc/core/modelIR/operations/GemmOp.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/operations/GemmOp.h"
+#include "mir/ops/GemmOp.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/core/modelIR/operations/PadOp.cpp b/contrib/nnc/core/modelIR/operations/PadOp.cpp
index a82b540..35e7e11 100644 (file)
--- a/contrib/nnc/core/modelIR/operations/PadOp.cpp
+++ b/contrib/nnc/core/modelIR/operations/PadOp.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/operations/PadOp.h"
+#include "mir/ops/PadOp.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/core/modelIR/operations/PoolOp.cpp b/contrib/nnc/core/modelIR/operations/PoolOp.cpp
index 8d632dd..dfc470f 100644 (file)
--- a/contrib/nnc/core/modelIR/operations/PoolOp.cpp
+++ b/contrib/nnc/core/modelIR/operations/PoolOp.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/operations/PoolOp.h"
+#include "mir/ops/PoolOp.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/core/modelIR/operations/SliceOp.cpp b/contrib/nnc/core/modelIR/operations/SliceOp.cpp
index 645c4a8..6264b8d 100644 (file)
--- a/contrib/nnc/core/modelIR/operations/SliceOp.cpp
+++ b/contrib/nnc/core/modelIR/operations/SliceOp.cpp
@@ -15,7 +15,7 @@
  */
 
 
-#include "core/modelIR/operations/SliceOp.h"
+#include "mir/ops/SliceOp.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/core/modelIR/operations/SqueezeOp.cpp b/contrib/nnc/core/modelIR/operations/SqueezeOp.cpp
index 62f75d4..06bd72d 100644 (file)
--- a/contrib/nnc/core/modelIR/operations/SqueezeOp.cpp
+++ b/contrib/nnc/core/modelIR/operations/SqueezeOp.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/operations/SqueezeOp.h"
+#include "mir/ops/SqueezeOp.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/core/modelIR/operations/TransposeOp.cpp b/contrib/nnc/core/modelIR/operations/TransposeOp.cpp
index ba1c0b3..6bf5b32 100644 (file)
--- a/contrib/nnc/core/modelIR/operations/TransposeOp.cpp
+++ b/contrib/nnc/core/modelIR/operations/TransposeOp.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/operations/TransposeOp.h"
+#include "mir/ops/TransposeOp.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/Common.h b/contrib/nnc/include/mir/Common.h
similarity index 100%
rename from contrib/nnc/include/core/modelIR/Common.h
rename to contrib/nnc/include/mir/Common.h

diff --git a/contrib/nnc/include/core/modelIR/DataType.h b/contrib/nnc/include/mir/DataType.h
similarity index 100%
rename from contrib/nnc/include/core/modelIR/DataType.h
rename to contrib/nnc/include/mir/DataType.h

diff --git a/contrib/nnc/include/core/modelIR/Deserializer.h b/contrib/nnc/include/mir/Deserializer.h
similarity index 94%
rename from contrib/nnc/include/core/modelIR/Deserializer.h
rename to contrib/nnc/include/mir/Deserializer.h
index bacf298..cc8f657 100644 (file)
--- a/contrib/nnc/include/core/modelIR/Deserializer.h
+++ b/contrib/nnc/include/mir/Deserializer.h
@@ -21,8 +21,8 @@
 
 #include "model_ir.pb.h"
 
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/TensorVariant.h"
+#include "mir/Shape.h"
+#include "mir/TensorVariant.h"
 
 namespace mir
 {

diff --git a/contrib/nnc/include/core/modelIR/ExternalRegion.h b/contrib/nnc/include/mir/ExternalRegion.h
similarity index 97%
rename from contrib/nnc/include/core/modelIR/ExternalRegion.h
rename to contrib/nnc/include/mir/ExternalRegion.h
index dc697e2..d5c5a2d 100644 (file)
--- a/contrib/nnc/include/core/modelIR/ExternalRegion.h
+++ b/contrib/nnc/include/mir/ExternalRegion.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_LINALG_EXTERNAL_REGION_H_
 #define _NNC_CORE_LINALG_EXTERNAL_REGION_H_
 
-#include "core/modelIR/Region.h"
+#include "mir/Region.h"
 
 namespace mir
 {

diff --git a/contrib/nnc/include/core/modelIR/Graph.h b/contrib/nnc/include/mir/Graph.h
similarity index 96%
rename from contrib/nnc/include/core/modelIR/Graph.h
rename to contrib/nnc/include/mir/Graph.h
index 01bafc9..4879f9d 100644 (file)
--- a/contrib/nnc/include/core/modelIR/Graph.h
+++ b/contrib/nnc/include/mir/Graph.h
@@ -24,9 +24,9 @@
 #include <unordered_map>
 #include <set>
 
-#include "core/modelIR/Operation.h"
-#include "core/modelIR/operations/InputOp.h"
-#include "core/modelIR/operations/OutputOp.h"
+#include "mir/Operation.h"
+#include "mir/ops/InputOp.h"
+#include "mir/ops/OutputOp.h"
 
 namespace mir {
 

diff --git a/contrib/nnc/include/core/modelIR/GraphPatternMatcher.h b/contrib/nnc/include/mir/GraphPatternMatcher.h
similarity index 98%
rename from contrib/nnc/include/core/modelIR/GraphPatternMatcher.h
rename to contrib/nnc/include/mir/GraphPatternMatcher.h
index c97ac55..4954164 100644 (file)
--- a/contrib/nnc/include/core/modelIR/GraphPatternMatcher.h
+++ b/contrib/nnc/include/mir/GraphPatternMatcher.h
@@ -17,7 +17,7 @@
 #ifndef NNCC_GRAPH_PATTERN_MATCHER_H
 #define NNCC_GRAPH_PATTERN_MATCHER_H
 
-#include "Graph.h"
+#include "mir/Graph.h"
 
 namespace mir {
 

diff --git a/contrib/nnc/include/core/modelIR/Index.h b/contrib/nnc/include/mir/Index.h
similarity index 98%
rename from contrib/nnc/include/core/modelIR/Index.h
rename to contrib/nnc/include/mir/Index.h
index 799a116..6776e19 100644 (file)
--- a/contrib/nnc/include/core/modelIR/Index.h
+++ b/contrib/nnc/include/mir/Index.h
@@ -21,7 +21,7 @@
 #include <cstdint>
 #include <ostream>
 
-#include "core/modelIR/Common.h"
+#include "mir/Common.h"
 
 #include "ADT/SmallVector.h"
 

diff --git a/contrib/nnc/include/core/modelIR/IrDotDumper.h b/contrib/nnc/include/mir/IrDotDumper.h
similarity index 97%
rename from contrib/nnc/include/core/modelIR/IrDotDumper.h
rename to contrib/nnc/include/mir/IrDotDumper.h
index c0f05b6..24a5bb1 100644 (file)
--- a/contrib/nnc/include/core/modelIR/IrDotDumper.h
+++ b/contrib/nnc/include/mir/IrDotDumper.h
@@ -17,8 +17,8 @@
 #ifndef _NNC_BACKEND_INTERPRETER_CORE_DOTDUMPER_
 #define _NNC_BACKEND_INTERPRETER_CORE_DOTDUMPER_
 
-#include "core/modelIR/Visitor.h"
-#include "core/modelIR/ir_dot_builder.h"
+#include "mir/Visitor.h"
+#include "mir/ir_dot_builder.h"
 
 namespace mir
 {

diff --git a/contrib/nnc/include/core/modelIR/Operation.h b/contrib/nnc/include/mir/Operation.h
similarity index 97%
rename from contrib/nnc/include/core/modelIR/Operation.h
rename to contrib/nnc/include/mir/Operation.h
index 202d511..886e63d 100644 (file)
--- a/contrib/nnc/include/core/modelIR/Operation.h
+++ b/contrib/nnc/include/mir/Operation.h
@@ -17,8 +17,8 @@
 #ifndef _NNC_CORE_IR_MODEL_OPERATION_H_
 #define _NNC_CORE_IR_MODEL_OPERATION_H_
 
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/Visitor.h"
+#include "mir/Shape.h"
+#include "mir/Visitor.h"
 #include <deque>
 #include <string>
 #include <unordered_set>
@@ -29,7 +29,7 @@ class Operation {
 public:
   enum class Type {
 #define HANDLE_OP(OpType, OpClass) OpType,
-#include "core/modelIR/operations/operations.lst.h"
+#include "mir/ops/operations.lst.h"
 #undef HANDLE_OP
   };
 

diff --git a/contrib/nnc/include/core/modelIR/Region.h b/contrib/nnc/include/mir/Region.h
similarity index 97%
rename from contrib/nnc/include/core/modelIR/Region.h
rename to contrib/nnc/include/mir/Region.h
index 92f8f0d..2210281 100644 (file)
--- a/contrib/nnc/include/core/modelIR/Region.h
+++ b/contrib/nnc/include/mir/Region.h
@@ -18,7 +18,7 @@
 #define _NNC_CORE_LINALG_REGION_H_
 
 #include <cstdint>
-#include "Shape.h"
+#include "mir/Shape.h"
 
 namespace mir
 {

diff --git a/contrib/nnc/include/core/modelIR/Scalar.h b/contrib/nnc/include/mir/Scalar.h
similarity index 98%
rename from contrib/nnc/include/core/modelIR/Scalar.h
rename to contrib/nnc/include/mir/Scalar.h
index d18dd37..065ff2a 100644 (file)
--- a/contrib/nnc/include/core/modelIR/Scalar.h
+++ b/contrib/nnc/include/mir/Scalar.h
@@ -21,7 +21,7 @@
 #include <cassert>
 #include <cstring>
 
-#include "core/modelIR/DataType.h"
+#include "mir/DataType.h"
 
 namespace mir {
 /**

diff --git a/contrib/nnc/include/core/modelIR/Serializer.h b/contrib/nnc/include/mir/Serializer.h
similarity index 95%
rename from contrib/nnc/include/core/modelIR/Serializer.h
rename to contrib/nnc/include/mir/Serializer.h
index e57cb2c..9c11dc5 100644 (file)
--- a/contrib/nnc/include/core/modelIR/Serializer.h
+++ b/contrib/nnc/include/mir/Serializer.h
@@ -21,8 +21,8 @@
 
 #include "model_ir.pb.h"
 
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/Tensor.h"
+#include "mir/Shape.h"
+#include "mir/Tensor.h"
 
 namespace mir
 {

diff --git a/contrib/nnc/include/core/modelIR/Shape.h b/contrib/nnc/include/mir/Shape.h
similarity index 98%
rename from contrib/nnc/include/core/modelIR/Shape.h
rename to contrib/nnc/include/mir/Shape.h
index c715201..857dc6b 100644 (file)
--- a/contrib/nnc/include/core/modelIR/Shape.h
+++ b/contrib/nnc/include/mir/Shape.h
@@ -24,7 +24,7 @@
 #include <cassert>
 
 #include "ADT/SmallVector.h"
-#include "core/modelIR/Common.h"
+#include "mir/Common.h"
 
 namespace mir {
 

diff --git a/contrib/nnc/include/core/modelIR/ShapeRange.h b/contrib/nnc/include/mir/ShapeRange.h
similarity index 97%
rename from contrib/nnc/include/core/modelIR/ShapeRange.h
rename to contrib/nnc/include/mir/ShapeRange.h
index c9a1f5a..8184806 100644 (file)
--- a/contrib/nnc/include/core/modelIR/ShapeRange.h
+++ b/contrib/nnc/include/mir/ShapeRange.h
@@ -19,8 +19,8 @@
 
 #include <cassert>
 
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/Index.h"
+#include "mir/Shape.h"
+#include "mir/Index.h"
 
 namespace mir
 {

diff --git a/contrib/nnc/include/core/modelIR/Tensor.h b/contrib/nnc/include/mir/Tensor.h
similarity index 93%
rename from contrib/nnc/include/core/modelIR/Tensor.h
rename to contrib/nnc/include/mir/Tensor.h
index 5348bcd..e6075b6 100644 (file)
--- a/contrib/nnc/include/core/modelIR/Tensor.h
+++ b/contrib/nnc/include/mir/Tensor.h
@@ -16,11 +16,9 @@
 
 #pragma once
 
-#include "core/modelIR/Shape.h"
-
-#include "core/modelIR/ExternalRegion.h"
-
-#include "core/modelIR/TensorVariant.h"
+#include "mir/Shape.h"
+#include "mir/ExternalRegion.h"
+#include "mir/TensorVariant.h"
 
 namespace mir
 {

diff --git a/contrib/nnc/include/core/modelIR/TensorUtil.h b/contrib/nnc/include/mir/TensorUtil.h
similarity index 91%
rename from contrib/nnc/include/core/modelIR/TensorUtil.h
rename to contrib/nnc/include/mir/TensorUtil.h
index 3274e56..1b1377e 100644 (file)
--- a/contrib/nnc/include/core/modelIR/TensorUtil.h
+++ b/contrib/nnc/include/mir/TensorUtil.h
@@ -20,10 +20,10 @@
 #include <cstring>
 #include <memory>
 
-#include "core/modelIR/TensorVariant.h"
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/Index.h"
-#include "core/modelIR/ShapeRange.h"
+#include "mir/TensorVariant.h"
+#include "mir/Shape.h"
+#include "mir/Index.h"
+#include "mir/ShapeRange.h"
 
 namespace mir {
 

diff --git a/contrib/nnc/include/core/modelIR/TensorVariant.h b/contrib/nnc/include/mir/TensorVariant.h
similarity index 93%
rename from contrib/nnc/include/core/modelIR/TensorVariant.h
rename to contrib/nnc/include/mir/TensorVariant.h
index 8254585..c1559e5 100644 (file)
--- a/contrib/nnc/include/core/modelIR/TensorVariant.h
+++ b/contrib/nnc/include/mir/TensorVariant.h
@@ -21,10 +21,10 @@
 #include <memory>
 #include <cassert>
 
-#include "core/modelIR/Index.h"
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/DataType.h"
-#include "core/modelIR/Common.h"
+#include "mir/Index.h"
+#include "mir/Shape.h"
+#include "mir/DataType.h"
+#include "mir/Common.h"
 
 namespace mir
 {

diff --git a/contrib/nnc/include/core/modelIR/Visitor.h b/contrib/nnc/include/mir/Visitor.h
similarity index 93%
rename from contrib/nnc/include/core/modelIR/Visitor.h
rename to contrib/nnc/include/mir/Visitor.h
index 5955e6a..8167d61 100644 (file)
--- a/contrib/nnc/include/core/modelIR/Visitor.h
+++ b/contrib/nnc/include/mir/Visitor.h
@@ -22,7 +22,7 @@ namespace mir {
 //Forward declare operations as we don't need anything but references
 namespace ops {
 #define HANDLE_OP(OpType, OpClass) class OpClass;
-#include "operations/operations.lst.h"
+#include "mir/ops/operations.lst.h"
 #undef HANDLE_OP
 } // namespace ops
 
@@ -32,7 +32,7 @@ namespace ops {
 class IVisitor {
 public:
 #define HANDLE_OP(OpType, OpClass) virtual void visit(ops::OpClass&) = 0;
-#include "operations/operations.lst.h"
+#include "mir/ops/operations.lst.h"
 #undef HANDLE_OP
 
   virtual ~IVisitor() = default;
@@ -48,7 +48,7 @@ public:
 class Visitor : public IVisitor {
 public:
 #define HANDLE_OP(OpType, OpClass) virtual void visit(ops::OpClass&) override;
-#include "operations/operations.lst.h"
+#include "mir/ops/operations.lst.h"
 #undef HANDLE_OP
 
   ~Visitor() override = default;

diff --git a/contrib/nnc/include/core/modelIR/ir_dot_builder.h b/contrib/nnc/include/mir/ir_dot_builder.h
similarity index 96%
rename from contrib/nnc/include/core/modelIR/ir_dot_builder.h
rename to contrib/nnc/include/mir/ir_dot_builder.h
index ee21dbb..d244e50 100644 (file)
--- a/contrib/nnc/include/core/modelIR/ir_dot_builder.h
+++ b/contrib/nnc/include/mir/ir_dot_builder.h
@@ -19,7 +19,7 @@
 
 #include <sstream>
 
-#include "core/modelIR/ir_dot_node_info.h"
+#include "mir/ir_dot_node_info.h"
 
 namespace mir
 {

diff --git a/contrib/nnc/include/core/modelIR/ir_dot_node_info.h b/contrib/nnc/include/mir/ir_dot_node_info.h
similarity index 96%
rename from contrib/nnc/include/core/modelIR/ir_dot_node_info.h
rename to contrib/nnc/include/mir/ir_dot_node_info.h
index 2bf206e..f502ec1 100644 (file)
--- a/contrib/nnc/include/core/modelIR/ir_dot_node_info.h
+++ b/contrib/nnc/include/mir/ir_dot_node_info.h
@@ -17,9 +17,9 @@
 #ifndef NNCC_IR_NODE_DOT_BUILDER_H
 #define NNCC_IR_NODE_DOT_BUILDER_H
 
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/operations/CommonProps.h"
-#include "core/modelIR/operations/PoolOp.h"
+#include "mir/Shape.h"
+#include "mir/ops/CommonProps.h"
+#include "mir/ops/PoolOp.h"
 
 namespace mir
 {

diff --git a/contrib/nnc/include/core/modelIR/operations/BatchNormOp.h b/contrib/nnc/include/mir/ops/BatchNormOp.h
similarity index 98%
rename from contrib/nnc/include/core/modelIR/operations/BatchNormOp.h
rename to contrib/nnc/include/mir/ops/BatchNormOp.h
index 7964e99..d0f3e93 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/BatchNormOp.h
+++ b/contrib/nnc/include/mir/ops/BatchNormOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_BATCH_NORM_H_
 #define _NNC_CORE_IR_MODEL_BATCH_NORM_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/BiasAddOp.h b/contrib/nnc/include/mir/ops/BiasAddOp.h
similarity index 93%
rename from contrib/nnc/include/core/modelIR/operations/BiasAddOp.h
rename to contrib/nnc/include/mir/ops/BiasAddOp.h
index 200dc8b..be175cb 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/BiasAddOp.h
+++ b/contrib/nnc/include/mir/ops/BiasAddOp.h
@@ -17,8 +17,8 @@
 #ifndef _NNC_CORE_IR_MODEL_BIAS_ADD_H_
 #define _NNC_CORE_IR_MODEL_BIAS_ADD_H_
 
-#include "core/modelIR/Operation.h"
-#include "core/modelIR/TensorVariant.h"
+#include "mir/Operation.h"
+#include "mir/TensorVariant.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/CappedReluOp.h b/contrib/nnc/include/mir/ops/CappedReluOp.h
similarity index 96%
rename from contrib/nnc/include/core/modelIR/operations/CappedReluOp.h
rename to contrib/nnc/include/mir/ops/CappedReluOp.h
index 5dbcf03..9d14126 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/CappedReluOp.h
+++ b/contrib/nnc/include/mir/ops/CappedReluOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_CAPPED_RELU_H_
 #define _NNC_CORE_IR_MODEL_CAPPED_RELU_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/CommonProps.h b/contrib/nnc/include/mir/ops/CommonProps.h
similarity index 100%
rename from contrib/nnc/include/core/modelIR/operations/CommonProps.h
rename to contrib/nnc/include/mir/ops/CommonProps.h

diff --git a/contrib/nnc/include/core/modelIR/operations/ConcatOp.h b/contrib/nnc/include/mir/ops/ConcatOp.h
similarity index 97%
rename from contrib/nnc/include/core/modelIR/operations/ConcatOp.h
rename to contrib/nnc/include/mir/ops/ConcatOp.h
index f432744..531e782 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/ConcatOp.h
+++ b/contrib/nnc/include/mir/ops/ConcatOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_CONCAT_OP_H_
 #define _NNC_CORE_IR_MODEL_CONCAT_OP_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/ConstantOp.h b/contrib/nnc/include/mir/ops/ConstantOp.h
similarity index 96%
rename from contrib/nnc/include/core/modelIR/operations/ConstantOp.h
rename to contrib/nnc/include/mir/ops/ConstantOp.h
index 24ea428..a5f3c09 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/ConstantOp.h
+++ b/contrib/nnc/include/mir/ops/ConstantOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_CONSTANT_H_
 #define _NNC_CORE_IR_MODEL_CONSTANT_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/Conv2DOp.h b/contrib/nnc/include/mir/ops/Conv2DOp.h
similarity index 97%
rename from contrib/nnc/include/core/modelIR/operations/Conv2DOp.h
rename to contrib/nnc/include/mir/ops/Conv2DOp.h
index 0a19046..af89ebe 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/Conv2DOp.h
+++ b/contrib/nnc/include/mir/ops/Conv2DOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_CONV_2D_H_
 #define _NNC_CORE_IR_MODEL_CONV_2D_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 #include <vector>
 
 namespace mir {

diff --git a/contrib/nnc/include/core/modelIR/operations/Deconv2DOp.h b/contrib/nnc/include/mir/ops/Deconv2DOp.h
similarity index 96%
rename from contrib/nnc/include/core/modelIR/operations/Deconv2DOp.h
rename to contrib/nnc/include/mir/ops/Deconv2DOp.h
index 7568819..1f09c5f 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/Deconv2DOp.h
+++ b/contrib/nnc/include/mir/ops/Deconv2DOp.h
@@ -17,8 +17,8 @@
 #ifndef _NNC_CORE_IR_MODEL_DECONV_2D_H_
 #define _NNC_CORE_IR_MODEL_DECONV_2D_H_
 
-#include "core/modelIR/Operation.h"
-#include "core/modelIR/operations/CommonProps.h"
+#include "mir/Operation.h"
+#include "mir/ops/CommonProps.h"
 #include <vector>
 
 namespace mir {

diff --git a/contrib/nnc/include/core/modelIR/operations/DepthwiseConv2DOp.h b/contrib/nnc/include/mir/ops/DepthwiseConv2DOp.h
similarity index 97%
rename from contrib/nnc/include/core/modelIR/operations/DepthwiseConv2DOp.h
rename to contrib/nnc/include/mir/ops/DepthwiseConv2DOp.h
index 1e177c4..a3d7eb1 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/DepthwiseConv2DOp.h
+++ b/contrib/nnc/include/mir/ops/DepthwiseConv2DOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_DEPTHWISE_CONV_2D_H_
 #define _NNC_CORE_IR_MODEL_DEPTHWISE_CONV_2D_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 #include <vector>
 
 namespace mir {

diff --git a/contrib/nnc/include/core/modelIR/operations/DropoutOp.h b/contrib/nnc/include/mir/ops/DropoutOp.h
similarity index 96%
rename from contrib/nnc/include/core/modelIR/operations/DropoutOp.h
rename to contrib/nnc/include/mir/ops/DropoutOp.h
index 9a322ab..69faf7b 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/DropoutOp.h
+++ b/contrib/nnc/include/mir/ops/DropoutOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_DROPOUT_H_
 #define _NNC_CORE_IR_MODEL_DROPOUT_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/ElementwiseOp.h b/contrib/nnc/include/mir/ops/ElementwiseOp.h
similarity index 97%
rename from contrib/nnc/include/core/modelIR/operations/ElementwiseOp.h
rename to contrib/nnc/include/mir/ops/ElementwiseOp.h
index 0026073..0b49a39 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/ElementwiseOp.h
+++ b/contrib/nnc/include/mir/ops/ElementwiseOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_ELEMENTWISE_OP_H_
 #define _NNC_CORE_IR_MODEL_ELEMENTWISE_OP_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/EluOp.h b/contrib/nnc/include/mir/ops/EluOp.h
similarity index 96%
rename from contrib/nnc/include/core/modelIR/operations/EluOp.h
rename to contrib/nnc/include/mir/ops/EluOp.h
index 1b5ceb8..61ad133 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/EluOp.h
+++ b/contrib/nnc/include/mir/ops/EluOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_ELU_H_
 #define _NNC_CORE_IR_MODEL_ELU_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/FullyConnectedOp.h b/contrib/nnc/include/mir/ops/FullyConnectedOp.h
similarity index 93%
rename from contrib/nnc/include/core/modelIR/operations/FullyConnectedOp.h
rename to contrib/nnc/include/mir/ops/FullyConnectedOp.h
index 898c5e6..e352148 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/FullyConnectedOp.h
+++ b/contrib/nnc/include/mir/ops/FullyConnectedOp.h
@@ -17,8 +17,8 @@
 #ifndef _NNC_CORE_IR_MODEL_FULLY_CONNECTED_OP_H_
 #define _NNC_CORE_IR_MODEL_FULLY_CONNECTED_OP_H_
 
-#include "core/modelIR/Operation.h"
-#include "core/modelIR/TensorVariant.h"
+#include "mir/Operation.h"
+#include "mir/TensorVariant.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/GatherOp.h b/contrib/nnc/include/mir/ops/GatherOp.h
similarity index 97%
rename from contrib/nnc/include/core/modelIR/operations/GatherOp.h
rename to contrib/nnc/include/mir/ops/GatherOp.h
index 1ebc885..2d376db 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/GatherOp.h
+++ b/contrib/nnc/include/mir/ops/GatherOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_GATHER_H_
 #define _NNC_CORE_IR_MODEL_GATHER_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/GemmOp.h b/contrib/nnc/include/mir/ops/GemmOp.h
similarity index 93%
rename from contrib/nnc/include/core/modelIR/operations/GemmOp.h
rename to contrib/nnc/include/mir/ops/GemmOp.h
index cbdf912..f1059ce 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/GemmOp.h
+++ b/contrib/nnc/include/mir/ops/GemmOp.h
@@ -17,8 +17,8 @@
 #ifndef _NNC_CORE_IR_MODEL_GEMM_OP_H_
 #define _NNC_CORE_IR_MODEL_GEMM_OP_H_
 
-#include "core/modelIR/Operation.h"
-#include "core/modelIR/TensorVariant.h"
+#include "mir/Operation.h"
+#include "mir/TensorVariant.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/InputOp.h b/contrib/nnc/include/mir/ops/InputOp.h
similarity index 96%
rename from contrib/nnc/include/core/modelIR/operations/InputOp.h
rename to contrib/nnc/include/mir/ops/InputOp.h
index 98c6a82..41b10a2 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/InputOp.h
+++ b/contrib/nnc/include/mir/ops/InputOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_INPUT_H_
 #define _NNC_CORE_IR_MODEL_INPUT_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/LeakyReluOp.h b/contrib/nnc/include/mir/ops/LeakyReluOp.h
similarity index 96%
rename from contrib/nnc/include/core/modelIR/operations/LeakyReluOp.h
rename to contrib/nnc/include/mir/ops/LeakyReluOp.h
index f6b63c2..db18cf2 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/LeakyReluOp.h
+++ b/contrib/nnc/include/mir/ops/LeakyReluOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_LEAKY_RELU_H_
 #define _NNC_CORE_IR_MODEL_LEAKY_RELU_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/OutputOp.h b/contrib/nnc/include/mir/ops/OutputOp.h
similarity index 96%
rename from contrib/nnc/include/core/modelIR/operations/OutputOp.h
rename to contrib/nnc/include/mir/ops/OutputOp.h
index e3b93d2..66d961c 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/OutputOp.h
+++ b/contrib/nnc/include/mir/ops/OutputOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_OUTPUT_H_
 #define _NNC_CORE_IR_MODEL_OUTPUT_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/PadOp.h b/contrib/nnc/include/mir/ops/PadOp.h
similarity index 96%
rename from contrib/nnc/include/core/modelIR/operations/PadOp.h
rename to contrib/nnc/include/mir/ops/PadOp.h
index 11cf677..8ffaf98 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/PadOp.h
+++ b/contrib/nnc/include/mir/ops/PadOp.h
@@ -17,9 +17,8 @@
 #ifndef _NCC_CORE_IR_MODEL_PAD_H_
 #define _NCC_CORE_IR_MODEL_PAD_H_
 
-#include "core/modelIR/Operation.h"
-
-#include "core/modelIR/Scalar.h"
+#include "mir/Operation.h"
+#include "mir/Scalar.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/PoolOp.h b/contrib/nnc/include/mir/ops/PoolOp.h
similarity index 96%
rename from contrib/nnc/include/core/modelIR/operations/PoolOp.h
rename to contrib/nnc/include/mir/ops/PoolOp.h
index 5107e14..028e5fc 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/PoolOp.h
+++ b/contrib/nnc/include/mir/ops/PoolOp.h
@@ -17,8 +17,8 @@
 #ifndef _NNC_CORE_IR_MODEL_POOL_H_
 #define _NNC_CORE_IR_MODEL_POOL_H_
 
-#include "core/modelIR/Operation.h"
-#include "core/modelIR/operations/CommonProps.h"
+#include "mir/Operation.h"
+#include "mir/ops/CommonProps.h"
 #include <vector>
 #include <cmath>
 

diff --git a/contrib/nnc/include/core/modelIR/operations/ReduceFOp.h b/contrib/nnc/include/mir/ops/ReduceFOp.h
similarity index 98%
rename from contrib/nnc/include/core/modelIR/operations/ReduceFOp.h
rename to contrib/nnc/include/mir/ops/ReduceFOp.h
index 7f1f5cc..1a9bed2 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/ReduceFOp.h
+++ b/contrib/nnc/include/mir/ops/ReduceFOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_REDUCE_F_H_
 #define _NNC_CORE_IR_MODEL_REDUCE_F_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 #include <vector>
 
 namespace mir {

diff --git a/contrib/nnc/include/core/modelIR/operations/ReluOp.h b/contrib/nnc/include/mir/ops/ReluOp.h
similarity index 96%
rename from contrib/nnc/include/core/modelIR/operations/ReluOp.h
rename to contrib/nnc/include/mir/ops/ReluOp.h
index 5cf5b9f..8b58b7a 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/ReluOp.h
+++ b/contrib/nnc/include/mir/ops/ReluOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_RELU_H_
 #define _NNC_CORE_IR_MODEL_RELU_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/ReshapeOp.h b/contrib/nnc/include/mir/ops/ReshapeOp.h
similarity index 97%
rename from contrib/nnc/include/core/modelIR/operations/ReshapeOp.h
rename to contrib/nnc/include/mir/ops/ReshapeOp.h
index ebbb9dc..f8983b8 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/ReshapeOp.h
+++ b/contrib/nnc/include/mir/ops/ReshapeOp.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/ResizeOp.h b/contrib/nnc/include/mir/ops/ResizeOp.h
similarity index 97%
rename from contrib/nnc/include/core/modelIR/operations/ResizeOp.h
rename to contrib/nnc/include/mir/ops/ResizeOp.h
index 22a2361..fde9359 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/ResizeOp.h
+++ b/contrib/nnc/include/mir/ops/ResizeOp.h
@@ -17,8 +17,8 @@
 #ifndef _NNC_CORE_IR_MODEL_RESIZEOP_H_
 #define _NNC_CORE_IR_MODEL_RESIZEOP_H_
 
-#include "core/modelIR/Operation.h"
-#include "core/modelIR/Shape.h"
+#include "mir/Operation.h"
+#include "mir/Shape.h"
 #include <vector>
 #include <cmath>
 

diff --git a/contrib/nnc/include/core/modelIR/operations/ScaleOp.h b/contrib/nnc/include/mir/ops/ScaleOp.h
similarity index 96%
rename from contrib/nnc/include/core/modelIR/operations/ScaleOp.h
rename to contrib/nnc/include/mir/ops/ScaleOp.h
index 3b61f89..4530754 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/ScaleOp.h
+++ b/contrib/nnc/include/mir/ops/ScaleOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_SCALE_H_
 #define _NNC_CORE_IR_MODEL_SCALE_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/SigmoidOp.h b/contrib/nnc/include/mir/ops/SigmoidOp.h
similarity index 96%
rename from contrib/nnc/include/core/modelIR/operations/SigmoidOp.h
rename to contrib/nnc/include/mir/ops/SigmoidOp.h
index 640251d..04eea87 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/SigmoidOp.h
+++ b/contrib/nnc/include/mir/ops/SigmoidOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_SIGMOID_H_
 #define _NNC_CORE_IR_MODEL_SIGMOID_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/SliceOp.h b/contrib/nnc/include/mir/ops/SliceOp.h
similarity index 97%
rename from contrib/nnc/include/core/modelIR/operations/SliceOp.h
rename to contrib/nnc/include/mir/ops/SliceOp.h
index fd7380a..51d0335 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/SliceOp.h
+++ b/contrib/nnc/include/mir/ops/SliceOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_SLICE_H_
 #define _NNC_CORE_IR_MODEL_SLICE_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/SoftmaxOp.h b/contrib/nnc/include/mir/ops/SoftmaxOp.h
similarity index 97%
rename from contrib/nnc/include/core/modelIR/operations/SoftmaxOp.h
rename to contrib/nnc/include/mir/ops/SoftmaxOp.h
index a396e12..2648b64 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/SoftmaxOp.h
+++ b/contrib/nnc/include/mir/ops/SoftmaxOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_SOFTMAX_H_
 #define _NNC_CORE_IR_MODEL_SOFTMAX_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/SqrtOp.h b/contrib/nnc/include/mir/ops/SqrtOp.h
similarity index 91%
rename from contrib/nnc/include/core/modelIR/operations/SqrtOp.h
rename to contrib/nnc/include/mir/ops/SqrtOp.h
index befe86e..1ef4b92 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/SqrtOp.h
+++ b/contrib/nnc/include/mir/ops/SqrtOp.h
@@ -17,8 +17,8 @@
 #ifndef _NNC_CORE_IR_MODEL_SQRT_H_
 #define _NNC_CORE_IR_MODEL_SQRT_H_
 
-#include "core/modelIR/Operation.h"
-#include "core/modelIR/operations/CommonProps.h"
+#include "mir/Operation.h"
+#include "mir/ops/CommonProps.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/SqueezeOp.h b/contrib/nnc/include/mir/ops/SqueezeOp.h
similarity index 97%
rename from contrib/nnc/include/core/modelIR/operations/SqueezeOp.h
rename to contrib/nnc/include/mir/ops/SqueezeOp.h
index add2471..178b694 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/SqueezeOp.h
+++ b/contrib/nnc/include/mir/ops/SqueezeOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_SQUEEZE_OP_H_
 #define _NNC_CORE_IR_MODEL_SQUEEZE_OP_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 #include <algorithm>
 
 namespace mir {

diff --git a/contrib/nnc/include/core/modelIR/operations/TanhOp.h b/contrib/nnc/include/mir/ops/TanhOp.h
similarity index 96%
rename from contrib/nnc/include/core/modelIR/operations/TanhOp.h
rename to contrib/nnc/include/mir/ops/TanhOp.h
index ef18c4b..ba8726a 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/TanhOp.h
+++ b/contrib/nnc/include/mir/ops/TanhOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_TANH_H_
 #define _NNC_CORE_IR_MODEL_TANH_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 
 namespace mir {
 namespace ops {

diff --git a/contrib/nnc/include/core/modelIR/operations/TransposeOp.h b/contrib/nnc/include/mir/ops/TransposeOp.h
similarity index 97%
rename from contrib/nnc/include/core/modelIR/operations/TransposeOp.h
rename to contrib/nnc/include/mir/ops/TransposeOp.h
index 807f7c5..3ac68ae 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/TransposeOp.h
+++ b/contrib/nnc/include/mir/ops/TransposeOp.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_IR_MODEL_TRANSPOSE_H_
 #define _NNC_CORE_IR_MODEL_TRANSPOSE_H_
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 #include <vector>
 
 namespace mir {

diff --git a/contrib/nnc/include/core/modelIR/operations/operations.lst.h b/contrib/nnc/include/mir/ops/operations.lst.h
similarity index 100%
rename from contrib/nnc/include/core/modelIR/operations/operations.lst.h
rename to contrib/nnc/include/mir/ops/operations.lst.h

diff --git a/contrib/nnc/include/pass/PassData.h b/contrib/nnc/include/pass/PassData.h
index fbc79e7..d4a9348 100644 (file)
--- a/contrib/nnc/include/pass/PassData.h
+++ b/contrib/nnc/include/pass/PassData.h
@@ -17,8 +17,8 @@
 #ifndef NNCC_PASSDATA_H
 #define NNCC_PASSDATA_H
 
-#include "core/modelIR/Graph.h"
-#include "core/modelIR/TensorVariant.h"
+#include "mir/Graph.h"
+#include "mir/TensorVariant.h"
 
 
 namespace nnc

diff --git a/contrib/nnc/include/passes/common_frontend/NNImporter.h b/contrib/nnc/include/passes/common_frontend/NNImporter.h
index 4965477..bd281b9 100644 (file)
--- a/contrib/nnc/include/passes/common_frontend/NNImporter.h
+++ b/contrib/nnc/include/passes/common_frontend/NNImporter.h
@@ -18,7 +18,7 @@
 #define FRONTEND_COMMON_INCLUDE_NN_IMPORTER_
 
 #include "pass/Pass.h"
-#include "core/modelIR/Graph.h"
+#include "mir/Graph.h"
 
 namespace nnc {
 

diff --git a/contrib/nnc/include/passes/common_frontend/op_creator_helper.h b/contrib/nnc/include/passes/common_frontend/op_creator_helper.h
index b268d2a..80bd64d 100644 (file)
--- a/contrib/nnc/include/passes/common_frontend/op_creator_helper.h
+++ b/contrib/nnc/include/passes/common_frontend/op_creator_helper.h
@@ -21,8 +21,8 @@
 #include <memory>
 #include <set>
 
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/TensorVariant.h"
+#include "mir/Shape.h"
+#include "mir/TensorVariant.h"
 
 namespace nnc {
 

diff --git a/contrib/nnc/include/passes/common_frontend/shape_helper.h b/contrib/nnc/include/passes/common_frontend/shape_helper.h
index 8dc6ecd..35343b8 100644 (file)
--- a/contrib/nnc/include/passes/common_frontend/shape_helper.h
+++ b/contrib/nnc/include/passes/common_frontend/shape_helper.h
@@ -17,7 +17,7 @@
 #ifndef NNCC_SHAPE_HELPER_H
 #define NNCC_SHAPE_HELPER_H
 
-#include "core/modelIR/Shape.h"
+#include "mir/Shape.h"
 
 namespace nnc
 {

diff --git a/contrib/nnc/include/passes/dot_dumper/DumperPass.h b/contrib/nnc/include/passes/dot_dumper/DumperPass.h
index c1c603e..dd349ad 100644 (file)
--- a/contrib/nnc/include/passes/dot_dumper/DumperPass.h
+++ b/contrib/nnc/include/passes/dot_dumper/DumperPass.h
@@ -19,7 +19,7 @@
 
 #include "pass/Pass.h"
 #include "pass/PassData.h"
-#include "core/modelIR/IrDotDumper.h"
+#include "mir/IrDotDumper.h"
 
 namespace nnc {
 

diff --git a/contrib/nnc/include/passes/interpreter/Interpreter.h b/contrib/nnc/include/passes/interpreter/Interpreter.h
index 7bbfe48..5dfc124 100644 (file)
--- a/contrib/nnc/include/passes/interpreter/Interpreter.h
+++ b/contrib/nnc/include/passes/interpreter/Interpreter.h
@@ -17,9 +17,9 @@
 #ifndef _NNC_BACKEND_INTERPRETER_CORE_INTERPRETER_
 #define _NNC_BACKEND_INTERPRETER_CORE_INTERPRETER_
 
-#include "core/modelIR/Visitor.h"
-#include "core/modelIR/Operation.h"
-#include "core/modelIR/TensorVariant.h"
+#include "mir/Visitor.h"
+#include "mir/Operation.h"
+#include "mir/TensorVariant.h"
 #include <string>
 #include <unordered_map>
 #include <vector>

diff --git a/contrib/nnc/include/passes/interpreter/InterpreterPass.h b/contrib/nnc/include/passes/interpreter/InterpreterPass.h
index 2febd08..a521d12 100644 (file)
--- a/contrib/nnc/include/passes/interpreter/InterpreterPass.h
+++ b/contrib/nnc/include/passes/interpreter/InterpreterPass.h
@@ -17,9 +17,9 @@
 #ifndef NNCC_INTERPRETERPASS_H
 #define NNCC_INTERPRETERPASS_H
 
-#include "core/modelIR/operations/InputOp.h"
-#include "core/modelIR/TensorVariant.h"
-#include "core/modelIR/Shape.h"
+#include "mir/ops/InputOp.h"
+#include "mir/TensorVariant.h"
+#include "mir/Shape.h"
 
 #include "pass/Pass.h"
 #include "pass/PassData.h"

diff --git a/contrib/nnc/include/passes/soft_backend/BaseGenerator.h b/contrib/nnc/include/passes/soft_backend/BaseGenerator.h
index 8aad740..2425962 100644 (file)
--- a/contrib/nnc/include/passes/soft_backend/BaseGenerator.h
+++ b/contrib/nnc/include/passes/soft_backend/BaseGenerator.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_SOFT_BACKEND_BASE_GENERATOR_H_
 #define _NNC_SOFT_BACKEND_BASE_GENERATOR_H_
 
-#include "core/modelIR/Graph.h"
+#include "mir/Graph.h"
 #include "pass/Pass.h"
 #include "pass/PassData.h"
 

diff --git a/contrib/nnc/passes/acl_soft_backend/AclCppOpGenerator.cpp b/contrib/nnc/passes/acl_soft_backend/AclCppOpGenerator.cpp
index 7d6e286..d5e6d8d 100644 (file)
--- a/contrib/nnc/passes/acl_soft_backend/AclCppOpGenerator.cpp
+++ b/contrib/nnc/passes/acl_soft_backend/AclCppOpGenerator.cpp
@@ -16,39 +16,39 @@
 
 #include "AclCppOpGenerator.h"
 #include "passes/acl_soft_backend/AclCppException.h"
-#include "core/modelIR/ShapeRange.h"
-#include "core/modelIR/TensorUtil.h"
+#include "mir/ShapeRange.h"
+#include "mir/TensorUtil.h"
 #include "option/Options.h"
-#include "core/modelIR/Tensor.h"
-
-#include "core/modelIR/Operation.h"
-#include "core/modelIR/operations/BatchNormOp.h"
-#include "core/modelIR/operations/BiasAddOp.h"
-#include "core/modelIR/operations/CappedReluOp.h"
-#include "core/modelIR/operations/ConcatOp.h"
-#include "core/modelIR/operations/ConstantOp.h"
-#include "core/modelIR/operations/Conv2DOp.h"
-#include "core/modelIR/operations/Deconv2DOp.h"
-#include "core/modelIR/operations/DepthwiseConv2DOp.h"
-#include "core/modelIR/operations/DropoutOp.h"
-#include "core/modelIR/operations/ElementwiseOp.h"
-#include "core/modelIR/operations/FullyConnectedOp.h"
-#include "core/modelIR/operations/GemmOp.h"
-#include "core/modelIR/operations/InputOp.h"
-#include "core/modelIR/operations/LeakyReluOp.h"
-#include "core/modelIR/operations/OutputOp.h"
-#include "core/modelIR/operations/PadOp.h"
-#include "core/modelIR/operations/PoolOp.h"
-#include "core/modelIR/operations/ReduceFOp.h"
-#include "core/modelIR/operations/ReluOp.h"
-#include "core/modelIR/operations/ReshapeOp.h"
-#include "core/modelIR/operations/ResizeOp.h"
-#include "core/modelIR/operations/ScaleOp.h"
-#include "core/modelIR/operations/SigmoidOp.h"
-#include "core/modelIR/operations/SoftmaxOp.h"
-#include "core/modelIR/operations/SqrtOp.h"
-#include "core/modelIR/operations/TanhOp.h"
-#include "core/modelIR/operations/TransposeOp.h"
+#include "mir/Tensor.h"
+
+#include "mir/Operation.h"
+#include "mir/ops/BatchNormOp.h"
+#include "mir/ops/BiasAddOp.h"
+#include "mir/ops/CappedReluOp.h"
+#include "mir/ops/ConcatOp.h"
+#include "mir/ops/ConstantOp.h"
+#include "mir/ops/Conv2DOp.h"
+#include "mir/ops/Deconv2DOp.h"
+#include "mir/ops/DepthwiseConv2DOp.h"
+#include "mir/ops/DropoutOp.h"
+#include "mir/ops/ElementwiseOp.h"
+#include "mir/ops/FullyConnectedOp.h"
+#include "mir/ops/GemmOp.h"
+#include "mir/ops/InputOp.h"
+#include "mir/ops/LeakyReluOp.h"
+#include "mir/ops/OutputOp.h"
+#include "mir/ops/PadOp.h"
+#include "mir/ops/PoolOp.h"
+#include "mir/ops/ReduceFOp.h"
+#include "mir/ops/ReluOp.h"
+#include "mir/ops/ReshapeOp.h"
+#include "mir/ops/ResizeOp.h"
+#include "mir/ops/ScaleOp.h"
+#include "mir/ops/SigmoidOp.h"
+#include "mir/ops/SoftmaxOp.h"
+#include "mir/ops/SqrtOp.h"
+#include "mir/ops/TanhOp.h"
+#include "mir/ops/TransposeOp.h"
 
 #include <algorithm>
 

diff --git a/contrib/nnc/passes/acl_soft_backend/AclCppOpGenerator.h b/contrib/nnc/passes/acl_soft_backend/AclCppOpGenerator.h
index b32b720..4b274e8 100644 (file)
--- a/contrib/nnc/passes/acl_soft_backend/AclCppOpGenerator.h
+++ b/contrib/nnc/passes/acl_soft_backend/AclCppOpGenerator.h
@@ -17,10 +17,10 @@
 #ifndef _NNC_ACL_CPP_OP_GENERATOR_H_
 #define _NNC_ACL_CPP_OP_GENERATOR_H_
 
-#include "core/modelIR/Visitor.h"
-#include "core/modelIR/TensorVariant.h"
-#include "core/modelIR/Operation.h"
-#include "core/modelIR/Graph.h"
+#include "mir/Visitor.h"
+#include "mir/TensorVariant.h"
+#include "mir/Operation.h"
+#include "mir/Graph.h"
 #include "ArtifactModel.h"
 #include "ArtifactGeneratorCppCode.h"
 #include "ArtifactGeneratorCppDecl.h"

diff --git a/contrib/nnc/passes/caffe2_frontend/caffe2_importer.cpp b/contrib/nnc/passes/caffe2_frontend/caffe2_importer.cpp
index 242af7b..67c7a8e 100644 (file)
--- a/contrib/nnc/passes/caffe2_frontend/caffe2_importer.cpp
+++ b/contrib/nnc/passes/caffe2_frontend/caffe2_importer.cpp
@@ -22,8 +22,8 @@
 #include "caffe2_op_types.h"
 #include "caffe2_op_creator.h"
 
-#include "core/modelIR/operations/OutputOp.h"
-#include "core/modelIR/Shape.h"
+#include "mir/ops/OutputOp.h"
+#include "mir/Shape.h"
 #include "pass/PassException.h"
 
 #include "caffe2_proto_helper.h"

diff --git a/contrib/nnc/passes/caffe2_frontend/caffe2_op_creator.cpp b/contrib/nnc/passes/caffe2_frontend/caffe2_op_creator.cpp
index 4b4ba9e..1deb94c 100644 (file)
--- a/contrib/nnc/passes/caffe2_frontend/caffe2_op_creator.cpp
+++ b/contrib/nnc/passes/caffe2_frontend/caffe2_op_creator.cpp
@@ -14,31 +14,31 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/operations/BatchNormOp.h"
-#include "core/modelIR/operations/BiasAddOp.h"
-#include "core/modelIR/operations/CappedReluOp.h"
-#include "core/modelIR/operations/ConcatOp.h"
-#include "core/modelIR/operations/ConstantOp.h"
-#include "core/modelIR/operations/Conv2DOp.h"
-#include "core/modelIR/operations/DepthwiseConv2DOp.h"
-#include "core/modelIR/operations/DropoutOp.h"
-#include "core/modelIR/operations/ElementwiseOp.h"
-#include "core/modelIR/operations/FullyConnectedOp.h"
-#include "core/modelIR/operations/InputOp.h"
-#include "core/modelIR/operations/PoolOp.h"
-#include "core/modelIR/operations/ReluOp.h"
-#include "core/modelIR/operations/ReshapeOp.h"
-#include "core/modelIR/operations/ResizeOp.h"
-#include "core/modelIR/operations/ScaleOp.h"
-#include "core/modelIR/operations/SigmoidOp.h"
-#include "core/modelIR/operations/SoftmaxOp.h"
-#include "core/modelIR/operations/TransposeOp.h"
-
-#include "core/modelIR/Index.h"
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/ShapeRange.h"
-#include "core/modelIR/Tensor.h"
-#include "core/modelIR/TensorUtil.h"
+#include "mir/ops/BatchNormOp.h"
+#include "mir/ops/BiasAddOp.h"
+#include "mir/ops/CappedReluOp.h"
+#include "mir/ops/ConcatOp.h"
+#include "mir/ops/ConstantOp.h"
+#include "mir/ops/Conv2DOp.h"
+#include "mir/ops/DepthwiseConv2DOp.h"
+#include "mir/ops/DropoutOp.h"
+#include "mir/ops/ElementwiseOp.h"
+#include "mir/ops/FullyConnectedOp.h"
+#include "mir/ops/InputOp.h"
+#include "mir/ops/PoolOp.h"
+#include "mir/ops/ReluOp.h"
+#include "mir/ops/ReshapeOp.h"
+#include "mir/ops/ResizeOp.h"
+#include "mir/ops/ScaleOp.h"
+#include "mir/ops/SigmoidOp.h"
+#include "mir/ops/SoftmaxOp.h"
+#include "mir/ops/TransposeOp.h"
+
+#include "mir/Index.h"
+#include "mir/Shape.h"
+#include "mir/ShapeRange.h"
+#include "mir/Tensor.h"
+#include "mir/TensorUtil.h"
 
 #include "passes/common_frontend/op_creator_helper.h"
 #include "passes/common_frontend/shape_helper.h"

diff --git a/contrib/nnc/passes/caffe2_frontend/caffe2_op_creator.h b/contrib/nnc/passes/caffe2_frontend/caffe2_op_creator.h
index 5cef1d2..7653fe3 100644 (file)
--- a/contrib/nnc/passes/caffe2_frontend/caffe2_op_creator.h
+++ b/contrib/nnc/passes/caffe2_frontend/caffe2_op_creator.h
@@ -22,11 +22,11 @@
 #include <vector>
 #include <memory>
 
-#include "core/modelIR/Graph.h"
-#include "core/modelIR/Operation.h"
-#include "core/modelIR/TensorVariant.h"
-#include "core/modelIR/operations/CommonProps.h"
-#include "core/modelIR/Shape.h"
+#include "mir/Graph.h"
+#include "mir/Operation.h"
+#include "mir/TensorVariant.h"
+#include "mir/ops/CommonProps.h"
+#include "mir/Shape.h"
 
 #include "caffe2/proto/caffe2.pb.h"
 

diff --git a/contrib/nnc/passes/caffe_frontend/caffe_importer.cpp b/contrib/nnc/passes/caffe_frontend/caffe_importer.cpp
index 3352517..edc7b26 100644 (file)
--- a/contrib/nnc/passes/caffe_frontend/caffe_importer.cpp
+++ b/contrib/nnc/passes/caffe_frontend/caffe_importer.cpp
@@ -23,9 +23,9 @@
 #include "caffe_op_creator.h"
 #include "caffe_op_types.h"
 
-#include "core/modelIR/operations/OutputOp.h"
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/TensorUtil.h"
+#include "mir/ops/OutputOp.h"
+#include "mir/Shape.h"
+#include "mir/TensorUtil.h"
 #include "pass/PassException.h"
 
 #include "passes/common_frontend/op_creator_helper.h"

diff --git a/contrib/nnc/passes/caffe_frontend/caffe_op_creator.cpp b/contrib/nnc/passes/caffe_frontend/caffe_op_creator.cpp
index 8aefe8c..588093e 100644 (file)
--- a/contrib/nnc/passes/caffe_frontend/caffe_op_creator.cpp
+++ b/contrib/nnc/passes/caffe_frontend/caffe_op_creator.cpp
@@ -14,34 +14,34 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/operations/BatchNormOp.h"
-#include "core/modelIR/operations/BiasAddOp.h"
-#include "core/modelIR/operations/CappedReluOp.h"
-#include "core/modelIR/operations/ConcatOp.h"
-#include "core/modelIR/operations/ConstantOp.h"
-#include "core/modelIR/operations/Conv2DOp.h"
-#include "core/modelIR/operations/Deconv2DOp.h"
-#include "core/modelIR/operations/DepthwiseConv2DOp.h"
-#include "core/modelIR/operations/DropoutOp.h"
-#include "core/modelIR/operations/ElementwiseOp.h"
-#include "core/modelIR/operations/EluOp.h"
-#include "core/modelIR/operations/FullyConnectedOp.h"
-#include "core/modelIR/operations/GatherOp.h"
-#include "core/modelIR/operations/LeakyReluOp.h"
-#include "core/modelIR/operations/PoolOp.h"
-#include "core/modelIR/operations/ReluOp.h"
-#include "core/modelIR/operations/ReshapeOp.h"
-#include "core/modelIR/operations/ScaleOp.h"
-#include "core/modelIR/operations/SigmoidOp.h"
-#include "core/modelIR/operations/SliceOp.h"
-#include "core/modelIR/operations/SoftmaxOp.h"
-#include "core/modelIR/operations/TanhOp.h"
-#include "core/modelIR/operations/TransposeOp.h"
-
-#include "core/modelIR/Index.h"
-#include "core/modelIR/ShapeRange.h"
-#include "core/modelIR/Tensor.h"
-#include "core/modelIR/TensorUtil.h"
+#include "mir/ops/BatchNormOp.h"
+#include "mir/ops/BiasAddOp.h"
+#include "mir/ops/CappedReluOp.h"
+#include "mir/ops/ConcatOp.h"
+#include "mir/ops/ConstantOp.h"
+#include "mir/ops/Conv2DOp.h"
+#include "mir/ops/Deconv2DOp.h"
+#include "mir/ops/DepthwiseConv2DOp.h"
+#include "mir/ops/DropoutOp.h"
+#include "mir/ops/ElementwiseOp.h"
+#include "mir/ops/EluOp.h"
+#include "mir/ops/FullyConnectedOp.h"
+#include "mir/ops/GatherOp.h"
+#include "mir/ops/LeakyReluOp.h"
+#include "mir/ops/PoolOp.h"
+#include "mir/ops/ReluOp.h"
+#include "mir/ops/ReshapeOp.h"
+#include "mir/ops/ScaleOp.h"
+#include "mir/ops/SigmoidOp.h"
+#include "mir/ops/SliceOp.h"
+#include "mir/ops/SoftmaxOp.h"
+#include "mir/ops/TanhOp.h"
+#include "mir/ops/TransposeOp.h"
+
+#include "mir/Index.h"
+#include "mir/ShapeRange.h"
+#include "mir/Tensor.h"
+#include "mir/TensorUtil.h"
 
 #include "passes/common_frontend/shape_helper.h"
 #include "passes/common_frontend/op_creator_helper.h"

diff --git a/contrib/nnc/passes/caffe_frontend/caffe_op_creator.h b/contrib/nnc/passes/caffe_frontend/caffe_op_creator.h
index 6f1e2e5..1e81b3f 100644 (file)
--- a/contrib/nnc/passes/caffe_frontend/caffe_op_creator.h
+++ b/contrib/nnc/passes/caffe_frontend/caffe_op_creator.h
@@ -22,10 +22,10 @@
 #include <vector>
 #include <memory>
 
-#include "core/modelIR/Graph.h"
-#include "core/modelIR/TensorVariant.h"
-#include "core/modelIR/operations/CommonProps.h"
-#include "core/modelIR/Shape.h"
+#include "mir/Graph.h"
+#include "mir/TensorVariant.h"
+#include "mir/ops/CommonProps.h"
+#include "mir/Shape.h"
 
 #include "caffe/proto/caffe.pb.h"
 

diff --git a/contrib/nnc/passes/common_frontend/op_creator_helper.cpp b/contrib/nnc/passes/common_frontend/op_creator_helper.cpp
index 85477b5..a43606f 100644 (file)
--- a/contrib/nnc/passes/common_frontend/op_creator_helper.cpp
+++ b/contrib/nnc/passes/common_frontend/op_creator_helper.cpp
@@ -17,9 +17,9 @@
 #include "pass/PassException.h"
 #include "passes/common_frontend/op_creator_helper.h"
 
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/ShapeRange.h"
-#include "core/modelIR/TensorVariant.h"
+#include "mir/Shape.h"
+#include "mir/ShapeRange.h"
+#include "mir/TensorVariant.h"
 
 #include <set>
 

diff --git a/contrib/nnc/passes/dot_dumper/DumperPass.cpp b/contrib/nnc/passes/dot_dumper/DumperPass.cpp
index 9ed90ed..1f60000 100644 (file)
--- a/contrib/nnc/passes/dot_dumper/DumperPass.cpp
+++ b/contrib/nnc/passes/dot_dumper/DumperPass.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "passes/dot_dumper/DumperPass.h"
-#include "core/modelIR/Graph.h"
+#include "mir/Graph.h"
 #include "pass/PassException.h"
 
 #include <fstream>

diff --git a/contrib/nnc/passes/interpreter/Interpreter.cpp b/contrib/nnc/passes/interpreter/Interpreter.cpp
index 91f4edd..39db8d8 100644 (file)
--- a/contrib/nnc/passes/interpreter/Interpreter.cpp
+++ b/contrib/nnc/passes/interpreter/Interpreter.cpp
@@ -16,36 +16,36 @@
 
 #include "passes/interpreter/Interpreter.h"
 
-#include "core/modelIR/operations/BatchNormOp.h"
-#include "core/modelIR/operations/BiasAddOp.h"
-#include "core/modelIR/operations/CappedReluOp.h"
-#include "core/modelIR/operations/ConcatOp.h"
-#include "core/modelIR/operations/ConstantOp.h"
-#include "core/modelIR/operations/Conv2DOp.h"
-#include "core/modelIR/operations/Deconv2DOp.h"
-#include "core/modelIR/operations/DepthwiseConv2DOp.h"
-#include "core/modelIR/operations/DropoutOp.h"
-#include "core/modelIR/operations/ElementwiseOp.h"
-#include "core/modelIR/operations/EluOp.h"
-#include "core/modelIR/operations/FullyConnectedOp.h"
-#include "core/modelIR/operations/GatherOp.h"
-#include "core/modelIR/operations/GemmOp.h"
-#include "core/modelIR/operations/InputOp.h"
-#include "core/modelIR/operations/OutputOp.h"
-#include "core/modelIR/operations/LeakyReluOp.h"
-#include "core/modelIR/operations/PadOp.h"
-#include "core/modelIR/operations/PoolOp.h"
-#include "core/modelIR/operations/ReduceFOp.h"
-#include "core/modelIR/operations/ReluOp.h"
-#include "core/modelIR/operations/ResizeOp.h"
-#include "core/modelIR/operations/ScaleOp.h"
-#include "core/modelIR/operations/SigmoidOp.h"
-#include "core/modelIR/operations/SliceOp.h"
-#include "core/modelIR/operations/SoftmaxOp.h"
-#include "core/modelIR/operations/SqrtOp.h"
-#include "core/modelIR/operations/SqueezeOp.h"
-#include "core/modelIR/operations/TanhOp.h"
-#include "core/modelIR/operations/TransposeOp.h"
+#include "mir/ops/BatchNormOp.h"
+#include "mir/ops/BiasAddOp.h"
+#include "mir/ops/CappedReluOp.h"
+#include "mir/ops/ConcatOp.h"
+#include "mir/ops/ConstantOp.h"
+#include "mir/ops/Conv2DOp.h"
+#include "mir/ops/Deconv2DOp.h"
+#include "mir/ops/DepthwiseConv2DOp.h"
+#include "mir/ops/DropoutOp.h"
+#include "mir/ops/ElementwiseOp.h"
+#include "mir/ops/EluOp.h"
+#include "mir/ops/FullyConnectedOp.h"
+#include "mir/ops/GatherOp.h"
+#include "mir/ops/GemmOp.h"
+#include "mir/ops/InputOp.h"
+#include "mir/ops/OutputOp.h"
+#include "mir/ops/LeakyReluOp.h"
+#include "mir/ops/PadOp.h"
+#include "mir/ops/PoolOp.h"
+#include "mir/ops/ReduceFOp.h"
+#include "mir/ops/ReluOp.h"
+#include "mir/ops/ResizeOp.h"
+#include "mir/ops/ScaleOp.h"
+#include "mir/ops/SigmoidOp.h"
+#include "mir/ops/SliceOp.h"
+#include "mir/ops/SoftmaxOp.h"
+#include "mir/ops/SqrtOp.h"
+#include "mir/ops/SqueezeOp.h"
+#include "mir/ops/TanhOp.h"
+#include "mir/ops/TransposeOp.h"
 
 #include "ops/BatchNorm.h"
 #include "ops/Bias.h"

diff --git a/contrib/nnc/passes/interpreter/interpreter_pass.cpp b/contrib/nnc/passes/interpreter/interpreter_pass.cpp
index 7a4fbcf..b591cba 100644 (file)
--- a/contrib/nnc/passes/interpreter/interpreter_pass.cpp
+++ b/contrib/nnc/passes/interpreter/interpreter_pass.cpp
@@ -27,7 +27,7 @@
 #include <H5Cpp.h>
 #endif  // NNC_HDF5_SUPPORTED
 
-#include "core/modelIR/Shape.h"
+#include "mir/Shape.h"
 
 #include "pass/Pass.h"
 #include "pass/PassData.h"
@@ -36,10 +36,10 @@
 #include "passes/interpreter/Interpreter.h"
 #include "passes/interpreter/InterpreterPass.h"
 
-#include "core/modelIR/Graph.h"
+#include "mir/Graph.h"
 
-#include "core/modelIR/ShapeRange.h"
-#include "core/modelIR/Tensor.h"
+#include "mir/ShapeRange.h"
+#include "mir/Tensor.h"
 
 
 namespace nnc {

diff --git a/contrib/nnc/passes/interpreter/ops/BatchNorm.h b/contrib/nnc/passes/interpreter/ops/BatchNorm.h
index 8034808..87a2305 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/BatchNorm.h
+++ b/contrib/nnc/passes/interpreter/ops/BatchNorm.h
@@ -20,7 +20,7 @@
 #include "OperationImpl.h"
 #include "Fill.h"
 
-#include "core/modelIR/operations/BatchNormOp.h"
+#include "mir/ops/BatchNormOp.h"
 
 namespace nnc
 {

diff --git a/contrib/nnc/passes/interpreter/ops/Bias.h b/contrib/nnc/passes/interpreter/ops/Bias.h
index 9d21525..3ca8f50 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/Bias.h
+++ b/contrib/nnc/passes/interpreter/ops/Bias.h
@@ -18,7 +18,7 @@
 #define _NNC_BACKEND_INTERPRETER_BIAS_
 
 #include "OperationImpl.h"
-#include "core/modelIR/Tensor.h"
+#include "mir/Tensor.h"
 
 namespace nnc {
 

diff --git a/contrib/nnc/passes/interpreter/ops/Conv2D.cpp b/contrib/nnc/passes/interpreter/ops/Conv2D.cpp
index a481f86..18a1157 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/Conv2D.cpp
+++ b/contrib/nnc/passes/interpreter/ops/Conv2D.cpp
@@ -15,8 +15,8 @@
  */
 
 #include "Conv2D.h"
-#include "core/modelIR/ShapeRange.h"
-#include "core/modelIR/TensorUtil.h"
+#include "mir/ShapeRange.h"
+#include "mir/TensorUtil.h"
 
 namespace nnc {
 

diff --git a/contrib/nnc/passes/interpreter/ops/Conv2D.h b/contrib/nnc/passes/interpreter/ops/Conv2D.h
index 0bf7287..a7e465b 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/Conv2D.h
+++ b/contrib/nnc/passes/interpreter/ops/Conv2D.h
@@ -18,8 +18,8 @@
 #define _NNC_CORE_BACKEND_INTERPRETER_CONV2D_IMPL_
 
 #include "OperationImpl.h"
-#include "core/modelIR/operations/Conv2DOp.h"
-#include "core/modelIR/Tensor.h"
+#include "mir/ops/Conv2DOp.h"
+#include "mir/Tensor.h"
 
 namespace nnc {
 

diff --git a/contrib/nnc/passes/interpreter/ops/DeConv2D.cpp b/contrib/nnc/passes/interpreter/ops/DeConv2D.cpp
index 73b0aa3..8f5d31a 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/DeConv2D.cpp
+++ b/contrib/nnc/passes/interpreter/ops/DeConv2D.cpp
@@ -16,8 +16,8 @@
 
 #include <cstdlib>
 
-#include "core/modelIR/TensorUtil.h"
-#include "core/modelIR/ShapeRange.h"
+#include "mir/TensorUtil.h"
+#include "mir/ShapeRange.h"
 
 #include "DeConv2D.h"
 #include "common.h"

diff --git a/contrib/nnc/passes/interpreter/ops/DeConv2D.h b/contrib/nnc/passes/interpreter/ops/DeConv2D.h
index 2a07240..ad10beb 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/DeConv2D.h
+++ b/contrib/nnc/passes/interpreter/ops/DeConv2D.h
@@ -18,8 +18,8 @@
 #define _NNC_CORE_BACKEND_INTERPRETER_DECONV2D_IMPL_
 
 #include "OperationImpl.h"
-#include "core/modelIR/operations/Deconv2DOp.h"
-#include "core/modelIR/Tensor.h"
+#include "mir/ops/Deconv2DOp.h"
+#include "mir/Tensor.h"
 
 namespace nnc {
 

diff --git a/contrib/nnc/passes/interpreter/ops/DepthwiseConv2D.cpp b/contrib/nnc/passes/interpreter/ops/DepthwiseConv2D.cpp
index 8582db2..ad9c037 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/DepthwiseConv2D.cpp
+++ b/contrib/nnc/passes/interpreter/ops/DepthwiseConv2D.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "DepthwiseConv2D.h"
-#include "core/modelIR/ShapeRange.h"
+#include "mir/ShapeRange.h"
 
 namespace nnc {
 

diff --git a/contrib/nnc/passes/interpreter/ops/DepthwiseConv2D.h b/contrib/nnc/passes/interpreter/ops/DepthwiseConv2D.h
index fd8ef74..0c643d9 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/DepthwiseConv2D.h
+++ b/contrib/nnc/passes/interpreter/ops/DepthwiseConv2D.h
@@ -18,8 +18,8 @@
 #define _NNC_CORE_BACKEND_INTERPRETER_DEPTHWISE_CONV2D_IMPL_
 
 #include "OperationImpl.h"
-#include "core/modelIR/operations/DepthwiseConv2DOp.h"
-#include "core/modelIR/Tensor.h"
+#include "mir/ops/DepthwiseConv2DOp.h"
+#include "mir/Tensor.h"
 
 namespace nnc {
 

diff --git a/contrib/nnc/passes/interpreter/ops/Dropout.h b/contrib/nnc/passes/interpreter/ops/Dropout.h
index 8fa2d01..dd4f7a1 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/Dropout.h
+++ b/contrib/nnc/passes/interpreter/ops/Dropout.h
@@ -20,7 +20,7 @@
 #include "OperationImpl.h"
 #include "Fill.h"
 
-#include "core/modelIR/operations/DropoutOp.h"
+#include "mir/ops/DropoutOp.h"
 
 namespace nnc
 {

diff --git a/contrib/nnc/passes/interpreter/ops/Fill.h b/contrib/nnc/passes/interpreter/ops/Fill.h
index 7047a03..a11062f 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/Fill.h
+++ b/contrib/nnc/passes/interpreter/ops/Fill.h
@@ -18,8 +18,8 @@
 #define _NNC_CORE_BACKEND_INTERPRETER_FILL_
 
 #include "OperationImpl.h"
-#include "core/modelIR/ShapeRange.h"
-#include "core/modelIR/Tensor.h"
+#include "mir/ShapeRange.h"
+#include "mir/Tensor.h"
 #include <functional>
 
 namespace nnc {

diff --git a/contrib/nnc/passes/interpreter/ops/FullyConnected.h b/contrib/nnc/passes/interpreter/ops/FullyConnected.h
index f903bb5..fc4cf1c 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/FullyConnected.h
+++ b/contrib/nnc/passes/interpreter/ops/FullyConnected.h
@@ -18,9 +18,9 @@
 #define _NNC_CORE_BACKEND_INTERPRETER_FULLYCONNECTED_
 
 #include "OperationImpl.h"
-#include "core/modelIR/operations/FullyConnectedOp.h"
-#include "core/modelIR/Tensor.h"
-#include "core/modelIR/ShapeRange.h"
+#include "mir/ops/FullyConnectedOp.h"
+#include "mir/Tensor.h"
+#include "mir/ShapeRange.h"
 
 namespace nnc {
 

diff --git a/contrib/nnc/passes/interpreter/ops/Gather.h b/contrib/nnc/passes/interpreter/ops/Gather.h
index 420841b..1119fef 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/Gather.h
+++ b/contrib/nnc/passes/interpreter/ops/Gather.h
@@ -18,8 +18,8 @@
 #define _NNC_CORE_BACKEND_INTERPRETER_GATHER_
 
 #include "OperationImpl.h"
-#include "core/modelIR/operations/GatherOp.h"
-#include "core/modelIR/Tensor.h"
+#include "mir/ops/GatherOp.h"
+#include "mir/Tensor.h"
 
 namespace nnc {
 

diff --git a/contrib/nnc/passes/interpreter/ops/Gemm.h b/contrib/nnc/passes/interpreter/ops/Gemm.h
index 6984e80..83be0d0 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/Gemm.h
+++ b/contrib/nnc/passes/interpreter/ops/Gemm.h
@@ -18,10 +18,10 @@
 #define _NNC_CORE_BACKEND_INTERPRETER_GEMM_
 
 #include "OperationImpl.h"
-#include "core/modelIR/operations/GemmOp.h"
-#include "core/modelIR/Tensor.h"
-#include "core/modelIR/TensorVariant.h"
-#include "core/modelIR/ShapeRange.h"
+#include "mir/ops/GemmOp.h"
+#include "mir/Tensor.h"
+#include "mir/TensorVariant.h"
+#include "mir/ShapeRange.h"
 
 namespace nnc {
 template<typename T>

diff --git a/contrib/nnc/passes/interpreter/ops/OperationImpl.h b/contrib/nnc/passes/interpreter/ops/OperationImpl.h
index 192478f..105f28b 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/OperationImpl.h
+++ b/contrib/nnc/passes/interpreter/ops/OperationImpl.h
@@ -17,8 +17,8 @@
 #ifndef _NNC_CORE_BACKEND_INTERPRETER_OPERATION_IMPL_
 #define _NNC_CORE_BACKEND_INTERPRETER_OPERATION_IMPL_
 
-#include "core/modelIR/TensorVariant.h"
-#include "core/modelIR/Shape.h"
+#include "mir/TensorVariant.h"
+#include "mir/Shape.h"
 #include <vector>
 
 namespace nnc {

diff --git a/contrib/nnc/passes/interpreter/ops/Pad.cpp b/contrib/nnc/passes/interpreter/ops/Pad.cpp
index 072e987..ec4c13a 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/Pad.cpp
+++ b/contrib/nnc/passes/interpreter/ops/Pad.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/ShapeRange.h"
+#include "mir/ShapeRange.h"
 
 #include "Pad.h"
 

diff --git a/contrib/nnc/passes/interpreter/ops/Pad.h b/contrib/nnc/passes/interpreter/ops/Pad.h
index 64e8861..00d5313 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/Pad.h
+++ b/contrib/nnc/passes/interpreter/ops/Pad.h
@@ -18,8 +18,8 @@
 #define _NNC_CORE_BACKEND_INTERPRETER_PAD_IMPL_
 
 #include "OperationImpl.h"
-#include "core/modelIR/operations/PadOp.h"
-#include "core/modelIR/Tensor.h"
+#include "mir/ops/PadOp.h"
+#include "mir/Tensor.h"
 
 namespace nnc {
 /**

diff --git a/contrib/nnc/passes/interpreter/ops/Pool.cpp b/contrib/nnc/passes/interpreter/ops/Pool.cpp
index 48efc29..0443ee0 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/Pool.cpp
+++ b/contrib/nnc/passes/interpreter/ops/Pool.cpp
@@ -17,7 +17,7 @@
 #include <iostream>
 #include <limits>
 
-#include "core/modelIR/ShapeRange.h"
+#include "mir/ShapeRange.h"
 
 #include "Pool.h"
 #include "common.h"

diff --git a/contrib/nnc/passes/interpreter/ops/Pool.h b/contrib/nnc/passes/interpreter/ops/Pool.h
index 3dcffa1..e2216ac 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/Pool.h
+++ b/contrib/nnc/passes/interpreter/ops/Pool.h
@@ -18,9 +18,9 @@
 #define _NNC_CORE_BACKEND_INTERPRETER_POOL_
 
 #include "OperationImpl.h"
-#include "core/modelIR/operations/PoolOp.h"
-#include "core/modelIR/operations/CommonProps.h"
-#include "core/modelIR/Tensor.h"
+#include "mir/ops/PoolOp.h"
+#include "mir/ops/CommonProps.h"
+#include "mir/Tensor.h"
 
 namespace nnc
 {

diff --git a/contrib/nnc/passes/interpreter/ops/Reduce.h b/contrib/nnc/passes/interpreter/ops/Reduce.h
index f12d403..f991ffd 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/Reduce.h
+++ b/contrib/nnc/passes/interpreter/ops/Reduce.h
@@ -19,9 +19,9 @@
 
 #include <functional>
 
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/Tensor.h"
-#include "core/modelIR/ShapeRange.h"
+#include "mir/Shape.h"
+#include "mir/Tensor.h"
+#include "mir/ShapeRange.h"
 
 #include "OperationImpl.h"
 #include "Fill.h"

diff --git a/contrib/nnc/passes/interpreter/ops/Reshape.h b/contrib/nnc/passes/interpreter/ops/Reshape.h
index 3fbc560..f2371a4 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/Reshape.h
+++ b/contrib/nnc/passes/interpreter/ops/Reshape.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_CORE_BACKEND_INTERPRETER_RESHAPE_IMPL_
 #define _NNC_CORE_BACKEND_INTERPRETER_RESHAPE_IMPL_
 
-#include "core/modelIR/operations/ReshapeOp.h"
+#include "mir/ops/ReshapeOp.h"
 
 #include "OperationImpl.h"
 #include "Fill.h"

diff --git a/contrib/nnc/passes/interpreter/ops/Scale.h b/contrib/nnc/passes/interpreter/ops/Scale.h
index 035b51f..ca6565c 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/Scale.h
+++ b/contrib/nnc/passes/interpreter/ops/Scale.h
@@ -18,7 +18,7 @@
 #define _NNC_CORE_BACKEND_INTERPRETER_SCALE_IMPL_
 
 #include "OperationImpl.h"
-#include "core/modelIR/Tensor.h"
+#include "mir/Tensor.h"
 
 namespace nnc {
 

diff --git a/contrib/nnc/passes/interpreter/ops/Softmax.h b/contrib/nnc/passes/interpreter/ops/Softmax.h
index add0545..03e05f0 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/Softmax.h
+++ b/contrib/nnc/passes/interpreter/ops/Softmax.h
@@ -19,8 +19,8 @@
 
 #include <cmath>
 
-#include "core/modelIR/ShapeRange.h"
-#include "core/modelIR/Tensor.h"
+#include "mir/ShapeRange.h"
+#include "mir/Tensor.h"
 
 #include "OperationImpl.h"
 #include "Reduce.h"

diff --git a/contrib/nnc/passes/interpreter/ops/Transpose.cpp b/contrib/nnc/passes/interpreter/ops/Transpose.cpp
index fba948d..9ca48ba 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/Transpose.cpp
+++ b/contrib/nnc/passes/interpreter/ops/Transpose.cpp
@@ -15,8 +15,8 @@
  */
 
 #include "Transpose.h"
-#include "core/modelIR/Tensor.h"
-#include "core/modelIR/ShapeRange.h"
+#include "mir/Tensor.h"
+#include "mir/ShapeRange.h"
 
 namespace nnc {
 

diff --git a/contrib/nnc/passes/interpreter/ops/Transpose.h b/contrib/nnc/passes/interpreter/ops/Transpose.h
index 79bf65c..b055428 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/Transpose.h
+++ b/contrib/nnc/passes/interpreter/ops/Transpose.h
@@ -18,8 +18,8 @@
 #define _NNC_CORE_BACKEND_INTERPRETER_TRANSPOSE_
 
 #include "OperationImpl.h"
-#include "core/modelIR/operations/TransposeOp.h"
-#include "core/modelIR/Tensor.h"
+#include "mir/ops/TransposeOp.h"
+#include "mir/Tensor.h"
 
 namespace nnc {
 

diff --git a/contrib/nnc/passes/interpreter/ops/common.h b/contrib/nnc/passes/interpreter/ops/common.h
index a414847..2ef925b 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/common.h
+++ b/contrib/nnc/passes/interpreter/ops/common.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "core/modelIR/Index.h"
-#include "core/modelIR/Shape.h"
+#include "mir/Index.h"
+#include "mir/Shape.h"
 
 namespace nnc
 {

diff --git a/contrib/nnc/passes/interpreter/ops/conv_FFT.cpp b/contrib/nnc/passes/interpreter/ops/conv_FFT.cpp
index 9c30760..ab50847 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/conv_FFT.cpp
+++ b/contrib/nnc/passes/interpreter/ops/conv_FFT.cpp
@@ -16,7 +16,7 @@
 
 #include <cmath>
 
-#include "core/modelIR/ShapeRange.h"
+#include "mir/ShapeRange.h"
 
 #include "conv_FFT.h"
 #include "common.h"

diff --git a/contrib/nnc/passes/interpreter/ops/conv_FFT.h b/contrib/nnc/passes/interpreter/ops/conv_FFT.h
index 8838bf3..a69018e 100644 (file)
--- a/contrib/nnc/passes/interpreter/ops/conv_FFT.h
+++ b/contrib/nnc/passes/interpreter/ops/conv_FFT.h
@@ -40,8 +40,8 @@
 #define _NNC_CORE_BACKEND_INTERPRETER_CONV2D_FFT_IMPL_
 
 #include "OperationImpl.h"
-#include "core/modelIR/operations/Conv2DOp.h"
-#include "core/modelIR/Tensor.h"
+#include "mir/ops/Conv2DOp.h"
+#include "mir/Tensor.h"
 #include <complex>
 
 namespace nnc

diff --git a/contrib/nnc/passes/onnx_frontend/ONNXImporterImpl.cpp b/contrib/nnc/passes/onnx_frontend/ONNXImporterImpl.cpp
index bcc4927..72dddff 100644 (file)
--- a/contrib/nnc/passes/onnx_frontend/ONNXImporterImpl.cpp
+++ b/contrib/nnc/passes/onnx_frontend/ONNXImporterImpl.cpp
@@ -18,18 +18,18 @@
 #include "ONNXPerfectHash.h"
 #include "ONNXOpCreator.h"
 
-#include "core/modelIR/IrDotDumper.h"
-#include "core/modelIR/operations/ConstantOp.h"
-#include "core/modelIR/operations/Conv2DOp.h"
-#include "core/modelIR/operations/DepthwiseConv2DOp.h"
-#include "core/modelIR/operations/ElementwiseOp.h"
-#include "core/modelIR/operations/InputOp.h"
-#include "core/modelIR/operations/OutputOp.h"
-#include "core/modelIR/operations/TransposeOp.h"
-#include "core/modelIR/Operation.h"
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/TensorUtil.h"
-#include "core/modelIR/TensorVariant.h"
+#include "mir/IrDotDumper.h"
+#include "mir/ops/ConstantOp.h"
+#include "mir/ops/Conv2DOp.h"
+#include "mir/ops/DepthwiseConv2DOp.h"
+#include "mir/ops/ElementwiseOp.h"
+#include "mir/ops/InputOp.h"
+#include "mir/ops/OutputOp.h"
+#include "mir/ops/TransposeOp.h"
+#include "mir/Operation.h"
+#include "mir/Shape.h"
+#include "mir/TensorUtil.h"
+#include "mir/TensorVariant.h"
 #include "onnx/onnx_pb.h"
 #include "onnx/proto_utils.h"
 #include "passes/common_frontend/model_allocation.h"

diff --git a/contrib/nnc/passes/onnx_frontend/ONNXImporterImpl.h b/contrib/nnc/passes/onnx_frontend/ONNXImporterImpl.h
index 6d5d65a..123f764 100644 (file)
--- a/contrib/nnc/passes/onnx_frontend/ONNXImporterImpl.h
+++ b/contrib/nnc/passes/onnx_frontend/ONNXImporterImpl.h
@@ -22,7 +22,7 @@
 #include <string>
 #include <onnx/onnx.pb.h>
 
-#include "core/modelIR/Graph.h"
+#include "mir/Graph.h"
 #include "ONNXOpType.h"
 #include "ONNXOpCreator.h"
 #include "passes/common_frontend/NNImporter.h"

diff --git a/contrib/nnc/passes/onnx_frontend/ONNXOpCreator.cpp b/contrib/nnc/passes/onnx_frontend/ONNXOpCreator.cpp
index 05b2440..32bab8c 100644 (file)
--- a/contrib/nnc/passes/onnx_frontend/ONNXOpCreator.cpp
+++ b/contrib/nnc/passes/onnx_frontend/ONNXOpCreator.cpp
@@ -17,34 +17,34 @@
 #include "ONNXOpCreator.h"
 #include "ONNXImporterImpl.h"
 
-#include "core/modelIR/Index.h"
-#include "core/modelIR/Graph.h"
-#include "core/modelIR/Scalar.h"
-#include "core/modelIR/ShapeRange.h"
-#include "core/modelIR/Tensor.h"
-#include "core/modelIR/TensorUtil.h"
-#include "core/modelIR/operations/BatchNormOp.h"
-#include "core/modelIR/operations/BiasAddOp.h"
-#include "core/modelIR/operations/CappedReluOp.h"
-#include "core/modelIR/operations/ConcatOp.h"
-#include "core/modelIR/operations/ConstantOp.h"
-#include "core/modelIR/operations/Conv2DOp.h"
-#include "core/modelIR/operations/DepthwiseConv2DOp.h"
-#include "core/modelIR/operations/DropoutOp.h"
-#include "core/modelIR/operations/FullyConnectedOp.h"
-#include "core/modelIR/operations/GatherOp.h"
-#include "core/modelIR/operations/GemmOp.h"
-#include "core/modelIR/operations/InputOp.h"
-#include "core/modelIR/operations/PadOp.h"
-#include "core/modelIR/operations/PoolOp.h"
-#include "core/modelIR/operations/ReluOp.h"
-#include "core/modelIR/operations/ReshapeOp.h"
-#include "core/modelIR/operations/ResizeOp.h"
-#include "core/modelIR/operations/ScaleOp.h"
-#include "core/modelIR/operations/SigmoidOp.h"
-#include "core/modelIR/operations/SoftmaxOp.h"
-#include "core/modelIR/operations/TransposeOp.h"
-#include "core/modelIR/operations/ElementwiseOp.h"
+#include "mir/Index.h"
+#include "mir/Graph.h"
+#include "mir/Scalar.h"
+#include "mir/ShapeRange.h"
+#include "mir/Tensor.h"
+#include "mir/TensorUtil.h"
+#include "mir/ops/BatchNormOp.h"
+#include "mir/ops/BiasAddOp.h"
+#include "mir/ops/CappedReluOp.h"
+#include "mir/ops/ConcatOp.h"
+#include "mir/ops/ConstantOp.h"
+#include "mir/ops/Conv2DOp.h"
+#include "mir/ops/DepthwiseConv2DOp.h"
+#include "mir/ops/DropoutOp.h"
+#include "mir/ops/FullyConnectedOp.h"
+#include "mir/ops/GatherOp.h"
+#include "mir/ops/GemmOp.h"
+#include "mir/ops/InputOp.h"
+#include "mir/ops/PadOp.h"
+#include "mir/ops/PoolOp.h"
+#include "mir/ops/ReluOp.h"
+#include "mir/ops/ReshapeOp.h"
+#include "mir/ops/ResizeOp.h"
+#include "mir/ops/ScaleOp.h"
+#include "mir/ops/SigmoidOp.h"
+#include "mir/ops/SoftmaxOp.h"
+#include "mir/ops/TransposeOp.h"
+#include "mir/ops/ElementwiseOp.h"
 #include "passes/common_frontend/op_creator_helper.h"
 #include "passes/common_frontend/shape_helper.h"
 #include "pass/PassException.h"

diff --git a/contrib/nnc/passes/onnx_frontend/ONNXOpCreator.h b/contrib/nnc/passes/onnx_frontend/ONNXOpCreator.h
index 2a08e66..2ccd101 100644 (file)
--- a/contrib/nnc/passes/onnx_frontend/ONNXOpCreator.h
+++ b/contrib/nnc/passes/onnx_frontend/ONNXOpCreator.h
@@ -17,11 +17,11 @@
 #ifndef NNCC_ONNX_OP_CREATOR_H
 #define NNCC_ONNX_OP_CREATOR_H
 
-#include "core/modelIR/Graph.h"
-#include "core/modelIR/TensorVariant.h"
-#include "core/modelIR/operations/CommonProps.h"
-#include "core/modelIR/operations/ElementwiseOp.h"
-#include "core/modelIR/Shape.h"
+#include "mir/Graph.h"
+#include "mir/TensorVariant.h"
+#include "mir/ops/CommonProps.h"
+#include "mir/ops/ElementwiseOp.h"
+#include "mir/Shape.h"
 #include "onnx/onnx.pb.h"
 #include "ONNXOpType.h"
 

diff --git a/contrib/nnc/passes/optimizations/CombineTransposes.cpp b/contrib/nnc/passes/optimizations/CombineTransposes.cpp
index e210b4d..ff958c2 100644 (file)
--- a/contrib/nnc/passes/optimizations/CombineTransposes.cpp
+++ b/contrib/nnc/passes/optimizations/CombineTransposes.cpp
@@ -16,9 +16,9 @@
 
 #include <algorithm>
 #include "passes/optimizations/CombineTransposes.h"
-#include "core/modelIR/operations/TransposeOp.h"
-#include "core/modelIR/Graph.h"
-#include "core/modelIR/GraphPatternMatcher.h"
+#include "mir/ops/TransposeOp.h"
+#include "mir/Graph.h"
+#include "mir/GraphPatternMatcher.h"
 
 namespace nnc {
 

diff --git a/contrib/nnc/passes/soft_backend/CPPGenerator.cpp b/contrib/nnc/passes/soft_backend/CPPGenerator.cpp
index 8693de1..4ee9cca 100644 (file)
--- a/contrib/nnc/passes/soft_backend/CPPGenerator.cpp
+++ b/contrib/nnc/passes/soft_backend/CPPGenerator.cpp
@@ -16,7 +16,7 @@
 
 #include "passes/soft_backend/CPPGenerator.h"
 
-#include "core/modelIR/Operation.h"
+#include "mir/Operation.h"
 #include "ModelAnalyzer.h"
 #include "SBSerializer.h"
 #include "option/Options.h"

diff --git a/contrib/nnc/passes/soft_backend/ModelAnalyzer.cpp b/contrib/nnc/passes/soft_backend/ModelAnalyzer.cpp
index 26ba9c4..92c1e7f 100644 (file)
--- a/contrib/nnc/passes/soft_backend/ModelAnalyzer.cpp
+++ b/contrib/nnc/passes/soft_backend/ModelAnalyzer.cpp
@@ -16,41 +16,41 @@
 
 #include "ModelAnalyzer.h"
 
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/ShapeRange.h"
-#include "core/modelIR/Graph.h"
-
-#include "core/modelIR/operations/BatchNormOp.h"
-#include "core/modelIR/operations/BiasAddOp.h"
-#include "core/modelIR/operations/CappedReluOp.h"
-#include "core/modelIR/operations/ConcatOp.h"
-#include "core/modelIR/operations/ConstantOp.h"
-#include "core/modelIR/operations/Conv2DOp.h"
-#include "core/modelIR/operations/Deconv2DOp.h"
-#include "core/modelIR/operations/DepthwiseConv2DOp.h"
-#include "core/modelIR/operations/DropoutOp.h"
-#include "core/modelIR/operations/ElementwiseOp.h"
-#include "core/modelIR/operations/EluOp.h"
-#include "core/modelIR/operations/FullyConnectedOp.h"
-#include "core/modelIR/operations/GatherOp.h"
-#include "core/modelIR/operations/GemmOp.h"
-#include "core/modelIR/operations/InputOp.h"
-#include "core/modelIR/operations/LeakyReluOp.h"
-#include "core/modelIR/operations/OutputOp.h"
-#include "core/modelIR/operations/PadOp.h"
-#include "core/modelIR/operations/PoolOp.h"
-#include "core/modelIR/operations/ReduceFOp.h"
-#include "core/modelIR/operations/ReluOp.h"
-#include "core/modelIR/operations/ReshapeOp.h"
-#include "core/modelIR/operations/ResizeOp.h"
-#include "core/modelIR/operations/ScaleOp.h"
-#include "core/modelIR/operations/SigmoidOp.h"
-#include "core/modelIR/operations/SliceOp.h"
-#include "core/modelIR/operations/SoftmaxOp.h"
-#include "core/modelIR/operations/SqrtOp.h"
-#include "core/modelIR/operations/SqueezeOp.h"
-#include "core/modelIR/operations/TanhOp.h"
-#include "core/modelIR/operations/TransposeOp.h"
+#include "mir/Shape.h"
+#include "mir/ShapeRange.h"
+#include "mir/Graph.h"
+
+#include "mir/ops/BatchNormOp.h"
+#include "mir/ops/BiasAddOp.h"
+#include "mir/ops/CappedReluOp.h"
+#include "mir/ops/ConcatOp.h"
+#include "mir/ops/ConstantOp.h"
+#include "mir/ops/Conv2DOp.h"
+#include "mir/ops/Deconv2DOp.h"
+#include "mir/ops/DepthwiseConv2DOp.h"
+#include "mir/ops/DropoutOp.h"
+#include "mir/ops/ElementwiseOp.h"
+#include "mir/ops/EluOp.h"
+#include "mir/ops/FullyConnectedOp.h"
+#include "mir/ops/GatherOp.h"
+#include "mir/ops/GemmOp.h"
+#include "mir/ops/InputOp.h"
+#include "mir/ops/LeakyReluOp.h"
+#include "mir/ops/OutputOp.h"
+#include "mir/ops/PadOp.h"
+#include "mir/ops/PoolOp.h"
+#include "mir/ops/ReduceFOp.h"
+#include "mir/ops/ReluOp.h"
+#include "mir/ops/ReshapeOp.h"
+#include "mir/ops/ResizeOp.h"
+#include "mir/ops/ScaleOp.h"
+#include "mir/ops/SigmoidOp.h"
+#include "mir/ops/SliceOp.h"
+#include "mir/ops/SoftmaxOp.h"
+#include "mir/ops/SqrtOp.h"
+#include "mir/ops/SqueezeOp.h"
+#include "mir/ops/TanhOp.h"
+#include "mir/ops/TransposeOp.h"
 
 #include <type_traits>
 #include <limits>

diff --git a/contrib/nnc/passes/soft_backend/ModelAnalyzer.h b/contrib/nnc/passes/soft_backend/ModelAnalyzer.h
index 31d92f7..2513bc8 100644 (file)
--- a/contrib/nnc/passes/soft_backend/ModelAnalyzer.h
+++ b/contrib/nnc/passes/soft_backend/ModelAnalyzer.h
@@ -19,11 +19,11 @@
 
 #include "SequencedIR.h"
 
-#include "core/modelIR/Graph.h"
-#include "core/modelIR/Visitor.h"
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/TensorVariant.h"
-#include "core/modelIR/Operation.h"
+#include "mir/Graph.h"
+#include "mir/Visitor.h"
+#include "mir/Shape.h"
+#include "mir/TensorVariant.h"
+#include "mir/Operation.h"
 
 #include <vector>
 #include <map>

diff --git a/contrib/nnc/passes/soft_backend/SBSerializer.cpp b/contrib/nnc/passes/soft_backend/SBSerializer.cpp
index 3ac19e6..24c1e18 100644 (file)
--- a/contrib/nnc/passes/soft_backend/SBSerializer.cpp
+++ b/contrib/nnc/passes/soft_backend/SBSerializer.cpp
@@ -15,39 +15,39 @@
  */
 
 #include "SBSerializer.h"
-#include "core/modelIR/ShapeRange.h"
-#include "core/modelIR/TensorUtil.h"
+#include "mir/ShapeRange.h"
+#include "mir/TensorUtil.h"
 
 #include "CommonData.def"
 
-#include "core/modelIR/operations/BatchNormOp.h"
-#include "core/modelIR/operations/BiasAddOp.h"
-#include "core/modelIR/operations/CappedReluOp.h"
-#include "core/modelIR/operations/ConcatOp.h"
-#include "core/modelIR/operations/ConstantOp.h"
-#include "core/modelIR/operations/Conv2DOp.h"
-#include "core/modelIR/operations/Deconv2DOp.h"
-#include "core/modelIR/operations/DepthwiseConv2DOp.h"
-#include "core/modelIR/operations/DropoutOp.h"
-#include "core/modelIR/operations/ElementwiseOp.h"
-#include "core/modelIR/operations/EluOp.h"
-#include "core/modelIR/operations/FullyConnectedOp.h"
-#include "core/modelIR/operations/GatherOp.h"
-#include "core/modelIR/operations/GemmOp.h"
-#include "core/modelIR/operations/LeakyReluOp.h"
-#include "core/modelIR/operations/PadOp.h"
-#include "core/modelIR/operations/PoolOp.h"
-#include "core/modelIR/operations/ReduceFOp.h"
-#include "core/modelIR/operations/ReluOp.h"
-#include "core/modelIR/operations/ReshapeOp.h"
-#include "core/modelIR/operations/ResizeOp.h"
-#include "core/modelIR/operations/ScaleOp.h"
-#include "core/modelIR/operations/SliceOp.h"
-#include "core/modelIR/operations/SoftmaxOp.h"
-#include "core/modelIR/operations/SqueezeOp.h"
-#include "core/modelIR/operations/SqrtOp.h"
-#include "core/modelIR/operations/TanhOp.h"
-#include "core/modelIR/operations/TransposeOp.h"
+#include "mir/ops/BatchNormOp.h"
+#include "mir/ops/BiasAddOp.h"
+#include "mir/ops/CappedReluOp.h"
+#include "mir/ops/ConcatOp.h"
+#include "mir/ops/ConstantOp.h"
+#include "mir/ops/Conv2DOp.h"
+#include "mir/ops/Deconv2DOp.h"
+#include "mir/ops/DepthwiseConv2DOp.h"
+#include "mir/ops/DropoutOp.h"
+#include "mir/ops/ElementwiseOp.h"
+#include "mir/ops/EluOp.h"
+#include "mir/ops/FullyConnectedOp.h"
+#include "mir/ops/GatherOp.h"
+#include "mir/ops/GemmOp.h"
+#include "mir/ops/LeakyReluOp.h"
+#include "mir/ops/PadOp.h"
+#include "mir/ops/PoolOp.h"
+#include "mir/ops/ReduceFOp.h"
+#include "mir/ops/ReluOp.h"
+#include "mir/ops/ReshapeOp.h"
+#include "mir/ops/ResizeOp.h"
+#include "mir/ops/ScaleOp.h"
+#include "mir/ops/SliceOp.h"
+#include "mir/ops/SoftmaxOp.h"
+#include "mir/ops/SqueezeOp.h"
+#include "mir/ops/SqrtOp.h"
+#include "mir/ops/TanhOp.h"
+#include "mir/ops/TransposeOp.h"
 
 #include "pass/PassException.h"
 #include <algorithm>

diff --git a/contrib/nnc/passes/soft_backend/SBSerializer.h b/contrib/nnc/passes/soft_backend/SBSerializer.h
index 133211d..cbf7985 100644 (file)
--- a/contrib/nnc/passes/soft_backend/SBSerializer.h
+++ b/contrib/nnc/passes/soft_backend/SBSerializer.h
@@ -17,9 +17,9 @@
 #ifndef _NNC_SOFT_BACKEND_SERIALIZER_H_
 #define _NNC_SOFT_BACKEND_SERIALIZER_H_
 
-#include "core/modelIR/Visitor.h"
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/TensorVariant.h"
+#include "mir/Visitor.h"
+#include "mir/Shape.h"
+#include "mir/TensorVariant.h"
 #include "ModelAnalyzer.h"
 
 #include <vector>

diff --git a/contrib/nnc/passes/soft_backend/SequencedIR.h b/contrib/nnc/passes/soft_backend/SequencedIR.h
index 4db16b2..c1e4ac1 100644 (file)
--- a/contrib/nnc/passes/soft_backend/SequencedIR.h
+++ b/contrib/nnc/passes/soft_backend/SequencedIR.h
@@ -17,8 +17,8 @@
 #ifndef _NNC_SOFT_BACKEND_SEQUENCED_IR_H_
 #define _NNC_SOFT_BACKEND_SEQUENCED_IR_H_
 
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/Operation.h"
+#include "mir/Shape.h"
+#include "mir/Operation.h"
 
 #include <string>
 #include <vector>

diff --git a/contrib/nnc/passes/tflite_frontend/tflite_importer.cpp b/contrib/nnc/passes/tflite_frontend/tflite_importer.cpp
index df2f7cc..703813c 100644 (file)
--- a/contrib/nnc/passes/tflite_frontend/tflite_importer.cpp
+++ b/contrib/nnc/passes/tflite_frontend/tflite_importer.cpp
@@ -16,9 +16,9 @@
 
 #include "schema_generated.h"
 #include "tflite_importer.h"
-#include "core/modelIR/operations/ConstantOp.h"
-#include "core/modelIR/operations/ElementwiseOp.h"
-#include "core/modelIR/operations/OutputOp.h"
+#include "mir/ops/ConstantOp.h"
+#include "mir/ops/ElementwiseOp.h"
+#include "mir/ops/OutputOp.h"
 #include "tflite_op_creator.h"
 #include "passes/common_frontend/op_creator_helper.h"
 

diff --git a/contrib/nnc/passes/tflite_frontend/tflite_importer.h b/contrib/nnc/passes/tflite_frontend/tflite_importer.h
index cac6616..b20a772 100644 (file)
--- a/contrib/nnc/passes/tflite_frontend/tflite_importer.h
+++ b/contrib/nnc/passes/tflite_frontend/tflite_importer.h
@@ -28,9 +28,9 @@
 #include "passes/common_frontend/model_allocation.h"
 #include "tflite_op_creator.h"
 
-#include "core/modelIR/Graph.h"
-#include "core/modelIR/TensorUtil.h"
-#include "core/modelIR/TensorVariant.h"
+#include "mir/Graph.h"
+#include "mir/TensorUtil.h"
+#include "mir/TensorVariant.h"
 
 namespace nnc {
 

diff --git a/contrib/nnc/passes/tflite_frontend/tflite_op_creator.cpp b/contrib/nnc/passes/tflite_frontend/tflite_op_creator.cpp
index c377023..791a6a9 100644 (file)
--- a/contrib/nnc/passes/tflite_frontend/tflite_op_creator.cpp
+++ b/contrib/nnc/passes/tflite_frontend/tflite_op_creator.cpp
@@ -17,37 +17,37 @@
 #include "tflite_op_creator.h"
 #include "schema_generated.h"
 
-#include "core/modelIR/operations/BiasAddOp.h"
-#include "core/modelIR/operations/CappedReluOp.h"
-#include "core/modelIR/operations/ConcatOp.h"
-#include "core/modelIR/operations/ConstantOp.h"
-#include "core/modelIR/operations/Conv2DOp.h"
-#include "core/modelIR/operations/Deconv2DOp.h"
-#include "core/modelIR/operations/DepthwiseConv2DOp.h"
-#include "core/modelIR/operations/ElementwiseOp.h"
-#include "core/modelIR/operations/FullyConnectedOp.h"
-#include "core/modelIR/operations/LeakyReluOp.h"
-#include "core/modelIR/operations/PadOp.h"
-#include "core/modelIR/operations/PoolOp.h"
-#include "core/modelIR/operations/ReduceFOp.h"
-#include "core/modelIR/operations/ReluOp.h"
-#include "core/modelIR/operations/ReshapeOp.h"
-#include "core/modelIR/operations/ResizeOp.h"
-#include "core/modelIR/operations/SigmoidOp.h"
-#include "core/modelIR/operations/SliceOp.h"
-#include "core/modelIR/operations/SoftmaxOp.h"
-#include "core/modelIR/operations/SqrtOp.h"
-#include "core/modelIR/operations/SqueezeOp.h"
-#include "core/modelIR/operations/TanhOp.h"
-#include "core/modelIR/operations/TransposeOp.h"
+#include "mir/ops/BiasAddOp.h"
+#include "mir/ops/CappedReluOp.h"
+#include "mir/ops/ConcatOp.h"
+#include "mir/ops/ConstantOp.h"
+#include "mir/ops/Conv2DOp.h"
+#include "mir/ops/Deconv2DOp.h"
+#include "mir/ops/DepthwiseConv2DOp.h"
+#include "mir/ops/ElementwiseOp.h"
+#include "mir/ops/FullyConnectedOp.h"
+#include "mir/ops/LeakyReluOp.h"
+#include "mir/ops/PadOp.h"
+#include "mir/ops/PoolOp.h"
+#include "mir/ops/ReduceFOp.h"
+#include "mir/ops/ReluOp.h"
+#include "mir/ops/ReshapeOp.h"
+#include "mir/ops/ResizeOp.h"
+#include "mir/ops/SigmoidOp.h"
+#include "mir/ops/SliceOp.h"
+#include "mir/ops/SoftmaxOp.h"
+#include "mir/ops/SqrtOp.h"
+#include "mir/ops/SqueezeOp.h"
+#include "mir/ops/TanhOp.h"
+#include "mir/ops/TransposeOp.h"
 
 #include "pass/PassException.h"
 #include "option/Options.h"
 
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/ShapeRange.h"
-#include "core/modelIR/Tensor.h"
-#include "core/modelIR/TensorUtil.h"
+#include "mir/Shape.h"
+#include "mir/ShapeRange.h"
+#include "mir/Tensor.h"
+#include "mir/TensorUtil.h"
 
 using namespace ::tflite;
 

diff --git a/contrib/nnc/passes/tflite_frontend/tflite_op_creator.h b/contrib/nnc/passes/tflite_frontend/tflite_op_creator.h
index 31024c3..daed52d 100644 (file)
--- a/contrib/nnc/passes/tflite_frontend/tflite_op_creator.h
+++ b/contrib/nnc/passes/tflite_frontend/tflite_op_creator.h
@@ -23,14 +23,14 @@
 #include <memory>
 #include <cstdint>
 
-#include "core/modelIR/Graph.h"
-#include "core/modelIR/TensorVariant.h"
-#include "core/modelIR/Scalar.h"
-#include "core/modelIR/Shape.h"
-
-#include "core/modelIR/operations/CommonProps.h"
-#include "core/modelIR/operations/ReduceFOp.h"
-#include "core/modelIR/operations/ElementwiseOp.h"
+#include "mir/Graph.h"
+#include "mir/TensorVariant.h"
+#include "mir/Scalar.h"
+#include "mir/Shape.h"
+
+#include "mir/ops/CommonProps.h"
+#include "mir/ops/ReduceFOp.h"
+#include "mir/ops/ElementwiseOp.h"
 
 #include "schema_generated.h"
 #include "passes/common_frontend/shape_helper.h"

diff --git a/contrib/nnc/tests/soft_backend/CompileCPP.cpp b/contrib/nnc/tests/soft_backend/CompileCPP.cpp
index 15c4e1b..ed75f17 100644 (file)
--- a/contrib/nnc/tests/soft_backend/CompileCPP.cpp
+++ b/contrib/nnc/tests/soft_backend/CompileCPP.cpp
@@ -22,11 +22,11 @@
 #include "support/CommandLine.h"
 #include "option/Options.h"
 
-#include "core/modelIR/Graph.h"
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/operations/InputOp.h"
-#include "core/modelIR/operations/OutputOp.h"
-#include "core/modelIR/operations/ReluOp.h"
+#include "mir/Graph.h"
+#include "mir/Shape.h"
+#include "mir/ops/InputOp.h"
+#include "mir/ops/OutputOp.h"
+#include "mir/ops/ReluOp.h"
 
 #include "passes/soft_backend/CPPGenerator.h"
 

diff --git a/contrib/nnc/unittests/acl_backend/MIRToDOM.cpp b/contrib/nnc/unittests/acl_backend/MIRToDOM.cpp
index 1c97a3d..006250d 100644 (file)
--- a/contrib/nnc/unittests/acl_backend/MIRToDOM.cpp
+++ b/contrib/nnc/unittests/acl_backend/MIRToDOM.cpp
@@ -27,30 +27,30 @@
 #include "AclCppOpGenerator.h"
 
 // MIR
-#include "core/modelIR/Graph.h"
-#include "core/modelIR/operations/BiasAddOp.h"
-#include "core/modelIR/operations/CappedReluOp.h"
-#include "core/modelIR/operations/CappedReluOp.h"
-#include "core/modelIR/operations/ConcatOp.h"
-#include "core/modelIR/operations/ConstantOp.h"
-#include "core/modelIR/operations/Conv2DOp.h"
-#include "core/modelIR/operations/Deconv2DOp.h"
-#include "core/modelIR/operations/DepthwiseConv2DOp.h"
-#include "core/modelIR/operations/ElementwiseOp.h"
-#include "core/modelIR/operations/EluOp.h"
-#include "core/modelIR/operations/FullyConnectedOp.h"
-#include "core/modelIR/operations/InputOp.h"
-#include "core/modelIR/operations/OutputOp.h"
-#include "core/modelIR/operations/PadOp.h"
-#include "core/modelIR/operations/PoolOp.h"
-#include "core/modelIR/operations/ReduceFOp.h"
-#include "core/modelIR/operations/ReluOp.h"
-#include "core/modelIR/operations/ReshapeOp.h"
-#include "core/modelIR/operations/ScaleOp.h"
-#include "core/modelIR/operations/SigmoidOp.h"
-#include "core/modelIR/operations/SoftmaxOp.h"
-#include "core/modelIR/operations/TanhOp.h"
-#include "core/modelIR/operations/TransposeOp.h"
+#include "mir/Graph.h"
+#include "mir/ops/BiasAddOp.h"
+#include "mir/ops/CappedReluOp.h"
+#include "mir/ops/CappedReluOp.h"
+#include "mir/ops/ConcatOp.h"
+#include "mir/ops/ConstantOp.h"
+#include "mir/ops/Conv2DOp.h"
+#include "mir/ops/Deconv2DOp.h"
+#include "mir/ops/DepthwiseConv2DOp.h"
+#include "mir/ops/ElementwiseOp.h"
+#include "mir/ops/EluOp.h"
+#include "mir/ops/FullyConnectedOp.h"
+#include "mir/ops/InputOp.h"
+#include "mir/ops/OutputOp.h"
+#include "mir/ops/PadOp.h"
+#include "mir/ops/PoolOp.h"
+#include "mir/ops/ReduceFOp.h"
+#include "mir/ops/ReluOp.h"
+#include "mir/ops/ReshapeOp.h"
+#include "mir/ops/ScaleOp.h"
+#include "mir/ops/SigmoidOp.h"
+#include "mir/ops/SoftmaxOp.h"
+#include "mir/ops/TanhOp.h"
+#include "mir/ops/TransposeOp.h"
 
 #include "gtest/gtest.h"
 

diff --git a/contrib/nnc/unittests/core/Graph.cpp b/contrib/nnc/unittests/core/Graph.cpp
index 3ff4712..f744f94 100644 (file)
--- a/contrib/nnc/unittests/core/Graph.cpp
+++ b/contrib/nnc/unittests/core/Graph.cpp
@@ -1,10 +1,10 @@
 #include <gtest/gtest.h>
 
-#include "core/modelIR/Graph.h"
-#include "core/modelIR/operations/ConcatOp.h"
-#include "core/modelIR/operations/InputOp.h"
-#include "core/modelIR/operations/OutputOp.h"
-#include "core/modelIR/operations/ReluOp.h"
+#include "mir/Graph.h"
+#include "mir/ops/ConcatOp.h"
+#include "mir/ops/InputOp.h"
+#include "mir/ops/OutputOp.h"
+#include "mir/ops/ReluOp.h"
 
 namespace {
 

diff --git a/contrib/nnc/unittests/core/NodeReplacer.cpp b/contrib/nnc/unittests/core/NodeReplacer.cpp
index e340665..f0daeae 100644 (file)
--- a/contrib/nnc/unittests/core/NodeReplacer.cpp
+++ b/contrib/nnc/unittests/core/NodeReplacer.cpp
@@ -1,9 +1,9 @@
 #include <gtest/gtest.h>
 
-#include "core/modelIR/Graph.h"
-#include "core/modelIR/operations/ConcatOp.h"
-#include "core/modelIR/operations/InputOp.h"
-#include "core/modelIR/operations/ReluOp.h"
+#include "mir/Graph.h"
+#include "mir/ops/ConcatOp.h"
+#include "mir/ops/InputOp.h"
+#include "mir/ops/ReluOp.h"
 
 namespace {
 

diff --git a/contrib/nnc/unittests/core/ShapeIndex.cpp b/contrib/nnc/unittests/core/ShapeIndex.cpp
index a629af1..e2edf40 100644 (file)
--- a/contrib/nnc/unittests/core/ShapeIndex.cpp
+++ b/contrib/nnc/unittests/core/ShapeIndex.cpp
@@ -16,8 +16,8 @@
 
 #include <gtest/gtest.h>
 
-#include "core/modelIR/Shape.h"
-#include "core/modelIR/Index.h"
+#include "mir/Shape.h"
+#include "mir/Index.h"
 
 using namespace mir;
 

diff --git a/contrib/nnc/unittests/core/ShapeInference.cpp b/contrib/nnc/unittests/core/ShapeInference.cpp
index 7ba7bb6..7ac555f 100644 (file)
--- a/contrib/nnc/unittests/core/ShapeInference.cpp
+++ b/contrib/nnc/unittests/core/ShapeInference.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/Graph.h"
-#include "core/modelIR/operations/ReshapeOp.h"
-#include "core/modelIR/operations/ElementwiseOp.h"
-#include "core/modelIR/operations/ResizeOp.h"
-#include "core/modelIR/operations/SqueezeOp.h"
-#include "core/modelIR/operations/ReduceFOp.h"
-#include "core/modelIR/Shape.h"
+#include "mir/Graph.h"
+#include "mir/ops/ReshapeOp.h"
+#include "mir/ops/ElementwiseOp.h"
+#include "mir/ops/ResizeOp.h"
+#include "mir/ops/SqueezeOp.h"
+#include "mir/ops/ReduceFOp.h"
+#include "mir/Shape.h"
 
 #include <vector>
 

diff --git a/contrib/nnc/unittests/core/ShapeRange.cpp b/contrib/nnc/unittests/core/ShapeRange.cpp
index 05700ab..a7f8839 100644 (file)
--- a/contrib/nnc/unittests/core/ShapeRange.cpp
+++ b/contrib/nnc/unittests/core/ShapeRange.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "core/modelIR/ShapeRange.h"
+#include "mir/ShapeRange.h"
 
 using namespace mir;
 

diff --git a/contrib/nnc/unittests/core/TensorVariant.cpp b/contrib/nnc/unittests/core/TensorVariant.cpp
index 2a4477a..a07cd7c 100644 (file)
--- a/contrib/nnc/unittests/core/TensorVariant.cpp
+++ b/contrib/nnc/unittests/core/TensorVariant.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/TensorVariant.h"
+#include "mir/TensorVariant.h"
 
 #include <gtest/gtest.h>
 

diff --git a/contrib/nnc/unittests/core/deserializer.cpp b/contrib/nnc/unittests/core/deserializer.cpp
index 7ef0e26..3308d69 100644 (file)
--- a/contrib/nnc/unittests/core/deserializer.cpp
+++ b/contrib/nnc/unittests/core/deserializer.cpp
@@ -16,9 +16,9 @@
 
 #include <gtest/gtest.h>
 
-#include "core/modelIR/Deserializer.h"
-#include "core/modelIR/ShapeRange.h"
-#include "core/modelIR/Tensor.h"
+#include "mir/Deserializer.h"
+#include "mir/ShapeRange.h"
+#include "mir/Tensor.h"
 
 using namespace mir;
 

diff --git a/contrib/nnc/unittests/core/operation.cpp b/contrib/nnc/unittests/core/operation.cpp
index daa54e3..ee2edff 100644 (file)
--- a/contrib/nnc/unittests/core/operation.cpp
+++ b/contrib/nnc/unittests/core/operation.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "core/modelIR/Operation.h"
-#include "core/modelIR/operations/ConcatOp.h"
-#include "core/modelIR/operations/InputOp.h"
-#include "core/modelIR/operations/ReshapeOp.h"
-#include "core/modelIR/operations/SoftmaxOp.h"
+#include "mir/Operation.h"
+#include "mir/ops/ConcatOp.h"
+#include "mir/ops/InputOp.h"
+#include "mir/ops/ReshapeOp.h"
+#include "mir/ops/SoftmaxOp.h"
 
 #include <gtest/gtest.h>
 

diff --git a/contrib/nnc/unittests/core/serializer.cpp b/contrib/nnc/unittests/core/serializer.cpp
index caf17b4..07aa511 100644 (file)
--- a/contrib/nnc/unittests/core/serializer.cpp
+++ b/contrib/nnc/unittests/core/serializer.cpp
@@ -17,8 +17,8 @@
 #include <gtest/gtest.h>
 #include <cmath>
 
-#include "core/modelIR/Serializer.h"
-#include "core/modelIR/ShapeRange.h"
+#include "mir/Serializer.h"
+#include "mir/ShapeRange.h"
 
 using namespace mir;
 

diff --git a/contrib/nnc/unittests/optimizations/CombineTransposes.cpp b/contrib/nnc/unittests/optimizations/CombineTransposes.cpp
index 3a09572..432115a 100644 (file)
--- a/contrib/nnc/unittests/optimizations/CombineTransposes.cpp
+++ b/contrib/nnc/unittests/optimizations/CombineTransposes.cpp
@@ -15,10 +15,10 @@
  */
 
 #include "passes/optimizations/CombineTransposes.h"
-#include "core/modelIR/operations/TransposeOp.h"
-#include "core/modelIR/operations/ReluOp.h"
-#include "core/modelIR/operations/ElementwiseOp.h"
-#include "core/modelIR/operations/ConstantOp.h"
+#include "mir/ops/TransposeOp.h"
+#include "mir/ops/ReluOp.h"
+#include "mir/ops/ElementwiseOp.h"
+#include "mir/ops/ConstantOp.h"
 
 #include <gtest/gtest.h>
 

diff --git a/contrib/nnc/unittests/pass/PassManagerTest.cpp b/contrib/nnc/unittests/pass/PassManagerTest.cpp
index d0397ae..f6d734f 100644 (file)
--- a/contrib/nnc/unittests/pass/PassManagerTest.cpp
+++ b/contrib/nnc/unittests/pass/PassManagerTest.cpp
@@ -16,7 +16,7 @@
 
 #include <dlfcn.h>
 
-#include "core/modelIR/Graph.h"
+#include "mir/Graph.h"
 #include "support/CommandLine.h"
 #include "pass/Pass.h"
 #include "pass/PassData.h"

diff --git a/contrib/nnc/unittests/soft_backend/CPPOperations.cpp b/contrib/nnc/unittests/soft_backend/CPPOperations.cpp
index 86583a8..c809522 100644 (file)
--- a/contrib/nnc/unittests/soft_backend/CPPOperations.cpp
+++ b/contrib/nnc/unittests/soft_backend/CPPOperations.cpp
@@ -59,38 +59,38 @@
 #include "SBSerializer.h"
 
 // operations part
-#include "core/modelIR/operations/BiasAddOp.h"
-#include "core/modelIR/operations/CappedReluOp.h"
-#include "core/modelIR/operations/ConcatOp.h"
-#include "core/modelIR/operations/Conv2DOp.h"
-#include "core/modelIR/operations/Deconv2DOp.h"
-#include "core/modelIR/operations/DepthwiseConv2DOp.h"
-#include "core/modelIR/operations/ElementwiseOp.h"
-#include "core/modelIR/operations/EluOp.h"
-#include "core/modelIR/operations/FullyConnectedOp.h"
-#include "core/modelIR/operations/InputOp.h"
-#include "core/modelIR/operations/LeakyReluOp.h"
-#include "core/modelIR/operations/OutputOp.h"
-#include "core/modelIR/operations/PadOp.h"
-#include "core/modelIR/operations/PoolOp.h"
-#include "core/modelIR/operations/ReduceFOp.h"
-#include "core/modelIR/operations/ReluOp.h"
-#include "core/modelIR/operations/ReshapeOp.h"
-#include "core/modelIR/operations/ResizeOp.h"
-#include "core/modelIR/operations/ScaleOp.h"
-#include "core/modelIR/operations/SigmoidOp.h"
-#include "core/modelIR/operations/SliceOp.h"
-#include "core/modelIR/operations/SoftmaxOp.h"
-#include "core/modelIR/operations/SqrtOp.h"
-#include "core/modelIR/operations/TanhOp.h"
-#include "core/modelIR/operations/TransposeOp.h"
+#include "mir/ops/BiasAddOp.h"
+#include "mir/ops/CappedReluOp.h"
+#include "mir/ops/ConcatOp.h"
+#include "mir/ops/Conv2DOp.h"
+#include "mir/ops/Deconv2DOp.h"
+#include "mir/ops/DepthwiseConv2DOp.h"
+#include "mir/ops/ElementwiseOp.h"
+#include "mir/ops/EluOp.h"
+#include "mir/ops/FullyConnectedOp.h"
+#include "mir/ops/InputOp.h"
+#include "mir/ops/LeakyReluOp.h"
+#include "mir/ops/OutputOp.h"
+#include "mir/ops/PadOp.h"
+#include "mir/ops/PoolOp.h"
+#include "mir/ops/ReduceFOp.h"
+#include "mir/ops/ReluOp.h"
+#include "mir/ops/ReshapeOp.h"
+#include "mir/ops/ResizeOp.h"
+#include "mir/ops/ScaleOp.h"
+#include "mir/ops/SigmoidOp.h"
+#include "mir/ops/SliceOp.h"
+#include "mir/ops/SoftmaxOp.h"
+#include "mir/ops/SqrtOp.h"
+#include "mir/ops/TanhOp.h"
+#include "mir/ops/TransposeOp.h"
 
 // various headers
-#include "core/modelIR/TensorVariant.h"
-#include "core/modelIR/Tensor.h"
-#include "core/modelIR/Graph.h"
-#include "core/modelIR/ShapeRange.h"
-#include "core/modelIR/Scalar.h"
+#include "mir/TensorVariant.h"
+#include "mir/Tensor.h"
+#include "mir/Graph.h"
+#include "mir/ShapeRange.h"
+#include "mir/Scalar.h"
 
 #include "passes/interpreter/Interpreter.h"
 

diff --git a/contrib/nnc/unittests/soft_backend/Generator.cpp b/contrib/nnc/unittests/soft_backend/Generator.cpp
index 3bc0107..98f5179 100644 (file)
--- a/contrib/nnc/unittests/soft_backend/Generator.cpp
+++ b/contrib/nnc/unittests/soft_backend/Generator.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "passes/soft_backend/CPPGenerator.h"
-#include "core/modelIR/operations/ReluOp.h"
+#include "mir/ops/ReluOp.h"
 
 #include <gtest/gtest.h>
 

diff --git a/contrib/nnc/unittests/soft_backend/ModelAnalyzer.cpp b/contrib/nnc/unittests/soft_backend/ModelAnalyzer.cpp
index 53d24d4..0049097 100644 (file)
--- a/contrib/nnc/unittests/soft_backend/ModelAnalyzer.cpp
+++ b/contrib/nnc/unittests/soft_backend/ModelAnalyzer.cpp
@@ -15,10 +15,10 @@
  */
 
 #include "ModelAnalyzer.h"
-#include "core/modelIR/Graph.h"
-#include "core/modelIR/operations/InputOp.h"
-#include "core/modelIR/operations/ReluOp.h"
-#include "core/modelIR/operations/ConcatOp.h"
+#include "mir/Graph.h"
+#include "mir/ops/InputOp.h"
+#include "mir/ops/ReluOp.h"
+#include "mir/ops/ConcatOp.h"
 
 #include <gtest/gtest.h>
 

diff --git a/contrib/nnc/utils/caffe2_dot_dumper/model_dump.cpp b/contrib/nnc/utils/caffe2_dot_dumper/model_dump.cpp
index 38a1190..87f58de 100644 (file)
--- a/contrib/nnc/utils/caffe2_dot_dumper/model_dump.cpp
+++ b/contrib/nnc/utils/caffe2_dot_dumper/model_dump.cpp
@@ -19,8 +19,8 @@
 #include "support/CommandLine.h"
 #include "option/Options.h"
 #include "caffe2_importer.h"
-#include "core/modelIR/Graph.h"
-#include "core/modelIR/IrDotDumper.h"
+#include "mir/Graph.h"
+#include "mir/IrDotDumper.h"
 #include "pass/PassException.h"
 
 using namespace nnc;

diff --git a/contrib/nnc/utils/caffe_dot_dumper/model_dump.cpp b/contrib/nnc/utils/caffe_dot_dumper/model_dump.cpp
index 62b338d..20c6303 100644 (file)
--- a/contrib/nnc/utils/caffe_dot_dumper/model_dump.cpp
+++ b/contrib/nnc/utils/caffe_dot_dumper/model_dump.cpp
@@ -19,8 +19,8 @@
 #include "support/CommandLine.h"
 #include "option/Options.h"
 #include "caffe_importer.h"
-#include "core/modelIR/Graph.h"
-#include "core/modelIR/IrDotDumper.h"
+#include "mir/Graph.h"
+#include "mir/IrDotDumper.h"
 #include "pass/PassException.h"
 
 using namespace nnc;

diff --git a/contrib/nnc/utils/tflite_dot_dumper/sanity_check.cpp b/contrib/nnc/utils/tflite_dot_dumper/sanity_check.cpp
index 74b06a9..ec7ae4e 100644 (file)
--- a/contrib/nnc/utils/tflite_dot_dumper/sanity_check.cpp
+++ b/contrib/nnc/utils/tflite_dot_dumper/sanity_check.cpp
@@ -20,8 +20,8 @@
 #include "pass/PassException.h"
 #include "option/Options.h"
 #include "tflite_importer.h"
-#include "core/modelIR/Graph.h"
-#include "core/modelIR/IrDotDumper.h"
+#include "mir/Graph.h"
+#include "mir/IrDotDumper.h"
 
 using namespace nnc;
 using namespace mir;