From cb4705ed29b6c3e412a2d8ab5312f5f5796d4917 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=9D=B4=ED=95=9C=EC=A2=85/On-Device=20Lab=28SR=29/Enginee?= =?utf8?q?r/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Tue, 19 Mar 2019 12:58:45 +0900 Subject: [PATCH] [neurun] Re-organize neurun core directories (#4781) Introduce core directory and separate headers into two types - private and public. Public header may be used by frontend and backend implemenatations. New directory structure is as follows: ``` - neurun - frontend (as-is) - backend (as-is) - core - include - src ``` Signed-off-by: Hanjoung Lee --- runtimes/neurun/CMakeLists.txt | 24 +++++++++------------- runtimes/neurun/backend/acl_cl/Config.h | 2 +- runtimes/neurun/backend/acl_cl/StageGenerator.h | 2 +- runtimes/neurun/backend/acl_cl/TensorBuilder.h | 2 +- runtimes/neurun/backend/acl_cl/kernel/CLFunction.h | 2 +- runtimes/neurun/backend/acl_cl/operand/ICLTensor.h | 2 +- runtimes/neurun/backend/acl_cl/operand/Object.h | 2 +- runtimes/neurun/backend/cpu/Config.h | 2 +- runtimes/neurun/backend/cpu/StageGenerator.cc | 4 ++-- runtimes/neurun/backend/cpu/StageGenerator.h | 2 +- runtimes/neurun/backend/cpu/TensorBuilder.h | 2 +- runtimes/neurun/backend/cpu/kernel/AvgPoolLayer.h | 2 +- runtimes/neurun/backend/cpu/kernel/ConcatLayer.h | 2 +- .../neurun/backend/cpu/kernel/ConvolutionLayer.h | 2 +- .../backend/cpu/kernel/DepthwiseConvolutionLayer.h | 2 +- .../backend/cpu/kernel/FullyConnectedLayer.h | 2 +- runtimes/neurun/backend/cpu/kernel/MaxPoolLayer.h | 2 +- runtimes/neurun/backend/cpu/kernel/PermuteLayer.h | 4 ++-- runtimes/neurun/backend/cpu/kernel/ReshapeLayer.h | 2 +- runtimes/neurun/backend/cpu/kernel/SoftMaxLayer.h | 2 +- runtimes/neurun/backend/cpu/operand/Object.h | 4 ++-- runtimes/neurun/backend/cpu/operand/Tensor.h | 2 +- .../{src => core/include}/backend/AtomicStage.h | 2 +- .../neurun/{src => core/include}/backend/Backend.h | 0 .../interface => core/include/backend}/IConfig.h | 0 .../interface => core/include/backend}/IStage.h | 0 .../include/backend}/IStageGenerator.h | 4 ++-- .../include/backend}/ITensorBuilder.h | 2 +- .../{src => core/include}/backend/StageSequence.h | 2 +- .../include/backend}/operand/IObject.h | 0 .../include/backend}/operand/ITensor.h | 0 .../{src => core/include}/compiler/Compiler.h | 0 .../include}/compiler/IExecutionBuilder.h | 2 +- .../{src => core/include}/compiler/SubTensorInfo.h | 0 .../{src => core/include}/compiler/TensorInfo.h | 0 .../neurun/{src => core/include}/exec/IExecutor.h | 0 .../interface => core/include/exec}/IFunction.h | 0 .../neurun/{src => core/include}/graph/Graph.h | 0 .../neurun/{src => core/include}/graph/Index.h | 0 .../{src => core/include}/graph/LowerInfoMap.h | 0 .../include}/graph/operand/BackendSet.h | 0 .../{src => core/include}/graph/operand/Layout.h | 0 .../include}/graph/operand/LowerInfo.h | 0 .../include}/graph/operand/ParentInfo.h | 0 .../include}/graph/operation/LowerInfo.h | 8 +++++++- .../neurun/{src => core/include}/model/Model.h | 0 .../{src => core/include}/model/operand/Data.h | 0 .../{src => core/include}/model/operand/DataType.h | 0 .../{src => core/include}/model/operand/Index.h | 0 .../{src => core/include}/model/operand/IndexMap.h | 0 .../{src => core/include}/model/operand/IndexSet.h | 0 .../{src => core/include}/model/operand/Object.h | 0 .../{src => core/include}/model/operand/Set.h | 0 .../{src => core/include}/model/operand/Shape.h | 0 .../{src => core/include}/model/operand/TypeInfo.h | 0 .../include}/model/operation/AddNode.h | 0 .../include}/model/operation/AvgPool2DNode.h | 0 .../include}/model/operation/CastNode.h | 0 .../include}/model/operation/ConcatNode.h | 0 .../include}/model/operation/Conv2DNode.h | 0 .../include}/model/operation/DepthwiseConv2DNode.h | 0 .../include}/model/operation/DivNode.h | 0 .../include}/model/operation/EmbeddingLookupNode.h | 0 .../include}/model/operation/ExpNode.h | 0 .../include}/model/operation/FloorNode.h | 0 .../include}/model/operation/FullyConnectedNode.h | 0 .../include}/model/operation/HashtableLookupNode.h | 0 .../{src => core/include}/model/operation/Index.h | 0 .../include}/model/operation/IndexList.h | 0 .../include}/model/operation/L2NormalizationNode.h | 0 .../include}/model/operation/L2Pool2DNode.h | 0 .../include}/model/operation/LogicalAndNode.h | 0 .../include}/model/operation/LogisticNode.h | 0 .../include}/model/operation/MaxPool2DNode.h | 0 .../include}/model/operation/MulNode.h | 0 .../include}/model/operation/Node.Include.h | 0 .../{src => core/include}/model/operation/Node.h | 0 .../include}/model/operation/NodeVisitor.h | 0 .../include}/model/operation/NotEqualNode.h | 0 .../{src => core/include}/model/operation/Op.lst | 0 .../include}/model/operation/OperandConstraint.h | 0 .../include}/model/operation/PReLUNode.h | 0 .../include}/model/operation/PermuteNode.h | 8 +++++++- .../include}/model/operation/RSQRTNode.h | 0 .../include}/model/operation/ReLU1Node.h | 0 .../include}/model/operation/ReLU6Node.h | 0 .../include}/model/operation/ReLUNode.h | 0 .../include}/model/operation/ReduceMaxNode.h | 0 .../include}/model/operation/ReduceSumNode.h | 0 .../include}/model/operation/ReshapeNode.h | 0 .../include}/model/operation/ResizeBilinearNode.h | 0 .../include}/model/operation/SQRTNode.h | 0 .../{src => core/include}/model/operation/Set.h | 0 .../include}/model/operation/SoftmaxNode.h | 0 .../include}/model/operation/SpaceToDepthNode.h | 0 .../include}/model/operation/SqueezeNode.h | 0 .../include}/model/operation/StridedSliceNode.h | 0 .../include}/model/operation/SubNode.h | 0 .../include}/model/operation/Subgraph.h | 0 .../include}/model/operation/TanhNode.h | 0 .../include}/model/operation/TransposeConvNode.h | 0 .../include}/model/operation/TransposeNode.h | 0 .../{src => core/include}/util/NNAPIConvert.h | 0 .../neurun/{src => core/include}/util/Padding.h | 0 runtimes/neurun/{src => core/include}/util/Utils.h | 0 .../{src => core/include}/util/config/Config.lst | 0 .../include}/util/config/ConfigManager.h | 0 .../include}/util/feature/Coordinate4D.h | 0 .../{src => core/include}/util/feature/nchw/View.h | 2 +- .../include}/util/feature/nhwc/Reader.h | 0 .../include}/util/feature/nhwc/Utils.h | 0 .../{src => core/include}/util/feature/nhwc/View.h | 0 .../neurun/{src => core/include}/util/logging.h | 0 runtimes/neurun/{ => core}/src/backend/Backend.cc | 8 ++++---- .../{ => core}/src/backend/BackendManager.cc | 6 +++--- .../neurun/{ => core}/src/backend/BackendManager.h | 2 +- .../{ => core}/src/compiler/BackendResolver.cc | 0 .../{ => core}/src/compiler/BackendResolver.h | 2 +- .../neurun/{ => core}/src/compiler/Compiler.cc | 4 ++-- .../{ => core}/src/compiler/ConstantInitializer.cc | 4 ++-- .../{ => core}/src/compiler/ConstantInitializer.h | 0 .../{ => core}/src/compiler/OperandContext.cc | 0 .../{ => core}/src/compiler/OperandContext.h | 2 +- .../{ => core}/src/compiler/OperationValidator.cc | 0 .../{ => core}/src/compiler/OperationValidator.h | 0 runtimes/neurun/{ => core}/src/compiler/Plan.cc | 0 runtimes/neurun/{ => core}/src/compiler/Plan.h | 0 .../neurun/{ => core}/src/compiler/PlanBuilder.cc | 2 +- .../neurun/{ => core}/src/compiler/PlanBuilder.h | 6 +++--- .../{ => core}/src/compiler/SubTensorAnalyzer.cc | 0 .../{ => core}/src/compiler/SubTensorAnalyzer.h | 0 .../{ => core}/src/compiler/operation/Sequence.cc | 0 .../{ => core}/src/compiler/operation/Sequence.h | 2 +- .../neurun/{ => core}/src/dumper/dot/DotBuilder.cc | 0 .../neurun/{ => core}/src/dumper/dot/DotBuilder.h | 0 .../neurun/{ => core}/src/dumper/dot/DotDumper.cc | 0 .../neurun/{ => core}/src/dumper/dot/DotDumper.h | 0 .../{ => core}/src/dumper/dot/DotNodeInfo.cc | 3 ++- .../neurun/{ => core}/src/dumper/dot/DotNodeInfo.h | 0 .../{ => core}/src/dumper/dot/DotOperandInfo.cc | 2 +- .../{ => core}/src/dumper/dot/DotOperandInfo.h | 0 .../neurun/{ => core}/src/dumper/dot/IDotInfo.h | 0 .../neurun/{ => core}/src/exec/DataflowExecutor.cc | 0 .../neurun/{ => core}/src/exec/DataflowExecutor.h | 0 runtimes/neurun/{ => core}/src/exec/Executor.cc | 4 ++-- runtimes/neurun/{ => core}/src/exec/Executor.h | 0 .../neurun/{ => core}/src/exec/ExecutorBase.cc | 0 runtimes/neurun/{ => core}/src/exec/ExecutorBase.h | 5 +++-- .../neurun/{ => core}/src/exec/FunctionSequence.cc | 0 .../neurun/{ => core}/src/exec/FunctionSequence.h | 2 +- runtimes/neurun/{ => core}/src/exec/Job.cc | 0 runtimes/neurun/{ => core}/src/exec/Job.h | 2 +- runtimes/neurun/{ => core}/src/exec/Sink.h | 0 runtimes/neurun/{ => core}/src/exec/Source.h | 0 .../{ => core}/src/exec/interp/ExecManager.cc | 0 .../{ => core}/src/exec/interp/ExecManager.h | 0 runtimes/neurun/{ => core}/src/graph/Graph.cc | 8 ++++---- .../neurun/{ => core}/src/graph/dumper/Dumper.cc | 0 .../neurun/{ => core}/src/graph/dumper/Dumper.h | 0 .../{ => core}/src/graph/operand/BackendSet.cc | 2 +- .../{ => core}/src/graph/operand/LayoutSet.cc | 0 .../{ => core}/src/graph/operand/LayoutSet.h | 2 +- .../{ => core}/src/graph/operand/LowerInfo.cc | 2 +- .../{ => core}/src/graph/operand/Shape4DConvert.h | 2 +- .../{ => core}/src/graph/operation/LowerInfo.cc | 2 +- .../{ => core}/src/graph/pass/OperandPass.cc | 0 .../neurun/{ => core}/src/graph/pass/OperandPass.h | 0 .../{ => core}/src/graph/pass/OperationPass.cc | 0 .../{ => core}/src/graph/pass/OperationPass.h | 0 runtimes/neurun/{ => core}/src/graph/pass/Pass.cc | 0 runtimes/neurun/{ => core}/src/graph/pass/Pass.h | 0 .../src/graph/pass/PermutationEliminationPass.cc | 2 +- .../src/graph/pass/PermutationEliminationPass.h | 0 .../src/graph/pass/PermutationInsertionPass.cc | 2 +- .../src/graph/pass/PermutationInsertionPass.h | 0 .../{ => core}/src/graph/verifier/Verifier.cc | 0 .../{ => core}/src/graph/verifier/Verifier.h | 0 runtimes/neurun/{ => core}/src/library_info.cc | 0 runtimes/neurun/{ => core}/src/linear/Linear.cc | 5 +++-- runtimes/neurun/{ => core}/src/linear/Linear.h | 2 +- .../{ => core}/src/model/operand/IndexSet.cc | 2 +- .../neurun/{ => core}/src/model/operand/Object.cc | 2 +- .../neurun/{ => core}/src/model/operand/Set.cc | 2 +- .../neurun/{ => core}/src/model/operand/Shape.cc | 2 +- .../{ => core}/src/model/operand/TypeInfo.cc | 2 +- .../{ => core}/src/model/operation/AddNode.cc | 4 ++-- .../src/model/operation/AvgPool2DNode.cc | 4 ++-- .../{ => core}/src/model/operation/CastNode.cc | 4 ++-- .../{ => core}/src/model/operation/ConcatNode.cc | 4 ++-- .../{ => core}/src/model/operation/Conv2DNode.cc | 4 ++-- .../src/model/operation/DepthwiseConv2DNode.cc | 4 ++-- .../{ => core}/src/model/operation/DivNode.cc | 4 ++-- .../src/model/operation/EmbeddingLookupNode.cc | 4 ++-- .../{ => core}/src/model/operation/ExpNode.cc | 4 ++-- .../{ => core}/src/model/operation/FloorNode.cc | 4 ++-- .../src/model/operation/FullyConnectedNode.cc | 4 ++-- .../src/model/operation/HashtableLookupNode.cc | 4 ++-- .../{ => core}/src/model/operation/IndexList.cc | 2 +- .../src/model/operation/L2NormalizationNode.cc | 4 ++-- .../{ => core}/src/model/operation/L2Pool2DNode.cc | 4 ++-- .../src/model/operation/LogicalAndNode.cc | 4 ++-- .../{ => core}/src/model/operation/LogisticNode.cc | 4 ++-- .../src/model/operation/MaxPool2DNode.cc | 4 ++-- .../{ => core}/src/model/operation/MulNode.cc | 4 ++-- .../neurun/{ => core}/src/model/operation/Node.cc | 2 +- .../{ => core}/src/model/operation/NotEqualNode.cc | 4 ++-- .../src/model/operation/OperandConstraint.cc | 2 +- .../{ => core}/src/model/operation/PReLUNode.cc | 4 ++-- .../{ => core}/src/model/operation/PermuteNode.cc | 4 ++-- .../{ => core}/src/model/operation/RSQRTNode.cc | 4 ++-- .../{ => core}/src/model/operation/ReLU1Node.cc | 4 ++-- .../{ => core}/src/model/operation/ReLU6Node.cc | 4 ++-- .../{ => core}/src/model/operation/ReLUNode.cc | 4 ++-- .../src/model/operation/ReduceMaxNode.cc | 4 ++-- .../src/model/operation/ReduceSumNode.cc | 4 ++-- .../{ => core}/src/model/operation/ReshapeNode.cc | 4 ++-- .../src/model/operation/ResizeBilinearNode.cc | 4 ++-- .../{ => core}/src/model/operation/SQRTNode.cc | 4 ++-- .../neurun/{ => core}/src/model/operation/Set.cc | 2 +- .../{ => core}/src/model/operation/SoftmaxNode.cc | 4 ++-- .../src/model/operation/SpaceToDepthNode.cc | 4 ++-- .../{ => core}/src/model/operation/SqueezeNode.cc | 4 ++-- .../src/model/operation/StridedSliceNode.cc | 4 ++-- .../{ => core}/src/model/operation/SubNode.cc | 4 ++-- .../{ => core}/src/model/operation/Subgraph.cc | 4 ++-- .../{ => core}/src/model/operation/TanhNode.cc | 4 ++-- .../src/model/operation/TransposeConvNode.cc | 4 ++-- .../src/model/operation/TransposeNode.cc | 4 ++-- .../neurun/{ => core}/src/util/NNAPIConvert.cc | 2 +- runtimes/neurun/{ => core}/src/util/Padding.cc | 0 runtimes/neurun/{ => core}/src/util/Utils.cc | 2 +- .../{ => core}/src/util/config/ConfigManager.cc | 6 +++--- runtimes/neurun/frontend/nnapi/CMakeLists.txt | 1 + 233 files changed, 192 insertions(+), 180 deletions(-) rename runtimes/neurun/{src => core/include}/backend/AtomicStage.h (97%) rename runtimes/neurun/{src => core/include}/backend/Backend.h (100%) rename runtimes/neurun/{src/backend/interface => core/include/backend}/IConfig.h (100%) rename runtimes/neurun/{src/backend/interface => core/include/backend}/IStage.h (100%) rename runtimes/neurun/{src/backend/interface => core/include/backend}/IStageGenerator.h (96%) rename runtimes/neurun/{src/backend/interface => core/include/backend}/ITensorBuilder.h (98%) rename runtimes/neurun/{src => core/include}/backend/StageSequence.h (97%) rename runtimes/neurun/{src/backend/interface => core/include/backend}/operand/IObject.h (100%) rename runtimes/neurun/{src/backend/interface => core/include/backend}/operand/ITensor.h (100%) rename runtimes/neurun/{src => core/include}/compiler/Compiler.h (100%) rename runtimes/neurun/{src => core/include}/compiler/IExecutionBuilder.h (96%) rename runtimes/neurun/{src => core/include}/compiler/SubTensorInfo.h (100%) rename runtimes/neurun/{src => core/include}/compiler/TensorInfo.h (100%) rename runtimes/neurun/{src => core/include}/exec/IExecutor.h (100%) rename runtimes/neurun/{src/exec/interface => core/include/exec}/IFunction.h (100%) rename runtimes/neurun/{src => core/include}/graph/Graph.h (100%) rename runtimes/neurun/{src => core/include}/graph/Index.h (100%) rename runtimes/neurun/{src => core/include}/graph/LowerInfoMap.h (100%) rename runtimes/neurun/{src => core/include}/graph/operand/BackendSet.h (100%) rename runtimes/neurun/{src => core/include}/graph/operand/Layout.h (100%) rename runtimes/neurun/{src => core/include}/graph/operand/LowerInfo.h (100%) rename runtimes/neurun/{src => core/include}/graph/operand/ParentInfo.h (100%) rename runtimes/neurun/{src => core/include}/graph/operation/LowerInfo.h (91%) rename runtimes/neurun/{src => core/include}/model/Model.h (100%) rename runtimes/neurun/{src => core/include}/model/operand/Data.h (100%) rename runtimes/neurun/{src => core/include}/model/operand/DataType.h (100%) rename runtimes/neurun/{src => core/include}/model/operand/Index.h (100%) rename runtimes/neurun/{src => core/include}/model/operand/IndexMap.h (100%) rename runtimes/neurun/{src => core/include}/model/operand/IndexSet.h (100%) rename runtimes/neurun/{src => core/include}/model/operand/Object.h (100%) rename runtimes/neurun/{src => core/include}/model/operand/Set.h (100%) rename runtimes/neurun/{src => core/include}/model/operand/Shape.h (100%) rename runtimes/neurun/{src => core/include}/model/operand/TypeInfo.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/AddNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/AvgPool2DNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/CastNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/ConcatNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/Conv2DNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/DepthwiseConv2DNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/DivNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/EmbeddingLookupNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/ExpNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/FloorNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/FullyConnectedNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/HashtableLookupNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/Index.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/IndexList.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/L2NormalizationNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/L2Pool2DNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/LogicalAndNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/LogisticNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/MaxPool2DNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/MulNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/Node.Include.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/Node.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/NodeVisitor.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/NotEqualNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/Op.lst (100%) rename runtimes/neurun/{src => core/include}/model/operation/OperandConstraint.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/PReLUNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/PermuteNode.h (94%) rename runtimes/neurun/{src => core/include}/model/operation/RSQRTNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/ReLU1Node.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/ReLU6Node.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/ReLUNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/ReduceMaxNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/ReduceSumNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/ReshapeNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/ResizeBilinearNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/SQRTNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/Set.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/SoftmaxNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/SpaceToDepthNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/SqueezeNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/StridedSliceNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/SubNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/Subgraph.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/TanhNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/TransposeConvNode.h (100%) rename runtimes/neurun/{src => core/include}/model/operation/TransposeNode.h (100%) rename runtimes/neurun/{src => core/include}/util/NNAPIConvert.h (100%) rename runtimes/neurun/{src => core/include}/util/Padding.h (100%) rename runtimes/neurun/{src => core/include}/util/Utils.h (100%) rename runtimes/neurun/{src => core/include}/util/config/Config.lst (100%) rename runtimes/neurun/{src => core/include}/util/config/ConfigManager.h (100%) rename runtimes/neurun/{src => core/include}/util/feature/Coordinate4D.h (100%) rename runtimes/neurun/{src => core/include}/util/feature/nchw/View.h (98%) rename runtimes/neurun/{src => core/include}/util/feature/nhwc/Reader.h (100%) rename runtimes/neurun/{src => core/include}/util/feature/nhwc/Utils.h (100%) rename runtimes/neurun/{src => core/include}/util/feature/nhwc/View.h (100%) rename runtimes/neurun/{src => core/include}/util/logging.h (100%) rename runtimes/neurun/{ => core}/src/backend/Backend.cc (89%) rename runtimes/neurun/{ => core}/src/backend/BackendManager.cc (96%) rename runtimes/neurun/{ => core}/src/backend/BackendManager.h (98%) rename runtimes/neurun/{ => core}/src/compiler/BackendResolver.cc (100%) rename runtimes/neurun/{ => core}/src/compiler/BackendResolver.h (98%) rename runtimes/neurun/{ => core}/src/compiler/Compiler.cc (99%) rename runtimes/neurun/{ => core}/src/compiler/ConstantInitializer.cc (98%) rename runtimes/neurun/{ => core}/src/compiler/ConstantInitializer.h (100%) rename runtimes/neurun/{ => core}/src/compiler/OperandContext.cc (100%) rename runtimes/neurun/{ => core}/src/compiler/OperandContext.h (97%) rename runtimes/neurun/{ => core}/src/compiler/OperationValidator.cc (100%) rename runtimes/neurun/{ => core}/src/compiler/OperationValidator.h (100%) rename runtimes/neurun/{ => core}/src/compiler/Plan.cc (100%) rename runtimes/neurun/{ => core}/src/compiler/Plan.h (100%) rename runtimes/neurun/{ => core}/src/compiler/PlanBuilder.cc (97%) rename runtimes/neurun/{ => core}/src/compiler/PlanBuilder.h (93%) rename runtimes/neurun/{ => core}/src/compiler/SubTensorAnalyzer.cc (100%) rename runtimes/neurun/{ => core}/src/compiler/SubTensorAnalyzer.h (100%) rename runtimes/neurun/{ => core}/src/compiler/operation/Sequence.cc (100%) rename runtimes/neurun/{ => core}/src/compiler/operation/Sequence.h (97%) rename runtimes/neurun/{ => core}/src/dumper/dot/DotBuilder.cc (100%) rename runtimes/neurun/{ => core}/src/dumper/dot/DotBuilder.h (100%) rename runtimes/neurun/{ => core}/src/dumper/dot/DotDumper.cc (100%) rename runtimes/neurun/{ => core}/src/dumper/dot/DotDumper.h (100%) rename runtimes/neurun/{ => core}/src/dumper/dot/DotNodeInfo.cc (97%) rename runtimes/neurun/{ => core}/src/dumper/dot/DotNodeInfo.h (100%) rename runtimes/neurun/{ => core}/src/dumper/dot/DotOperandInfo.cc (98%) rename runtimes/neurun/{ => core}/src/dumper/dot/DotOperandInfo.h (100%) rename runtimes/neurun/{ => core}/src/dumper/dot/IDotInfo.h (100%) rename runtimes/neurun/{ => core}/src/exec/DataflowExecutor.cc (100%) rename runtimes/neurun/{ => core}/src/exec/DataflowExecutor.h (100%) rename runtimes/neurun/{ => core}/src/exec/Executor.cc (95%) rename runtimes/neurun/{ => core}/src/exec/Executor.h (100%) rename runtimes/neurun/{ => core}/src/exec/ExecutorBase.cc (100%) rename runtimes/neurun/{ => core}/src/exec/ExecutorBase.h (98%) rename runtimes/neurun/{ => core}/src/exec/FunctionSequence.cc (100%) rename runtimes/neurun/{ => core}/src/exec/FunctionSequence.h (97%) rename runtimes/neurun/{ => core}/src/exec/Job.cc (100%) rename runtimes/neurun/{ => core}/src/exec/Job.h (98%) rename runtimes/neurun/{ => core}/src/exec/Sink.h (100%) rename runtimes/neurun/{ => core}/src/exec/Source.h (100%) rename runtimes/neurun/{ => core}/src/exec/interp/ExecManager.cc (100%) rename runtimes/neurun/{ => core}/src/exec/interp/ExecManager.h (100%) rename runtimes/neurun/{ => core}/src/graph/Graph.cc (99%) rename runtimes/neurun/{ => core}/src/graph/dumper/Dumper.cc (100%) rename runtimes/neurun/{ => core}/src/graph/dumper/Dumper.h (100%) rename runtimes/neurun/{ => core}/src/graph/operand/BackendSet.cc (97%) rename runtimes/neurun/{ => core}/src/graph/operand/LayoutSet.cc (100%) rename runtimes/neurun/{ => core}/src/graph/operand/LayoutSet.h (98%) rename runtimes/neurun/{ => core}/src/graph/operand/LowerInfo.cc (95%) rename runtimes/neurun/{ => core}/src/graph/operand/Shape4DConvert.h (97%) rename runtimes/neurun/{ => core}/src/graph/operation/LowerInfo.cc (95%) rename runtimes/neurun/{ => core}/src/graph/pass/OperandPass.cc (100%) rename runtimes/neurun/{ => core}/src/graph/pass/OperandPass.h (100%) rename runtimes/neurun/{ => core}/src/graph/pass/OperationPass.cc (100%) rename runtimes/neurun/{ => core}/src/graph/pass/OperationPass.h (100%) rename runtimes/neurun/{ => core}/src/graph/pass/Pass.cc (100%) rename runtimes/neurun/{ => core}/src/graph/pass/Pass.h (100%) rename runtimes/neurun/{ => core}/src/graph/pass/PermutationEliminationPass.cc (99%) rename runtimes/neurun/{ => core}/src/graph/pass/PermutationEliminationPass.h (100%) rename runtimes/neurun/{ => core}/src/graph/pass/PermutationInsertionPass.cc (99%) rename runtimes/neurun/{ => core}/src/graph/pass/PermutationInsertionPass.h (100%) rename runtimes/neurun/{ => core}/src/graph/verifier/Verifier.cc (100%) rename runtimes/neurun/{ => core}/src/graph/verifier/Verifier.h (100%) rename runtimes/neurun/{ => core}/src/library_info.cc (100%) rename runtimes/neurun/{ => core}/src/linear/Linear.cc (98%) rename runtimes/neurun/{ => core}/src/linear/Linear.h (98%) rename runtimes/neurun/{ => core}/src/model/operand/IndexSet.cc (97%) rename runtimes/neurun/{ => core}/src/model/operand/Object.cc (98%) rename runtimes/neurun/{ => core}/src/model/operand/Set.cc (98%) rename runtimes/neurun/{ => core}/src/model/operand/Shape.cc (98%) rename runtimes/neurun/{ => core}/src/model/operand/TypeInfo.cc (96%) rename runtimes/neurun/{ => core}/src/model/operation/AddNode.cc (93%) rename runtimes/neurun/{ => core}/src/model/operation/AvgPool2DNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/CastNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/ConcatNode.cc (93%) rename runtimes/neurun/{ => core}/src/model/operation/Conv2DNode.cc (93%) rename runtimes/neurun/{ => core}/src/model/operation/DepthwiseConv2DNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/DivNode.cc (93%) rename runtimes/neurun/{ => core}/src/model/operation/EmbeddingLookupNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/ExpNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/FloorNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/FullyConnectedNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/HashtableLookupNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/IndexList.cc (96%) rename runtimes/neurun/{ => core}/src/model/operation/L2NormalizationNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/L2Pool2DNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/LogicalAndNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/LogisticNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/MaxPool2DNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/MulNode.cc (93%) rename runtimes/neurun/{ => core}/src/model/operation/Node.cc (97%) rename runtimes/neurun/{ => core}/src/model/operation/NotEqualNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/OperandConstraint.cc (94%) rename runtimes/neurun/{ => core}/src/model/operation/PReLUNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/PermuteNode.cc (93%) rename runtimes/neurun/{ => core}/src/model/operation/RSQRTNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/ReLU1Node.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/ReLU6Node.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/ReLUNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/ReduceMaxNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/ReduceSumNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/ReshapeNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/ResizeBilinearNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/SQRTNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/Set.cc (98%) rename runtimes/neurun/{ => core}/src/model/operation/SoftmaxNode.cc (93%) rename runtimes/neurun/{ => core}/src/model/operation/SpaceToDepthNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/SqueezeNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/StridedSliceNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/SubNode.cc (93%) rename runtimes/neurun/{ => core}/src/model/operation/Subgraph.cc (94%) rename runtimes/neurun/{ => core}/src/model/operation/TanhNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/TransposeConvNode.cc (92%) rename runtimes/neurun/{ => core}/src/model/operation/TransposeNode.cc (92%) rename runtimes/neurun/{ => core}/src/util/NNAPIConvert.cc (98%) rename runtimes/neurun/{ => core}/src/util/Padding.cc (100%) rename runtimes/neurun/{ => core}/src/util/Utils.cc (97%) rename runtimes/neurun/{ => core}/src/util/config/ConfigManager.cc (94%) diff --git a/runtimes/neurun/CMakeLists.txt b/runtimes/neurun/CMakeLists.txt index 689d0b0..0d6ee42 100644 --- a/runtimes/neurun/CMakeLists.txt +++ b/runtimes/neurun/CMakeLists.txt @@ -1,6 +1,6 @@ # Add cpu -set(NEURUN_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) +set(NEURUN_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/core/include) # Build backends and their kernels set(LIB_NEURUN_KERNEL_CPU neurun_kernel_cpu) @@ -16,30 +16,24 @@ add_subdirectory(backend) add_subdirectory(frontend) -file(GLOB SOURCES "src/*.cc") -file(GLOB SOURCES_BACKEND "src/backend/*.cc") -file(GLOB_RECURSE SOURCES_GRAPH "src/graph/*.cc") -file(GLOB_RECURSE SOURCES_LINEAR "src/linear/*.cc") -file(GLOB_RECURSE SOURCES_DUMPER "src/dumper/*.cc") -file(GLOB_RECURSE SOURCES_COMPILER "src/compiler/*.cc") -file(GLOB_RECURSE SOURCES_EXEC "src/exec/*.cc") -file(GLOB_RECURSE SOURCES_VERIFIER "src/verifier/*.cc") -file(GLOB_RECURSE SOURCES_UTIL "src/util/*.cc") -file(GLOB_RECURSE SOURCES_MODEL "src/model/*.cc") +# TODO Extract this to `core/CMakeLists.txt` -set(SOURCES ${SOURCES} ${SOURCES_BACKEND} ${SOURCES_GRAPH} ${SOURCES_LINEAR} ${SOURCES_DUMPER} ${SOURCES_COMPILER} ${SOURCES_EXEC} ${SOURCES_VERIFIER} ${SOURCES_UTIL} ${SOURCES_MODEL}) +file(GLOB_RECURSE SOURCES "core/src/*.cc") add_library(neurun-core STATIC ${SOURCES}) set_target_properties(neurun-core PROPERTIES POSITION_INDEPENDENT_CODE ON) -target_include_directories(neurun-core PUBLIC ${NEURUN_INCLUDE_DIR}) +target_include_directories(neurun-core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/core/include) +target_include_directories(neurun-core PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/core/src) target_include_directories(neurun-core PUBLIC ${CMAKE_SOURCE_DIR}/externals/tensorflow) -target_link_libraries(neurun-core nnapi-header) +target_link_libraries(neurun-core nnapi-header) # TODO Remove this dependency target_link_libraries(neurun-core tensorflow-lite) target_link_libraries(neurun-core nnfw_lib_misc) target_link_libraries(neurun-core nnfw_lib_cpp14) target_compile_options(neurun-core PRIVATE -Wall -Wextra -Werror) +# TODO Extract this to `test/CMakeLists.txt` + # Unit Tests set(TEST_NEURUN test_neurun) @@ -51,8 +45,10 @@ add_executable(${TEST_NEURUN} ${TESTS}) # NOTE This line is a workaround to resolve compilation error target_include_directories(${TEST_NEURUN} PRIVATE frontend/nnapi) target_include_directories(${TEST_NEURUN} PRIVATE backend/cpu) +target_include_directories(${TEST_NEURUN} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/core/src) target_link_libraries(${TEST_NEURUN} ${LIB_NEURUN}) +target_link_libraries(${TEST_NEURUN} neurun-core) target_link_libraries(${TEST_NEURUN} gtest) target_link_libraries(${TEST_NEURUN} gtest_main) target_link_libraries(${TEST_NEURUN} ${LIB_PTHREAD}) diff --git a/runtimes/neurun/backend/acl_cl/Config.h b/runtimes/neurun/backend/acl_cl/Config.h index cb43bfb..b0909fb 100644 --- a/runtimes/neurun/backend/acl_cl/Config.h +++ b/runtimes/neurun/backend/acl_cl/Config.h @@ -17,7 +17,7 @@ #ifndef __NEURUN_BACKEND_ACL_CL_CONFIG_H__ #define __NEURUN_BACKEND_ACL_CL_CONFIG_H__ -#include "backend/interface/IConfig.h" +#include namespace neurun { diff --git a/runtimes/neurun/backend/acl_cl/StageGenerator.h b/runtimes/neurun/backend/acl_cl/StageGenerator.h index f698694..b3e8e9d 100644 --- a/runtimes/neurun/backend/acl_cl/StageGenerator.h +++ b/runtimes/neurun/backend/acl_cl/StageGenerator.h @@ -17,7 +17,7 @@ #ifndef __NEURUN_BACKEND_ACL_CL_STAGE_GENERATOR_H__ #define __NEURUN_BACKEND_ACL_CL_STAGE_GENERATOR_H__ -#include "backend/interface/IStageGenerator.h" +#include #include "model/operand/Set.h" #include "TensorBuilder.h" diff --git a/runtimes/neurun/backend/acl_cl/TensorBuilder.h b/runtimes/neurun/backend/acl_cl/TensorBuilder.h index 677f8a4..7dc5fbc 100644 --- a/runtimes/neurun/backend/acl_cl/TensorBuilder.h +++ b/runtimes/neurun/backend/acl_cl/TensorBuilder.h @@ -17,7 +17,7 @@ #ifndef __NEURUN_BACKEND_ACL_CL_TENSOR_BUILDER_H__ #define __NEURUN_BACKEND_ACL_CL_TENSOR_BUILDER_H__ -#include "backend/interface/ITensorBuilder.h" +#include #include "operand/CLTensor.h" #include "operand/CLSubTensor.h" #include "operand/Object.h" diff --git a/runtimes/neurun/backend/acl_cl/kernel/CLFunction.h b/runtimes/neurun/backend/acl_cl/kernel/CLFunction.h index 8edee11..5d9875c 100644 --- a/runtimes/neurun/backend/acl_cl/kernel/CLFunction.h +++ b/runtimes/neurun/backend/acl_cl/kernel/CLFunction.h @@ -17,7 +17,7 @@ #ifndef __NEURUN_BACKEND_ACL_CL_KERNEL_CL_FUNCTION_H__ #define __NEURUN_BACKEND_ACL_CL_KERNEL_CL_FUNCTION_H__ -#include "exec/interface/IFunction.h" +#include #include #include diff --git a/runtimes/neurun/backend/acl_cl/operand/ICLTensor.h b/runtimes/neurun/backend/acl_cl/operand/ICLTensor.h index e8abfc4..288652f 100644 --- a/runtimes/neurun/backend/acl_cl/operand/ICLTensor.h +++ b/runtimes/neurun/backend/acl_cl/operand/ICLTensor.h @@ -19,7 +19,7 @@ #include #include -#include "backend/interface/operand/ITensor.h" +#include namespace neurun { diff --git a/runtimes/neurun/backend/acl_cl/operand/Object.h b/runtimes/neurun/backend/acl_cl/operand/Object.h index e186ada..a4308fe 100644 --- a/runtimes/neurun/backend/acl_cl/operand/Object.h +++ b/runtimes/neurun/backend/acl_cl/operand/Object.h @@ -19,7 +19,7 @@ #include -#include "backend/interface/operand/IObject.h" +#include #include "operand/ICLTensor.h" namespace neurun diff --git a/runtimes/neurun/backend/cpu/Config.h b/runtimes/neurun/backend/cpu/Config.h index ad9ca0e..fab2111 100644 --- a/runtimes/neurun/backend/cpu/Config.h +++ b/runtimes/neurun/backend/cpu/Config.h @@ -17,7 +17,7 @@ #ifndef __NEURUN_BACKEND_CPU_CONFIG_H__ #define __NEURUN_BACKEND_CPU_CONFIG_H__ -#include "backend/interface/IConfig.h" +#include namespace neurun { diff --git a/runtimes/neurun/backend/cpu/StageGenerator.cc b/runtimes/neurun/backend/cpu/StageGenerator.cc index db9d74f..3e1a7d8 100644 --- a/runtimes/neurun/backend/cpu/StageGenerator.cc +++ b/runtimes/neurun/backend/cpu/StageGenerator.cc @@ -31,8 +31,8 @@ #include "kernel/PermuteLayer.h" #include "kernel/DepthwiseConvolutionLayer.h" -#include "backend/BackendManager.h" -#include "backend/interface/IConfig.h" +#include +#include #include "compiler/IExecutionBuilder.h" #include "util/logging.h" diff --git a/runtimes/neurun/backend/cpu/StageGenerator.h b/runtimes/neurun/backend/cpu/StageGenerator.h index 3358059..74f76f3 100644 --- a/runtimes/neurun/backend/cpu/StageGenerator.h +++ b/runtimes/neurun/backend/cpu/StageGenerator.h @@ -17,7 +17,7 @@ #ifndef __NEURUN_BACKEND_CPU_STAGE_GENERATOR_H__ #define __NEURUN_BACKEND_CPU_STAGE_GENERATOR_H__ -#include "backend/interface/IStageGenerator.h" +#include #include "model/operand/Set.h" #include "operand/Tensor.h" diff --git a/runtimes/neurun/backend/cpu/TensorBuilder.h b/runtimes/neurun/backend/cpu/TensorBuilder.h index 7f5fb20..b4130aa 100644 --- a/runtimes/neurun/backend/cpu/TensorBuilder.h +++ b/runtimes/neurun/backend/cpu/TensorBuilder.h @@ -19,7 +19,7 @@ #include -#include "backend/interface/ITensorBuilder.h" +#include #include "operand/Tensor.h" #include "operand/Object.h" #include "model/operand/IndexMap.h" diff --git a/runtimes/neurun/backend/cpu/kernel/AvgPoolLayer.h b/runtimes/neurun/backend/cpu/kernel/AvgPoolLayer.h index bd8c47c..a27de81 100644 --- a/runtimes/neurun/backend/cpu/kernel/AvgPoolLayer.h +++ b/runtimes/neurun/backend/cpu/kernel/AvgPoolLayer.h @@ -19,7 +19,7 @@ #include -#include "exec/interface/IFunction.h" +#include #include "OperationUtils.h" diff --git a/runtimes/neurun/backend/cpu/kernel/ConcatLayer.h b/runtimes/neurun/backend/cpu/kernel/ConcatLayer.h index 6f96a5a..b1dd172 100644 --- a/runtimes/neurun/backend/cpu/kernel/ConcatLayer.h +++ b/runtimes/neurun/backend/cpu/kernel/ConcatLayer.h @@ -20,7 +20,7 @@ #include -#include "exec/interface/IFunction.h" +#include #include "OperationUtils.h" diff --git a/runtimes/neurun/backend/cpu/kernel/ConvolutionLayer.h b/runtimes/neurun/backend/cpu/kernel/ConvolutionLayer.h index 699a837..b323672 100644 --- a/runtimes/neurun/backend/cpu/kernel/ConvolutionLayer.h +++ b/runtimes/neurun/backend/cpu/kernel/ConvolutionLayer.h @@ -19,7 +19,7 @@ #include -#include "exec/interface/IFunction.h" +#include #include "OperationUtils.h" diff --git a/runtimes/neurun/backend/cpu/kernel/DepthwiseConvolutionLayer.h b/runtimes/neurun/backend/cpu/kernel/DepthwiseConvolutionLayer.h index 7b5133e..47afe9b 100644 --- a/runtimes/neurun/backend/cpu/kernel/DepthwiseConvolutionLayer.h +++ b/runtimes/neurun/backend/cpu/kernel/DepthwiseConvolutionLayer.h @@ -19,7 +19,7 @@ #include -#include "exec/interface/IFunction.h" +#include #include "OperationUtils.h" diff --git a/runtimes/neurun/backend/cpu/kernel/FullyConnectedLayer.h b/runtimes/neurun/backend/cpu/kernel/FullyConnectedLayer.h index 664bbd8..29a5f6d 100644 --- a/runtimes/neurun/backend/cpu/kernel/FullyConnectedLayer.h +++ b/runtimes/neurun/backend/cpu/kernel/FullyConnectedLayer.h @@ -19,7 +19,7 @@ #include -#include "exec/interface/IFunction.h" +#include #include "OperationUtils.h" diff --git a/runtimes/neurun/backend/cpu/kernel/MaxPoolLayer.h b/runtimes/neurun/backend/cpu/kernel/MaxPoolLayer.h index 764225b..8dd4904 100644 --- a/runtimes/neurun/backend/cpu/kernel/MaxPoolLayer.h +++ b/runtimes/neurun/backend/cpu/kernel/MaxPoolLayer.h @@ -19,7 +19,7 @@ #include -#include "exec/interface/IFunction.h" +#include #include "OperationUtils.h" diff --git a/runtimes/neurun/backend/cpu/kernel/PermuteLayer.h b/runtimes/neurun/backend/cpu/kernel/PermuteLayer.h index 47c46de..4026c5f 100644 --- a/runtimes/neurun/backend/cpu/kernel/PermuteLayer.h +++ b/runtimes/neurun/backend/cpu/kernel/PermuteLayer.h @@ -19,11 +19,11 @@ #include -#include "exec/interface/IFunction.h" +#include #include "util/feature/nhwc/View.h" #include "OperationUtils.h" -#include "backend/interface/operand/IObject.h" +#include #include "model/operation/PermuteNode.h" namespace neurun diff --git a/runtimes/neurun/backend/cpu/kernel/ReshapeLayer.h b/runtimes/neurun/backend/cpu/kernel/ReshapeLayer.h index 852fb43..e56efc2 100644 --- a/runtimes/neurun/backend/cpu/kernel/ReshapeLayer.h +++ b/runtimes/neurun/backend/cpu/kernel/ReshapeLayer.h @@ -19,7 +19,7 @@ #include -#include "exec/interface/IFunction.h" +#include #include "OperationUtils.h" diff --git a/runtimes/neurun/backend/cpu/kernel/SoftMaxLayer.h b/runtimes/neurun/backend/cpu/kernel/SoftMaxLayer.h index ec6c512..0cfbdb8 100644 --- a/runtimes/neurun/backend/cpu/kernel/SoftMaxLayer.h +++ b/runtimes/neurun/backend/cpu/kernel/SoftMaxLayer.h @@ -19,7 +19,7 @@ #include -#include "exec/interface/IFunction.h" +#include #include "OperationUtils.h" diff --git a/runtimes/neurun/backend/cpu/operand/Object.h b/runtimes/neurun/backend/cpu/operand/Object.h index 2b37080..005d9be 100644 --- a/runtimes/neurun/backend/cpu/operand/Object.h +++ b/runtimes/neurun/backend/cpu/operand/Object.h @@ -18,9 +18,9 @@ #define __NEURUN_BACKEND_CPU_OPERAND_OBJECT_H__ #include -#include "backend/interface/operand/ITensor.h" +#include -#include "backend/interface/operand/IObject.h" +#include namespace neurun { diff --git a/runtimes/neurun/backend/cpu/operand/Tensor.h b/runtimes/neurun/backend/cpu/operand/Tensor.h index a45ed1f..f7d60e9 100644 --- a/runtimes/neurun/backend/cpu/operand/Tensor.h +++ b/runtimes/neurun/backend/cpu/operand/Tensor.h @@ -17,7 +17,7 @@ #ifndef __NEURUN_BACKEND_CPU_OPERAND_TENSOR_H__ #define __NEURUN_BACKEND_CPU_OPERAND_TENSOR_H__ -#include "backend/interface/operand/ITensor.h" +#include #include "compiler/TensorInfo.h" namespace neurun diff --git a/runtimes/neurun/src/backend/AtomicStage.h b/runtimes/neurun/core/include/backend/AtomicStage.h similarity index 97% rename from runtimes/neurun/src/backend/AtomicStage.h rename to runtimes/neurun/core/include/backend/AtomicStage.h index 79041ad..859f053 100644 --- a/runtimes/neurun/src/backend/AtomicStage.h +++ b/runtimes/neurun/core/include/backend/AtomicStage.h @@ -20,7 +20,7 @@ #include #include -#include "backend/interface/IStage.h" +#include "IStage.h" namespace neurun { diff --git a/runtimes/neurun/src/backend/Backend.h b/runtimes/neurun/core/include/backend/Backend.h similarity index 100% rename from runtimes/neurun/src/backend/Backend.h rename to runtimes/neurun/core/include/backend/Backend.h diff --git a/runtimes/neurun/src/backend/interface/IConfig.h b/runtimes/neurun/core/include/backend/IConfig.h similarity index 100% rename from runtimes/neurun/src/backend/interface/IConfig.h rename to runtimes/neurun/core/include/backend/IConfig.h diff --git a/runtimes/neurun/src/backend/interface/IStage.h b/runtimes/neurun/core/include/backend/IStage.h similarity index 100% rename from runtimes/neurun/src/backend/interface/IStage.h rename to runtimes/neurun/core/include/backend/IStage.h diff --git a/runtimes/neurun/src/backend/interface/IStageGenerator.h b/runtimes/neurun/core/include/backend/IStageGenerator.h similarity index 96% rename from runtimes/neurun/src/backend/interface/IStageGenerator.h rename to runtimes/neurun/core/include/backend/IStageGenerator.h index 66fe761..487a1b7 100644 --- a/runtimes/neurun/src/backend/interface/IStageGenerator.h +++ b/runtimes/neurun/core/include/backend/IStageGenerator.h @@ -20,8 +20,8 @@ #include #include -#include "backend/interface/ITensorBuilder.h" -#include "backend/interface/IStage.h" +#include "ITensorBuilder.h" +#include "IStage.h" #include "model/operation/NodeVisitor.h" #include "model/operation/Subgraph.h" #include "cpp14/memory.h" diff --git a/runtimes/neurun/src/backend/interface/ITensorBuilder.h b/runtimes/neurun/core/include/backend/ITensorBuilder.h similarity index 98% rename from runtimes/neurun/src/backend/interface/ITensorBuilder.h rename to runtimes/neurun/core/include/backend/ITensorBuilder.h index 354a270..2f7165f 100644 --- a/runtimes/neurun/src/backend/interface/ITensorBuilder.h +++ b/runtimes/neurun/core/include/backend/ITensorBuilder.h @@ -23,7 +23,7 @@ #include "operand/IObject.h" #include "compiler/SubTensorInfo.h" #include "compiler/TensorInfo.h" -#include "backend/interface/operand/ITensor.h" +#include "operand/ITensor.h" namespace neurun { diff --git a/runtimes/neurun/src/backend/StageSequence.h b/runtimes/neurun/core/include/backend/StageSequence.h similarity index 97% rename from runtimes/neurun/src/backend/StageSequence.h rename to runtimes/neurun/core/include/backend/StageSequence.h index 28c073d..63dad16 100644 --- a/runtimes/neurun/src/backend/StageSequence.h +++ b/runtimes/neurun/core/include/backend/StageSequence.h @@ -20,7 +20,7 @@ #include #include -#include "backend/interface/IStage.h" +#include "IStage.h" #include "backend/AtomicStage.h" #include "cpp14/memory.h" diff --git a/runtimes/neurun/src/backend/interface/operand/IObject.h b/runtimes/neurun/core/include/backend/operand/IObject.h similarity index 100% rename from runtimes/neurun/src/backend/interface/operand/IObject.h rename to runtimes/neurun/core/include/backend/operand/IObject.h diff --git a/runtimes/neurun/src/backend/interface/operand/ITensor.h b/runtimes/neurun/core/include/backend/operand/ITensor.h similarity index 100% rename from runtimes/neurun/src/backend/interface/operand/ITensor.h rename to runtimes/neurun/core/include/backend/operand/ITensor.h diff --git a/runtimes/neurun/src/compiler/Compiler.h b/runtimes/neurun/core/include/compiler/Compiler.h similarity index 100% rename from runtimes/neurun/src/compiler/Compiler.h rename to runtimes/neurun/core/include/compiler/Compiler.h diff --git a/runtimes/neurun/src/compiler/IExecutionBuilder.h b/runtimes/neurun/core/include/compiler/IExecutionBuilder.h similarity index 96% rename from runtimes/neurun/src/compiler/IExecutionBuilder.h rename to runtimes/neurun/core/include/compiler/IExecutionBuilder.h index 871ad72..c5a06fe 100644 --- a/runtimes/neurun/src/compiler/IExecutionBuilder.h +++ b/runtimes/neurun/core/include/compiler/IExecutionBuilder.h @@ -19,7 +19,7 @@ #include -#include "exec/interface/IFunction.h" +#include "exec/IFunction.h" namespace neurun { diff --git a/runtimes/neurun/src/compiler/SubTensorInfo.h b/runtimes/neurun/core/include/compiler/SubTensorInfo.h similarity index 100% rename from runtimes/neurun/src/compiler/SubTensorInfo.h rename to runtimes/neurun/core/include/compiler/SubTensorInfo.h diff --git a/runtimes/neurun/src/compiler/TensorInfo.h b/runtimes/neurun/core/include/compiler/TensorInfo.h similarity index 100% rename from runtimes/neurun/src/compiler/TensorInfo.h rename to runtimes/neurun/core/include/compiler/TensorInfo.h diff --git a/runtimes/neurun/src/exec/IExecutor.h b/runtimes/neurun/core/include/exec/IExecutor.h similarity index 100% rename from runtimes/neurun/src/exec/IExecutor.h rename to runtimes/neurun/core/include/exec/IExecutor.h diff --git a/runtimes/neurun/src/exec/interface/IFunction.h b/runtimes/neurun/core/include/exec/IFunction.h similarity index 100% rename from runtimes/neurun/src/exec/interface/IFunction.h rename to runtimes/neurun/core/include/exec/IFunction.h diff --git a/runtimes/neurun/src/graph/Graph.h b/runtimes/neurun/core/include/graph/Graph.h similarity index 100% rename from runtimes/neurun/src/graph/Graph.h rename to runtimes/neurun/core/include/graph/Graph.h diff --git a/runtimes/neurun/src/graph/Index.h b/runtimes/neurun/core/include/graph/Index.h similarity index 100% rename from runtimes/neurun/src/graph/Index.h rename to runtimes/neurun/core/include/graph/Index.h diff --git a/runtimes/neurun/src/graph/LowerInfoMap.h b/runtimes/neurun/core/include/graph/LowerInfoMap.h similarity index 100% rename from runtimes/neurun/src/graph/LowerInfoMap.h rename to runtimes/neurun/core/include/graph/LowerInfoMap.h diff --git a/runtimes/neurun/src/graph/operand/BackendSet.h b/runtimes/neurun/core/include/graph/operand/BackendSet.h similarity index 100% rename from runtimes/neurun/src/graph/operand/BackendSet.h rename to runtimes/neurun/core/include/graph/operand/BackendSet.h diff --git a/runtimes/neurun/src/graph/operand/Layout.h b/runtimes/neurun/core/include/graph/operand/Layout.h similarity index 100% rename from runtimes/neurun/src/graph/operand/Layout.h rename to runtimes/neurun/core/include/graph/operand/Layout.h diff --git a/runtimes/neurun/src/graph/operand/LowerInfo.h b/runtimes/neurun/core/include/graph/operand/LowerInfo.h similarity index 100% rename from runtimes/neurun/src/graph/operand/LowerInfo.h rename to runtimes/neurun/core/include/graph/operand/LowerInfo.h diff --git a/runtimes/neurun/src/graph/operand/ParentInfo.h b/runtimes/neurun/core/include/graph/operand/ParentInfo.h similarity index 100% rename from runtimes/neurun/src/graph/operand/ParentInfo.h rename to runtimes/neurun/core/include/graph/operand/ParentInfo.h diff --git a/runtimes/neurun/src/graph/operation/LowerInfo.h b/runtimes/neurun/core/include/graph/operation/LowerInfo.h similarity index 91% rename from runtimes/neurun/src/graph/operation/LowerInfo.h rename to runtimes/neurun/core/include/graph/operation/LowerInfo.h index e920b0e..17dfb51 100644 --- a/runtimes/neurun/src/graph/operation/LowerInfo.h +++ b/runtimes/neurun/core/include/graph/operation/LowerInfo.h @@ -19,7 +19,13 @@ #include -#include "backend/BackendManager.h" +namespace neurun +{ +namespace backend +{ +class Backend; +} // namespace backend +} // namespace neurun namespace neurun { diff --git a/runtimes/neurun/src/model/Model.h b/runtimes/neurun/core/include/model/Model.h similarity index 100% rename from runtimes/neurun/src/model/Model.h rename to runtimes/neurun/core/include/model/Model.h diff --git a/runtimes/neurun/src/model/operand/Data.h b/runtimes/neurun/core/include/model/operand/Data.h similarity index 100% rename from runtimes/neurun/src/model/operand/Data.h rename to runtimes/neurun/core/include/model/operand/Data.h diff --git a/runtimes/neurun/src/model/operand/DataType.h b/runtimes/neurun/core/include/model/operand/DataType.h similarity index 100% rename from runtimes/neurun/src/model/operand/DataType.h rename to runtimes/neurun/core/include/model/operand/DataType.h diff --git a/runtimes/neurun/src/model/operand/Index.h b/runtimes/neurun/core/include/model/operand/Index.h similarity index 100% rename from runtimes/neurun/src/model/operand/Index.h rename to runtimes/neurun/core/include/model/operand/Index.h diff --git a/runtimes/neurun/src/model/operand/IndexMap.h b/runtimes/neurun/core/include/model/operand/IndexMap.h similarity index 100% rename from runtimes/neurun/src/model/operand/IndexMap.h rename to runtimes/neurun/core/include/model/operand/IndexMap.h diff --git a/runtimes/neurun/src/model/operand/IndexSet.h b/runtimes/neurun/core/include/model/operand/IndexSet.h similarity index 100% rename from runtimes/neurun/src/model/operand/IndexSet.h rename to runtimes/neurun/core/include/model/operand/IndexSet.h diff --git a/runtimes/neurun/src/model/operand/Object.h b/runtimes/neurun/core/include/model/operand/Object.h similarity index 100% rename from runtimes/neurun/src/model/operand/Object.h rename to runtimes/neurun/core/include/model/operand/Object.h diff --git a/runtimes/neurun/src/model/operand/Set.h b/runtimes/neurun/core/include/model/operand/Set.h similarity index 100% rename from runtimes/neurun/src/model/operand/Set.h rename to runtimes/neurun/core/include/model/operand/Set.h diff --git a/runtimes/neurun/src/model/operand/Shape.h b/runtimes/neurun/core/include/model/operand/Shape.h similarity index 100% rename from runtimes/neurun/src/model/operand/Shape.h rename to runtimes/neurun/core/include/model/operand/Shape.h diff --git a/runtimes/neurun/src/model/operand/TypeInfo.h b/runtimes/neurun/core/include/model/operand/TypeInfo.h similarity index 100% rename from runtimes/neurun/src/model/operand/TypeInfo.h rename to runtimes/neurun/core/include/model/operand/TypeInfo.h diff --git a/runtimes/neurun/src/model/operation/AddNode.h b/runtimes/neurun/core/include/model/operation/AddNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/AddNode.h rename to runtimes/neurun/core/include/model/operation/AddNode.h diff --git a/runtimes/neurun/src/model/operation/AvgPool2DNode.h b/runtimes/neurun/core/include/model/operation/AvgPool2DNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/AvgPool2DNode.h rename to runtimes/neurun/core/include/model/operation/AvgPool2DNode.h diff --git a/runtimes/neurun/src/model/operation/CastNode.h b/runtimes/neurun/core/include/model/operation/CastNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/CastNode.h rename to runtimes/neurun/core/include/model/operation/CastNode.h diff --git a/runtimes/neurun/src/model/operation/ConcatNode.h b/runtimes/neurun/core/include/model/operation/ConcatNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/ConcatNode.h rename to runtimes/neurun/core/include/model/operation/ConcatNode.h diff --git a/runtimes/neurun/src/model/operation/Conv2DNode.h b/runtimes/neurun/core/include/model/operation/Conv2DNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/Conv2DNode.h rename to runtimes/neurun/core/include/model/operation/Conv2DNode.h diff --git a/runtimes/neurun/src/model/operation/DepthwiseConv2DNode.h b/runtimes/neurun/core/include/model/operation/DepthwiseConv2DNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/DepthwiseConv2DNode.h rename to runtimes/neurun/core/include/model/operation/DepthwiseConv2DNode.h diff --git a/runtimes/neurun/src/model/operation/DivNode.h b/runtimes/neurun/core/include/model/operation/DivNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/DivNode.h rename to runtimes/neurun/core/include/model/operation/DivNode.h diff --git a/runtimes/neurun/src/model/operation/EmbeddingLookupNode.h b/runtimes/neurun/core/include/model/operation/EmbeddingLookupNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/EmbeddingLookupNode.h rename to runtimes/neurun/core/include/model/operation/EmbeddingLookupNode.h diff --git a/runtimes/neurun/src/model/operation/ExpNode.h b/runtimes/neurun/core/include/model/operation/ExpNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/ExpNode.h rename to runtimes/neurun/core/include/model/operation/ExpNode.h diff --git a/runtimes/neurun/src/model/operation/FloorNode.h b/runtimes/neurun/core/include/model/operation/FloorNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/FloorNode.h rename to runtimes/neurun/core/include/model/operation/FloorNode.h diff --git a/runtimes/neurun/src/model/operation/FullyConnectedNode.h b/runtimes/neurun/core/include/model/operation/FullyConnectedNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/FullyConnectedNode.h rename to runtimes/neurun/core/include/model/operation/FullyConnectedNode.h diff --git a/runtimes/neurun/src/model/operation/HashtableLookupNode.h b/runtimes/neurun/core/include/model/operation/HashtableLookupNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/HashtableLookupNode.h rename to runtimes/neurun/core/include/model/operation/HashtableLookupNode.h diff --git a/runtimes/neurun/src/model/operation/Index.h b/runtimes/neurun/core/include/model/operation/Index.h similarity index 100% rename from runtimes/neurun/src/model/operation/Index.h rename to runtimes/neurun/core/include/model/operation/Index.h diff --git a/runtimes/neurun/src/model/operation/IndexList.h b/runtimes/neurun/core/include/model/operation/IndexList.h similarity index 100% rename from runtimes/neurun/src/model/operation/IndexList.h rename to runtimes/neurun/core/include/model/operation/IndexList.h diff --git a/runtimes/neurun/src/model/operation/L2NormalizationNode.h b/runtimes/neurun/core/include/model/operation/L2NormalizationNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/L2NormalizationNode.h rename to runtimes/neurun/core/include/model/operation/L2NormalizationNode.h diff --git a/runtimes/neurun/src/model/operation/L2Pool2DNode.h b/runtimes/neurun/core/include/model/operation/L2Pool2DNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/L2Pool2DNode.h rename to runtimes/neurun/core/include/model/operation/L2Pool2DNode.h diff --git a/runtimes/neurun/src/model/operation/LogicalAndNode.h b/runtimes/neurun/core/include/model/operation/LogicalAndNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/LogicalAndNode.h rename to runtimes/neurun/core/include/model/operation/LogicalAndNode.h diff --git a/runtimes/neurun/src/model/operation/LogisticNode.h b/runtimes/neurun/core/include/model/operation/LogisticNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/LogisticNode.h rename to runtimes/neurun/core/include/model/operation/LogisticNode.h diff --git a/runtimes/neurun/src/model/operation/MaxPool2DNode.h b/runtimes/neurun/core/include/model/operation/MaxPool2DNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/MaxPool2DNode.h rename to runtimes/neurun/core/include/model/operation/MaxPool2DNode.h diff --git a/runtimes/neurun/src/model/operation/MulNode.h b/runtimes/neurun/core/include/model/operation/MulNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/MulNode.h rename to runtimes/neurun/core/include/model/operation/MulNode.h diff --git a/runtimes/neurun/src/model/operation/Node.Include.h b/runtimes/neurun/core/include/model/operation/Node.Include.h similarity index 100% rename from runtimes/neurun/src/model/operation/Node.Include.h rename to runtimes/neurun/core/include/model/operation/Node.Include.h diff --git a/runtimes/neurun/src/model/operation/Node.h b/runtimes/neurun/core/include/model/operation/Node.h similarity index 100% rename from runtimes/neurun/src/model/operation/Node.h rename to runtimes/neurun/core/include/model/operation/Node.h diff --git a/runtimes/neurun/src/model/operation/NodeVisitor.h b/runtimes/neurun/core/include/model/operation/NodeVisitor.h similarity index 100% rename from runtimes/neurun/src/model/operation/NodeVisitor.h rename to runtimes/neurun/core/include/model/operation/NodeVisitor.h diff --git a/runtimes/neurun/src/model/operation/NotEqualNode.h b/runtimes/neurun/core/include/model/operation/NotEqualNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/NotEqualNode.h rename to runtimes/neurun/core/include/model/operation/NotEqualNode.h diff --git a/runtimes/neurun/src/model/operation/Op.lst b/runtimes/neurun/core/include/model/operation/Op.lst similarity index 100% rename from runtimes/neurun/src/model/operation/Op.lst rename to runtimes/neurun/core/include/model/operation/Op.lst diff --git a/runtimes/neurun/src/model/operation/OperandConstraint.h b/runtimes/neurun/core/include/model/operation/OperandConstraint.h similarity index 100% rename from runtimes/neurun/src/model/operation/OperandConstraint.h rename to runtimes/neurun/core/include/model/operation/OperandConstraint.h diff --git a/runtimes/neurun/src/model/operation/PReLUNode.h b/runtimes/neurun/core/include/model/operation/PReLUNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/PReLUNode.h rename to runtimes/neurun/core/include/model/operation/PReLUNode.h diff --git a/runtimes/neurun/src/model/operation/PermuteNode.h b/runtimes/neurun/core/include/model/operation/PermuteNode.h similarity index 94% rename from runtimes/neurun/src/model/operation/PermuteNode.h rename to runtimes/neurun/core/include/model/operation/PermuteNode.h index 63fc0ea..dffd2c1 100644 --- a/runtimes/neurun/src/model/operation/PermuteNode.h +++ b/runtimes/neurun/core/include/model/operation/PermuteNode.h @@ -19,7 +19,13 @@ #include "model/operation/Node.h" -#include "backend/BackendManager.h" +namespace neurun +{ +namespace backend +{ +class Backend; +} // namespace backend +} // namespace neurun namespace neurun { diff --git a/runtimes/neurun/src/model/operation/RSQRTNode.h b/runtimes/neurun/core/include/model/operation/RSQRTNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/RSQRTNode.h rename to runtimes/neurun/core/include/model/operation/RSQRTNode.h diff --git a/runtimes/neurun/src/model/operation/ReLU1Node.h b/runtimes/neurun/core/include/model/operation/ReLU1Node.h similarity index 100% rename from runtimes/neurun/src/model/operation/ReLU1Node.h rename to runtimes/neurun/core/include/model/operation/ReLU1Node.h diff --git a/runtimes/neurun/src/model/operation/ReLU6Node.h b/runtimes/neurun/core/include/model/operation/ReLU6Node.h similarity index 100% rename from runtimes/neurun/src/model/operation/ReLU6Node.h rename to runtimes/neurun/core/include/model/operation/ReLU6Node.h diff --git a/runtimes/neurun/src/model/operation/ReLUNode.h b/runtimes/neurun/core/include/model/operation/ReLUNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/ReLUNode.h rename to runtimes/neurun/core/include/model/operation/ReLUNode.h diff --git a/runtimes/neurun/src/model/operation/ReduceMaxNode.h b/runtimes/neurun/core/include/model/operation/ReduceMaxNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/ReduceMaxNode.h rename to runtimes/neurun/core/include/model/operation/ReduceMaxNode.h diff --git a/runtimes/neurun/src/model/operation/ReduceSumNode.h b/runtimes/neurun/core/include/model/operation/ReduceSumNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/ReduceSumNode.h rename to runtimes/neurun/core/include/model/operation/ReduceSumNode.h diff --git a/runtimes/neurun/src/model/operation/ReshapeNode.h b/runtimes/neurun/core/include/model/operation/ReshapeNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/ReshapeNode.h rename to runtimes/neurun/core/include/model/operation/ReshapeNode.h diff --git a/runtimes/neurun/src/model/operation/ResizeBilinearNode.h b/runtimes/neurun/core/include/model/operation/ResizeBilinearNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/ResizeBilinearNode.h rename to runtimes/neurun/core/include/model/operation/ResizeBilinearNode.h diff --git a/runtimes/neurun/src/model/operation/SQRTNode.h b/runtimes/neurun/core/include/model/operation/SQRTNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/SQRTNode.h rename to runtimes/neurun/core/include/model/operation/SQRTNode.h diff --git a/runtimes/neurun/src/model/operation/Set.h b/runtimes/neurun/core/include/model/operation/Set.h similarity index 100% rename from runtimes/neurun/src/model/operation/Set.h rename to runtimes/neurun/core/include/model/operation/Set.h diff --git a/runtimes/neurun/src/model/operation/SoftmaxNode.h b/runtimes/neurun/core/include/model/operation/SoftmaxNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/SoftmaxNode.h rename to runtimes/neurun/core/include/model/operation/SoftmaxNode.h diff --git a/runtimes/neurun/src/model/operation/SpaceToDepthNode.h b/runtimes/neurun/core/include/model/operation/SpaceToDepthNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/SpaceToDepthNode.h rename to runtimes/neurun/core/include/model/operation/SpaceToDepthNode.h diff --git a/runtimes/neurun/src/model/operation/SqueezeNode.h b/runtimes/neurun/core/include/model/operation/SqueezeNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/SqueezeNode.h rename to runtimes/neurun/core/include/model/operation/SqueezeNode.h diff --git a/runtimes/neurun/src/model/operation/StridedSliceNode.h b/runtimes/neurun/core/include/model/operation/StridedSliceNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/StridedSliceNode.h rename to runtimes/neurun/core/include/model/operation/StridedSliceNode.h diff --git a/runtimes/neurun/src/model/operation/SubNode.h b/runtimes/neurun/core/include/model/operation/SubNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/SubNode.h rename to runtimes/neurun/core/include/model/operation/SubNode.h diff --git a/runtimes/neurun/src/model/operation/Subgraph.h b/runtimes/neurun/core/include/model/operation/Subgraph.h similarity index 100% rename from runtimes/neurun/src/model/operation/Subgraph.h rename to runtimes/neurun/core/include/model/operation/Subgraph.h diff --git a/runtimes/neurun/src/model/operation/TanhNode.h b/runtimes/neurun/core/include/model/operation/TanhNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/TanhNode.h rename to runtimes/neurun/core/include/model/operation/TanhNode.h diff --git a/runtimes/neurun/src/model/operation/TransposeConvNode.h b/runtimes/neurun/core/include/model/operation/TransposeConvNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/TransposeConvNode.h rename to runtimes/neurun/core/include/model/operation/TransposeConvNode.h diff --git a/runtimes/neurun/src/model/operation/TransposeNode.h b/runtimes/neurun/core/include/model/operation/TransposeNode.h similarity index 100% rename from runtimes/neurun/src/model/operation/TransposeNode.h rename to runtimes/neurun/core/include/model/operation/TransposeNode.h diff --git a/runtimes/neurun/src/util/NNAPIConvert.h b/runtimes/neurun/core/include/util/NNAPIConvert.h similarity index 100% rename from runtimes/neurun/src/util/NNAPIConvert.h rename to runtimes/neurun/core/include/util/NNAPIConvert.h diff --git a/runtimes/neurun/src/util/Padding.h b/runtimes/neurun/core/include/util/Padding.h similarity index 100% rename from runtimes/neurun/src/util/Padding.h rename to runtimes/neurun/core/include/util/Padding.h diff --git a/runtimes/neurun/src/util/Utils.h b/runtimes/neurun/core/include/util/Utils.h similarity index 100% rename from runtimes/neurun/src/util/Utils.h rename to runtimes/neurun/core/include/util/Utils.h diff --git a/runtimes/neurun/src/util/config/Config.lst b/runtimes/neurun/core/include/util/config/Config.lst similarity index 100% rename from runtimes/neurun/src/util/config/Config.lst rename to runtimes/neurun/core/include/util/config/Config.lst diff --git a/runtimes/neurun/src/util/config/ConfigManager.h b/runtimes/neurun/core/include/util/config/ConfigManager.h similarity index 100% rename from runtimes/neurun/src/util/config/ConfigManager.h rename to runtimes/neurun/core/include/util/config/ConfigManager.h diff --git a/runtimes/neurun/src/util/feature/Coordinate4D.h b/runtimes/neurun/core/include/util/feature/Coordinate4D.h similarity index 100% rename from runtimes/neurun/src/util/feature/Coordinate4D.h rename to runtimes/neurun/core/include/util/feature/Coordinate4D.h diff --git a/runtimes/neurun/src/util/feature/nchw/View.h b/runtimes/neurun/core/include/util/feature/nchw/View.h similarity index 98% rename from runtimes/neurun/src/util/feature/nchw/View.h rename to runtimes/neurun/core/include/util/feature/nchw/View.h index 048fdec..9ff79c5 100644 --- a/runtimes/neurun/src/util/feature/nchw/View.h +++ b/runtimes/neurun/core/include/util/feature/nchw/View.h @@ -20,7 +20,7 @@ #include "misc/feature/Reader.h" #include "misc/feature/Shape.h" -#include "backend/interface/operand/ITensor.h" +#include "backend/operand/ITensor.h" #include "util/feature/Coordinate4D.h" #include diff --git a/runtimes/neurun/src/util/feature/nhwc/Reader.h b/runtimes/neurun/core/include/util/feature/nhwc/Reader.h similarity index 100% rename from runtimes/neurun/src/util/feature/nhwc/Reader.h rename to runtimes/neurun/core/include/util/feature/nhwc/Reader.h diff --git a/runtimes/neurun/src/util/feature/nhwc/Utils.h b/runtimes/neurun/core/include/util/feature/nhwc/Utils.h similarity index 100% rename from runtimes/neurun/src/util/feature/nhwc/Utils.h rename to runtimes/neurun/core/include/util/feature/nhwc/Utils.h diff --git a/runtimes/neurun/src/util/feature/nhwc/View.h b/runtimes/neurun/core/include/util/feature/nhwc/View.h similarity index 100% rename from runtimes/neurun/src/util/feature/nhwc/View.h rename to runtimes/neurun/core/include/util/feature/nhwc/View.h diff --git a/runtimes/neurun/src/util/logging.h b/runtimes/neurun/core/include/util/logging.h similarity index 100% rename from runtimes/neurun/src/util/logging.h rename to runtimes/neurun/core/include/util/logging.h diff --git a/runtimes/neurun/src/backend/Backend.cc b/runtimes/neurun/core/src/backend/Backend.cc similarity index 89% rename from runtimes/neurun/src/backend/Backend.cc rename to runtimes/neurun/core/src/backend/Backend.cc index 52f3314..fbc85e4 100644 --- a/runtimes/neurun/src/backend/Backend.cc +++ b/runtimes/neurun/core/src/backend/Backend.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "Backend.h" +#include "backend/Backend.h" -#include "backend/interface/IConfig.h" -#include "backend/interface/ITensorBuilder.h" -#include "backend/interface/IStageGenerator.h" +#include "backend/IConfig.h" +#include "backend/ITensorBuilder.h" +#include "backend/IStageGenerator.h" namespace neurun { diff --git a/runtimes/neurun/src/backend/BackendManager.cc b/runtimes/neurun/core/src/backend/BackendManager.cc similarity index 96% rename from runtimes/neurun/src/backend/BackendManager.cc rename to runtimes/neurun/core/src/backend/BackendManager.cc index e2d6343..b263250 100644 --- a/runtimes/neurun/src/backend/BackendManager.cc +++ b/runtimes/neurun/core/src/backend/BackendManager.cc @@ -17,9 +17,9 @@ #include #include "BackendManager.h" -#include "backend/interface/IConfig.h" -#include "backend/interface/ITensorBuilder.h" -#include "backend/interface/IStageGenerator.h" +#include "backend/IConfig.h" +#include "backend/ITensorBuilder.h" +#include "backend/IStageGenerator.h" #include "util/logging.h" #include "util/config/ConfigManager.h" diff --git a/runtimes/neurun/src/backend/BackendManager.h b/runtimes/neurun/core/src/backend/BackendManager.h similarity index 98% rename from runtimes/neurun/src/backend/BackendManager.h rename to runtimes/neurun/core/src/backend/BackendManager.h index 66cf6be..2ef8ed6 100644 --- a/runtimes/neurun/src/backend/BackendManager.h +++ b/runtimes/neurun/core/src/backend/BackendManager.h @@ -21,7 +21,7 @@ #include #include "model/operand/Set.h" -#include "Backend.h" +#include "backend/Backend.h" namespace neurun { diff --git a/runtimes/neurun/src/compiler/BackendResolver.cc b/runtimes/neurun/core/src/compiler/BackendResolver.cc similarity index 100% rename from runtimes/neurun/src/compiler/BackendResolver.cc rename to runtimes/neurun/core/src/compiler/BackendResolver.cc diff --git a/runtimes/neurun/src/compiler/BackendResolver.h b/runtimes/neurun/core/src/compiler/BackendResolver.h similarity index 98% rename from runtimes/neurun/src/compiler/BackendResolver.h rename to runtimes/neurun/core/src/compiler/BackendResolver.h index da5d24b..53b2f59 100644 --- a/runtimes/neurun/src/compiler/BackendResolver.h +++ b/runtimes/neurun/core/src/compiler/BackendResolver.h @@ -24,7 +24,7 @@ #include "util/logging.h" #include "util/config/ConfigManager.h" #include "backend/BackendManager.h" -#include "backend/interface/IStageGenerator.h" +#include "backend/IStageGenerator.h" namespace neurun { diff --git a/runtimes/neurun/src/compiler/Compiler.cc b/runtimes/neurun/core/src/compiler/Compiler.cc similarity index 99% rename from runtimes/neurun/src/compiler/Compiler.cc rename to runtimes/neurun/core/src/compiler/Compiler.cc index f2c8a15..a951cb9 100644 --- a/runtimes/neurun/src/compiler/Compiler.cc +++ b/runtimes/neurun/core/src/compiler/Compiler.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "Compiler.h" +#include "compiler/Compiler.h" #include "OperationValidator.h" #include "SubTensorAnalyzer.h" @@ -114,7 +114,7 @@ void Compiler::compile(void) // TODO Extract this to another class // IExecutionBuilder should be moved to `compiler/IExecutionBuilder.h` from - // `backend/interface/IStageGenerator.h`. + // `backend/IStageGenerator.h`. class ExecutionBuilder : public IExecutionBuilder { public: diff --git a/runtimes/neurun/src/compiler/ConstantInitializer.cc b/runtimes/neurun/core/src/compiler/ConstantInitializer.cc similarity index 98% rename from runtimes/neurun/src/compiler/ConstantInitializer.cc rename to runtimes/neurun/core/src/compiler/ConstantInitializer.cc index bdc9f23..a2a6f18 100644 --- a/runtimes/neurun/src/compiler/ConstantInitializer.cc +++ b/runtimes/neurun/core/src/compiler/ConstantInitializer.cc @@ -16,8 +16,8 @@ #include "ConstantInitializer.h" -#include "backend/interface/operand/IObject.h" -#include "backend/interface/IConfig.h" +#include "backend/operand/IObject.h" +#include "backend/IConfig.h" #include "backend/BackendManager.h" #include "model/operation/FullyConnectedNode.h" #include "util/feature/nhwc/Reader.h" diff --git a/runtimes/neurun/src/compiler/ConstantInitializer.h b/runtimes/neurun/core/src/compiler/ConstantInitializer.h similarity index 100% rename from runtimes/neurun/src/compiler/ConstantInitializer.h rename to runtimes/neurun/core/src/compiler/ConstantInitializer.h diff --git a/runtimes/neurun/src/compiler/OperandContext.cc b/runtimes/neurun/core/src/compiler/OperandContext.cc similarity index 100% rename from runtimes/neurun/src/compiler/OperandContext.cc rename to runtimes/neurun/core/src/compiler/OperandContext.cc diff --git a/runtimes/neurun/src/compiler/OperandContext.h b/runtimes/neurun/core/src/compiler/OperandContext.h similarity index 97% rename from runtimes/neurun/src/compiler/OperandContext.h rename to runtimes/neurun/core/src/compiler/OperandContext.h index 3061228..b54b3d4 100644 --- a/runtimes/neurun/src/compiler/OperandContext.h +++ b/runtimes/neurun/core/src/compiler/OperandContext.h @@ -17,7 +17,7 @@ #ifndef __NEURUN_COMPILER_OPERAND_CONTEXT_H__ #define __NEURUN_COMPILER_OPERAND_CONTEXT_H__ -#include "backend/interface/operand/IObject.h" +#include "backend/operand/IObject.h" #include "model/operand/IndexMap.h" #include #include diff --git a/runtimes/neurun/src/compiler/OperationValidator.cc b/runtimes/neurun/core/src/compiler/OperationValidator.cc similarity index 100% rename from runtimes/neurun/src/compiler/OperationValidator.cc rename to runtimes/neurun/core/src/compiler/OperationValidator.cc diff --git a/runtimes/neurun/src/compiler/OperationValidator.h b/runtimes/neurun/core/src/compiler/OperationValidator.h similarity index 100% rename from runtimes/neurun/src/compiler/OperationValidator.h rename to runtimes/neurun/core/src/compiler/OperationValidator.h diff --git a/runtimes/neurun/src/compiler/Plan.cc b/runtimes/neurun/core/src/compiler/Plan.cc similarity index 100% rename from runtimes/neurun/src/compiler/Plan.cc rename to runtimes/neurun/core/src/compiler/Plan.cc diff --git a/runtimes/neurun/src/compiler/Plan.h b/runtimes/neurun/core/src/compiler/Plan.h similarity index 100% rename from runtimes/neurun/src/compiler/Plan.h rename to runtimes/neurun/core/src/compiler/Plan.h diff --git a/runtimes/neurun/src/compiler/PlanBuilder.cc b/runtimes/neurun/core/src/compiler/PlanBuilder.cc similarity index 97% rename from runtimes/neurun/src/compiler/PlanBuilder.cc rename to runtimes/neurun/core/src/compiler/PlanBuilder.cc index da35bb0..feb012a 100644 --- a/runtimes/neurun/src/compiler/PlanBuilder.cc +++ b/runtimes/neurun/core/src/compiler/PlanBuilder.cc @@ -16,7 +16,7 @@ #include "PlanBuilder.h" -#include "backend/interface/operand/IObject.h" +#include "backend/operand/IObject.h" namespace neurun { diff --git a/runtimes/neurun/src/compiler/PlanBuilder.h b/runtimes/neurun/core/src/compiler/PlanBuilder.h similarity index 93% rename from runtimes/neurun/src/compiler/PlanBuilder.h rename to runtimes/neurun/core/src/compiler/PlanBuilder.h index 88608d5..58fde49 100644 --- a/runtimes/neurun/src/compiler/PlanBuilder.h +++ b/runtimes/neurun/core/src/compiler/PlanBuilder.h @@ -20,9 +20,9 @@ #include "compiler/OperandContext.h" #include "compiler/operation/Sequence.h" #include "compiler/IExecutionBuilder.h" -#include "backend/interface/IStageGenerator.h" -#include "backend/interface/ITensorBuilder.h" -#include "backend/interface/IStage.h" +#include "backend/IStageGenerator.h" +#include "backend/ITensorBuilder.h" +#include "backend/IStage.h" namespace neurun { diff --git a/runtimes/neurun/src/compiler/SubTensorAnalyzer.cc b/runtimes/neurun/core/src/compiler/SubTensorAnalyzer.cc similarity index 100% rename from runtimes/neurun/src/compiler/SubTensorAnalyzer.cc rename to runtimes/neurun/core/src/compiler/SubTensorAnalyzer.cc diff --git a/runtimes/neurun/src/compiler/SubTensorAnalyzer.h b/runtimes/neurun/core/src/compiler/SubTensorAnalyzer.h similarity index 100% rename from runtimes/neurun/src/compiler/SubTensorAnalyzer.h rename to runtimes/neurun/core/src/compiler/SubTensorAnalyzer.h diff --git a/runtimes/neurun/src/compiler/operation/Sequence.cc b/runtimes/neurun/core/src/compiler/operation/Sequence.cc similarity index 100% rename from runtimes/neurun/src/compiler/operation/Sequence.cc rename to runtimes/neurun/core/src/compiler/operation/Sequence.cc diff --git a/runtimes/neurun/src/compiler/operation/Sequence.h b/runtimes/neurun/core/src/compiler/operation/Sequence.h similarity index 97% rename from runtimes/neurun/src/compiler/operation/Sequence.h rename to runtimes/neurun/core/src/compiler/operation/Sequence.h index d69cfcf..c3ced26 100644 --- a/runtimes/neurun/src/compiler/operation/Sequence.h +++ b/runtimes/neurun/core/src/compiler/operation/Sequence.h @@ -17,7 +17,7 @@ #ifndef __NEURUN_COMPILER_OPERATION_SEQUENCE_H__ #define __NEURUN_COMPILER_OPERATION_SEQUENCE_H__ #include -#include "exec/interface/IFunction.h" +#include "exec/IFunction.h" #include #include diff --git a/runtimes/neurun/src/dumper/dot/DotBuilder.cc b/runtimes/neurun/core/src/dumper/dot/DotBuilder.cc similarity index 100% rename from runtimes/neurun/src/dumper/dot/DotBuilder.cc rename to runtimes/neurun/core/src/dumper/dot/DotBuilder.cc diff --git a/runtimes/neurun/src/dumper/dot/DotBuilder.h b/runtimes/neurun/core/src/dumper/dot/DotBuilder.h similarity index 100% rename from runtimes/neurun/src/dumper/dot/DotBuilder.h rename to runtimes/neurun/core/src/dumper/dot/DotBuilder.h diff --git a/runtimes/neurun/src/dumper/dot/DotDumper.cc b/runtimes/neurun/core/src/dumper/dot/DotDumper.cc similarity index 100% rename from runtimes/neurun/src/dumper/dot/DotDumper.cc rename to runtimes/neurun/core/src/dumper/dot/DotDumper.cc diff --git a/runtimes/neurun/src/dumper/dot/DotDumper.h b/runtimes/neurun/core/src/dumper/dot/DotDumper.h similarity index 100% rename from runtimes/neurun/src/dumper/dot/DotDumper.h rename to runtimes/neurun/core/src/dumper/dot/DotDumper.h diff --git a/runtimes/neurun/src/dumper/dot/DotNodeInfo.cc b/runtimes/neurun/core/src/dumper/dot/DotNodeInfo.cc similarity index 97% rename from runtimes/neurun/src/dumper/dot/DotNodeInfo.cc rename to runtimes/neurun/core/src/dumper/dot/DotNodeInfo.cc index aefe12e..169c769 100644 --- a/runtimes/neurun/src/dumper/dot/DotNodeInfo.cc +++ b/runtimes/neurun/core/src/dumper/dot/DotNodeInfo.cc @@ -19,7 +19,8 @@ #include "DotNodeInfo.h" #include "graph/Graph.h" #include "graph/operation/LowerInfo.h" -#include "backend/interface/IConfig.h" +#include "backend/IConfig.h" +#include "backend/Backend.h" namespace neurun { diff --git a/runtimes/neurun/src/dumper/dot/DotNodeInfo.h b/runtimes/neurun/core/src/dumper/dot/DotNodeInfo.h similarity index 100% rename from runtimes/neurun/src/dumper/dot/DotNodeInfo.h rename to runtimes/neurun/core/src/dumper/dot/DotNodeInfo.h diff --git a/runtimes/neurun/src/dumper/dot/DotOperandInfo.cc b/runtimes/neurun/core/src/dumper/dot/DotOperandInfo.cc similarity index 98% rename from runtimes/neurun/src/dumper/dot/DotOperandInfo.cc rename to runtimes/neurun/core/src/dumper/dot/DotOperandInfo.cc index 5c49b8c..c67c38c 100644 --- a/runtimes/neurun/src/dumper/dot/DotOperandInfo.cc +++ b/runtimes/neurun/core/src/dumper/dot/DotOperandInfo.cc @@ -19,7 +19,7 @@ #include "DotOperandInfo.h" #include "graph/Graph.h" #include "graph/operand/LowerInfo.h" -#include "backend/interface/IConfig.h" +#include "backend/IConfig.h" #include "backend/BackendManager.h" namespace neurun diff --git a/runtimes/neurun/src/dumper/dot/DotOperandInfo.h b/runtimes/neurun/core/src/dumper/dot/DotOperandInfo.h similarity index 100% rename from runtimes/neurun/src/dumper/dot/DotOperandInfo.h rename to runtimes/neurun/core/src/dumper/dot/DotOperandInfo.h diff --git a/runtimes/neurun/src/dumper/dot/IDotInfo.h b/runtimes/neurun/core/src/dumper/dot/IDotInfo.h similarity index 100% rename from runtimes/neurun/src/dumper/dot/IDotInfo.h rename to runtimes/neurun/core/src/dumper/dot/IDotInfo.h diff --git a/runtimes/neurun/src/exec/DataflowExecutor.cc b/runtimes/neurun/core/src/exec/DataflowExecutor.cc similarity index 100% rename from runtimes/neurun/src/exec/DataflowExecutor.cc rename to runtimes/neurun/core/src/exec/DataflowExecutor.cc diff --git a/runtimes/neurun/src/exec/DataflowExecutor.h b/runtimes/neurun/core/src/exec/DataflowExecutor.h similarity index 100% rename from runtimes/neurun/src/exec/DataflowExecutor.h rename to runtimes/neurun/core/src/exec/DataflowExecutor.h diff --git a/runtimes/neurun/src/exec/Executor.cc b/runtimes/neurun/core/src/exec/Executor.cc similarity index 95% rename from runtimes/neurun/src/exec/Executor.cc rename to runtimes/neurun/core/src/exec/Executor.cc index 8fbbd2f..8e6f319 100644 --- a/runtimes/neurun/src/exec/Executor.cc +++ b/runtimes/neurun/core/src/exec/Executor.cc @@ -17,8 +17,8 @@ #include "Executor.h" #include "backend/BackendManager.h" -#include "backend/interface/IConfig.h" -#include "backend/interface/operand/ITensor.h" +#include "backend/IConfig.h" +#include "backend/operand/ITensor.h" #include "graph/operand/LowerInfo.h" namespace neurun diff --git a/runtimes/neurun/src/exec/Executor.h b/runtimes/neurun/core/src/exec/Executor.h similarity index 100% rename from runtimes/neurun/src/exec/Executor.h rename to runtimes/neurun/core/src/exec/Executor.h diff --git a/runtimes/neurun/src/exec/ExecutorBase.cc b/runtimes/neurun/core/src/exec/ExecutorBase.cc similarity index 100% rename from runtimes/neurun/src/exec/ExecutorBase.cc rename to runtimes/neurun/core/src/exec/ExecutorBase.cc diff --git a/runtimes/neurun/src/exec/ExecutorBase.h b/runtimes/neurun/core/src/exec/ExecutorBase.h similarity index 98% rename from runtimes/neurun/src/exec/ExecutorBase.h rename to runtimes/neurun/core/src/exec/ExecutorBase.h index e8d4bec..50cf492 100644 --- a/runtimes/neurun/src/exec/ExecutorBase.h +++ b/runtimes/neurun/core/src/exec/ExecutorBase.h @@ -19,12 +19,13 @@ #include "Source.h" #include "Sink.h" -#include "IExecutor.h" +#include "exec/IExecutor.h" #include "model/Model.h" #include "graph/LowerInfoMap.h" -#include "backend/interface/IConfig.h" +#include "backend/IConfig.h" #include "compiler/TensorInfo.h" #include "model/operation/Subgraph.h" +#include "backend/Backend.h" namespace neurun { diff --git a/runtimes/neurun/src/exec/FunctionSequence.cc b/runtimes/neurun/core/src/exec/FunctionSequence.cc similarity index 100% rename from runtimes/neurun/src/exec/FunctionSequence.cc rename to runtimes/neurun/core/src/exec/FunctionSequence.cc diff --git a/runtimes/neurun/src/exec/FunctionSequence.h b/runtimes/neurun/core/src/exec/FunctionSequence.h similarity index 97% rename from runtimes/neurun/src/exec/FunctionSequence.h rename to runtimes/neurun/core/src/exec/FunctionSequence.h index 464d105..8976c43 100644 --- a/runtimes/neurun/src/exec/FunctionSequence.h +++ b/runtimes/neurun/core/src/exec/FunctionSequence.h @@ -20,7 +20,7 @@ #include #include -#include "exec/interface/IFunction.h" +#include "exec/IFunction.h" namespace neurun { diff --git a/runtimes/neurun/src/exec/Job.cc b/runtimes/neurun/core/src/exec/Job.cc similarity index 100% rename from runtimes/neurun/src/exec/Job.cc rename to runtimes/neurun/core/src/exec/Job.cc diff --git a/runtimes/neurun/src/exec/Job.h b/runtimes/neurun/core/src/exec/Job.h similarity index 98% rename from runtimes/neurun/src/exec/Job.h rename to runtimes/neurun/core/src/exec/Job.h index e3964e2..85178dd 100644 --- a/runtimes/neurun/src/exec/Job.h +++ b/runtimes/neurun/core/src/exec/Job.h @@ -19,7 +19,7 @@ #include -#include "interface/IFunction.h" +#include "exec/IFunction.h" #include "model/operation/Index.h" #include "model/operand/IndexSet.h" diff --git a/runtimes/neurun/src/exec/Sink.h b/runtimes/neurun/core/src/exec/Sink.h similarity index 100% rename from runtimes/neurun/src/exec/Sink.h rename to runtimes/neurun/core/src/exec/Sink.h diff --git a/runtimes/neurun/src/exec/Source.h b/runtimes/neurun/core/src/exec/Source.h similarity index 100% rename from runtimes/neurun/src/exec/Source.h rename to runtimes/neurun/core/src/exec/Source.h diff --git a/runtimes/neurun/src/exec/interp/ExecManager.cc b/runtimes/neurun/core/src/exec/interp/ExecManager.cc similarity index 100% rename from runtimes/neurun/src/exec/interp/ExecManager.cc rename to runtimes/neurun/core/src/exec/interp/ExecManager.cc diff --git a/runtimes/neurun/src/exec/interp/ExecManager.h b/runtimes/neurun/core/src/exec/interp/ExecManager.h similarity index 100% rename from runtimes/neurun/src/exec/interp/ExecManager.h rename to runtimes/neurun/core/src/exec/interp/ExecManager.h diff --git a/runtimes/neurun/src/graph/Graph.cc b/runtimes/neurun/core/src/graph/Graph.cc similarity index 99% rename from runtimes/neurun/src/graph/Graph.cc rename to runtimes/neurun/core/src/graph/Graph.cc index c435f4f..ae2f803 100644 --- a/runtimes/neurun/src/graph/Graph.cc +++ b/runtimes/neurun/core/src/graph/Graph.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "Graph.h" +#include "graph/Graph.h" #include #include @@ -23,11 +23,11 @@ #include "verifier/Verifier.h" #include "cpp14/memory.h" #include "linear/Linear.h" -#include "operation/LowerInfo.h" -#include "operand/LowerInfo.h" +#include "graph/operation/LowerInfo.h" +#include "graph/operand/LowerInfo.h" #include "operand/Shape4DConvert.h" #include "compiler/BackendResolver.h" -#include "backend/interface/IConfig.h" +#include "backend/IConfig.h" #include "pass/PermutationInsertionPass.h" #include "pass/PermutationEliminationPass.h" diff --git a/runtimes/neurun/src/graph/dumper/Dumper.cc b/runtimes/neurun/core/src/graph/dumper/Dumper.cc similarity index 100% rename from runtimes/neurun/src/graph/dumper/Dumper.cc rename to runtimes/neurun/core/src/graph/dumper/Dumper.cc diff --git a/runtimes/neurun/src/graph/dumper/Dumper.h b/runtimes/neurun/core/src/graph/dumper/Dumper.h similarity index 100% rename from runtimes/neurun/src/graph/dumper/Dumper.h rename to runtimes/neurun/core/src/graph/dumper/Dumper.h diff --git a/runtimes/neurun/src/graph/operand/BackendSet.cc b/runtimes/neurun/core/src/graph/operand/BackendSet.cc similarity index 97% rename from runtimes/neurun/src/graph/operand/BackendSet.cc rename to runtimes/neurun/core/src/graph/operand/BackendSet.cc index 9a284d7..8066b61 100644 --- a/runtimes/neurun/src/graph/operand/BackendSet.cc +++ b/runtimes/neurun/core/src/graph/operand/BackendSet.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "BackendSet.h" +#include "graph/operand/BackendSet.h" #include diff --git a/runtimes/neurun/src/graph/operand/LayoutSet.cc b/runtimes/neurun/core/src/graph/operand/LayoutSet.cc similarity index 100% rename from runtimes/neurun/src/graph/operand/LayoutSet.cc rename to runtimes/neurun/core/src/graph/operand/LayoutSet.cc diff --git a/runtimes/neurun/src/graph/operand/LayoutSet.h b/runtimes/neurun/core/src/graph/operand/LayoutSet.h similarity index 98% rename from runtimes/neurun/src/graph/operand/LayoutSet.h rename to runtimes/neurun/core/src/graph/operand/LayoutSet.h index 928259c..1cc2b10 100644 --- a/runtimes/neurun/src/graph/operand/LayoutSet.h +++ b/runtimes/neurun/core/src/graph/operand/LayoutSet.h @@ -20,7 +20,7 @@ #include #include -#include "Layout.h" +#include "graph/operand/Layout.h" namespace neurun { diff --git a/runtimes/neurun/src/graph/operand/LowerInfo.cc b/runtimes/neurun/core/src/graph/operand/LowerInfo.cc similarity index 95% rename from runtimes/neurun/src/graph/operand/LowerInfo.cc rename to runtimes/neurun/core/src/graph/operand/LowerInfo.cc index c269659..e8a4fe5 100644 --- a/runtimes/neurun/src/graph/operand/LowerInfo.cc +++ b/runtimes/neurun/core/src/graph/operand/LowerInfo.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "LowerInfo.h" +#include "graph/operand/LowerInfo.h" namespace neurun { diff --git a/runtimes/neurun/src/graph/operand/Shape4DConvert.h b/runtimes/neurun/core/src/graph/operand/Shape4DConvert.h similarity index 97% rename from runtimes/neurun/src/graph/operand/Shape4DConvert.h rename to runtimes/neurun/core/src/graph/operand/Shape4DConvert.h index 73cf090..093b475 100644 --- a/runtimes/neurun/src/graph/operand/Shape4DConvert.h +++ b/runtimes/neurun/core/src/graph/operand/Shape4DConvert.h @@ -17,7 +17,7 @@ #ifndef __NEURUN_GRAPH_OPERAND_SHAPE4D_CONVERT_H__ #define __NEURUN_GRAPH_OPERAND_SHAPE4D_CONVERT_H__ -#include "LowerInfo.h" +#include "graph/operand/LowerInfo.h" namespace neurun { diff --git a/runtimes/neurun/src/graph/operation/LowerInfo.cc b/runtimes/neurun/core/src/graph/operation/LowerInfo.cc similarity index 95% rename from runtimes/neurun/src/graph/operation/LowerInfo.cc rename to runtimes/neurun/core/src/graph/operation/LowerInfo.cc index 7862fd0..5a14778 100644 --- a/runtimes/neurun/src/graph/operation/LowerInfo.cc +++ b/runtimes/neurun/core/src/graph/operation/LowerInfo.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "LowerInfo.h" +#include "graph/operation/LowerInfo.h" namespace neurun { diff --git a/runtimes/neurun/src/graph/pass/OperandPass.cc b/runtimes/neurun/core/src/graph/pass/OperandPass.cc similarity index 100% rename from runtimes/neurun/src/graph/pass/OperandPass.cc rename to runtimes/neurun/core/src/graph/pass/OperandPass.cc diff --git a/runtimes/neurun/src/graph/pass/OperandPass.h b/runtimes/neurun/core/src/graph/pass/OperandPass.h similarity index 100% rename from runtimes/neurun/src/graph/pass/OperandPass.h rename to runtimes/neurun/core/src/graph/pass/OperandPass.h diff --git a/runtimes/neurun/src/graph/pass/OperationPass.cc b/runtimes/neurun/core/src/graph/pass/OperationPass.cc similarity index 100% rename from runtimes/neurun/src/graph/pass/OperationPass.cc rename to runtimes/neurun/core/src/graph/pass/OperationPass.cc diff --git a/runtimes/neurun/src/graph/pass/OperationPass.h b/runtimes/neurun/core/src/graph/pass/OperationPass.h similarity index 100% rename from runtimes/neurun/src/graph/pass/OperationPass.h rename to runtimes/neurun/core/src/graph/pass/OperationPass.h diff --git a/runtimes/neurun/src/graph/pass/Pass.cc b/runtimes/neurun/core/src/graph/pass/Pass.cc similarity index 100% rename from runtimes/neurun/src/graph/pass/Pass.cc rename to runtimes/neurun/core/src/graph/pass/Pass.cc diff --git a/runtimes/neurun/src/graph/pass/Pass.h b/runtimes/neurun/core/src/graph/pass/Pass.h similarity index 100% rename from runtimes/neurun/src/graph/pass/Pass.h rename to runtimes/neurun/core/src/graph/pass/Pass.h diff --git a/runtimes/neurun/src/graph/pass/PermutationEliminationPass.cc b/runtimes/neurun/core/src/graph/pass/PermutationEliminationPass.cc similarity index 99% rename from runtimes/neurun/src/graph/pass/PermutationEliminationPass.cc rename to runtimes/neurun/core/src/graph/pass/PermutationEliminationPass.cc index e5ed633..9173b7a 100644 --- a/runtimes/neurun/src/graph/pass/PermutationEliminationPass.cc +++ b/runtimes/neurun/core/src/graph/pass/PermutationEliminationPass.cc @@ -19,7 +19,7 @@ #include "model/operand/Object.h" #include "graph/operand/LowerInfo.h" #include "graph/Graph.h" -#include "backend/interface/IConfig.h" +#include "backend/IConfig.h" #include "util/logging.h" #include "compiler/BackendResolver.h" diff --git a/runtimes/neurun/src/graph/pass/PermutationEliminationPass.h b/runtimes/neurun/core/src/graph/pass/PermutationEliminationPass.h similarity index 100% rename from runtimes/neurun/src/graph/pass/PermutationEliminationPass.h rename to runtimes/neurun/core/src/graph/pass/PermutationEliminationPass.h diff --git a/runtimes/neurun/src/graph/pass/PermutationInsertionPass.cc b/runtimes/neurun/core/src/graph/pass/PermutationInsertionPass.cc similarity index 99% rename from runtimes/neurun/src/graph/pass/PermutationInsertionPass.cc rename to runtimes/neurun/core/src/graph/pass/PermutationInsertionPass.cc index bcdb570..d1ba0b8 100644 --- a/runtimes/neurun/src/graph/pass/PermutationInsertionPass.cc +++ b/runtimes/neurun/core/src/graph/pass/PermutationInsertionPass.cc @@ -23,7 +23,7 @@ #include "model/operand/Object.h" #include "graph/operation/LowerInfo.h" #include "graph/Graph.h" -#include "backend/interface/IConfig.h" +#include "backend/IConfig.h" #include "util/logging.h" #include "cpp14/memory.h" #include "model/operation/PermuteNode.h" diff --git a/runtimes/neurun/src/graph/pass/PermutationInsertionPass.h b/runtimes/neurun/core/src/graph/pass/PermutationInsertionPass.h similarity index 100% rename from runtimes/neurun/src/graph/pass/PermutationInsertionPass.h rename to runtimes/neurun/core/src/graph/pass/PermutationInsertionPass.h diff --git a/runtimes/neurun/src/graph/verifier/Verifier.cc b/runtimes/neurun/core/src/graph/verifier/Verifier.cc similarity index 100% rename from runtimes/neurun/src/graph/verifier/Verifier.cc rename to runtimes/neurun/core/src/graph/verifier/Verifier.cc diff --git a/runtimes/neurun/src/graph/verifier/Verifier.h b/runtimes/neurun/core/src/graph/verifier/Verifier.h similarity index 100% rename from runtimes/neurun/src/graph/verifier/Verifier.h rename to runtimes/neurun/core/src/graph/verifier/Verifier.h diff --git a/runtimes/neurun/src/library_info.cc b/runtimes/neurun/core/src/library_info.cc similarity index 100% rename from runtimes/neurun/src/library_info.cc rename to runtimes/neurun/core/src/library_info.cc diff --git a/runtimes/neurun/src/linear/Linear.cc b/runtimes/neurun/core/src/linear/Linear.cc similarity index 98% rename from runtimes/neurun/src/linear/Linear.cc rename to runtimes/neurun/core/src/linear/Linear.cc index 1fd4d3c..c8f412b 100644 --- a/runtimes/neurun/src/linear/Linear.cc +++ b/runtimes/neurun/core/src/linear/Linear.cc @@ -20,8 +20,9 @@ #include "graph/operation/LowerInfo.h" #include "graph/operand/LowerInfo.h" -#include "backend/interface/IStageGenerator.h" -#include "backend/interface/IConfig.h" +#include "backend/IStageGenerator.h" +#include "backend/IConfig.h" +#include "backend/Backend.h" #include "compiler/SubTensorInfo.h" #include "compiler/TensorInfo.h" #include "model/operand/IndexMap.h" diff --git a/runtimes/neurun/src/linear/Linear.h b/runtimes/neurun/core/src/linear/Linear.h similarity index 98% rename from runtimes/neurun/src/linear/Linear.h rename to runtimes/neurun/core/src/linear/Linear.h index 78bfb75..78ff35c 100644 --- a/runtimes/neurun/src/linear/Linear.h +++ b/runtimes/neurun/core/src/linear/Linear.h @@ -22,7 +22,7 @@ #include "model/Model.h" #include "model/operation/Subgraph.h" -#include "backend/interface/ITensorBuilder.h" +#include "backend/ITensorBuilder.h" #include "graph/LowerInfoMap.h" namespace neurun diff --git a/runtimes/neurun/src/model/operand/IndexSet.cc b/runtimes/neurun/core/src/model/operand/IndexSet.cc similarity index 97% rename from runtimes/neurun/src/model/operand/IndexSet.cc rename to runtimes/neurun/core/src/model/operand/IndexSet.cc index b83d314..f3efb2b 100644 --- a/runtimes/neurun/src/model/operand/IndexSet.cc +++ b/runtimes/neurun/core/src/model/operand/IndexSet.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "IndexSet.h" +#include "model/operand/IndexSet.h" #include diff --git a/runtimes/neurun/src/model/operand/Object.cc b/runtimes/neurun/core/src/model/operand/Object.cc similarity index 98% rename from runtimes/neurun/src/model/operand/Object.cc rename to runtimes/neurun/core/src/model/operand/Object.cc index 10a0128..84db266 100644 --- a/runtimes/neurun/src/model/operand/Object.cc +++ b/runtimes/neurun/core/src/model/operand/Object.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "Object.h" +#include "model/operand/Object.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operand/Set.cc b/runtimes/neurun/core/src/model/operand/Set.cc similarity index 98% rename from runtimes/neurun/src/model/operand/Set.cc rename to runtimes/neurun/core/src/model/operand/Set.cc index d93c215..cdbc5f5 100644 --- a/runtimes/neurun/src/model/operand/Set.cc +++ b/runtimes/neurun/core/src/model/operand/Set.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "Set.h" +#include "model/operand/Set.h" #include "cpp14/memory.h" diff --git a/runtimes/neurun/src/model/operand/Shape.cc b/runtimes/neurun/core/src/model/operand/Shape.cc similarity index 98% rename from runtimes/neurun/src/model/operand/Shape.cc rename to runtimes/neurun/core/src/model/operand/Shape.cc index a72ce73..7415c00 100644 --- a/runtimes/neurun/src/model/operand/Shape.cc +++ b/runtimes/neurun/core/src/model/operand/Shape.cc @@ -16,7 +16,7 @@ #include -#include "Shape.h" +#include "model/operand/Shape.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operand/TypeInfo.cc b/runtimes/neurun/core/src/model/operand/TypeInfo.cc similarity index 96% rename from runtimes/neurun/src/model/operand/TypeInfo.cc rename to runtimes/neurun/core/src/model/operand/TypeInfo.cc index e468591..15321ba 100644 --- a/runtimes/neurun/src/model/operand/TypeInfo.cc +++ b/runtimes/neurun/core/src/model/operand/TypeInfo.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "TypeInfo.h" +#include "model/operand/TypeInfo.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/AddNode.cc b/runtimes/neurun/core/src/model/operation/AddNode.cc similarity index 93% rename from runtimes/neurun/src/model/operation/AddNode.cc rename to runtimes/neurun/core/src/model/operation/AddNode.cc index 7de82df..e66cd3e 100644 --- a/runtimes/neurun/src/model/operation/AddNode.cc +++ b/runtimes/neurun/core/src/model/operation/AddNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "AddNode.h" +#include "model/operation/AddNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/AvgPool2DNode.cc b/runtimes/neurun/core/src/model/operation/AvgPool2DNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/AvgPool2DNode.cc rename to runtimes/neurun/core/src/model/operation/AvgPool2DNode.cc index f15b501..41ae575 100644 --- a/runtimes/neurun/src/model/operation/AvgPool2DNode.cc +++ b/runtimes/neurun/core/src/model/operation/AvgPool2DNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "AvgPool2DNode.h" +#include "model/operation/AvgPool2DNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/CastNode.cc b/runtimes/neurun/core/src/model/operation/CastNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/CastNode.cc rename to runtimes/neurun/core/src/model/operation/CastNode.cc index d3fd822..a60ba23 100644 --- a/runtimes/neurun/src/model/operation/CastNode.cc +++ b/runtimes/neurun/core/src/model/operation/CastNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "CastNode.h" +#include "model/operation/CastNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/ConcatNode.cc b/runtimes/neurun/core/src/model/operation/ConcatNode.cc similarity index 93% rename from runtimes/neurun/src/model/operation/ConcatNode.cc rename to runtimes/neurun/core/src/model/operation/ConcatNode.cc index e25fcd0..bcaf440 100644 --- a/runtimes/neurun/src/model/operation/ConcatNode.cc +++ b/runtimes/neurun/core/src/model/operation/ConcatNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "ConcatNode.h" +#include "model/operation/ConcatNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/Conv2DNode.cc b/runtimes/neurun/core/src/model/operation/Conv2DNode.cc similarity index 93% rename from runtimes/neurun/src/model/operation/Conv2DNode.cc rename to runtimes/neurun/core/src/model/operation/Conv2DNode.cc index d823f75..5f75815 100644 --- a/runtimes/neurun/src/model/operation/Conv2DNode.cc +++ b/runtimes/neurun/core/src/model/operation/Conv2DNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "Conv2DNode.h" +#include "model/operation/Conv2DNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/DepthwiseConv2DNode.cc b/runtimes/neurun/core/src/model/operation/DepthwiseConv2DNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/DepthwiseConv2DNode.cc rename to runtimes/neurun/core/src/model/operation/DepthwiseConv2DNode.cc index c34658d..a0c062b 100644 --- a/runtimes/neurun/src/model/operation/DepthwiseConv2DNode.cc +++ b/runtimes/neurun/core/src/model/operation/DepthwiseConv2DNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "DepthwiseConv2DNode.h" +#include "model/operation/DepthwiseConv2DNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/DivNode.cc b/runtimes/neurun/core/src/model/operation/DivNode.cc similarity index 93% rename from runtimes/neurun/src/model/operation/DivNode.cc rename to runtimes/neurun/core/src/model/operation/DivNode.cc index cc8e98a..9078e54 100644 --- a/runtimes/neurun/src/model/operation/DivNode.cc +++ b/runtimes/neurun/core/src/model/operation/DivNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "DivNode.h" +#include "model/operation/DivNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/EmbeddingLookupNode.cc b/runtimes/neurun/core/src/model/operation/EmbeddingLookupNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/EmbeddingLookupNode.cc rename to runtimes/neurun/core/src/model/operation/EmbeddingLookupNode.cc index 47a66fd..0c202fa 100644 --- a/runtimes/neurun/src/model/operation/EmbeddingLookupNode.cc +++ b/runtimes/neurun/core/src/model/operation/EmbeddingLookupNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "EmbeddingLookupNode.h" +#include "model/operation/EmbeddingLookupNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/ExpNode.cc b/runtimes/neurun/core/src/model/operation/ExpNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/ExpNode.cc rename to runtimes/neurun/core/src/model/operation/ExpNode.cc index 6ade127..1386298 100644 --- a/runtimes/neurun/src/model/operation/ExpNode.cc +++ b/runtimes/neurun/core/src/model/operation/ExpNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "ExpNode.h" +#include "model/operation/ExpNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/FloorNode.cc b/runtimes/neurun/core/src/model/operation/FloorNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/FloorNode.cc rename to runtimes/neurun/core/src/model/operation/FloorNode.cc index ed06102..3b315cb 100644 --- a/runtimes/neurun/src/model/operation/FloorNode.cc +++ b/runtimes/neurun/core/src/model/operation/FloorNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "FloorNode.h" +#include "model/operation/FloorNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/FullyConnectedNode.cc b/runtimes/neurun/core/src/model/operation/FullyConnectedNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/FullyConnectedNode.cc rename to runtimes/neurun/core/src/model/operation/FullyConnectedNode.cc index e47fce2..9304358 100644 --- a/runtimes/neurun/src/model/operation/FullyConnectedNode.cc +++ b/runtimes/neurun/core/src/model/operation/FullyConnectedNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "FullyConnectedNode.h" +#include "model/operation/FullyConnectedNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/HashtableLookupNode.cc b/runtimes/neurun/core/src/model/operation/HashtableLookupNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/HashtableLookupNode.cc rename to runtimes/neurun/core/src/model/operation/HashtableLookupNode.cc index 9315160..845cc66 100644 --- a/runtimes/neurun/src/model/operation/HashtableLookupNode.cc +++ b/runtimes/neurun/core/src/model/operation/HashtableLookupNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "HashtableLookupNode.h" +#include "model/operation/HashtableLookupNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/IndexList.cc b/runtimes/neurun/core/src/model/operation/IndexList.cc similarity index 96% rename from runtimes/neurun/src/model/operation/IndexList.cc rename to runtimes/neurun/core/src/model/operation/IndexList.cc index e469870..b1fc89b 100644 --- a/runtimes/neurun/src/model/operation/IndexList.cc +++ b/runtimes/neurun/core/src/model/operation/IndexList.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "IndexList.h" +#include "model/operation/IndexList.h" #include diff --git a/runtimes/neurun/src/model/operation/L2NormalizationNode.cc b/runtimes/neurun/core/src/model/operation/L2NormalizationNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/L2NormalizationNode.cc rename to runtimes/neurun/core/src/model/operation/L2NormalizationNode.cc index 0218bfb..1ac21df 100644 --- a/runtimes/neurun/src/model/operation/L2NormalizationNode.cc +++ b/runtimes/neurun/core/src/model/operation/L2NormalizationNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "L2NormalizationNode.h" +#include "model/operation/L2NormalizationNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/L2Pool2DNode.cc b/runtimes/neurun/core/src/model/operation/L2Pool2DNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/L2Pool2DNode.cc rename to runtimes/neurun/core/src/model/operation/L2Pool2DNode.cc index 78d13ea..56667de 100644 --- a/runtimes/neurun/src/model/operation/L2Pool2DNode.cc +++ b/runtimes/neurun/core/src/model/operation/L2Pool2DNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "L2Pool2DNode.h" +#include "model/operation/L2Pool2DNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/LogicalAndNode.cc b/runtimes/neurun/core/src/model/operation/LogicalAndNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/LogicalAndNode.cc rename to runtimes/neurun/core/src/model/operation/LogicalAndNode.cc index a21f5e2..0dfdf4a 100644 --- a/runtimes/neurun/src/model/operation/LogicalAndNode.cc +++ b/runtimes/neurun/core/src/model/operation/LogicalAndNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "LogicalAndNode.h" +#include "model/operation/LogicalAndNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/LogisticNode.cc b/runtimes/neurun/core/src/model/operation/LogisticNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/LogisticNode.cc rename to runtimes/neurun/core/src/model/operation/LogisticNode.cc index 990e189..ced133d 100644 --- a/runtimes/neurun/src/model/operation/LogisticNode.cc +++ b/runtimes/neurun/core/src/model/operation/LogisticNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "LogisticNode.h" +#include "model/operation/LogisticNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/MaxPool2DNode.cc b/runtimes/neurun/core/src/model/operation/MaxPool2DNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/MaxPool2DNode.cc rename to runtimes/neurun/core/src/model/operation/MaxPool2DNode.cc index cfc08ab..5b2efdf 100644 --- a/runtimes/neurun/src/model/operation/MaxPool2DNode.cc +++ b/runtimes/neurun/core/src/model/operation/MaxPool2DNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "MaxPool2DNode.h" +#include "model/operation/MaxPool2DNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/MulNode.cc b/runtimes/neurun/core/src/model/operation/MulNode.cc similarity index 93% rename from runtimes/neurun/src/model/operation/MulNode.cc rename to runtimes/neurun/core/src/model/operation/MulNode.cc index d727a8f..3254b86 100644 --- a/runtimes/neurun/src/model/operation/MulNode.cc +++ b/runtimes/neurun/core/src/model/operation/MulNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "MulNode.h" +#include "model/operation/MulNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/Node.cc b/runtimes/neurun/core/src/model/operation/Node.cc similarity index 97% rename from runtimes/neurun/src/model/operation/Node.cc rename to runtimes/neurun/core/src/model/operation/Node.cc index 8764e69..9af2aa4 100644 --- a/runtimes/neurun/src/model/operation/Node.cc +++ b/runtimes/neurun/core/src/model/operation/Node.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "Node.h" +#include "model/operation/Node.h" #include diff --git a/runtimes/neurun/src/model/operation/NotEqualNode.cc b/runtimes/neurun/core/src/model/operation/NotEqualNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/NotEqualNode.cc rename to runtimes/neurun/core/src/model/operation/NotEqualNode.cc index b63a584..867184b 100644 --- a/runtimes/neurun/src/model/operation/NotEqualNode.cc +++ b/runtimes/neurun/core/src/model/operation/NotEqualNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "NotEqualNode.h" +#include "model/operation/NotEqualNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/OperandConstraint.cc b/runtimes/neurun/core/src/model/operation/OperandConstraint.cc similarity index 94% rename from runtimes/neurun/src/model/operation/OperandConstraint.cc rename to runtimes/neurun/core/src/model/operation/OperandConstraint.cc index 5c69de9..cd58d25 100644 --- a/runtimes/neurun/src/model/operation/OperandConstraint.cc +++ b/runtimes/neurun/core/src/model/operation/OperandConstraint.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "OperandConstraint.h" +#include "model/operation/OperandConstraint.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/PReLUNode.cc b/runtimes/neurun/core/src/model/operation/PReLUNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/PReLUNode.cc rename to runtimes/neurun/core/src/model/operation/PReLUNode.cc index 3f40de6..16872b3 100644 --- a/runtimes/neurun/src/model/operation/PReLUNode.cc +++ b/runtimes/neurun/core/src/model/operation/PReLUNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "PReLUNode.h" +#include "model/operation/PReLUNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/PermuteNode.cc b/runtimes/neurun/core/src/model/operation/PermuteNode.cc similarity index 93% rename from runtimes/neurun/src/model/operation/PermuteNode.cc rename to runtimes/neurun/core/src/model/operation/PermuteNode.cc index c894869..a8232c7 100644 --- a/runtimes/neurun/src/model/operation/PermuteNode.cc +++ b/runtimes/neurun/core/src/model/operation/PermuteNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "PermuteNode.h" +#include "model/operation/PermuteNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/RSQRTNode.cc b/runtimes/neurun/core/src/model/operation/RSQRTNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/RSQRTNode.cc rename to runtimes/neurun/core/src/model/operation/RSQRTNode.cc index 77ad3c9..8f9b17a 100644 --- a/runtimes/neurun/src/model/operation/RSQRTNode.cc +++ b/runtimes/neurun/core/src/model/operation/RSQRTNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "RSQRTNode.h" +#include "model/operation/RSQRTNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/ReLU1Node.cc b/runtimes/neurun/core/src/model/operation/ReLU1Node.cc similarity index 92% rename from runtimes/neurun/src/model/operation/ReLU1Node.cc rename to runtimes/neurun/core/src/model/operation/ReLU1Node.cc index 576f83c..2329f68 100644 --- a/runtimes/neurun/src/model/operation/ReLU1Node.cc +++ b/runtimes/neurun/core/src/model/operation/ReLU1Node.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "ReLU1Node.h" +#include "model/operation/ReLU1Node.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/ReLU6Node.cc b/runtimes/neurun/core/src/model/operation/ReLU6Node.cc similarity index 92% rename from runtimes/neurun/src/model/operation/ReLU6Node.cc rename to runtimes/neurun/core/src/model/operation/ReLU6Node.cc index 37d58e8..a3c86c5 100644 --- a/runtimes/neurun/src/model/operation/ReLU6Node.cc +++ b/runtimes/neurun/core/src/model/operation/ReLU6Node.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "ReLU6Node.h" +#include "model/operation/ReLU6Node.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/ReLUNode.cc b/runtimes/neurun/core/src/model/operation/ReLUNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/ReLUNode.cc rename to runtimes/neurun/core/src/model/operation/ReLUNode.cc index 692f648..4fd49e5 100644 --- a/runtimes/neurun/src/model/operation/ReLUNode.cc +++ b/runtimes/neurun/core/src/model/operation/ReLUNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "ReLUNode.h" +#include "model/operation/ReLUNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/ReduceMaxNode.cc b/runtimes/neurun/core/src/model/operation/ReduceMaxNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/ReduceMaxNode.cc rename to runtimes/neurun/core/src/model/operation/ReduceMaxNode.cc index ef2ff72..2a5864d 100644 --- a/runtimes/neurun/src/model/operation/ReduceMaxNode.cc +++ b/runtimes/neurun/core/src/model/operation/ReduceMaxNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "ReduceMaxNode.h" +#include "model/operation/ReduceMaxNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/ReduceSumNode.cc b/runtimes/neurun/core/src/model/operation/ReduceSumNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/ReduceSumNode.cc rename to runtimes/neurun/core/src/model/operation/ReduceSumNode.cc index 973107d..e2d0b45 100644 --- a/runtimes/neurun/src/model/operation/ReduceSumNode.cc +++ b/runtimes/neurun/core/src/model/operation/ReduceSumNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "ReduceSumNode.h" +#include "model/operation/ReduceSumNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/ReshapeNode.cc b/runtimes/neurun/core/src/model/operation/ReshapeNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/ReshapeNode.cc rename to runtimes/neurun/core/src/model/operation/ReshapeNode.cc index a31152c..4a79b49 100644 --- a/runtimes/neurun/src/model/operation/ReshapeNode.cc +++ b/runtimes/neurun/core/src/model/operation/ReshapeNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "ReshapeNode.h" +#include "model/operation/ReshapeNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/ResizeBilinearNode.cc b/runtimes/neurun/core/src/model/operation/ResizeBilinearNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/ResizeBilinearNode.cc rename to runtimes/neurun/core/src/model/operation/ResizeBilinearNode.cc index df9b93a..92f1701 100644 --- a/runtimes/neurun/src/model/operation/ResizeBilinearNode.cc +++ b/runtimes/neurun/core/src/model/operation/ResizeBilinearNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "ResizeBilinearNode.h" +#include "model/operation/ResizeBilinearNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/SQRTNode.cc b/runtimes/neurun/core/src/model/operation/SQRTNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/SQRTNode.cc rename to runtimes/neurun/core/src/model/operation/SQRTNode.cc index 1643500..6cd25ad 100644 --- a/runtimes/neurun/src/model/operation/SQRTNode.cc +++ b/runtimes/neurun/core/src/model/operation/SQRTNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "SQRTNode.h" +#include "model/operation/SQRTNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/Set.cc b/runtimes/neurun/core/src/model/operation/Set.cc similarity index 98% rename from runtimes/neurun/src/model/operation/Set.cc rename to runtimes/neurun/core/src/model/operation/Set.cc index 14bd4f5..5b42284 100644 --- a/runtimes/neurun/src/model/operation/Set.cc +++ b/runtimes/neurun/core/src/model/operation/Set.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "Set.h" +#include "model/operation/Set.h" #include diff --git a/runtimes/neurun/src/model/operation/SoftmaxNode.cc b/runtimes/neurun/core/src/model/operation/SoftmaxNode.cc similarity index 93% rename from runtimes/neurun/src/model/operation/SoftmaxNode.cc rename to runtimes/neurun/core/src/model/operation/SoftmaxNode.cc index 4551f1e..93388bd 100644 --- a/runtimes/neurun/src/model/operation/SoftmaxNode.cc +++ b/runtimes/neurun/core/src/model/operation/SoftmaxNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "SoftmaxNode.h" +#include "model/operation/SoftmaxNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/SpaceToDepthNode.cc b/runtimes/neurun/core/src/model/operation/SpaceToDepthNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/SpaceToDepthNode.cc rename to runtimes/neurun/core/src/model/operation/SpaceToDepthNode.cc index baef777..7cf5464 100644 --- a/runtimes/neurun/src/model/operation/SpaceToDepthNode.cc +++ b/runtimes/neurun/core/src/model/operation/SpaceToDepthNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "SpaceToDepthNode.h" +#include "model/operation/SpaceToDepthNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/SqueezeNode.cc b/runtimes/neurun/core/src/model/operation/SqueezeNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/SqueezeNode.cc rename to runtimes/neurun/core/src/model/operation/SqueezeNode.cc index 04769f5..4abb3c9 100644 --- a/runtimes/neurun/src/model/operation/SqueezeNode.cc +++ b/runtimes/neurun/core/src/model/operation/SqueezeNode.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "SqueezeNode.h" -#include "NodeVisitor.h" +#include "model/operation/SqueezeNode.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/StridedSliceNode.cc b/runtimes/neurun/core/src/model/operation/StridedSliceNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/StridedSliceNode.cc rename to runtimes/neurun/core/src/model/operation/StridedSliceNode.cc index 153c22f..924cb83 100644 --- a/runtimes/neurun/src/model/operation/StridedSliceNode.cc +++ b/runtimes/neurun/core/src/model/operation/StridedSliceNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "StridedSliceNode.h" +#include "model/operation/StridedSliceNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/SubNode.cc b/runtimes/neurun/core/src/model/operation/SubNode.cc similarity index 93% rename from runtimes/neurun/src/model/operation/SubNode.cc rename to runtimes/neurun/core/src/model/operation/SubNode.cc index 9a68ae6..8669994 100644 --- a/runtimes/neurun/src/model/operation/SubNode.cc +++ b/runtimes/neurun/core/src/model/operation/SubNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "SubNode.h" +#include "model/operation/SubNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/Subgraph.cc b/runtimes/neurun/core/src/model/operation/Subgraph.cc similarity index 94% rename from runtimes/neurun/src/model/operation/Subgraph.cc rename to runtimes/neurun/core/src/model/operation/Subgraph.cc index 93883e0..cf70e10 100644 --- a/runtimes/neurun/src/model/operation/Subgraph.cc +++ b/runtimes/neurun/core/src/model/operation/Subgraph.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "Subgraph.h" -#include "NodeVisitor.h" +#include "model/operation/Subgraph.h" +#include "model/operation/NodeVisitor.h" #include namespace neurun diff --git a/runtimes/neurun/src/model/operation/TanhNode.cc b/runtimes/neurun/core/src/model/operation/TanhNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/TanhNode.cc rename to runtimes/neurun/core/src/model/operation/TanhNode.cc index 6f966a6..8f1b810 100644 --- a/runtimes/neurun/src/model/operation/TanhNode.cc +++ b/runtimes/neurun/core/src/model/operation/TanhNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "TanhNode.h" +#include "model/operation/TanhNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/TransposeConvNode.cc b/runtimes/neurun/core/src/model/operation/TransposeConvNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/TransposeConvNode.cc rename to runtimes/neurun/core/src/model/operation/TransposeConvNode.cc index 40a8731..b385f66 100644 --- a/runtimes/neurun/src/model/operation/TransposeConvNode.cc +++ b/runtimes/neurun/core/src/model/operation/TransposeConvNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "TransposeConvNode.h" +#include "model/operation/TransposeConvNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/model/operation/TransposeNode.cc b/runtimes/neurun/core/src/model/operation/TransposeNode.cc similarity index 92% rename from runtimes/neurun/src/model/operation/TransposeNode.cc rename to runtimes/neurun/core/src/model/operation/TransposeNode.cc index a6b6c69..c931a67 100644 --- a/runtimes/neurun/src/model/operation/TransposeNode.cc +++ b/runtimes/neurun/core/src/model/operation/TransposeNode.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "TransposeNode.h" +#include "model/operation/TransposeNode.h" #include -#include "NodeVisitor.h" +#include "model/operation/NodeVisitor.h" namespace neurun { diff --git a/runtimes/neurun/src/util/NNAPIConvert.cc b/runtimes/neurun/core/src/util/NNAPIConvert.cc similarity index 98% rename from runtimes/neurun/src/util/NNAPIConvert.cc rename to runtimes/neurun/core/src/util/NNAPIConvert.cc index 6166133..011e5cb 100644 --- a/runtimes/neurun/src/util/NNAPIConvert.cc +++ b/runtimes/neurun/core/src/util/NNAPIConvert.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "NNAPIConvert.h" +#include "util/NNAPIConvert.h" namespace neurun { diff --git a/runtimes/neurun/src/util/Padding.cc b/runtimes/neurun/core/src/util/Padding.cc similarity index 100% rename from runtimes/neurun/src/util/Padding.cc rename to runtimes/neurun/core/src/util/Padding.cc diff --git a/runtimes/neurun/src/util/Utils.cc b/runtimes/neurun/core/src/util/Utils.cc similarity index 97% rename from runtimes/neurun/src/util/Utils.cc rename to runtimes/neurun/core/src/util/Utils.cc index def02db..ca15c70 100644 --- a/runtimes/neurun/src/util/Utils.cc +++ b/runtimes/neurun/core/src/util/Utils.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "Utils.h" +#include "util/Utils.h" #include diff --git a/runtimes/neurun/src/util/config/ConfigManager.cc b/runtimes/neurun/core/src/util/config/ConfigManager.cc similarity index 94% rename from runtimes/neurun/src/util/config/ConfigManager.cc rename to runtimes/neurun/core/src/util/config/ConfigManager.cc index 588f440..7912028 100644 --- a/runtimes/neurun/src/util/config/ConfigManager.cc +++ b/runtimes/neurun/core/src/util/config/ConfigManager.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ConfigManager.h" +#include "util/config/ConfigManager.h" #include @@ -25,7 +25,7 @@ namespace config #define CONFIG(Name, Type, Default) const char *Name = #Name; -#include "Config.lst" +#include "util/config/Config.lst" #undef CONFIG @@ -49,7 +49,7 @@ ConfigManager::ConfigManager() _map.insert({std::string{#Name}, std::string{Default}}); \ fetch_from_env_var(#Name); -#include "Config.lst" +#include "util/config/Config.lst" #undef CONFIG } diff --git a/runtimes/neurun/frontend/nnapi/CMakeLists.txt b/runtimes/neurun/frontend/nnapi/CMakeLists.txt index b372da1..7c5ea9c 100644 --- a/runtimes/neurun/frontend/nnapi/CMakeLists.txt +++ b/runtimes/neurun/frontend/nnapi/CMakeLists.txt @@ -3,6 +3,7 @@ file(GLOB_RECURSE SOURCES_FRONTEND "*.cc") add_library(${LIB_NEURUN} SHARED ${SOURCES_FRONTEND}) target_include_directories(${LIB_NEURUN} PUBLIC ${NEURUN_INCLUDE_DIR}) target_include_directories(${LIB_NEURUN} PUBLIC ${CMAKE_SOURCE_DIR}/externals/tensorflow) +target_link_libraries(${LIB_NEURUN} nnapi-header) target_link_libraries(${LIB_NEURUN} neurun-core) target_compile_options(${LIB_NEURUN} PRIVATE -Wall -Wextra -Werror) -- 2.7.4