[neurun] Rename `graph` to `ir` (#9362)

Rename `src/graph/` and `include/graph/` to `src/ir/` and `include/ir/`, respectively

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

diff --git a/runtime/neurun/core/include/backend/IShapeFixer.h b/runtime/neurun/core/include/backend/IShapeFixer.h
index a4f708a..f33f4ec 100644 (file)
--- a/runtime/neurun/core/include/backend/IShapeFixer.h
+++ b/runtime/neurun/core/include/backend/IShapeFixer.h
@@ -20,7 +20,7 @@
 #include <memory>
 #include <functional>
 
-#include "graph/LowerInfoMap.h"
+#include "ir/LowerInfoMap.h"
 #include "ITensorBuilder.h"
 #include "model/OperationVisitor.h"
 #include "model/Subgraph.h"

diff --git a/runtime/neurun/core/include/backend/ITensorRegister.h b/runtime/neurun/core/include/backend/ITensorRegister.h
index a4b0937..851006b 100644 (file)
--- a/runtime/neurun/core/include/backend/ITensorRegister.h
+++ b/runtime/neurun/core/include/backend/ITensorRegister.h
@@ -18,8 +18,8 @@
 #define __NEURUN_BACKEND_ITENSOR_REGISTER_H__
 
 #include "compiler/SubTensorInfo.h"
-#include "graph/LowerInfoMap.h"
-#include "graph/operand/ParentInfo.h"
+#include "ir/LowerInfoMap.h"
+#include "ir/operand/ParentInfo.h"
 #include "ITensorBuilder.h"
 #include "model/Layout.h"
 #include "model/OperandIndexSequence.h"

diff --git a/runtime/neurun/core/include/compiler/Compiler.h b/runtime/neurun/core/include/compiler/Compiler.h
index 094ffe8..d8b4429 100644 (file)
--- a/runtime/neurun/core/include/compiler/Compiler.h
+++ b/runtime/neurun/core/include/compiler/Compiler.h
@@ -22,7 +22,7 @@
 #ifndef __NEURUN_COMPILER_COMPILE_H_
 #define __NEURUN_COMPILER_COMPILE_H_
 
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 #include "exec/IExecutor.h"
 
 namespace neurun

diff --git a/runtime/neurun/core/include/exec/IExecutor.h b/runtime/neurun/core/include/exec/IExecutor.h
index bf83761..ecb195c 100644 (file)
--- a/runtime/neurun/core/include/exec/IExecutor.h
+++ b/runtime/neurun/core/include/exec/IExecutor.h
@@ -21,7 +21,7 @@
 #ifndef __NEURUN_EXEC_I_EXECUTOR_H_
 #define __NEURUN_EXEC_I_EXECUTOR_H_
 
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 #include "IFunction.h"
 #include "IODescription.h"
 #include "model/OperationIndexMap.h"

diff --git a/runtime/neurun/core/include/graph/BackendSet.h b/runtime/neurun/core/include/ir/BackendSet.h
similarity index 100%
rename from runtime/neurun/core/include/graph/BackendSet.h
rename to runtime/neurun/core/include/ir/BackendSet.h

diff --git a/runtime/neurun/core/include/graph/Graph.h b/runtime/neurun/core/include/ir/Graph.h
similarity index 99%
rename from runtime/neurun/core/include/graph/Graph.h
rename to runtime/neurun/core/include/ir/Graph.h
index 437e3ee..6895b66 100644 (file)
--- a/runtime/neurun/core/include/graph/Graph.h
+++ b/runtime/neurun/core/include/ir/Graph.h
@@ -21,7 +21,7 @@
 
 #include "model/Operands.h"
 #include "model/Operations.h"
-#include "graph/LowerInfoMap.h"
+#include "ir/LowerInfoMap.h"
 #include "model/Subgraph.h"
 #include "model/Subgraphs.h"
 

diff --git a/runtime/neurun/core/include/graph/LowerInfoMap.h b/runtime/neurun/core/include/ir/LowerInfoMap.h
similarity index 93%
rename from runtime/neurun/core/include/graph/LowerInfoMap.h
rename to runtime/neurun/core/include/ir/LowerInfoMap.h
index 5b755ea..24ed296 100644 (file)
--- a/runtime/neurun/core/include/graph/LowerInfoMap.h
+++ b/runtime/neurun/core/include/ir/LowerInfoMap.h
@@ -20,8 +20,8 @@
 #include <memory>
 #include <unordered_map>
 
-#include "graph/operand/LowerInfo.h"
-#include "graph/operation/LowerInfo.h"
+#include "ir/operand/LowerInfo.h"
+#include "ir/operation/LowerInfo.h"
 #include "model/OperandIndexMap.h"
 #include "model/Index.h"
 

diff --git a/runtime/neurun/core/include/graph/operand/LowerInfo.h b/runtime/neurun/core/include/ir/operand/LowerInfo.h
similarity index 98%
rename from runtime/neurun/core/include/graph/operand/LowerInfo.h
rename to runtime/neurun/core/include/ir/operand/LowerInfo.h
index 3558f6c..c37e9d1 100644 (file)
--- a/runtime/neurun/core/include/graph/operand/LowerInfo.h
+++ b/runtime/neurun/core/include/ir/operand/LowerInfo.h
@@ -20,7 +20,7 @@
 #include <functional>
 #include <stdint.h>
 
-#include "graph/operand/PermuteFactor.h"
+#include "ir/operand/PermuteFactor.h"
 #include "util/Set.h"
 
 namespace neurun

diff --git a/runtime/neurun/core/include/graph/operand/ParentInfo.h b/runtime/neurun/core/include/ir/operand/ParentInfo.h
similarity index 100%
rename from runtime/neurun/core/include/graph/operand/ParentInfo.h
rename to runtime/neurun/core/include/ir/operand/ParentInfo.h

diff --git a/runtime/neurun/core/include/graph/operand/PermuteFactor.h b/runtime/neurun/core/include/ir/operand/PermuteFactor.h
similarity index 100%
rename from runtime/neurun/core/include/graph/operand/PermuteFactor.h
rename to runtime/neurun/core/include/ir/operand/PermuteFactor.h

diff --git a/runtime/neurun/core/include/graph/operation/LowerInfo.h b/runtime/neurun/core/include/ir/operation/LowerInfo.h
similarity index 97%
rename from runtime/neurun/core/include/graph/operation/LowerInfo.h
rename to runtime/neurun/core/include/ir/operation/LowerInfo.h
index fb9f520..83f67d5 100644 (file)
--- a/runtime/neurun/core/include/graph/operation/LowerInfo.h
+++ b/runtime/neurun/core/include/ir/operation/LowerInfo.h
@@ -19,7 +19,7 @@
 
 #include <string>
 
-#include <graph/operand/PermuteFactor.h>
+#include <ir/operand/PermuteFactor.h>
 
 namespace neurun
 {

diff --git a/runtime/neurun/core/include/model/Operand.h b/runtime/neurun/core/include/model/Operand.h
index ff8c3c9..470be4a 100644 (file)
--- a/runtime/neurun/core/include/model/Operand.h
+++ b/runtime/neurun/core/include/model/Operand.h
@@ -25,7 +25,7 @@
 #include "Data.h"
 #include "DataType.h"
 #include "OperandInfo.h"
-#include "graph/operand/ParentInfo.h" // TODO Remove this dependency
+#include "ir/operand/ParentInfo.h" // TODO Remove this dependency
 #include "model/OperationIndexList.h"
 
 namespace neurun

diff --git a/runtime/neurun/core/src/compiler/Compiler.cc b/runtime/neurun/core/src/compiler/Compiler.cc
index 7335828..9e03761 100644 (file)
--- a/runtime/neurun/core/src/compiler/Compiler.cc
+++ b/runtime/neurun/core/src/compiler/Compiler.cc
@@ -24,7 +24,7 @@
 #include "compiler/ManualScheduler.h"
 #include "compiler/HEScheduler.h"
 #include "backend/ExecTime.h"
-#include "graph/operation/LowerInfo.h"
+#include "ir/operation/LowerInfo.h"
 #include "dumper/dot/DotDumper.h"
 #include "compiler/Linear.h"
 #include "exec/interp/ExecManager.h"

diff --git a/runtime/neurun/core/src/compiler/ExecutorFactory.cc b/runtime/neurun/core/src/compiler/ExecutorFactory.cc
index 2b6dbb5..5ba4b36 100644 (file)
--- a/runtime/neurun/core/src/compiler/ExecutorFactory.cc
+++ b/runtime/neurun/core/src/compiler/ExecutorFactory.cc
@@ -24,7 +24,7 @@
 #include "compiler/BackendResolver.h"
 #include "backend/ExecTime.h"
 #include "compiler/Linear.h"
-#include "graph/dumper/Dumper.h"
+#include "ir/dumper/Dumper.h"
 #include "OperationValidator.h"
 #include "SubTensorAnalyzer.h"
 #include "backend/IConstantInitializer.h"

diff --git a/runtime/neurun/core/src/compiler/ExecutorFactory.h b/runtime/neurun/core/src/compiler/ExecutorFactory.h
index bec25b1..4b96a36 100644 (file)
--- a/runtime/neurun/core/src/compiler/ExecutorFactory.h
+++ b/runtime/neurun/core/src/compiler/ExecutorFactory.h
@@ -20,7 +20,7 @@
 #include <unordered_map>
 
 #include "exec/IExecutor.h"
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 
 namespace neurun
 {

diff --git a/runtime/neurun/core/src/compiler/HEScheduler.cc b/runtime/neurun/core/src/compiler/HEScheduler.cc
index f47ca86..21241c7 100644 (file)
--- a/runtime/neurun/core/src/compiler/HEScheduler.cc
+++ b/runtime/neurun/core/src/compiler/HEScheduler.cc
@@ -16,7 +16,7 @@
 
 #include "model/Operand.h"
 #include "compiler/HEScheduler.h"
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 #include "util/ConfigSource.h"
 #include "compiler/IExecutionBuilder.h"
 #include "compiler/BackendResolver.h"

diff --git a/runtime/neurun/core/src/compiler/HEScheduler.h b/runtime/neurun/core/src/compiler/HEScheduler.h
index 1f58564..b888fa6 100644 (file)
--- a/runtime/neurun/core/src/compiler/HEScheduler.h
+++ b/runtime/neurun/core/src/compiler/HEScheduler.h
@@ -24,7 +24,7 @@
 #define __NEURUN_COMPILER_H_E_SCHEDULER_H_
 
 #include "compiler/IScheduler.h"
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 #include "backend/ExecTime.h"
 #include "backend/Backend.h"
 #include "cpp14/memory.h"

diff --git a/runtime/neurun/core/src/compiler/IScheduler.h b/runtime/neurun/core/src/compiler/IScheduler.h
index 5b425bf..3812a11 100644 (file)
--- a/runtime/neurun/core/src/compiler/IScheduler.h
+++ b/runtime/neurun/core/src/compiler/IScheduler.h
@@ -18,7 +18,7 @@
 #define __NEURUN_CORE_COMPILER_I_SCHEDULER_H__
 
 #include "BackendResolver.h"
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 
 namespace neurun
 {

diff --git a/runtime/neurun/core/src/compiler/Linear.h b/runtime/neurun/core/src/compiler/Linear.h
index 48c6656..9453f21 100644 (file)
--- a/runtime/neurun/core/src/compiler/Linear.h
+++ b/runtime/neurun/core/src/compiler/Linear.h
@@ -22,7 +22,7 @@
 
 #include "model/Subgraphs.h"
 #include "backend/ITensorBuilder.h"
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 #include "compiler/BackendResolver.h"
 
 namespace neurun

diff --git a/runtime/neurun/core/src/compiler/OperationValidator.cc b/runtime/neurun/core/src/compiler/OperationValidator.cc
index 92b2f9a..9558fff 100644 (file)
--- a/runtime/neurun/core/src/compiler/OperationValidator.cc
+++ b/runtime/neurun/core/src/compiler/OperationValidator.cc
@@ -19,7 +19,7 @@
 #include <typeinfo>
 
 #include "model/Operands.h"
-#include "graph/operation/LowerInfo.h"
+#include "ir/operation/LowerInfo.h"
 
 #include "util/logging.h"
 #include "util/Utils.h"

diff --git a/runtime/neurun/core/src/compiler/ParamChecker.cc b/runtime/neurun/core/src/compiler/ParamChecker.cc
index 10bfa1e..657da71 100644 (file)
--- a/runtime/neurun/core/src/compiler/ParamChecker.cc
+++ b/runtime/neurun/core/src/compiler/ParamChecker.cc
@@ -16,7 +16,7 @@
 
 #include "ParamChecker.h"
 
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 
 namespace neurun
 {

diff --git a/runtime/neurun/core/src/compiler/SubTensorAnalyzer.h b/runtime/neurun/core/src/compiler/SubTensorAnalyzer.h
index 32f555f..64591f7 100644 (file)
--- a/runtime/neurun/core/src/compiler/SubTensorAnalyzer.h
+++ b/runtime/neurun/core/src/compiler/SubTensorAnalyzer.h
@@ -24,7 +24,7 @@
 #define __NEURUN_COMPILER_SUBTENSOR_ANALYZER_H__
 
 #include "model/OperationVisitor.h"
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 
 namespace neurun
 {

diff --git a/runtime/neurun/core/src/dumper/dot/DotDumper.h b/runtime/neurun/core/src/dumper/dot/DotDumper.h
index 4ccaac8..7631d9f 100644 (file)
--- a/runtime/neurun/core/src/dumper/dot/DotDumper.h
+++ b/runtime/neurun/core/src/dumper/dot/DotDumper.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 
 #ifndef __NEURUN_DUMPER_DOT_DOT_DUMPER_H__
 #define __NEURUN_DUMPER_DOT_DOT_DUMPER_H__

diff --git a/runtime/neurun/core/src/dumper/dot/OperandNode.cc b/runtime/neurun/core/src/dumper/dot/OperandNode.cc
index e4223fc..141549f 100644 (file)
--- a/runtime/neurun/core/src/dumper/dot/OperandNode.cc
+++ b/runtime/neurun/core/src/dumper/dot/OperandNode.cc
@@ -17,8 +17,8 @@
 #include <sstream>
 
 #include "OperandNode.h"
-#include "graph/Graph.h"
-#include "graph/operand/LowerInfo.h"
+#include "ir/Graph.h"
+#include "ir/operand/LowerInfo.h"
 
 namespace neurun
 {

diff --git a/runtime/neurun/core/src/dumper/dot/OperationNode.cc b/runtime/neurun/core/src/dumper/dot/OperationNode.cc
index bc3237b..5f599db 100644 (file)
--- a/runtime/neurun/core/src/dumper/dot/OperationNode.cc
+++ b/runtime/neurun/core/src/dumper/dot/OperationNode.cc
@@ -17,8 +17,8 @@
 #include <sstream>
 
 #include "OperationNode.h"
-#include "graph/Graph.h"
-#include "graph/operation/LowerInfo.h"
+#include "ir/Graph.h"
+#include "ir/operation/LowerInfo.h"
 #include "backend/IConfig.h"
 #include "backend/Backend.h"
 

diff --git a/runtime/neurun/core/src/exec/ExecutorBase.h b/runtime/neurun/core/src/exec/ExecutorBase.h
index f94320c..2b9f996 100644 (file)
--- a/runtime/neurun/core/src/exec/ExecutorBase.h
+++ b/runtime/neurun/core/src/exec/ExecutorBase.h
@@ -23,8 +23,8 @@
 #include "exec/ExecutionObservers.h"
 #include "Sink.h"
 #include "exec/IExecutor.h"
-#include "graph/Graph.h"
-#include "graph/LowerInfoMap.h"
+#include "ir/Graph.h"
+#include "ir/LowerInfoMap.h"
 #include "backend/IConfig.h"
 #include "backend/Backend.h"
 #include "compiler/OperandContext.h"

diff --git a/runtime/neurun/core/src/exec/ParallelScheduler.h b/runtime/neurun/core/src/exec/ParallelScheduler.h
index 41e474f..60b707a 100644 (file)
--- a/runtime/neurun/core/src/exec/ParallelScheduler.h
+++ b/runtime/neurun/core/src/exec/ParallelScheduler.h
@@ -21,7 +21,7 @@
 #include <memory>
 
 #include "exec/IFunction.h"
-#include "graph/BackendSet.h"
+#include "ir/BackendSet.h"
 #include "ThreadPool.h"
 
 namespace neurun

diff --git a/runtime/neurun/core/src/exec/interp/ExecEnv.h b/runtime/neurun/core/src/exec/interp/ExecEnv.h
index 2305dbd..b3b6e65 100644 (file)
--- a/runtime/neurun/core/src/exec/interp/ExecEnv.h
+++ b/runtime/neurun/core/src/exec/interp/ExecEnv.h
@@ -23,7 +23,7 @@
 
 #include <unordered_set>
 
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 #include "Tensor.h"
 
 namespace neurun

diff --git a/runtime/neurun/core/src/exec/interp/ExecManager.h b/runtime/neurun/core/src/exec/interp/ExecManager.h
index a039797..098c110 100644 (file)
--- a/runtime/neurun/core/src/exec/interp/ExecManager.h
+++ b/runtime/neurun/core/src/exec/interp/ExecManager.h
@@ -22,7 +22,7 @@
 #ifndef __NEURUN_EXEC_INTERP_EXEC_MANAGER_H_
 #define __NEURUN_EXEC_INTERP_EXEC_MANAGER_H_
 
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 #include "exec/IExecutor.h"
 #include "Tensor.h"
 

diff --git a/runtime/neurun/core/src/graph/Graph.cc b/runtime/neurun/core/src/ir/Graph.cc
similarity index 99%
rename from runtime/neurun/core/src/graph/Graph.cc
rename to runtime/neurun/core/src/ir/Graph.cc
index d510c5a..a1fad2c 100644 (file)
--- a/runtime/neurun/core/src/graph/Graph.cc
+++ b/runtime/neurun/core/src/ir/Graph.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 
 #include <algorithm>
 #include <bitset>
@@ -23,9 +23,9 @@
 #include "util/logging.h"
 #include "verifier/Verifier.h"
 #include "cpp14/memory.h"
-#include "graph/operation/LowerInfo.h"
-#include "graph/operand/LowerInfo.h"
-#include "graph/operand/PermuteFactor.h"
+#include "ir/operation/LowerInfo.h"
+#include "ir/operand/LowerInfo.h"
+#include "ir/operand/PermuteFactor.h"
 #include "operand/Shape4DConvert.h"
 #include "compiler/BackendResolver.h"
 #include "backend/IConfig.h"

diff --git a/runtime/neurun/core/src/graph/dumper/Dumper.cc b/runtime/neurun/core/src/ir/dumper/Dumper.cc
similarity index 100%
rename from runtime/neurun/core/src/graph/dumper/Dumper.cc
rename to runtime/neurun/core/src/ir/dumper/Dumper.cc

diff --git a/runtime/neurun/core/src/graph/dumper/Dumper.h b/runtime/neurun/core/src/ir/dumper/Dumper.h
similarity index 100%
rename from runtime/neurun/core/src/graph/dumper/Dumper.h
rename to runtime/neurun/core/src/ir/dumper/Dumper.h

diff --git a/runtime/neurun/core/src/graph/operand/LowerInfo.cc b/runtime/neurun/core/src/ir/operand/LowerInfo.cc
similarity index 95%
rename from runtime/neurun/core/src/graph/operand/LowerInfo.cc
rename to runtime/neurun/core/src/ir/operand/LowerInfo.cc
index e8a4fe5..b713820 100644 (file)
--- a/runtime/neurun/core/src/graph/operand/LowerInfo.cc
+++ b/runtime/neurun/core/src/ir/operand/LowerInfo.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "graph/operand/LowerInfo.h"
+#include "ir/operand/LowerInfo.h"
 
 namespace neurun
 {

diff --git a/runtime/neurun/core/src/graph/operand/Shape4DConvert.h b/runtime/neurun/core/src/ir/operand/Shape4DConvert.h
similarity index 97%
rename from runtime/neurun/core/src/graph/operand/Shape4DConvert.h
rename to runtime/neurun/core/src/ir/operand/Shape4DConvert.h
index 9b8d44e..36058fd 100644 (file)
--- a/runtime/neurun/core/src/graph/operand/Shape4DConvert.h
+++ b/runtime/neurun/core/src/ir/operand/Shape4DConvert.h
@@ -17,7 +17,7 @@
 #ifndef __NEURUN_GRAPH_OPERAND_SHAPE4D_CONVERT_H__
 #define __NEURUN_GRAPH_OPERAND_SHAPE4D_CONVERT_H__
 
-#include "graph/operand/LowerInfo.h"
+#include "ir/operand/LowerInfo.h"
 
 namespace neurun
 {

diff --git a/runtime/neurun/core/src/graph/operation/LowerInfo.cc b/runtime/neurun/core/src/ir/operation/LowerInfo.cc
similarity index 95%
rename from runtime/neurun/core/src/graph/operation/LowerInfo.cc
rename to runtime/neurun/core/src/ir/operation/LowerInfo.cc
index 507dcc7..e33eed0 100644 (file)
--- a/runtime/neurun/core/src/graph/operation/LowerInfo.cc
+++ b/runtime/neurun/core/src/ir/operation/LowerInfo.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "graph/operation/LowerInfo.h"
+#include "ir/operation/LowerInfo.h"
 
 namespace neurun
 {

diff --git a/runtime/neurun/core/src/graph/pass/ConstantInsertionPass.cc b/runtime/neurun/core/src/ir/pass/ConstantInsertionPass.cc
similarity index 98%
rename from runtime/neurun/core/src/graph/pass/ConstantInsertionPass.cc
rename to runtime/neurun/core/src/ir/pass/ConstantInsertionPass.cc
index 03f6384..7243b81 100644 (file)
--- a/runtime/neurun/core/src/graph/pass/ConstantInsertionPass.cc
+++ b/runtime/neurun/core/src/ir/pass/ConstantInsertionPass.cc
@@ -17,8 +17,8 @@
 #include "ConstantInsertionPass.h"
 
 #include "backend/Backend.h"
-#include <graph/Graph.h>
-#include "graph/operand/Shape4DConvert.h"
+#include <ir/Graph.h>
+#include "ir/operand/Shape4DConvert.h"
 #include <util/Utils.h>
 
 namespace neurun

diff --git a/runtime/neurun/core/src/graph/pass/ConstantInsertionPass.h b/runtime/neurun/core/src/ir/pass/ConstantInsertionPass.h
similarity index 97%
rename from runtime/neurun/core/src/graph/pass/ConstantInsertionPass.h
rename to runtime/neurun/core/src/ir/pass/ConstantInsertionPass.h
index 6a3d415..c7a5bd9 100644 (file)
--- a/runtime/neurun/core/src/graph/pass/ConstantInsertionPass.h
+++ b/runtime/neurun/core/src/ir/pass/ConstantInsertionPass.h
@@ -17,7 +17,7 @@
 #ifndef __NEURUN_GRAPH_PASS_CONSTANT_INSERTION_PASS_H__
 #define __NEURUN_GRAPH_PASS_CONSTANT_INSERTION_PASS_H__
 
-#include <graph/operand/PermuteFactor.h>
+#include <ir/operand/PermuteFactor.h>
 #include <model/Index.h>
 #include "OperationPass.h"
 #include <unordered_map>

diff --git a/runtime/neurun/core/src/graph/pass/OperandPass.cc b/runtime/neurun/core/src/ir/pass/OperandPass.cc
similarity index 97%
rename from runtime/neurun/core/src/graph/pass/OperandPass.cc
rename to runtime/neurun/core/src/ir/pass/OperandPass.cc
index 237833c..cec131e 100644 (file)
--- a/runtime/neurun/core/src/graph/pass/OperandPass.cc
+++ b/runtime/neurun/core/src/ir/pass/OperandPass.cc
@@ -16,7 +16,7 @@
 
 #include "OperandPass.h"
 
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 
 namespace neurun
 {

diff --git a/runtime/neurun/core/src/graph/pass/OperandPass.h b/runtime/neurun/core/src/ir/pass/OperandPass.h
similarity index 100%
rename from runtime/neurun/core/src/graph/pass/OperandPass.h
rename to runtime/neurun/core/src/ir/pass/OperandPass.h

diff --git a/runtime/neurun/core/src/graph/pass/OperationPass.cc b/runtime/neurun/core/src/ir/pass/OperationPass.cc
similarity index 97%
rename from runtime/neurun/core/src/graph/pass/OperationPass.cc
rename to runtime/neurun/core/src/ir/pass/OperationPass.cc
index d093a1d..b726dec 100644 (file)
--- a/runtime/neurun/core/src/graph/pass/OperationPass.cc
+++ b/runtime/neurun/core/src/ir/pass/OperationPass.cc
@@ -18,7 +18,7 @@
 
 #include "model/Index.h"
 #include "model/Operation.h"
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 
 namespace neurun
 {

diff --git a/runtime/neurun/core/src/graph/pass/OperationPass.h b/runtime/neurun/core/src/ir/pass/OperationPass.h
similarity index 100%
rename from runtime/neurun/core/src/graph/pass/OperationPass.h
rename to runtime/neurun/core/src/ir/pass/OperationPass.h

diff --git a/runtime/neurun/core/src/graph/pass/Pass.cc b/runtime/neurun/core/src/ir/pass/Pass.cc
similarity index 100%
rename from runtime/neurun/core/src/graph/pass/Pass.cc
rename to runtime/neurun/core/src/ir/pass/Pass.cc

diff --git a/runtime/neurun/core/src/graph/pass/Pass.h b/runtime/neurun/core/src/ir/pass/Pass.h
similarity index 100%
rename from runtime/neurun/core/src/graph/pass/Pass.h
rename to runtime/neurun/core/src/ir/pass/Pass.h

diff --git a/runtime/neurun/core/src/graph/pass/PermutationEliminationPass.cc b/runtime/neurun/core/src/ir/pass/PermutationEliminationPass.cc
similarity index 99%
rename from runtime/neurun/core/src/graph/pass/PermutationEliminationPass.cc
rename to runtime/neurun/core/src/ir/pass/PermutationEliminationPass.cc
index 1fc9b69..52d7b33 100644 (file)
--- a/runtime/neurun/core/src/graph/pass/PermutationEliminationPass.cc
+++ b/runtime/neurun/core/src/ir/pass/PermutationEliminationPass.cc
@@ -17,8 +17,8 @@
 #include "PermutationEliminationPass.h"
 
 #include "model/Operand.h"
-#include "graph/operand/LowerInfo.h"
-#include "graph/Graph.h"
+#include "ir/operand/LowerInfo.h"
+#include "ir/Graph.h"
 #include "backend/IConfig.h"
 #include "util/logging.h"
 #include "compiler/BackendResolver.h"

diff --git a/runtime/neurun/core/src/graph/pass/PermutationEliminationPass.h b/runtime/neurun/core/src/ir/pass/PermutationEliminationPass.h
similarity index 100%
rename from runtime/neurun/core/src/graph/pass/PermutationEliminationPass.h
rename to runtime/neurun/core/src/ir/pass/PermutationEliminationPass.h

diff --git a/runtime/neurun/core/src/graph/pass/PermutationInsertionPass.cc b/runtime/neurun/core/src/ir/pass/PermutationInsertionPass.cc
similarity index 98%
rename from runtime/neurun/core/src/graph/pass/PermutationInsertionPass.cc
rename to runtime/neurun/core/src/ir/pass/PermutationInsertionPass.cc
index 7c9668b..ad823cb 100644 (file)
--- a/runtime/neurun/core/src/graph/pass/PermutationInsertionPass.cc
+++ b/runtime/neurun/core/src/ir/pass/PermutationInsertionPass.cc
@@ -21,13 +21,13 @@
 #include <unordered_map>
 
 #include "model/Operand.h"
-#include "graph/operation/LowerInfo.h"
-#include "graph/Graph.h"
+#include "ir/operation/LowerInfo.h"
+#include "ir/Graph.h"
 #include "backend/IConfig.h"
 #include "util/logging.h"
 #include "cpp14/memory.h"
 #include "model/operation/Permute.h"
-#include "graph/operand/Shape4DConvert.h"
+#include "ir/operand/Shape4DConvert.h"
 #include "compiler/BackendResolver.h"
 
 namespace neurun

diff --git a/runtime/neurun/core/src/graph/pass/PermutationInsertionPass.h b/runtime/neurun/core/src/ir/pass/PermutationInsertionPass.h
similarity index 97%
rename from runtime/neurun/core/src/graph/pass/PermutationInsertionPass.h
rename to runtime/neurun/core/src/ir/pass/PermutationInsertionPass.h
index b430be8..a0bc0bf 100644 (file)
--- a/runtime/neurun/core/src/graph/pass/PermutationInsertionPass.h
+++ b/runtime/neurun/core/src/ir/pass/PermutationInsertionPass.h
@@ -20,7 +20,7 @@
 #include "OperandPass.h"
 #include "model/Operand.h" //for model::OperationIndex
 #include "backend/BackendManager.h"
-#include "graph/operand/PermuteFactor.h"
+#include "ir/operand/PermuteFactor.h"
 
 namespace neurun
 {

diff --git a/runtime/neurun/core/src/graph/pass/PermutationOperationPass.cc b/runtime/neurun/core/src/ir/pass/PermutationOperationPass.cc
similarity index 99%
rename from runtime/neurun/core/src/graph/pass/PermutationOperationPass.cc
rename to runtime/neurun/core/src/ir/pass/PermutationOperationPass.cc
index ecf0593..0b5929b 100644 (file)
--- a/runtime/neurun/core/src/graph/pass/PermutationOperationPass.cc
+++ b/runtime/neurun/core/src/ir/pass/PermutationOperationPass.cc
@@ -18,7 +18,7 @@
 
 #include "backend/Backend.h"
 #include "backend/IConfig.h"
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 
 namespace neurun
 {

diff --git a/runtime/neurun/core/src/graph/pass/PermutationOperationPass.h b/runtime/neurun/core/src/ir/pass/PermutationOperationPass.h
similarity index 100%
rename from runtime/neurun/core/src/graph/pass/PermutationOperationPass.h
rename to runtime/neurun/core/src/ir/pass/PermutationOperationPass.h

diff --git a/runtime/neurun/core/src/graph/verifier/Verifier.cc b/runtime/neurun/core/src/ir/verifier/Verifier.cc
similarity index 99%
rename from runtime/neurun/core/src/graph/verifier/Verifier.cc
rename to runtime/neurun/core/src/ir/verifier/Verifier.cc
index 46e2ead..c1e6d20 100644 (file)
--- a/runtime/neurun/core/src/graph/verifier/Verifier.cc
+++ b/runtime/neurun/core/src/ir/verifier/Verifier.cc
@@ -16,7 +16,7 @@
 
 #include "Verifier.h"
 
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 #include "model/OperationIndexMap.h"
 
 #include "util/logging.h"

diff --git a/runtime/neurun/core/src/graph/verifier/Verifier.h b/runtime/neurun/core/src/ir/verifier/Verifier.h
similarity index 100%
rename from runtime/neurun/core/src/graph/verifier/Verifier.h
rename to runtime/neurun/core/src/ir/verifier/Verifier.h

diff --git a/runtime/neurun/frontend/base_loader/base_loader.h b/runtime/neurun/frontend/base_loader/base_loader.h
index 4dee142..2f28ac3 100644 (file)
--- a/runtime/neurun/frontend/base_loader/base_loader.h
+++ b/runtime/neurun/frontend/base_loader/base_loader.h
@@ -17,7 +17,7 @@
 #ifndef __BASE_LOADER_BASE_LOADER_H__
 #define __BASE_LOADER_BASE_LOADER_H__
 
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 #include "model/Operations.Include.h"
 
 #include <map>

diff --git a/runtime/neurun/frontend/circle/circle_loader.h b/runtime/neurun/frontend/circle/circle_loader.h
index 0ff3f33..0c3d5ae 100644 (file)
--- a/runtime/neurun/frontend/circle/circle_loader.h
+++ b/runtime/neurun/frontend/circle/circle_loader.h
@@ -17,7 +17,7 @@
 #ifndef __CIRCLE_CIRCLE_LOADER_H__
 #define __CIRCLE_CIRCLE_LOADER_H__
 
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 
 #include <memory>
 

diff --git a/runtime/neurun/frontend/nnapi/wrapper/ANeuralNetworksCompilation.h b/runtime/neurun/frontend/nnapi/wrapper/ANeuralNetworksCompilation.h
index 7a4ee98..affcc15 100644 (file)
--- a/runtime/neurun/frontend/nnapi/wrapper/ANeuralNetworksCompilation.h
+++ b/runtime/neurun/frontend/nnapi/wrapper/ANeuralNetworksCompilation.h
@@ -18,7 +18,7 @@
 #define __COMPILATION_H__
 
 #include "compiler/Compiler.h"
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 #include "exec/IExecutor.h"
 
 struct ANeuralNetworksCompilation

diff --git a/runtime/neurun/frontend/nnapi/wrapper/ANeuralNetworksModel.h b/runtime/neurun/frontend/nnapi/wrapper/ANeuralNetworksModel.h
index 35facc9..a1af145 100644 (file)
--- a/runtime/neurun/frontend/nnapi/wrapper/ANeuralNetworksModel.h
+++ b/runtime/neurun/frontend/nnapi/wrapper/ANeuralNetworksModel.h
@@ -21,7 +21,7 @@
 #include <NeuralNetworks.h>
 #include <NeuralNetworksEx.h>
 
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 
 struct ANeuralNetworksModel
 {

diff --git a/runtime/neurun/frontend/tflite/tflite_loader.h b/runtime/neurun/frontend/tflite/tflite_loader.h
index 02d66e5..04d1fd5 100644 (file)
--- a/runtime/neurun/frontend/tflite/tflite_loader.h
+++ b/runtime/neurun/frontend/tflite/tflite_loader.h
@@ -17,7 +17,7 @@
 #ifndef __TFLITE_TFLITE_LOADER_H__
 #define __TFLITE_TFLITE_LOADER_H__
 
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 
 #include <memory>
 

diff --git a/runtime/neurun/test/core/exec/ExecInstance.cc b/runtime/neurun/test/core/exec/ExecInstance.cc
index b00f793..bd4a3c8 100644 (file)
--- a/runtime/neurun/test/core/exec/ExecInstance.cc
+++ b/runtime/neurun/test/core/exec/ExecInstance.cc
@@ -17,7 +17,7 @@
 #include <gtest/gtest.h>
 #include <thread>
 
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 #include "compiler/Compiler.h"
 #include "exec/Execution.h"
 #include "model/operation/Add.h"

diff --git a/runtime/neurun/test/core/exec/interp/ExecManager.cc b/runtime/neurun/test/core/exec/interp/ExecManager.cc
index 6620438..2915e78 100644 (file)
--- a/runtime/neurun/test/core/exec/interp/ExecManager.cc
+++ b/runtime/neurun/test/core/exec/interp/ExecManager.cc
@@ -18,7 +18,7 @@
 
 #include <cpp14/memory.h>
 
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 #include "exec/interp/ExecManager.h"
 #include "exec/Execution.h"
 #include "model/operation/Add.h"

diff --git a/runtime/neurun/test/graph/Graph.cc b/runtime/neurun/test/graph/Graph.cc
index f952fc6..4d52571 100644 (file)
--- a/runtime/neurun/test/graph/Graph.cc
+++ b/runtime/neurun/test/graph/Graph.cc
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 
 TEST(Graph, inputs_and_outputs)
 {

diff --git a/runtime/neurun/test/graph/operand/UseDef.cc b/runtime/neurun/test/graph/operand/UseDef.cc
index 60d23c7..1d7d64a 100644 (file)
--- a/runtime/neurun/test/graph/operand/UseDef.cc
+++ b/runtime/neurun/test/graph/operand/UseDef.cc
@@ -16,8 +16,8 @@
 
 #include <gtest/gtest.h>
 
-#include "graph/Graph.h"
-#include "graph/verifier/Verifier.h"
+#include "ir/Graph.h"
+#include "ir/verifier/Verifier.h"
 #include "cpp14/memory.h"
 #include "../MockNode.h"
 

diff --git a/runtime/neurun/test/graph/operation/SetIO.cc b/runtime/neurun/test/graph/operation/SetIO.cc
index 606c498..29309f9 100644 (file)
--- a/runtime/neurun/test/graph/operation/SetIO.cc
+++ b/runtime/neurun/test/graph/operation/SetIO.cc
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 #include "model/Index.h"
 #include "model/OperandIndexSequence.h"
 #include "model/operation/Conv2D.h"

diff --git a/runtime/neurun/test/graph/verifier/Verifier.cc b/runtime/neurun/test/graph/verifier/Verifier.cc
index 7687b6a..d06c8ef 100644 (file)
--- a/runtime/neurun/test/graph/verifier/Verifier.cc
+++ b/runtime/neurun/test/graph/verifier/Verifier.cc
@@ -17,8 +17,8 @@
 #include <gtest/gtest.h>
 
 #include "model/Operation.h"
-#include "graph/Graph.h"
-#include "graph/verifier/Verifier.h"
+#include "ir/Graph.h"
+#include "ir/verifier/Verifier.h"
 #include "cpp14/memory.h"
 #include "model/Operand.h"
 #include "../MockNode.h"

diff --git a/tests/tools/tflite_loader/src/tflite_loader.cc b/tests/tools/tflite_loader/src/tflite_loader.cc
index dabbde4..cc83d7c 100644 (file)
--- a/tests/tools/tflite_loader/src/tflite_loader.cc
+++ b/tests/tools/tflite_loader/src/tflite_loader.cc
@@ -27,7 +27,7 @@
 
 #include "compiler/Compiler.h"
 #include "exec/Execution.h"
-#include "graph/Graph.h"
+#include "ir/Graph.h"
 
 #include "tflite_loader.h"