From: Роман Михайлович Русяев/AI Tools Lab /SRR/Staff Engineer/삼성전자 Date: Mon, 27 Aug 2018 07:44:34 +0000 (+0300) Subject: Partial reorganization of project file hierarchy (#1187) X-Git-Tag: nncc_backup~2051 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef4a190e0cfeaf4bb36d383f3d3ba55b1d1499e8;p=platform%2Fcore%2Fml%2Fnnfw.git Partial reorganization of project file hierarchy (#1187) * reorganize backend part: soft, interpreter * reorganize driver and support * create utils dir Signed-off-by: Roman Rusyaev --- diff --git a/contrib/nnc/CMakeLists.txt b/contrib/nnc/CMakeLists.txt index 846607e..edaac86 100644 --- a/contrib/nnc/CMakeLists.txt +++ b/contrib/nnc/CMakeLists.txt @@ -3,15 +3,16 @@ project(nnc) list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_SOURCE_DIR}/cmake) include(soft_backend) -file(GLOB_RECURSE HEADERS "include/*.h") -file(GLOB_RECURSE SOURCES "src/*.cpp") -set(MAIN "src/main.cpp") -set(OPTIONS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/Options.cpp) -list(REMOVE_ITEM SOURCES ${MAIN}) -list(REMOVE_ITEM SOURCES ${OPTIONS_SRC}) +set(DRIVER_HEADERS driver/Driver.h) +set(DRIVER_SOURCES driver/Driver.cpp) +set(MAIN "driver/main.cpp") +set(OPTIONS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/driver/Options.cpp) +# add interface header files include_directories(include) +set(NNC_ROOT_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + # # Variables that uses inside compiler via configure_file # @@ -43,7 +44,7 @@ set(NNC_CAFFE_PLUGIN_NAME "libcaffe_importer${LIB_SUFFIX}") set(NNC_TFLITE_PLUGIN_NAME "libtflite_import${LIB_SUFFIX}") set(NNC_SOFT_CPP_PLUGIN_NAME "libsoft_backend_cpp${LIB_SUFFIX}") set(NNC_SOFT_C_PLUGIN_NAME "libsoft_backend_c${LIB_SUFFIX}") -set(NNC_INTERPRETER_NAME "libnnc_interpreter_plugin${LIB_SUFFIX}") +set(NNC_INTERPRETER_NAME "libnnc_interpreter${LIB_SUFFIX}") ### # @@ -65,25 +66,20 @@ endfunction(install_common_library) # # Used by unit tests -set(NNC_SOFT_BACKEND_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/backend/soft) -set(NNC_INTERPRETER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/backend/interpreter) -set(NNC_CORE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/core) -set(NNC_PLUGIN_CORE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/plugin) +set(NNC_SOFT_BACKEND_DIR ${CMAKE_CURRENT_SOURCE_DIR}/plugin/soft_backend) +set(NNC_INTERPRETER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/plugin/interpreter) +set(NNC_CORE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/plugin/core) +set(NNC_PLUGIN_CORE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/plugin/plugin) set(NNC_SUPPORT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/support) -# Plugin module library -add_nncc_library(nnc_module SHARED ${HEADERS} ${SOURCES}) -target_link_libraries(nnc_module PRIVATE nnc_support nnc_plugin_core dl) -target_include_directories(nnc_module PUBLIC include) -install_common_library(nnc_module) - -# add supprot header files -include_directories(support/include) +# driver library +add_nncc_library(nnc_driver SHARED ${DRIVER_HEADERS} ${DRIVER_SOURCES}) +target_link_libraries(nnc_driver PRIVATE nnc_support) +install_common_library(nnc_driver) # nnc executable add_executable(nnc ${MAIN} ${OPTIONS_SRC}) -target_link_libraries(nnc PRIVATE nnc_support nnc_module nnc_plugin_core dl) -target_include_directories(nnc PUBLIC include) +target_link_libraries(nnc PRIVATE nnc_support nnc_driver) # configure file that contains extern definitions configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/Definitions.h.in @@ -91,7 +87,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/Definitions.h.in include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) add_subdirectory(support) -add_subdirectory(libs) +add_subdirectory(plugin) add_subdirectory(examples) add_subdirectory(unittests) add_subdirectory(tests) diff --git a/contrib/nnc/src/Driver.cpp b/contrib/nnc/driver/Driver.cpp similarity index 95% rename from contrib/nnc/src/Driver.cpp rename to contrib/nnc/driver/Driver.cpp index c17bd20..69d1bb2 100644 --- a/contrib/nnc/src/Driver.cpp +++ b/contrib/nnc/driver/Driver.cpp @@ -1,7 +1,7 @@ -#include "PluginManager.h" -#include "CommandLine.h" +#include "support/PluginManager.h" +#include "support/CommandLine.h" #include "Definitions.h" -#include "Options.h" +#include "option/Options.h" #include "Driver.h" using namespace nncc::contrib; diff --git a/contrib/nnc/include/Driver.h b/contrib/nnc/driver/Driver.h similarity index 100% rename from contrib/nnc/include/Driver.h rename to contrib/nnc/driver/Driver.h diff --git a/contrib/nnc/src/Options.cpp b/contrib/nnc/driver/Options.cpp similarity index 98% rename from contrib/nnc/src/Options.cpp rename to contrib/nnc/driver/Options.cpp index b7f7404..068fa0c 100644 --- a/contrib/nnc/src/Options.cpp +++ b/contrib/nnc/driver/Options.cpp @@ -1,7 +1,7 @@ #include -#include "CommandLine.h" -#include "Options.h" +#include "support/CommandLine.h" +#include "option/Options.h" namespace nncc { diff --git a/contrib/nnc/src/main.cpp b/contrib/nnc/driver/main.cpp similarity index 91% rename from contrib/nnc/src/main.cpp rename to contrib/nnc/driver/main.cpp index ba5fadf..3aba221 100644 --- a/contrib/nnc/src/main.cpp +++ b/contrib/nnc/driver/main.cpp @@ -1,8 +1,8 @@ #include #include -#include "PluginException.h" -#include "CommandLine.h" +#include "support/PluginException.h" +#include "support/CommandLine.h" #include "Driver.h" #define DEBUG_AREA diff --git a/contrib/nnc/examples/plugin_example/CMakeLists.txt b/contrib/nnc/examples/plugin_example/CMakeLists.txt index 011fc20..b0e7dbb 100644 --- a/contrib/nnc/examples/plugin_example/CMakeLists.txt +++ b/contrib/nnc/examples/plugin_example/CMakeLists.txt @@ -4,8 +4,6 @@ file(GLOB_RECURSE PL_EXAMPLE_PARSE_H) add_library(some_parser SHARED ${PL_EXAMPLE_PARSE_SRC} ${PL_EXAMPLE_PARSE_H}) add_library(some_parser_second SHARED ${PL_EXAMPLE_PARSE_SRC} ${PL_EXAMPLE_PARSE_H}) -target_link_libraries(some_parser PRIVATE nnc_plugin_core) -target_link_libraries(some_parser PRIVATE nnc_core) +target_link_libraries(some_parser PRIVATE nnc_core nnc_support) -target_link_libraries(some_parser_second PRIVATE nnc_plugin_core) -target_link_libraries(some_parser_second PRIVATE nnc_core) +target_link_libraries(some_parser_second PRIVATE nnc_core nnc_support) diff --git a/contrib/nnc/examples/plugin_example/samplePlugin.cpp b/contrib/nnc/examples/plugin_example/samplePlugin.cpp index 4de82b5..2d5fc37 100644 --- a/contrib/nnc/examples/plugin_example/samplePlugin.cpp +++ b/contrib/nnc/examples/plugin_example/samplePlugin.cpp @@ -1,8 +1,8 @@ #include #include #include -#include "PluginInstance.h" -#include "PluginException.h" +#include "support/PluginInstance.h" +#include "support/PluginException.h" using namespace nncc::contrib::plugin; diff --git a/contrib/nnc/include/Options.h b/contrib/nnc/include/option/Options.h similarity index 97% rename from contrib/nnc/include/Options.h rename to contrib/nnc/include/option/Options.h index 761f139..6c0fc70 100644 --- a/contrib/nnc/include/Options.h +++ b/contrib/nnc/include/option/Options.h @@ -2,7 +2,7 @@ #define NNCC_COMMANDLINEARGUMENTS_H #include -#include "CommandLine.h" +#include "support/CommandLine.h" namespace nncc { diff --git a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/core/Interpreter.h b/contrib/nnc/include/plugin/interpreter/Interpreter.h similarity index 100% rename from contrib/nnc/libs/backend/interpreter/core/include/interpreter/core/Interpreter.h rename to contrib/nnc/include/plugin/interpreter/Interpreter.h diff --git a/contrib/nnc/support/include/CommandLine.h b/contrib/nnc/include/support/CommandLine.h similarity index 100% rename from contrib/nnc/support/include/CommandLine.h rename to contrib/nnc/include/support/CommandLine.h diff --git a/contrib/nnc/include/debug.h b/contrib/nnc/include/support/Debug.h similarity index 100% rename from contrib/nnc/include/debug.h rename to contrib/nnc/include/support/Debug.h diff --git a/contrib/nnc/libs/plugin/include/PluginException.h b/contrib/nnc/include/support/PluginException.h similarity index 100% rename from contrib/nnc/libs/plugin/include/PluginException.h rename to contrib/nnc/include/support/PluginException.h diff --git a/contrib/nnc/libs/plugin/include/PluginInstance.h b/contrib/nnc/include/support/PluginInstance.h similarity index 100% rename from contrib/nnc/libs/plugin/include/PluginInstance.h rename to contrib/nnc/include/support/PluginInstance.h diff --git a/contrib/nnc/libs/plugin/include/PluginManager.h b/contrib/nnc/include/support/PluginManager.h similarity index 100% rename from contrib/nnc/libs/plugin/include/PluginManager.h rename to contrib/nnc/include/support/PluginManager.h diff --git a/contrib/nnc/libs/plugin/include/PluginProxy.h b/contrib/nnc/include/support/PluginProxy.h similarity index 100% rename from contrib/nnc/libs/plugin/include/PluginProxy.h rename to contrib/nnc/include/support/PluginProxy.h diff --git a/contrib/nnc/libs/plugin/include/shared_library.h b/contrib/nnc/include/support/shared_library.h similarity index 100% rename from contrib/nnc/libs/plugin/include/shared_library.h rename to contrib/nnc/include/support/shared_library.h diff --git a/contrib/nnc/libs/CMakeLists.txt b/contrib/nnc/libs/CMakeLists.txt deleted file mode 100644 index e426f17..0000000 --- a/contrib/nnc/libs/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(frontend) -add_subdirectory(core) -add_subdirectory(plugin) -add_subdirectory(backend) diff --git a/contrib/nnc/libs/backend/CMakeLists.txt b/contrib/nnc/libs/backend/CMakeLists.txt deleted file mode 100644 index 6540d8f..0000000 --- a/contrib/nnc/libs/backend/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(interpreter) -add_subdirectory(soft) diff --git a/contrib/nnc/libs/backend/interpreter/CMakeLists.txt b/contrib/nnc/libs/backend/interpreter/CMakeLists.txt deleted file mode 100644 index 9c40ad0..0000000 --- a/contrib/nnc/libs/backend/interpreter/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(core) -add_subdirectory(plugin) -add_subdirectory(test) diff --git a/contrib/nnc/libs/backend/interpreter/core/CMakeLists.txt b/contrib/nnc/libs/backend/interpreter/core/CMakeLists.txt deleted file mode 100644 index 00d3dcd..0000000 --- a/contrib/nnc/libs/backend/interpreter/core/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -file(GLOB_RECURSE interp_core_src ./*.cpp ./*.h) -add_library(nnc_interpreter_core STATIC ${interp_core_src}) -target_link_libraries(nnc_interpreter_core PUBLIC nnc_core) -target_include_directories(nnc_interpreter_core PUBLIC include) -set_target_properties(nnc_interpreter_core PROPERTIES POSITION_INDEPENDENT_CODE ON) diff --git a/contrib/nnc/libs/backend/interpreter/core/src/ops/Bias.cpp b/contrib/nnc/libs/backend/interpreter/core/src/ops/Bias.cpp deleted file mode 100644 index 66dd249..0000000 --- a/contrib/nnc/libs/backend/interpreter/core/src/ops/Bias.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "interpreter/ops/Bias.h" diff --git a/contrib/nnc/libs/backend/interpreter/core/src/ops/Concat.cpp b/contrib/nnc/libs/backend/interpreter/core/src/ops/Concat.cpp deleted file mode 100644 index 13991a0..0000000 --- a/contrib/nnc/libs/backend/interpreter/core/src/ops/Concat.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "interpreter/ops/Concat.h" diff --git a/contrib/nnc/libs/backend/interpreter/core/src/ops/Fill.cpp b/contrib/nnc/libs/backend/interpreter/core/src/ops/Fill.cpp deleted file mode 100644 index 296cd1c..0000000 --- a/contrib/nnc/libs/backend/interpreter/core/src/ops/Fill.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "interpreter/ops/Fill.h" diff --git a/contrib/nnc/libs/backend/interpreter/core/src/ops/Reduce.cpp b/contrib/nnc/libs/backend/interpreter/core/src/ops/Reduce.cpp deleted file mode 100644 index 3eec6fc..0000000 --- a/contrib/nnc/libs/backend/interpreter/core/src/ops/Reduce.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "interpreter/ops/Reduce.h" diff --git a/contrib/nnc/libs/backend/interpreter/core/src/ops/Reshape.cpp b/contrib/nnc/libs/backend/interpreter/core/src/ops/Reshape.cpp deleted file mode 100644 index 6e3ab17..0000000 --- a/contrib/nnc/libs/backend/interpreter/core/src/ops/Reshape.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "interpreter/ops/Reshape.h" diff --git a/contrib/nnc/libs/backend/interpreter/core/src/ops/Softmax.cpp b/contrib/nnc/libs/backend/interpreter/core/src/ops/Softmax.cpp deleted file mode 100644 index e030448..0000000 --- a/contrib/nnc/libs/backend/interpreter/core/src/ops/Softmax.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "interpreter/ops/Softmax.h" - diff --git a/contrib/nnc/libs/backend/interpreter/plugin/CMakeLists.txt b/contrib/nnc/libs/backend/interpreter/plugin/CMakeLists.txt deleted file mode 100644 index 0ef1c09..0000000 --- a/contrib/nnc/libs/backend/interpreter/plugin/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -file(GLOB_RECURSE interp_plugin_src ./*.cpp ./*.h) -add_library(nnc_interpreter_plugin SHARED ${interp_plugin_src}) -target_link_libraries(nnc_interpreter_plugin PRIVATE nnc_interpreter_core nnc_plugin_core) -target_include_directories(nnc_interpreter_plugin PUBLIC include) - -if(NNC_HDF5_SUPPORTED) - target_include_directories(nnc_interpreter_plugin PRIVATE ${HDF5_INCLUDE_DIRS}) - target_link_libraries(nnc_interpreter_plugin PRIVATE ${HDF5_CXX_LIBRARIES}) -endif(NNC_HDF5_SUPPORTED) - -# install interpreter library -install_nnc_plugin(nnc_interpreter_plugin) diff --git a/contrib/nnc/libs/plugin/CMakeLists.txt b/contrib/nnc/libs/plugin/CMakeLists.txt deleted file mode 100644 index af67be2..0000000 --- a/contrib/nnc/libs/plugin/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -file(GLOB_RECURSE HEADERS "include/*.h") -file(GLOB_RECURSE SOURCES "src/*.cpp") - -add_nncc_library(nnc_plugin_core SHARED ${HEADERS} ${SOURCES}) -set_target_properties(nnc_plugin_core PROPERTIES LINKER_LANGUAGE CXX) -target_link_libraries(nnc_plugin_core PRIVATE dl) -target_include_directories(nnc_plugin_core PUBLIC include) - -install_common_library(nnc_plugin_core) diff --git a/contrib/nnc/plugin/CMakeLists.txt b/contrib/nnc/plugin/CMakeLists.txt new file mode 100644 index 0000000..edbff0e --- /dev/null +++ b/contrib/nnc/plugin/CMakeLists.txt @@ -0,0 +1,4 @@ +add_subdirectory(frontend) +add_subdirectory(core) +add_subdirectory(interpreter) +add_subdirectory(soft_backend) diff --git a/contrib/nnc/libs/core/CMakeLists.txt b/contrib/nnc/plugin/core/CMakeLists.txt similarity index 100% rename from contrib/nnc/libs/core/CMakeLists.txt rename to contrib/nnc/plugin/core/CMakeLists.txt diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/dumpers/ir_dot_builder.h b/contrib/nnc/plugin/core/include/nnc/core/IR/dumpers/ir_dot_builder.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/dumpers/ir_dot_builder.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/dumpers/ir_dot_builder.h diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/dumpers/ir_dot_dumper.h b/contrib/nnc/plugin/core/include/nnc/core/IR/dumpers/ir_dot_dumper.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/dumpers/ir_dot_dumper.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/dumpers/ir_dot_dumper.h diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/dumpers/ir_dot_node_info.h b/contrib/nnc/plugin/core/include/nnc/core/IR/dumpers/ir_dot_node_info.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/dumpers/ir_dot_node_info.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/dumpers/ir_dot_node_info.h diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/actions/ShapeInference.h b/contrib/nnc/plugin/core/include/nnc/core/IR/model/actions/ShapeInference.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/model/actions/ShapeInference.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/model/actions/ShapeInference.h diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/graph/graph.h b/contrib/nnc/plugin/core/include/nnc/core/IR/model/graph/graph.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/model/graph/graph.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/model/graph/graph.h diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/graph/ir_node.h b/contrib/nnc/plugin/core/include/nnc/core/IR/model/graph/ir_node.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/model/graph/ir_node.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/model/graph/ir_node.h diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/bias_add_op.h b/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/bias_add_op.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/model/operations/bias_add_op.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/bias_add_op.h diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/capped_relu_op.h b/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/capped_relu_op.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/model/operations/capped_relu_op.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/capped_relu_op.h diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/common.h b/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/common.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/model/operations/common.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/common.h diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/concat_op.h b/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/concat_op.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/model/operations/concat_op.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/concat_op.h diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/conv_2d_op.h b/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/conv_2d_op.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/model/operations/conv_2d_op.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/conv_2d_op.h diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/depthwise_conv2d_op.h b/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/depthwise_conv2d_op.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/model/operations/depthwise_conv2d_op.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/depthwise_conv2d_op.h diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/fully_connected_op.h b/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/fully_connected_op.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/model/operations/fully_connected_op.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/fully_connected_op.h diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/operation.h b/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/operation.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/model/operations/operation.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/operation.h diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/pool_op.h b/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/pool_op.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/model/operations/pool_op.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/pool_op.h diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/relu_op.h b/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/relu_op.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/model/operations/relu_op.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/relu_op.h diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/reshape_op.h b/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/reshape_op.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/model/operations/reshape_op.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/reshape_op.h diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/softmax_op.h b/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/softmax_op.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/model/operations/softmax_op.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/softmax_op.h diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/operations/variable_op.h b/contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/variable_op.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/model/operations/variable_op.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/model/operations/variable_op.h diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/visitor/visitor.h b/contrib/nnc/plugin/core/include/nnc/core/IR/model/visitor/visitor.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/IR/model/visitor/visitor.h rename to contrib/nnc/plugin/core/include/nnc/core/IR/model/visitor/visitor.h diff --git a/contrib/nnc/libs/core/include/nnc/core/linalg/Accessor.h b/contrib/nnc/plugin/core/include/nnc/core/linalg/Accessor.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/linalg/Accessor.h rename to contrib/nnc/plugin/core/include/nnc/core/linalg/Accessor.h diff --git a/contrib/nnc/libs/core/include/nnc/core/linalg/ExternalRegion.h b/contrib/nnc/plugin/core/include/nnc/core/linalg/ExternalRegion.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/linalg/ExternalRegion.h rename to contrib/nnc/plugin/core/include/nnc/core/linalg/ExternalRegion.h diff --git a/contrib/nnc/libs/core/include/nnc/core/linalg/Index.h b/contrib/nnc/plugin/core/include/nnc/core/linalg/Index.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/linalg/Index.h rename to contrib/nnc/plugin/core/include/nnc/core/linalg/Index.h diff --git a/contrib/nnc/libs/core/include/nnc/core/linalg/IndexEnumerator.h b/contrib/nnc/plugin/core/include/nnc/core/linalg/IndexEnumerator.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/linalg/IndexEnumerator.h rename to contrib/nnc/plugin/core/include/nnc/core/linalg/IndexEnumerator.h diff --git a/contrib/nnc/libs/core/include/nnc/core/linalg/IndexRange.h b/contrib/nnc/plugin/core/include/nnc/core/linalg/IndexRange.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/linalg/IndexRange.h rename to contrib/nnc/plugin/core/include/nnc/core/linalg/IndexRange.h diff --git a/contrib/nnc/libs/core/include/nnc/core/linalg/Iterable.h b/contrib/nnc/plugin/core/include/nnc/core/linalg/Iterable.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/linalg/Iterable.h rename to contrib/nnc/plugin/core/include/nnc/core/linalg/Iterable.h diff --git a/contrib/nnc/libs/core/include/nnc/core/linalg/Reader.h b/contrib/nnc/plugin/core/include/nnc/core/linalg/Reader.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/linalg/Reader.h rename to contrib/nnc/plugin/core/include/nnc/core/linalg/Reader.h diff --git a/contrib/nnc/libs/core/include/nnc/core/linalg/Region.h b/contrib/nnc/plugin/core/include/nnc/core/linalg/Region.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/linalg/Region.h rename to contrib/nnc/plugin/core/include/nnc/core/linalg/Region.h diff --git a/contrib/nnc/libs/core/include/nnc/core/linalg/Shape.h b/contrib/nnc/plugin/core/include/nnc/core/linalg/Shape.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/linalg/Shape.h rename to contrib/nnc/plugin/core/include/nnc/core/linalg/Shape.h diff --git a/contrib/nnc/libs/core/include/nnc/core/linalg/ShapeRange.h b/contrib/nnc/plugin/core/include/nnc/core/linalg/ShapeRange.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/linalg/ShapeRange.h rename to contrib/nnc/plugin/core/include/nnc/core/linalg/ShapeRange.h diff --git a/contrib/nnc/libs/core/include/nnc/core/linalg/Tensor.h b/contrib/nnc/plugin/core/include/nnc/core/linalg/Tensor.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/linalg/Tensor.h rename to contrib/nnc/plugin/core/include/nnc/core/linalg/Tensor.h diff --git a/contrib/nnc/libs/core/include/nnc/core/linalg/TensorUtil.h b/contrib/nnc/plugin/core/include/nnc/core/linalg/TensorUtil.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/linalg/TensorUtil.h rename to contrib/nnc/plugin/core/include/nnc/core/linalg/TensorUtil.h diff --git a/contrib/nnc/libs/core/include/nnc/core/linalg/TensorVariant.h b/contrib/nnc/plugin/core/include/nnc/core/linalg/TensorVariant.h similarity index 100% rename from contrib/nnc/libs/core/include/nnc/core/linalg/TensorVariant.h rename to contrib/nnc/plugin/core/include/nnc/core/linalg/TensorVariant.h diff --git a/contrib/nnc/libs/core/src/core/IR/dumpers/ir_dot_builder.cpp b/contrib/nnc/plugin/core/src/core/IR/dumpers/ir_dot_builder.cpp similarity index 100% rename from contrib/nnc/libs/core/src/core/IR/dumpers/ir_dot_builder.cpp rename to contrib/nnc/plugin/core/src/core/IR/dumpers/ir_dot_builder.cpp diff --git a/contrib/nnc/libs/core/src/core/IR/dumpers/ir_dot_dumper.cpp b/contrib/nnc/plugin/core/src/core/IR/dumpers/ir_dot_dumper.cpp similarity index 100% rename from contrib/nnc/libs/core/src/core/IR/dumpers/ir_dot_dumper.cpp rename to contrib/nnc/plugin/core/src/core/IR/dumpers/ir_dot_dumper.cpp diff --git a/contrib/nnc/libs/core/src/core/IR/dumpers/ir_dot_node_info.cpp b/contrib/nnc/plugin/core/src/core/IR/dumpers/ir_dot_node_info.cpp similarity index 100% rename from contrib/nnc/libs/core/src/core/IR/dumpers/ir_dot_node_info.cpp rename to contrib/nnc/plugin/core/src/core/IR/dumpers/ir_dot_node_info.cpp diff --git a/contrib/nnc/libs/core/src/core/IR/model/actions/ShapeInference.cpp b/contrib/nnc/plugin/core/src/core/IR/model/actions/ShapeInference.cpp similarity index 100% rename from contrib/nnc/libs/core/src/core/IR/model/actions/ShapeInference.cpp rename to contrib/nnc/plugin/core/src/core/IR/model/actions/ShapeInference.cpp diff --git a/contrib/nnc/libs/core/src/core/IR/model/graph/graph.cpp b/contrib/nnc/plugin/core/src/core/IR/model/graph/graph.cpp similarity index 100% rename from contrib/nnc/libs/core/src/core/IR/model/graph/graph.cpp rename to contrib/nnc/plugin/core/src/core/IR/model/graph/graph.cpp diff --git a/contrib/nnc/libs/core/src/core/IR/model/graph/ir_node.cpp b/contrib/nnc/plugin/core/src/core/IR/model/graph/ir_node.cpp similarity index 100% rename from contrib/nnc/libs/core/src/core/IR/model/graph/ir_node.cpp rename to contrib/nnc/plugin/core/src/core/IR/model/graph/ir_node.cpp diff --git a/contrib/nnc/libs/core/src/core/IR/model/operations/operation.cpp b/contrib/nnc/plugin/core/src/core/IR/model/operations/operation.cpp similarity index 100% rename from contrib/nnc/libs/core/src/core/IR/model/operations/operation.cpp rename to contrib/nnc/plugin/core/src/core/IR/model/operations/operation.cpp diff --git a/contrib/nnc/libs/core/src/core/linalg/Index.cpp b/contrib/nnc/plugin/core/src/core/linalg/Index.cpp similarity index 100% rename from contrib/nnc/libs/core/src/core/linalg/Index.cpp rename to contrib/nnc/plugin/core/src/core/linalg/Index.cpp diff --git a/contrib/nnc/libs/core/src/core/linalg/IndexEnumerator.cpp b/contrib/nnc/plugin/core/src/core/linalg/IndexEnumerator.cpp similarity index 100% rename from contrib/nnc/libs/core/src/core/linalg/IndexEnumerator.cpp rename to contrib/nnc/plugin/core/src/core/linalg/IndexEnumerator.cpp diff --git a/contrib/nnc/libs/core/src/core/linalg/IndexRange.cpp b/contrib/nnc/plugin/core/src/core/linalg/IndexRange.cpp similarity index 100% rename from contrib/nnc/libs/core/src/core/linalg/IndexRange.cpp rename to contrib/nnc/plugin/core/src/core/linalg/IndexRange.cpp diff --git a/contrib/nnc/libs/core/src/core/linalg/Reader.cpp b/contrib/nnc/plugin/core/src/core/linalg/Reader.cpp similarity index 100% rename from contrib/nnc/libs/core/src/core/linalg/Reader.cpp rename to contrib/nnc/plugin/core/src/core/linalg/Reader.cpp diff --git a/contrib/nnc/libs/core/src/core/linalg/Shape.cpp b/contrib/nnc/plugin/core/src/core/linalg/Shape.cpp similarity index 100% rename from contrib/nnc/libs/core/src/core/linalg/Shape.cpp rename to contrib/nnc/plugin/core/src/core/linalg/Shape.cpp diff --git a/contrib/nnc/libs/core/src/core/linalg/Tensor.cpp b/contrib/nnc/plugin/core/src/core/linalg/Tensor.cpp similarity index 100% rename from contrib/nnc/libs/core/src/core/linalg/Tensor.cpp rename to contrib/nnc/plugin/core/src/core/linalg/Tensor.cpp diff --git a/contrib/nnc/libs/core/src/core/linalg/TensorVariant.cpp b/contrib/nnc/plugin/core/src/core/linalg/TensorVariant.cpp similarity index 100% rename from contrib/nnc/libs/core/src/core/linalg/TensorVariant.cpp rename to contrib/nnc/plugin/core/src/core/linalg/TensorVariant.cpp diff --git a/contrib/nnc/libs/frontend/CMakeLists.txt b/contrib/nnc/plugin/frontend/CMakeLists.txt similarity index 81% rename from contrib/nnc/libs/frontend/CMakeLists.txt rename to contrib/nnc/plugin/frontend/CMakeLists.txt index 6fc7dc4..c17cba3 100644 --- a/contrib/nnc/libs/frontend/CMakeLists.txt +++ b/contrib/nnc/plugin/frontend/CMakeLists.txt @@ -11,8 +11,7 @@ add_library(${nn_import_common} STATIC ${common_sources} ${common_headers}) target_include_directories(${nn_import_common} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) set_target_properties(${nn_import_common} PROPERTIES POSITION_INDEPENDENT_CODE ON) -target_link_libraries(${nn_import_common} PRIVATE nnc_core) -target_link_libraries(${nn_import_common} PRIVATE nnc_plugin_core) +target_link_libraries(${nn_import_common} PRIVATE nnc_core nnc_support) add_subdirectory(tflite) add_subdirectory(caffe) diff --git a/contrib/nnc/libs/frontend/caffe/CMakeLists.txt b/contrib/nnc/plugin/frontend/caffe/CMakeLists.txt similarity index 95% rename from contrib/nnc/libs/frontend/caffe/CMakeLists.txt rename to contrib/nnc/plugin/frontend/caffe/CMakeLists.txt index 6b3bae2..814b411 100644 --- a/contrib/nnc/libs/frontend/caffe/CMakeLists.txt +++ b/contrib/nnc/plugin/frontend/caffe/CMakeLists.txt @@ -23,7 +23,6 @@ target_link_libraries(caffe_importer PUBLIC caffeproto) target_link_libraries(caffe_importer PUBLIC ${nn_import_common}) target_link_libraries(caffe_importer PRIVATE nnc_support) target_link_libraries(caffe_importer PRIVATE nnc_core) -target_link_libraries(caffe_importer PRIVATE nnc_plugin_core) add_nncc_example_executable(caffe_model_dumper ${OPTIONS_SRC} examples/model_dump.cpp) nncc_target_link_libraries(caffe_model_dumper nnc_support caffe_importer) diff --git a/contrib/nnc/libs/frontend/caffe/examples/model_dump.cpp b/contrib/nnc/plugin/frontend/caffe/examples/model_dump.cpp similarity index 91% rename from contrib/nnc/libs/frontend/caffe/examples/model_dump.cpp rename to contrib/nnc/plugin/frontend/caffe/examples/model_dump.cpp index c659fae..a2a23d6 100644 --- a/contrib/nnc/libs/frontend/caffe/examples/model_dump.cpp +++ b/contrib/nnc/plugin/frontend/caffe/examples/model_dump.cpp @@ -1,7 +1,7 @@ #include -#include "CommandLine.h" -#include "Options.h" +#include "support/CommandLine.h" +#include "option/Options.h" #include "caffe_importer.h" using namespace nncc::contrib; diff --git a/contrib/nnc/libs/frontend/caffe/include/caffe_dump_visitor.h b/contrib/nnc/plugin/frontend/caffe/include/caffe_dump_visitor.h similarity index 100% rename from contrib/nnc/libs/frontend/caffe/include/caffe_dump_visitor.h rename to contrib/nnc/plugin/frontend/caffe/include/caffe_dump_visitor.h diff --git a/contrib/nnc/libs/frontend/caffe/include/caffe_importer.h b/contrib/nnc/plugin/frontend/caffe/include/caffe_importer.h similarity index 100% rename from contrib/nnc/libs/frontend/caffe/include/caffe_importer.h rename to contrib/nnc/plugin/frontend/caffe/include/caffe_importer.h diff --git a/contrib/nnc/libs/frontend/caffe/include/caffe_model_visitor.h b/contrib/nnc/plugin/frontend/caffe/include/caffe_model_visitor.h similarity index 100% rename from contrib/nnc/libs/frontend/caffe/include/caffe_model_visitor.h rename to contrib/nnc/plugin/frontend/caffe/include/caffe_model_visitor.h diff --git a/contrib/nnc/libs/frontend/caffe/include/caffe_op_creator.h b/contrib/nnc/plugin/frontend/caffe/include/caffe_op_creator.h similarity index 98% rename from contrib/nnc/libs/frontend/caffe/include/caffe_op_creator.h rename to contrib/nnc/plugin/frontend/caffe/include/caffe_op_creator.h index 30e5f59..b2a257f 100644 --- a/contrib/nnc/libs/frontend/caffe/include/caffe_op_creator.h +++ b/contrib/nnc/plugin/frontend/caffe/include/caffe_op_creator.h @@ -5,7 +5,7 @@ #include #include -#include "PluginException.h" +#include "support/PluginException.h" #include "nnc/core/IR/model/graph/graph.h" #include "nnc/core/IR/model/graph/ir_node.h" #include "nnc/core/linalg/TensorVariant.h" diff --git a/contrib/nnc/libs/frontend/caffe/include/caffe_visitor.h b/contrib/nnc/plugin/frontend/caffe/include/caffe_visitor.h similarity index 100% rename from contrib/nnc/libs/frontend/caffe/include/caffe_visitor.h rename to contrib/nnc/plugin/frontend/caffe/include/caffe_visitor.h diff --git a/contrib/nnc/libs/frontend/caffe/include/caffe_walker.h b/contrib/nnc/plugin/frontend/caffe/include/caffe_walker.h similarity index 100% rename from contrib/nnc/libs/frontend/caffe/include/caffe_walker.h rename to contrib/nnc/plugin/frontend/caffe/include/caffe_walker.h diff --git a/contrib/nnc/libs/frontend/caffe/include/proto_reader.h b/contrib/nnc/plugin/frontend/caffe/include/proto_reader.h similarity index 100% rename from contrib/nnc/libs/frontend/caffe/include/proto_reader.h rename to contrib/nnc/plugin/frontend/caffe/include/proto_reader.h diff --git a/contrib/nnc/libs/frontend/caffe/src/caffe_dump_visitor.cpp b/contrib/nnc/plugin/frontend/caffe/src/caffe_dump_visitor.cpp similarity index 100% rename from contrib/nnc/libs/frontend/caffe/src/caffe_dump_visitor.cpp rename to contrib/nnc/plugin/frontend/caffe/src/caffe_dump_visitor.cpp diff --git a/contrib/nnc/libs/frontend/caffe/src/caffe_importer.cpp b/contrib/nnc/plugin/frontend/caffe/src/caffe_importer.cpp similarity index 100% rename from contrib/nnc/libs/frontend/caffe/src/caffe_importer.cpp rename to contrib/nnc/plugin/frontend/caffe/src/caffe_importer.cpp diff --git a/contrib/nnc/libs/frontend/caffe/src/caffe_model_visitor.cpp b/contrib/nnc/plugin/frontend/caffe/src/caffe_model_visitor.cpp similarity index 99% rename from contrib/nnc/libs/frontend/caffe/src/caffe_model_visitor.cpp rename to contrib/nnc/plugin/frontend/caffe/src/caffe_model_visitor.cpp index 69442c4..81f8779 100644 --- a/contrib/nnc/libs/frontend/caffe/src/caffe_model_visitor.cpp +++ b/contrib/nnc/plugin/frontend/caffe/src/caffe_model_visitor.cpp @@ -4,7 +4,7 @@ #include "nnc/core/linalg/Shape.h" #include "nnc/core/IR/model/operations/variable_op.h" #include "nnc/core/linalg/TensorUtil.h" -#include "PluginException.h" +#include "support/PluginException.h" #include "shape_helper.h" #include "caffe_model_visitor.h" diff --git a/contrib/nnc/libs/frontend/caffe/src/caffe_op_creator.cpp b/contrib/nnc/plugin/frontend/caffe/src/caffe_op_creator.cpp similarity index 100% rename from contrib/nnc/libs/frontend/caffe/src/caffe_op_creator.cpp rename to contrib/nnc/plugin/frontend/caffe/src/caffe_op_creator.cpp diff --git a/contrib/nnc/libs/frontend/caffe/src/caffe_plugin.cpp b/contrib/nnc/plugin/frontend/caffe/src/caffe_plugin.cpp similarity index 91% rename from contrib/nnc/libs/frontend/caffe/src/caffe_plugin.cpp rename to contrib/nnc/plugin/frontend/caffe/src/caffe_plugin.cpp index 9597d68..04d8c11 100644 --- a/contrib/nnc/libs/frontend/caffe/src/caffe_plugin.cpp +++ b/contrib/nnc/plugin/frontend/caffe/src/caffe_plugin.cpp @@ -2,9 +2,9 @@ #include #include -#include "PluginInstance.h" -#include "PluginException.h" -#include "Options.h" +#include "support/PluginInstance.h" +#include "support/PluginException.h" +#include "option/Options.h" #include "caffe_importer.h" diff --git a/contrib/nnc/libs/frontend/caffe/src/caffe_walker.cpp b/contrib/nnc/plugin/frontend/caffe/src/caffe_walker.cpp similarity index 100% rename from contrib/nnc/libs/frontend/caffe/src/caffe_walker.cpp rename to contrib/nnc/plugin/frontend/caffe/src/caffe_walker.cpp diff --git a/contrib/nnc/libs/frontend/caffe/src/proto_reader.cpp b/contrib/nnc/plugin/frontend/caffe/src/proto_reader.cpp similarity index 100% rename from contrib/nnc/libs/frontend/caffe/src/proto_reader.cpp rename to contrib/nnc/plugin/frontend/caffe/src/proto_reader.cpp diff --git a/contrib/nnc/libs/frontend/common/model_allocation.cpp b/contrib/nnc/plugin/frontend/common/model_allocation.cpp similarity index 100% rename from contrib/nnc/libs/frontend/common/model_allocation.cpp rename to contrib/nnc/plugin/frontend/common/model_allocation.cpp diff --git a/contrib/nnc/libs/frontend/common/shape_helper.cpp b/contrib/nnc/plugin/frontend/common/shape_helper.cpp similarity index 95% rename from contrib/nnc/libs/frontend/common/shape_helper.cpp rename to contrib/nnc/plugin/frontend/common/shape_helper.cpp index 627d743..39a21a8 100644 --- a/contrib/nnc/libs/frontend/common/shape_helper.cpp +++ b/contrib/nnc/plugin/frontend/common/shape_helper.cpp @@ -1,7 +1,7 @@ #include #include "shape_helper.h" -#include "PluginException.h" +#include "support/PluginException.h" namespace nncc { diff --git a/contrib/nnc/libs/frontend/include/model_allocation.h b/contrib/nnc/plugin/frontend/include/model_allocation.h similarity index 100% rename from contrib/nnc/libs/frontend/include/model_allocation.h rename to contrib/nnc/plugin/frontend/include/model_allocation.h diff --git a/contrib/nnc/libs/frontend/include/nn_importer.h b/contrib/nnc/plugin/frontend/include/nn_importer.h similarity index 100% rename from contrib/nnc/libs/frontend/include/nn_importer.h rename to contrib/nnc/plugin/frontend/include/nn_importer.h diff --git a/contrib/nnc/libs/frontend/include/shape_helper.h b/contrib/nnc/plugin/frontend/include/shape_helper.h similarity index 100% rename from contrib/nnc/libs/frontend/include/shape_helper.h rename to contrib/nnc/plugin/frontend/include/shape_helper.h diff --git a/contrib/nnc/libs/frontend/tflite/CMakeLists.txt b/contrib/nnc/plugin/frontend/tflite/CMakeLists.txt similarity index 97% rename from contrib/nnc/libs/frontend/tflite/CMakeLists.txt rename to contrib/nnc/plugin/frontend/tflite/CMakeLists.txt index b40e29a..af562d4 100644 --- a/contrib/nnc/libs/frontend/tflite/CMakeLists.txt +++ b/contrib/nnc/plugin/frontend/tflite/CMakeLists.txt @@ -38,7 +38,6 @@ target_link_libraries(${tflite_import} PUBLIC flatbuffers) target_link_libraries(${tflite_import} PUBLIC ${nn_import_common}) target_link_libraries(${tflite_import} PUBLIC nnc_support) target_link_libraries(${tflite_import} PUBLIC nnc_core) -target_link_libraries(${tflite_import} PUBLIC nnc_plugin_core) ################### # TFLITE examples # diff --git a/contrib/nnc/libs/frontend/tflite/examples/sanity_check.cpp b/contrib/nnc/plugin/frontend/tflite/examples/sanity_check.cpp similarity index 90% rename from contrib/nnc/libs/frontend/tflite/examples/sanity_check.cpp rename to contrib/nnc/plugin/frontend/tflite/examples/sanity_check.cpp index 2254fea..581fe9d 100644 --- a/contrib/nnc/libs/frontend/tflite/examples/sanity_check.cpp +++ b/contrib/nnc/plugin/frontend/tflite/examples/sanity_check.cpp @@ -1,7 +1,7 @@ #include -#include "CommandLine.h" -#include "Options.h" +#include "support/CommandLine.h" +#include "option/Options.h" #include "tflite_v3_importer.h" using namespace nncc::contrib; diff --git a/contrib/nnc/libs/frontend/tflite/include/schema_v3.h b/contrib/nnc/plugin/frontend/tflite/include/schema_v3.h similarity index 100% rename from contrib/nnc/libs/frontend/tflite/include/schema_v3.h rename to contrib/nnc/plugin/frontend/tflite/include/schema_v3.h diff --git a/contrib/nnc/libs/frontend/tflite/include/tflite_dump_visitor.h b/contrib/nnc/plugin/frontend/tflite/include/tflite_dump_visitor.h similarity index 100% rename from contrib/nnc/libs/frontend/tflite/include/tflite_dump_visitor.h rename to contrib/nnc/plugin/frontend/tflite/include/tflite_dump_visitor.h diff --git a/contrib/nnc/libs/frontend/tflite/include/tflite_importer.inline.h b/contrib/nnc/plugin/frontend/tflite/include/tflite_importer.inline.h similarity index 100% rename from contrib/nnc/libs/frontend/tflite/include/tflite_importer.inline.h rename to contrib/nnc/plugin/frontend/tflite/include/tflite_importer.inline.h diff --git a/contrib/nnc/libs/frontend/tflite/include/tflite_ir_visitor.h b/contrib/nnc/plugin/frontend/tflite/include/tflite_ir_visitor.h similarity index 100% rename from contrib/nnc/libs/frontend/tflite/include/tflite_ir_visitor.h rename to contrib/nnc/plugin/frontend/tflite/include/tflite_ir_visitor.h diff --git a/contrib/nnc/libs/frontend/tflite/include/tflite_op_creator.h b/contrib/nnc/plugin/frontend/tflite/include/tflite_op_creator.h similarity index 98% rename from contrib/nnc/libs/frontend/tflite/include/tflite_op_creator.h rename to contrib/nnc/plugin/frontend/tflite/include/tflite_op_creator.h index 89b37b5..12323b3 100644 --- a/contrib/nnc/libs/frontend/tflite/include/tflite_op_creator.h +++ b/contrib/nnc/plugin/frontend/tflite/include/tflite_op_creator.h @@ -6,7 +6,7 @@ #include #include -#include "PluginException.h" +#include "support/PluginException.h" #include "nnc/core/IR/model/graph/graph.h" #include "nnc/core/IR/model/graph/ir_node.h" #include "nnc/core/linalg/TensorVariant.h" diff --git a/contrib/nnc/libs/frontend/tflite/include/tflite_v3_importer.h b/contrib/nnc/plugin/frontend/tflite/include/tflite_v3_importer.h similarity index 100% rename from contrib/nnc/libs/frontend/tflite/include/tflite_v3_importer.h rename to contrib/nnc/plugin/frontend/tflite/include/tflite_v3_importer.h diff --git a/contrib/nnc/libs/frontend/tflite/include/tflite_visitor.h b/contrib/nnc/plugin/frontend/tflite/include/tflite_visitor.h similarity index 100% rename from contrib/nnc/libs/frontend/tflite/include/tflite_visitor.h rename to contrib/nnc/plugin/frontend/tflite/include/tflite_visitor.h diff --git a/contrib/nnc/libs/frontend/tflite/include/tflite_walker.h b/contrib/nnc/plugin/frontend/tflite/include/tflite_walker.h similarity index 100% rename from contrib/nnc/libs/frontend/tflite/include/tflite_walker.h rename to contrib/nnc/plugin/frontend/tflite/include/tflite_walker.h diff --git a/contrib/nnc/libs/frontend/tflite/schema/schema.fbs b/contrib/nnc/plugin/frontend/tflite/schema/schema.fbs similarity index 100% rename from contrib/nnc/libs/frontend/tflite/schema/schema.fbs rename to contrib/nnc/plugin/frontend/tflite/schema/schema.fbs diff --git a/contrib/nnc/libs/frontend/tflite/schema/schema.meta b/contrib/nnc/plugin/frontend/tflite/schema/schema.meta similarity index 100% rename from contrib/nnc/libs/frontend/tflite/schema/schema.meta rename to contrib/nnc/plugin/frontend/tflite/schema/schema.meta diff --git a/contrib/nnc/libs/frontend/tflite/schema/schema_v0.fbs b/contrib/nnc/plugin/frontend/tflite/schema/schema_v0.fbs similarity index 100% rename from contrib/nnc/libs/frontend/tflite/schema/schema_v0.fbs rename to contrib/nnc/plugin/frontend/tflite/schema/schema_v0.fbs diff --git a/contrib/nnc/libs/frontend/tflite/schema/schema_v0.meta b/contrib/nnc/plugin/frontend/tflite/schema/schema_v0.meta similarity index 100% rename from contrib/nnc/libs/frontend/tflite/schema/schema_v0.meta rename to contrib/nnc/plugin/frontend/tflite/schema/schema_v0.meta diff --git a/contrib/nnc/libs/frontend/tflite/schema/schema_v1.fbs b/contrib/nnc/plugin/frontend/tflite/schema/schema_v1.fbs similarity index 100% rename from contrib/nnc/libs/frontend/tflite/schema/schema_v1.fbs rename to contrib/nnc/plugin/frontend/tflite/schema/schema_v1.fbs diff --git a/contrib/nnc/libs/frontend/tflite/schema/schema_v1.meta b/contrib/nnc/plugin/frontend/tflite/schema/schema_v1.meta similarity index 100% rename from contrib/nnc/libs/frontend/tflite/schema/schema_v1.meta rename to contrib/nnc/plugin/frontend/tflite/schema/schema_v1.meta diff --git a/contrib/nnc/libs/frontend/tflite/schema/schema_v2.fbs b/contrib/nnc/plugin/frontend/tflite/schema/schema_v2.fbs similarity index 100% rename from contrib/nnc/libs/frontend/tflite/schema/schema_v2.fbs rename to contrib/nnc/plugin/frontend/tflite/schema/schema_v2.fbs diff --git a/contrib/nnc/libs/frontend/tflite/schema/schema_v2.meta b/contrib/nnc/plugin/frontend/tflite/schema/schema_v2.meta similarity index 100% rename from contrib/nnc/libs/frontend/tflite/schema/schema_v2.meta rename to contrib/nnc/plugin/frontend/tflite/schema/schema_v2.meta diff --git a/contrib/nnc/libs/frontend/tflite/schema/schema_v3.fbs b/contrib/nnc/plugin/frontend/tflite/schema/schema_v3.fbs similarity index 100% rename from contrib/nnc/libs/frontend/tflite/schema/schema_v3.fbs rename to contrib/nnc/plugin/frontend/tflite/schema/schema_v3.fbs diff --git a/contrib/nnc/libs/frontend/tflite/schema/schema_v3.meta b/contrib/nnc/plugin/frontend/tflite/schema/schema_v3.meta similarity index 100% rename from contrib/nnc/libs/frontend/tflite/schema/schema_v3.meta rename to contrib/nnc/plugin/frontend/tflite/schema/schema_v3.meta diff --git a/contrib/nnc/libs/frontend/tflite/src/tflite_dump_visitor.cpp b/contrib/nnc/plugin/frontend/tflite/src/tflite_dump_visitor.cpp similarity index 100% rename from contrib/nnc/libs/frontend/tflite/src/tflite_dump_visitor.cpp rename to contrib/nnc/plugin/frontend/tflite/src/tflite_dump_visitor.cpp diff --git a/contrib/nnc/libs/frontend/tflite/src/tflite_importer.inline.cpp b/contrib/nnc/plugin/frontend/tflite/src/tflite_importer.inline.cpp similarity index 100% rename from contrib/nnc/libs/frontend/tflite/src/tflite_importer.inline.cpp rename to contrib/nnc/plugin/frontend/tflite/src/tflite_importer.inline.cpp diff --git a/contrib/nnc/libs/frontend/tflite/src/tflite_ir_visitor.cpp b/contrib/nnc/plugin/frontend/tflite/src/tflite_ir_visitor.cpp similarity index 99% rename from contrib/nnc/libs/frontend/tflite/src/tflite_ir_visitor.cpp rename to contrib/nnc/plugin/frontend/tflite/src/tflite_ir_visitor.cpp index 471a1e2..0c9b14b 100644 --- a/contrib/nnc/libs/frontend/tflite/src/tflite_ir_visitor.cpp +++ b/contrib/nnc/plugin/frontend/tflite/src/tflite_ir_visitor.cpp @@ -2,7 +2,7 @@ #include #include "schema_v3.h" -#include "PluginException.h" +#include "support/PluginException.h" #include "nnc/core/linalg/Shape.h" #include "nnc/core/linalg/Index.h" #include "nnc/core/linalg/IndexRange.h" diff --git a/contrib/nnc/libs/frontend/tflite/src/tflite_op_creator.cpp b/contrib/nnc/plugin/frontend/tflite/src/tflite_op_creator.cpp similarity index 100% rename from contrib/nnc/libs/frontend/tflite/src/tflite_op_creator.cpp rename to contrib/nnc/plugin/frontend/tflite/src/tflite_op_creator.cpp diff --git a/contrib/nnc/libs/frontend/tflite/src/tflite_plugin.cpp b/contrib/nnc/plugin/frontend/tflite/src/tflite_plugin.cpp similarity index 91% rename from contrib/nnc/libs/frontend/tflite/src/tflite_plugin.cpp rename to contrib/nnc/plugin/frontend/tflite/src/tflite_plugin.cpp index 280e971..cd17f0f 100644 --- a/contrib/nnc/libs/frontend/tflite/src/tflite_plugin.cpp +++ b/contrib/nnc/plugin/frontend/tflite/src/tflite_plugin.cpp @@ -2,9 +2,9 @@ #include #include -#include "PluginInstance.h" -#include "PluginException.h" -#include "Options.h" +#include "support/PluginInstance.h" +#include "support/PluginException.h" +#include "option/Options.h" #include "tflite_v3_importer.h" diff --git a/contrib/nnc/libs/frontend/tflite/src/tflite_v3_importer.cpp b/contrib/nnc/plugin/frontend/tflite/src/tflite_v3_importer.cpp similarity index 100% rename from contrib/nnc/libs/frontend/tflite/src/tflite_v3_importer.cpp rename to contrib/nnc/plugin/frontend/tflite/src/tflite_v3_importer.cpp diff --git a/contrib/nnc/libs/frontend/tflite/src/tflite_walker.cpp b/contrib/nnc/plugin/frontend/tflite/src/tflite_walker.cpp similarity index 100% rename from contrib/nnc/libs/frontend/tflite/src/tflite_walker.cpp rename to contrib/nnc/plugin/frontend/tflite/src/tflite_walker.cpp diff --git a/contrib/nnc/plugin/interpreter/CMakeLists.txt b/contrib/nnc/plugin/interpreter/CMakeLists.txt new file mode 100644 index 0000000..30fc7ee --- /dev/null +++ b/contrib/nnc/plugin/interpreter/CMakeLists.txt @@ -0,0 +1,11 @@ +file(GLOB_RECURSE interp_src ./*.cpp ./*.h) +add_library(nnc_interpreter SHARED ${interp_src}) +target_link_libraries(nnc_interpreter PRIVATE nnc_core nnc_support) + +if(NNC_HDF5_SUPPORTED) + target_include_directories(nnc_interpreter PRIVATE ${HDF5_INCLUDE_DIRS}) + target_link_libraries(nnc_interpreter PRIVATE ${HDF5_CXX_LIBRARIES}) +endif(NNC_HDF5_SUPPORTED) + +# install interpreter library +install_nnc_plugin(nnc_interpreter) \ No newline at end of file diff --git a/contrib/nnc/libs/backend/interpreter/core/src/Interpreter.cpp b/contrib/nnc/plugin/interpreter/Interpreter.cpp similarity index 92% rename from contrib/nnc/libs/backend/interpreter/core/src/Interpreter.cpp rename to contrib/nnc/plugin/interpreter/Interpreter.cpp index c120e56..9de9a91 100644 --- a/contrib/nnc/libs/backend/interpreter/core/src/Interpreter.cpp +++ b/contrib/nnc/plugin/interpreter/Interpreter.cpp @@ -1,6 +1,6 @@ #include -#include "interpreter/core/Interpreter.h" +#include "plugin/interpreter/Interpreter.h" #include "nnc/core/IR/model/operations/fully_connected_op.h" #include "nnc/core/IR/model/operations/softmax_op.h" @@ -13,15 +13,15 @@ #include "nnc/core/IR/model/operations/concat_op.h" #include "nnc/core/IR/model/operations/bias_add_op.h" -#include "interpreter/ops/Bias.h" -#include "interpreter/ops/Concat.h" -#include "interpreter/ops/conv_2D.h" -#include "interpreter/ops/Depthwise_conv_2D.h" -#include "interpreter/ops/Elementwise.h" -#include "interpreter/ops/FullyConnected.h" -#include "interpreter/ops/Pool.h" -#include "interpreter/ops/Reshape.h" -#include "interpreter/ops/Softmax.h" +#include "ops/Bias.h" +#include "ops/Concat.h" +#include "ops/conv_2D.h" +#include "ops/Depthwise_conv_2D.h" +#include "ops/Elementwise.h" +#include "ops/FullyConnected.h" +#include "ops/Pool.h" +#include "ops/Reshape.h" +#include "ops/Softmax.h" namespace nncc { diff --git a/contrib/nnc/libs/backend/interpreter/plugin/src/interpreter_plugin.cpp b/contrib/nnc/plugin/interpreter/interpreter_plugin.cpp similarity index 97% rename from contrib/nnc/libs/backend/interpreter/plugin/src/interpreter_plugin.cpp rename to contrib/nnc/plugin/interpreter/interpreter_plugin.cpp index 0c15c93..79fc076 100644 --- a/contrib/nnc/libs/backend/interpreter/plugin/src/interpreter_plugin.cpp +++ b/contrib/nnc/plugin/interpreter/interpreter_plugin.cpp @@ -3,18 +3,18 @@ #include #include -#include "Options.h" +#include "option/Options.h" #include "Definitions.h" #ifdef NNC_HDF5_SUPPORTED #include #endif // NNC_HDF5_SUPPORTED -#include "PluginInstance.h" +#include "support/PluginInstance.h" #include "nnc/core/linalg/Shape.h" -#include "interpreter/core/Interpreter.h" +#include "plugin/interpreter/Interpreter.h" #include "nnc/core/IR/model/actions/ShapeInference.h" #include "nnc/core/IR/model/graph/graph.h" diff --git a/contrib/nnc/libs/backend/interpreter/plugin/include/interpreter_plugin.h b/contrib/nnc/plugin/interpreter/interpreter_plugin.h similarity index 92% rename from contrib/nnc/libs/backend/interpreter/plugin/include/interpreter_plugin.h rename to contrib/nnc/plugin/interpreter/interpreter_plugin.h index 3ace3c7..bb0d950 100644 --- a/contrib/nnc/libs/backend/interpreter/plugin/include/interpreter_plugin.h +++ b/contrib/nnc/plugin/interpreter/interpreter_plugin.h @@ -3,8 +3,8 @@ #include -#include "PluginInstance.h" -#include "PluginException.h" +#include "support/PluginInstance.h" +#include "support/PluginException.h" #include "nnc/core/linalg/TensorVariant.h" #include "nnc/core/linalg/Shape.h" diff --git a/contrib/nnc/plugin/interpreter/ops/Bias.cpp b/contrib/nnc/plugin/interpreter/ops/Bias.cpp new file mode 100644 index 0000000..88e8233 --- /dev/null +++ b/contrib/nnc/plugin/interpreter/ops/Bias.cpp @@ -0,0 +1 @@ +#include "Bias.h" diff --git a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Bias.h b/contrib/nnc/plugin/interpreter/ops/Bias.h similarity index 100% rename from contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Bias.h rename to contrib/nnc/plugin/interpreter/ops/Bias.h diff --git a/contrib/nnc/plugin/interpreter/ops/Concat.cpp b/contrib/nnc/plugin/interpreter/ops/Concat.cpp new file mode 100644 index 0000000..2e16214 --- /dev/null +++ b/contrib/nnc/plugin/interpreter/ops/Concat.cpp @@ -0,0 +1 @@ +#include "Concat.h" diff --git a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Concat.h b/contrib/nnc/plugin/interpreter/ops/Concat.h similarity index 97% rename from contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Concat.h rename to contrib/nnc/plugin/interpreter/ops/Concat.h index 6a276f0..edb14dd 100644 --- a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Concat.h +++ b/contrib/nnc/plugin/interpreter/ops/Concat.h @@ -1,7 +1,7 @@ #ifndef _NNC_CORE_BACKEND_INTERPRETER_FILL_IMPL_ #define _NNC_CORE_BACKEND_INTERPRETER_FILL_IMPL_ -#include "interpreter/ops/Fill.h" +#include "Fill.h" namespace nncc { diff --git a/contrib/nnc/libs/backend/interpreter/core/src/ops/Depthwise_conv_2D.cpp b/contrib/nnc/plugin/interpreter/ops/Depthwise_conv_2D.cpp similarity index 95% rename from contrib/nnc/libs/backend/interpreter/core/src/ops/Depthwise_conv_2D.cpp rename to contrib/nnc/plugin/interpreter/ops/Depthwise_conv_2D.cpp index 3ea313b..3c4d6e2 100644 --- a/contrib/nnc/libs/backend/interpreter/core/src/ops/Depthwise_conv_2D.cpp +++ b/contrib/nnc/plugin/interpreter/ops/Depthwise_conv_2D.cpp @@ -1,7 +1,7 @@ #include "nnc/core/linalg/ShapeRange.h" -#include "interpreter/ops/Depthwise_conv_2D.h" -#include "interpreter/ops/common.h" +#include "Depthwise_conv_2D.h" +#include "common.h" namespace nncc { diff --git a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Depthwise_conv_2D.h b/contrib/nnc/plugin/interpreter/ops/Depthwise_conv_2D.h similarity index 95% rename from contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Depthwise_conv_2D.h rename to contrib/nnc/plugin/interpreter/ops/Depthwise_conv_2D.h index f305415..9ca2ee3 100644 --- a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Depthwise_conv_2D.h +++ b/contrib/nnc/plugin/interpreter/ops/Depthwise_conv_2D.h @@ -1,7 +1,7 @@ #ifndef _NNC_CORE_BACKEND_INTERPRETER_DEPTHWISE_CONV2D_IMPL_ #define _NNC_CORE_BACKEND_INTERPRETER_DEPTHWISE_CONV2D_IMPL_ -#include "interpreter/ops/OperationImpl.h" +#include "OperationImpl.h" #include "nnc/core/IR/model/operations/common.h" #include "nnc/core/IR/model/operations/depthwise_conv2d_op.h" diff --git a/contrib/nnc/libs/backend/interpreter/core/src/ops/Elementwise.cpp b/contrib/nnc/plugin/interpreter/ops/Elementwise.cpp similarity index 59% rename from contrib/nnc/libs/backend/interpreter/core/src/ops/Elementwise.cpp rename to contrib/nnc/plugin/interpreter/ops/Elementwise.cpp index a34960f..1c269d1 100644 --- a/contrib/nnc/libs/backend/interpreter/core/src/ops/Elementwise.cpp +++ b/contrib/nnc/plugin/interpreter/ops/Elementwise.cpp @@ -1,3 +1,3 @@ -#include "interpreter/ops/Elementwise.h" +#include "Elementwise.h" //do not delete //used to force compilation of elementwise.h diff --git a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Elementwise.h b/contrib/nnc/plugin/interpreter/ops/Elementwise.h similarity index 96% rename from contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Elementwise.h rename to contrib/nnc/plugin/interpreter/ops/Elementwise.h index 585005b..7a4768d 100644 --- a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Elementwise.h +++ b/contrib/nnc/plugin/interpreter/ops/Elementwise.h @@ -4,7 +4,7 @@ #include "nnc/core/linalg/ShapeRange.h" #include "nnc/core/linalg/Tensor.h" -#include "interpreter/ops/OperationImpl.h" +#include "OperationImpl.h" namespace nncc { diff --git a/contrib/nnc/plugin/interpreter/ops/Fill.cpp b/contrib/nnc/plugin/interpreter/ops/Fill.cpp new file mode 100644 index 0000000..4acf328 --- /dev/null +++ b/contrib/nnc/plugin/interpreter/ops/Fill.cpp @@ -0,0 +1 @@ +#include "Fill.h" diff --git a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Fill.h b/contrib/nnc/plugin/interpreter/ops/Fill.h similarity index 94% rename from contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Fill.h rename to contrib/nnc/plugin/interpreter/ops/Fill.h index 20c92fd..8cafe51 100644 --- a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Fill.h +++ b/contrib/nnc/plugin/interpreter/ops/Fill.h @@ -3,7 +3,7 @@ #include -#include "interpreter/ops/Elementwise.h" +#include "Elementwise.h" namespace nncc { diff --git a/contrib/nnc/libs/backend/interpreter/core/src/ops/FullyConnected.cpp b/contrib/nnc/plugin/interpreter/ops/FullyConnected.cpp similarity index 56% rename from contrib/nnc/libs/backend/interpreter/core/src/ops/FullyConnected.cpp rename to contrib/nnc/plugin/interpreter/ops/FullyConnected.cpp index 4833ff1..172c6a2 100644 --- a/contrib/nnc/libs/backend/interpreter/core/src/ops/FullyConnected.cpp +++ b/contrib/nnc/plugin/interpreter/ops/FullyConnected.cpp @@ -1,3 +1,3 @@ -#include "interpreter/ops/FullyConnected.h" +#include "FullyConnected.h" //Do not remove //Used to force compile FullyConnected.h diff --git a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/FullyConnected.h b/contrib/nnc/plugin/interpreter/ops/FullyConnected.h similarity index 97% rename from contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/FullyConnected.h rename to contrib/nnc/plugin/interpreter/ops/FullyConnected.h index 12ce416..7f1d234 100644 --- a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/FullyConnected.h +++ b/contrib/nnc/plugin/interpreter/ops/FullyConnected.h @@ -3,7 +3,7 @@ #include "nnc/core/linalg/ShapeRange.h" #include "nnc/core/IR/model/operations/fully_connected_op.h" -#include "interpreter/ops/OperationImpl.h" +#include "OperationImpl.h" namespace nncc { diff --git a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/OperationImpl.h b/contrib/nnc/plugin/interpreter/ops/OperationImpl.h similarity index 100% rename from contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/OperationImpl.h rename to contrib/nnc/plugin/interpreter/ops/OperationImpl.h diff --git a/contrib/nnc/libs/backend/interpreter/core/src/ops/Pool.cpp b/contrib/nnc/plugin/interpreter/ops/Pool.cpp similarity index 96% rename from contrib/nnc/libs/backend/interpreter/core/src/ops/Pool.cpp rename to contrib/nnc/plugin/interpreter/ops/Pool.cpp index a2a9dbf..ab8b215 100644 --- a/contrib/nnc/libs/backend/interpreter/core/src/ops/Pool.cpp +++ b/contrib/nnc/plugin/interpreter/ops/Pool.cpp @@ -3,8 +3,8 @@ #include "nnc/core/linalg/ShapeRange.h" -#include "interpreter/ops/Pool.h" -#include "interpreter/ops/common.h" +#include "Pool.h" +#include "common.h" namespace nncc { diff --git a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Pool.h b/contrib/nnc/plugin/interpreter/ops/Pool.h similarity index 95% rename from contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Pool.h rename to contrib/nnc/plugin/interpreter/ops/Pool.h index 9cce2b2..96f2d12 100644 --- a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Pool.h +++ b/contrib/nnc/plugin/interpreter/ops/Pool.h @@ -1,7 +1,7 @@ #ifndef _NNC_CORE_BACKEND_INTERPRETER_POOL_ #define _NNC_CORE_BACKEND_INTERPRETER_POOL_ -#include "interpreter/ops/OperationImpl.h" +#include "OperationImpl.h" #include "nnc/core/IR/model/operations/pool_op.h" #include "nnc/core/IR/model/operations/common.h" diff --git a/contrib/nnc/plugin/interpreter/ops/Reduce.cpp b/contrib/nnc/plugin/interpreter/ops/Reduce.cpp new file mode 100644 index 0000000..9bc19f6 --- /dev/null +++ b/contrib/nnc/plugin/interpreter/ops/Reduce.cpp @@ -0,0 +1 @@ +#include "Reduce.h" diff --git a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Reduce.h b/contrib/nnc/plugin/interpreter/ops/Reduce.h similarity index 94% rename from contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Reduce.h rename to contrib/nnc/plugin/interpreter/ops/Reduce.h index 0c6e17c..e349553 100644 --- a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Reduce.h +++ b/contrib/nnc/plugin/interpreter/ops/Reduce.h @@ -6,8 +6,8 @@ #include "nnc/core/linalg/Shape.h" #include "nnc/core/linalg/Tensor.h" -#include "interpreter/ops/OperationImpl.h" -#include "interpreter/ops/Fill.h" +#include "OperationImpl.h" +#include "Fill.h" namespace nncc diff --git a/contrib/nnc/plugin/interpreter/ops/Reshape.cpp b/contrib/nnc/plugin/interpreter/ops/Reshape.cpp new file mode 100644 index 0000000..42b3952 --- /dev/null +++ b/contrib/nnc/plugin/interpreter/ops/Reshape.cpp @@ -0,0 +1 @@ +#include "Reshape.h" diff --git a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Reshape.h b/contrib/nnc/plugin/interpreter/ops/Reshape.h similarity index 94% rename from contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Reshape.h rename to contrib/nnc/plugin/interpreter/ops/Reshape.h index 0962e01..db4d39f 100644 --- a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Reshape.h +++ b/contrib/nnc/plugin/interpreter/ops/Reshape.h @@ -3,8 +3,8 @@ #include "nnc/core/IR/model/operations/reshape_op.h" -#include "interpreter/ops/OperationImpl.h" -#include "interpreter/ops/Fill.h" +#include "OperationImpl.h" +#include "Fill.h" namespace nncc { diff --git a/contrib/nnc/plugin/interpreter/ops/Softmax.cpp b/contrib/nnc/plugin/interpreter/ops/Softmax.cpp new file mode 100644 index 0000000..0378f12 --- /dev/null +++ b/contrib/nnc/plugin/interpreter/ops/Softmax.cpp @@ -0,0 +1,2 @@ +#include "Softmax.h" + diff --git a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Softmax.h b/contrib/nnc/plugin/interpreter/ops/Softmax.h similarity index 92% rename from contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Softmax.h rename to contrib/nnc/plugin/interpreter/ops/Softmax.h index 759f1ca..8927963 100644 --- a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/Softmax.h +++ b/contrib/nnc/plugin/interpreter/ops/Softmax.h @@ -6,9 +6,9 @@ #include "nnc/core/linalg/ShapeRange.h" #include "nnc/core/linalg/Tensor.h" -#include "interpreter/ops/OperationImpl.h" -#include "interpreter/ops/Elementwise.h" -#include "interpreter/ops/Reduce.h" +#include "OperationImpl.h" +#include "Elementwise.h" +#include "Reduce.h" namespace nncc { diff --git a/contrib/nnc/libs/backend/interpreter/core/src/ops/common.cpp b/contrib/nnc/plugin/interpreter/ops/common.cpp similarity index 94% rename from contrib/nnc/libs/backend/interpreter/core/src/ops/common.cpp rename to contrib/nnc/plugin/interpreter/ops/common.cpp index f004bfd..b55e49b 100644 --- a/contrib/nnc/libs/backend/interpreter/core/src/ops/common.cpp +++ b/contrib/nnc/plugin/interpreter/ops/common.cpp @@ -1,6 +1,6 @@ #include -#include "interpreter/ops/common.h" +#include "common.h" namespace nncc { diff --git a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/common.h b/contrib/nnc/plugin/interpreter/ops/common.h similarity index 100% rename from contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/common.h rename to contrib/nnc/plugin/interpreter/ops/common.h diff --git a/contrib/nnc/libs/backend/interpreter/core/src/ops/conv_2D.cpp b/contrib/nnc/plugin/interpreter/ops/conv_2D.cpp similarity index 97% rename from contrib/nnc/libs/backend/interpreter/core/src/ops/conv_2D.cpp rename to contrib/nnc/plugin/interpreter/ops/conv_2D.cpp index d3c222f..db910f5 100644 --- a/contrib/nnc/libs/backend/interpreter/core/src/ops/conv_2D.cpp +++ b/contrib/nnc/plugin/interpreter/ops/conv_2D.cpp @@ -2,8 +2,8 @@ #include "nnc/core/linalg/ShapeRange.h" -#include "interpreter/ops/conv_2D.h" -#include "interpreter/ops/common.h" +#include "conv_2D.h" +#include "common.h" namespace nncc { diff --git a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/conv_2D.h b/contrib/nnc/plugin/interpreter/ops/conv_2D.h similarity index 95% rename from contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/conv_2D.h rename to contrib/nnc/plugin/interpreter/ops/conv_2D.h index 11421e7..bf6e671 100644 --- a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/conv_2D.h +++ b/contrib/nnc/plugin/interpreter/ops/conv_2D.h @@ -1,7 +1,7 @@ #ifndef _NNC_CORE_BACKEND_INTERPRETER_CONV2D_IMPL_ #define _NNC_CORE_BACKEND_INTERPRETER_CONV2D_IMPL_ -#include "interpreter/ops/OperationImpl.h" +#include "OperationImpl.h" #include "nnc/core/IR/model/operations/conv_2d_op.h" namespace nncc diff --git a/contrib/nnc/libs/backend/interpreter/core/src/ops/conv_FFT.cpp b/contrib/nnc/plugin/interpreter/ops/conv_FFT.cpp similarity index 99% rename from contrib/nnc/libs/backend/interpreter/core/src/ops/conv_FFT.cpp rename to contrib/nnc/plugin/interpreter/ops/conv_FFT.cpp index 7d6718b..50a0692 100644 --- a/contrib/nnc/libs/backend/interpreter/core/src/ops/conv_FFT.cpp +++ b/contrib/nnc/plugin/interpreter/ops/conv_FFT.cpp @@ -2,8 +2,8 @@ #include "nnc/core/linalg/ShapeRange.h" -#include "interpreter/ops/conv_FFT.h" -#include "interpreter/ops/common.h" +#include "conv_FFT.h" +#include "common.h" namespace nncc { diff --git a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/conv_FFT.h b/contrib/nnc/plugin/interpreter/ops/conv_FFT.h similarity index 98% rename from contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/conv_FFT.h rename to contrib/nnc/plugin/interpreter/ops/conv_FFT.h index 1e5f068..73fc25e 100644 --- a/contrib/nnc/libs/backend/interpreter/core/include/interpreter/ops/conv_FFT.h +++ b/contrib/nnc/plugin/interpreter/ops/conv_FFT.h @@ -25,7 +25,7 @@ #include -#include "interpreter/ops/OperationImpl.h" +#include "OperationImpl.h" #include "nnc/core/IR/model/operations/conv_2d_op.h" namespace nncc diff --git a/contrib/nnc/libs/backend/soft/CMakeLists.txt b/contrib/nnc/plugin/soft_backend/CMakeLists.txt similarity index 61% rename from contrib/nnc/libs/backend/soft/CMakeLists.txt rename to contrib/nnc/plugin/soft_backend/CMakeLists.txt index 6de26da..604a999 100644 --- a/contrib/nnc/libs/backend/soft/CMakeLists.txt +++ b/contrib/nnc/plugin/soft_backend/CMakeLists.txt @@ -1,9 +1,9 @@ -set(SOFT_BACKEND_COMMON_SOURCES src/soft_backend.cpp src/base_generator.cpp src/model_analyzer.cpp src/serializer.cpp) -set(SOFT_BACKEND_CPP_SOURCES src/cpp_backend.cpp src/cpp_generator.cpp) -set(SOFT_BACKEND_C_SOURCES src/c_backend.cpp src/c_generator.cpp) -set(DEF_CONV src/def2src.cpp) +set(SOFT_BACKEND_COMMON_SOURCES soft_backend.cpp base_generator.cpp model_analyzer.cpp serializer.cpp) +set(SOFT_BACKEND_CPP_SOURCES cpp_backend.cpp cpp_generator.cpp) +set(SOFT_BACKEND_C_SOURCES c_backend.cpp c_generator.cpp) +set(DEF_CONV ${NNC_ROOT_SRC_DIR}/utils/def2src.cpp) -file(GLOB_RECURSE SOFT_DEF_SOURCES include/*.def) +file(GLOB_RECURSE SOFT_DEF_SOURCES "*.def") make_generated_sources("${SOFT_DEF_SOURCES}" ${CMAKE_CURRENT_BINARY_DIR} SOFT_GENERATED_SOURCES) @@ -11,20 +11,18 @@ add_executable(def2src ${DEF_CONV}) add_library(soft_backend_common STATIC ${SOFT_BACKEND_COMMON_SOURCES} ${SOFT_GENERATED_SOURCES}) set_property(TARGET soft_backend_common PROPERTY POSITION_INDEPENDENT_CODE ON) -target_include_directories(soft_backend_common PUBLIC include) target_include_directories(soft_backend_common PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) -target_link_libraries(soft_backend_common PRIVATE nnc_plugin_core) +target_link_libraries(soft_backend_common PRIVATE nnc_support) target_link_libraries(soft_backend_common PRIVATE nnc_core) -# This is included because right now common functional is built into nnc_module -target_link_libraries(soft_backend_common PRIVATE nnc_module) +# This is included because right now common functional is built into nnc_driver +target_link_libraries(soft_backend_common PRIVATE nnc_driver) function(make_soft_backend NAME) add_library(${NAME} SHARED ${ARGN} ${SOFT_GENERATED_SOURCES}) - target_include_directories(${NAME} PUBLIC include) target_include_directories(${NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(${NAME} PRIVATE soft_backend_common) - target_link_libraries(${NAME} PRIVATE nnc_plugin_core) + target_link_libraries(${NAME} PRIVATE nnc_support) target_link_libraries(${NAME} PRIVATE nnc_core) # install soft backend c++ library diff --git a/contrib/nnc/libs/backend/soft/src/base_generator.cpp b/contrib/nnc/plugin/soft_backend/base_generator.cpp similarity index 97% rename from contrib/nnc/libs/backend/soft/src/base_generator.cpp rename to contrib/nnc/plugin/soft_backend/base_generator.cpp index 46b1e82..385ba53 100644 --- a/contrib/nnc/libs/backend/soft/src/base_generator.cpp +++ b/contrib/nnc/plugin/soft_backend/base_generator.cpp @@ -1,9 +1,9 @@ #include "base_generator.h" #include "model_analyzer.h" #include "serializer.h" -#include "PluginException.h" +#include "support/PluginException.h" #include "nnc/core/IR/model/actions/ShapeInference.h" -#include "Options.h" +#include "option/Options.h" #include "param_constants.def" diff --git a/contrib/nnc/libs/backend/soft/include/base_generator.h b/contrib/nnc/plugin/soft_backend/base_generator.h similarity index 100% rename from contrib/nnc/libs/backend/soft/include/base_generator.h rename to contrib/nnc/plugin/soft_backend/base_generator.h diff --git a/contrib/nnc/libs/backend/soft/src/c_backend.cpp b/contrib/nnc/plugin/soft_backend/c_backend.cpp similarity index 100% rename from contrib/nnc/libs/backend/soft/src/c_backend.cpp rename to contrib/nnc/plugin/soft_backend/c_backend.cpp diff --git a/contrib/nnc/libs/backend/soft/src/c_generator.cpp b/contrib/nnc/plugin/soft_backend/c_generator.cpp similarity index 100% rename from contrib/nnc/libs/backend/soft/src/c_generator.cpp rename to contrib/nnc/plugin/soft_backend/c_generator.cpp diff --git a/contrib/nnc/libs/backend/soft/include/c_generator.h b/contrib/nnc/plugin/soft_backend/c_generator.h similarity index 100% rename from contrib/nnc/libs/backend/soft/include/c_generator.h rename to contrib/nnc/plugin/soft_backend/c_generator.h diff --git a/contrib/nnc/libs/backend/soft/src/cpp_backend.cpp b/contrib/nnc/plugin/soft_backend/cpp_backend.cpp similarity index 100% rename from contrib/nnc/libs/backend/soft/src/cpp_backend.cpp rename to contrib/nnc/plugin/soft_backend/cpp_backend.cpp diff --git a/contrib/nnc/libs/backend/soft/src/cpp_generator.cpp b/contrib/nnc/plugin/soft_backend/cpp_generator.cpp similarity index 99% rename from contrib/nnc/libs/backend/soft/src/cpp_generator.cpp rename to contrib/nnc/plugin/soft_backend/cpp_generator.cpp index c371195..cc4896e 100644 --- a/contrib/nnc/libs/backend/soft/src/cpp_generator.cpp +++ b/contrib/nnc/plugin/soft_backend/cpp_generator.cpp @@ -1,8 +1,8 @@ #include "cpp_generator.h" #include "model_analyzer.h" #include "serializer.h" -#include "PluginException.h" -#include "Options.h" +#include "support/PluginException.h" +#include "option/Options.h" using namespace std; using namespace nncc::contrib; diff --git a/contrib/nnc/libs/backend/soft/include/cpp_generator.h b/contrib/nnc/plugin/soft_backend/cpp_generator.h similarity index 100% rename from contrib/nnc/libs/backend/soft/include/cpp_generator.h rename to contrib/nnc/plugin/soft_backend/cpp_generator.h diff --git a/contrib/nnc/libs/backend/soft/include/cpp_header_types.def b/contrib/nnc/plugin/soft_backend/cpp_header_types.def similarity index 100% rename from contrib/nnc/libs/backend/soft/include/cpp_header_types.def rename to contrib/nnc/plugin/soft_backend/cpp_header_types.def diff --git a/contrib/nnc/libs/backend/soft/include/cpp_operations.def b/contrib/nnc/plugin/soft_backend/cpp_operations.def similarity index 100% rename from contrib/nnc/libs/backend/soft/include/cpp_operations.def rename to contrib/nnc/plugin/soft_backend/cpp_operations.def diff --git a/contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_add_bias.def b/contrib/nnc/plugin/soft_backend/cpp_ops/cpp_add_bias.def similarity index 100% rename from contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_add_bias.def rename to contrib/nnc/plugin/soft_backend/cpp_ops/cpp_add_bias.def diff --git a/contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_capped_relu.def b/contrib/nnc/plugin/soft_backend/cpp_ops/cpp_capped_relu.def similarity index 100% rename from contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_capped_relu.def rename to contrib/nnc/plugin/soft_backend/cpp_ops/cpp_capped_relu.def diff --git a/contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_common_funcs.def b/contrib/nnc/plugin/soft_backend/cpp_ops/cpp_common_funcs.def similarity index 100% rename from contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_common_funcs.def rename to contrib/nnc/plugin/soft_backend/cpp_ops/cpp_common_funcs.def diff --git a/contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_concat.def b/contrib/nnc/plugin/soft_backend/cpp_ops/cpp_concat.def similarity index 100% rename from contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_concat.def rename to contrib/nnc/plugin/soft_backend/cpp_ops/cpp_concat.def diff --git a/contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_conv.def b/contrib/nnc/plugin/soft_backend/cpp_ops/cpp_conv.def similarity index 100% rename from contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_conv.def rename to contrib/nnc/plugin/soft_backend/cpp_ops/cpp_conv.def diff --git a/contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_depthwise_conv.def b/contrib/nnc/plugin/soft_backend/cpp_ops/cpp_depthwise_conv.def similarity index 100% rename from contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_depthwise_conv.def rename to contrib/nnc/plugin/soft_backend/cpp_ops/cpp_depthwise_conv.def diff --git a/contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_fully_connected.def b/contrib/nnc/plugin/soft_backend/cpp_ops/cpp_fully_connected.def similarity index 100% rename from contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_fully_connected.def rename to contrib/nnc/plugin/soft_backend/cpp_ops/cpp_fully_connected.def diff --git a/contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_pool.def b/contrib/nnc/plugin/soft_backend/cpp_ops/cpp_pool.def similarity index 100% rename from contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_pool.def rename to contrib/nnc/plugin/soft_backend/cpp_ops/cpp_pool.def diff --git a/contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_relu.def b/contrib/nnc/plugin/soft_backend/cpp_ops/cpp_relu.def similarity index 100% rename from contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_relu.def rename to contrib/nnc/plugin/soft_backend/cpp_ops/cpp_relu.def diff --git a/contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_softmax.def b/contrib/nnc/plugin/soft_backend/cpp_ops/cpp_softmax.def similarity index 100% rename from contrib/nnc/libs/backend/soft/include/cpp_ops/cpp_softmax.def rename to contrib/nnc/plugin/soft_backend/cpp_ops/cpp_softmax.def diff --git a/contrib/nnc/libs/backend/soft/include/cpp_ops/eigen.def b/contrib/nnc/plugin/soft_backend/cpp_ops/eigen.def similarity index 100% rename from contrib/nnc/libs/backend/soft/include/cpp_ops/eigen.def rename to contrib/nnc/plugin/soft_backend/cpp_ops/eigen.def diff --git a/contrib/nnc/libs/backend/soft/src/model_analyzer.cpp b/contrib/nnc/plugin/soft_backend/model_analyzer.cpp similarity index 100% rename from contrib/nnc/libs/backend/soft/src/model_analyzer.cpp rename to contrib/nnc/plugin/soft_backend/model_analyzer.cpp diff --git a/contrib/nnc/libs/backend/soft/include/model_analyzer.h b/contrib/nnc/plugin/soft_backend/model_analyzer.h similarity index 100% rename from contrib/nnc/libs/backend/soft/include/model_analyzer.h rename to contrib/nnc/plugin/soft_backend/model_analyzer.h diff --git a/contrib/nnc/libs/backend/soft/include/param_constants.def b/contrib/nnc/plugin/soft_backend/param_constants.def similarity index 100% rename from contrib/nnc/libs/backend/soft/include/param_constants.def rename to contrib/nnc/plugin/soft_backend/param_constants.def diff --git a/contrib/nnc/libs/backend/soft/src/serializer.cpp b/contrib/nnc/plugin/soft_backend/serializer.cpp similarity index 100% rename from contrib/nnc/libs/backend/soft/src/serializer.cpp rename to contrib/nnc/plugin/soft_backend/serializer.cpp diff --git a/contrib/nnc/libs/backend/soft/include/serializer.h b/contrib/nnc/plugin/soft_backend/serializer.h similarity index 100% rename from contrib/nnc/libs/backend/soft/include/serializer.h rename to contrib/nnc/plugin/soft_backend/serializer.h diff --git a/contrib/nnc/libs/backend/soft/src/soft_backend.cpp b/contrib/nnc/plugin/soft_backend/soft_backend.cpp similarity index 91% rename from contrib/nnc/libs/backend/soft/src/soft_backend.cpp rename to contrib/nnc/plugin/soft_backend/soft_backend.cpp index c8284c1..22b4303 100644 --- a/contrib/nnc/libs/backend/soft/src/soft_backend.cpp +++ b/contrib/nnc/plugin/soft_backend/soft_backend.cpp @@ -4,10 +4,10 @@ #include #include "soft_backend.h" -#include "PluginException.h" +#include "support/PluginException.h" #include "nnc/core/IR/model/graph/graph.h" -#include "debug.h" +#include "support/Debug.h" #define DEBUG_AREA "soft_backend" using namespace std; diff --git a/contrib/nnc/libs/backend/soft/include/soft_backend.h b/contrib/nnc/plugin/soft_backend/soft_backend.h similarity index 95% rename from contrib/nnc/libs/backend/soft/include/soft_backend.h rename to contrib/nnc/plugin/soft_backend/soft_backend.h index d101c0e..4e93be0 100644 --- a/contrib/nnc/libs/backend/soft/include/soft_backend.h +++ b/contrib/nnc/plugin/soft_backend/soft_backend.h @@ -1,7 +1,7 @@ #ifndef _NNC_SOFT_BACKEND_PLUGIN_H_ #define _NNC_SOFT_BACKEND_PLUGIN_H_ -#include "PluginInstance.h" +#include "support/PluginInstance.h" #include "nnc/core/IR/model/graph/graph.h" #include "base_generator.h" diff --git a/contrib/nnc/support/src/CLOptionChecker.cpp b/contrib/nnc/support/CLOptionChecker.cpp similarity index 98% rename from contrib/nnc/support/src/CLOptionChecker.cpp rename to contrib/nnc/support/CLOptionChecker.cpp index 92e3a9f..bc4a6e7 100644 --- a/contrib/nnc/support/src/CLOptionChecker.cpp +++ b/contrib/nnc/support/CLOptionChecker.cpp @@ -1,7 +1,7 @@ // // Created by rrusyaev on 14.08.18. // -#include "CommandLine.h" +#include "support/CommandLine.h" #include #include diff --git a/contrib/nnc/support/CMakeLists.txt b/contrib/nnc/support/CMakeLists.txt index d1f94e0..fdce6ff 100644 --- a/contrib/nnc/support/CMakeLists.txt +++ b/contrib/nnc/support/CMakeLists.txt @@ -1,7 +1,12 @@ -set(SUPPORT_SOURCES src/CommandLine.cpp src/CLOptionChecker.cpp) -set(SUPPORT_HEADERS include/CommandLine.h) +set(SUPPORT_SOURCES + CommandLine.cpp + CLOptionChecker.cpp + Debug.cpp + PluginManager.cpp + PluginProxy.cpp) -add_library(nnc_support SHARED ${SUPPORT_SOURCES} ${SUPPORT_HEADERS}) - -target_include_directories(nnc_support PUBLIC include) +add_library(nnc_support SHARED ${SUPPORT_SOURCES}) +set_target_properties(nnc_support PROPERTIES LINKER_LANGUAGE CXX) +target_link_libraries(nnc_support PRIVATE dl) install_common_library(nnc_support) + diff --git a/contrib/nnc/support/src/CommandLine.cpp b/contrib/nnc/support/CommandLine.cpp similarity index 99% rename from contrib/nnc/support/src/CommandLine.cpp rename to contrib/nnc/support/CommandLine.cpp index 56cf315..30d9b24 100644 --- a/contrib/nnc/support/src/CommandLine.cpp +++ b/contrib/nnc/support/CommandLine.cpp @@ -9,7 +9,7 @@ #include #include "cstring" -#include "CommandLine.h" +#include "support/CommandLine.h" using namespace nncc::contrib::clopt; diff --git a/contrib/nnc/src/debug.cpp b/contrib/nnc/support/Debug.cpp similarity index 97% rename from contrib/nnc/src/debug.cpp rename to contrib/nnc/support/Debug.cpp index 9135560..f2005b9 100644 --- a/contrib/nnc/src/debug.cpp +++ b/contrib/nnc/support/Debug.cpp @@ -7,7 +7,7 @@ #include -#include "debug.h" +#include "support/Debug.h" #undef isCurrentDebugZone #undef setCurrentDebugZones diff --git a/contrib/nnc/libs/plugin/src/PluginManager.cpp b/contrib/nnc/support/PluginManager.cpp similarity index 85% rename from contrib/nnc/libs/plugin/src/PluginManager.cpp rename to contrib/nnc/support/PluginManager.cpp index 15393d3..b9faccb 100644 --- a/contrib/nnc/libs/plugin/src/PluginManager.cpp +++ b/contrib/nnc/support/PluginManager.cpp @@ -4,12 +4,12 @@ #include #include -#include "PluginProxy.h" -#include "PluginManager.h" -#include "PluginInstance.h" -#include "Options.h" +#include "support/PluginProxy.h" +#include "support/PluginManager.h" +#include "support/PluginInstance.h" +#include "option/Options.h" -#include "PluginException.h" +#include "support/PluginException.h" //#include "debug.h" //#define DEBUG_AREA "plugin" diff --git a/contrib/nnc/libs/plugin/src/PluginProxy.cpp b/contrib/nnc/support/PluginProxy.cpp similarity index 95% rename from contrib/nnc/libs/plugin/src/PluginProxy.cpp rename to contrib/nnc/support/PluginProxy.cpp index 2a356f2..192cebc 100644 --- a/contrib/nnc/libs/plugin/src/PluginProxy.cpp +++ b/contrib/nnc/support/PluginProxy.cpp @@ -2,8 +2,8 @@ #include #include -#include "PluginProxy.h" -#include "shared_library.h" +#include "support/PluginProxy.h" +#include "support/shared_library.h" namespace nncc { diff --git a/contrib/nnc/tests/CMakeLists.txt b/contrib/nnc/tests/CMakeLists.txt index c279d75..d39d0f0 100644 --- a/contrib/nnc/tests/CMakeLists.txt +++ b/contrib/nnc/tests/CMakeLists.txt @@ -1 +1,2 @@ add_subdirectory(import) +add_subdirectory(interpreter) diff --git a/contrib/nnc/tests/import/caffe.cpp b/contrib/nnc/tests/import/caffe.cpp index 36d2950..76a9a27 100644 --- a/contrib/nnc/tests/import/caffe.cpp +++ b/contrib/nnc/tests/import/caffe.cpp @@ -1,6 +1,6 @@ #include -#include "CommandLine.h" -#include "Options.h" +#include "support/CommandLine.h" +#include "option/Options.h" #include "caffe_importer.h" diff --git a/contrib/nnc/tests/import/tflite.cpp b/contrib/nnc/tests/import/tflite.cpp index a140033..d504cee 100644 --- a/contrib/nnc/tests/import/tflite.cpp +++ b/contrib/nnc/tests/import/tflite.cpp @@ -1,6 +1,6 @@ #include -#include "CommandLine.h" -#include "Options.h" +#include "support/CommandLine.h" +#include "option/Options.h" #include "tflite_v3_importer.h" diff --git a/contrib/nnc/libs/backend/interpreter/test/CMakeLists.txt b/contrib/nnc/tests/interpreter/CMakeLists.txt similarity index 87% rename from contrib/nnc/libs/backend/interpreter/test/CMakeLists.txt rename to contrib/nnc/tests/interpreter/CMakeLists.txt index 6c43c4f..b05e79c 100644 --- a/contrib/nnc/libs/backend/interpreter/test/CMakeLists.txt +++ b/contrib/nnc/tests/interpreter/CMakeLists.txt @@ -8,10 +8,10 @@ FlatBuffers_Generate(FB_GEN ${CMAKE_CURRENT_SOURCE_DIR}/gen op_info.fbs) -file(GLOB SOURCES src/*.cpp) -file(GLOB HEADERS include/*.h) +file(GLOB SOURCES ./*.cpp) +file(GLOB HEADERS ./*.h) -add_executable(interpreter_op_test ${SOURCES} ${HEADERS} ${FB_GEN_SOURCES}) +add_executable(interpreter_op_test ${SOURCES} ${HEADERS} ${FB_GEN_SOURCES} ${OPTIONS_SRC}) file(GLOB TEST_DATA ${CMAKE_CURRENT_SOURCE_DIR}/test_data/*_data.fb) foreach(TEST_DATA_ITEM ${TEST_DATA}) @@ -24,8 +24,7 @@ foreach(TEST_DATA_ITEM ${TEST_DATA}) endforeach() target_include_directories(interpreter_op_test PRIVATE ${FB_GEN_INCLUDE_DIRS}) -target_include_directories(interpreter_op_test PRIVATE include) target_link_libraries(interpreter_op_test PRIVATE gtest flatbuffers - nnc_core nnc_interpreter_core + nnc_core nnc_interpreter nn_import_common) diff --git a/contrib/nnc/libs/backend/interpreter/test/gen/gen_test_data.py b/contrib/nnc/tests/interpreter/gen/gen_test_data.py similarity index 100% rename from contrib/nnc/libs/backend/interpreter/test/gen/gen_test_data.py rename to contrib/nnc/tests/interpreter/gen/gen_test_data.py diff --git a/contrib/nnc/libs/backend/interpreter/test/gen/op_info.fbs b/contrib/nnc/tests/interpreter/gen/op_info.fbs similarity index 100% rename from contrib/nnc/libs/backend/interpreter/test/gen/op_info.fbs rename to contrib/nnc/tests/interpreter/gen/op_info.fbs diff --git a/contrib/nnc/libs/backend/interpreter/test/gen/opinfo/OperatorInfo.py b/contrib/nnc/tests/interpreter/gen/opinfo/OperatorInfo.py similarity index 100% rename from contrib/nnc/libs/backend/interpreter/test/gen/opinfo/OperatorInfo.py rename to contrib/nnc/tests/interpreter/gen/opinfo/OperatorInfo.py diff --git a/contrib/nnc/libs/backend/interpreter/test/gen/opinfo/OperatorInfoList.py b/contrib/nnc/tests/interpreter/gen/opinfo/OperatorInfoList.py similarity index 100% rename from contrib/nnc/libs/backend/interpreter/test/gen/opinfo/OperatorInfoList.py rename to contrib/nnc/tests/interpreter/gen/opinfo/OperatorInfoList.py diff --git a/contrib/nnc/libs/backend/interpreter/test/gen/opinfo/OperatorType.py b/contrib/nnc/tests/interpreter/gen/opinfo/OperatorType.py similarity index 100% rename from contrib/nnc/libs/backend/interpreter/test/gen/opinfo/OperatorType.py rename to contrib/nnc/tests/interpreter/gen/opinfo/OperatorType.py diff --git a/contrib/nnc/libs/backend/interpreter/test/gen/opinfo/PadType.py b/contrib/nnc/tests/interpreter/gen/opinfo/PadType.py similarity index 100% rename from contrib/nnc/libs/backend/interpreter/test/gen/opinfo/PadType.py rename to contrib/nnc/tests/interpreter/gen/opinfo/PadType.py diff --git a/contrib/nnc/libs/backend/interpreter/test/gen/opinfo/PoolType.py b/contrib/nnc/tests/interpreter/gen/opinfo/PoolType.py similarity index 100% rename from contrib/nnc/libs/backend/interpreter/test/gen/opinfo/PoolType.py rename to contrib/nnc/tests/interpreter/gen/opinfo/PoolType.py diff --git a/contrib/nnc/libs/backend/interpreter/test/gen/opinfo/Shape.py b/contrib/nnc/tests/interpreter/gen/opinfo/Shape.py similarity index 100% rename from contrib/nnc/libs/backend/interpreter/test/gen/opinfo/Shape.py rename to contrib/nnc/tests/interpreter/gen/opinfo/Shape.py diff --git a/contrib/nnc/libs/backend/interpreter/test/gen/opinfo/Tensor.py b/contrib/nnc/tests/interpreter/gen/opinfo/Tensor.py similarity index 100% rename from contrib/nnc/libs/backend/interpreter/test/gen/opinfo/Tensor.py rename to contrib/nnc/tests/interpreter/gen/opinfo/Tensor.py diff --git a/contrib/nnc/libs/backend/interpreter/test/gen/opinfo/__init__.py b/contrib/nnc/tests/interpreter/gen/opinfo/__init__.py similarity index 100% rename from contrib/nnc/libs/backend/interpreter/test/gen/opinfo/__init__.py rename to contrib/nnc/tests/interpreter/gen/opinfo/__init__.py diff --git a/contrib/nnc/libs/backend/interpreter/test/gen/requirements.txt b/contrib/nnc/tests/interpreter/gen/requirements.txt similarity index 100% rename from contrib/nnc/libs/backend/interpreter/test/gen/requirements.txt rename to contrib/nnc/tests/interpreter/gen/requirements.txt diff --git a/contrib/nnc/libs/backend/interpreter/test/gen/run_flatc.sh b/contrib/nnc/tests/interpreter/gen/run_flatc.sh similarity index 100% rename from contrib/nnc/libs/backend/interpreter/test/gen/run_flatc.sh rename to contrib/nnc/tests/interpreter/gen/run_flatc.sh diff --git a/contrib/nnc/libs/backend/interpreter/test/gen/run_gen.sh b/contrib/nnc/tests/interpreter/gen/run_gen.sh similarity index 100% rename from contrib/nnc/libs/backend/interpreter/test/gen/run_gen.sh rename to contrib/nnc/tests/interpreter/gen/run_gen.sh diff --git a/contrib/nnc/libs/backend/interpreter/test/src/graph_creator.cpp b/contrib/nnc/tests/interpreter/graph_creator.cpp similarity index 100% rename from contrib/nnc/libs/backend/interpreter/test/src/graph_creator.cpp rename to contrib/nnc/tests/interpreter/graph_creator.cpp diff --git a/contrib/nnc/libs/backend/interpreter/test/include/graph_creator.h b/contrib/nnc/tests/interpreter/graph_creator.h similarity index 100% rename from contrib/nnc/libs/backend/interpreter/test/include/graph_creator.h rename to contrib/nnc/tests/interpreter/graph_creator.h diff --git a/contrib/nnc/libs/backend/interpreter/test/src/main.cpp b/contrib/nnc/tests/interpreter/main.cpp similarity index 100% rename from contrib/nnc/libs/backend/interpreter/test/src/main.cpp rename to contrib/nnc/tests/interpreter/main.cpp diff --git a/contrib/nnc/libs/backend/interpreter/test/src/op_info_util.cpp b/contrib/nnc/tests/interpreter/op_info_util.cpp similarity index 100% rename from contrib/nnc/libs/backend/interpreter/test/src/op_info_util.cpp rename to contrib/nnc/tests/interpreter/op_info_util.cpp diff --git a/contrib/nnc/libs/backend/interpreter/test/include/op_info_util.h b/contrib/nnc/tests/interpreter/op_info_util.h similarity index 100% rename from contrib/nnc/libs/backend/interpreter/test/include/op_info_util.h rename to contrib/nnc/tests/interpreter/op_info_util.h diff --git a/contrib/nnc/libs/backend/interpreter/test/src/op_test.cpp b/contrib/nnc/tests/interpreter/op_test.cpp similarity index 96% rename from contrib/nnc/libs/backend/interpreter/test/src/op_test.cpp rename to contrib/nnc/tests/interpreter/op_test.cpp index dd69e68..3fdff4a 100644 --- a/contrib/nnc/libs/backend/interpreter/test/src/op_test.cpp +++ b/contrib/nnc/tests/interpreter/op_test.cpp @@ -5,7 +5,7 @@ #include "gtest/gtest.h" #include "op_info_generated.h" -#include "interpreter/core/Interpreter.h" +#include "plugin/interpreter/Interpreter.h" #include "nnc/core/IR/model/graph/graph.h" #include "op_info_util.h" #include "graph_creator.h" diff --git a/contrib/nnc/libs/backend/interpreter/test/test_data/test_description.txt b/contrib/nnc/tests/interpreter/test_data/test_description.txt similarity index 100% rename from contrib/nnc/libs/backend/interpreter/test/test_data/test_description.txt rename to contrib/nnc/tests/interpreter/test_data/test_description.txt diff --git a/contrib/nnc/unittests/CMakeLists.txt b/contrib/nnc/unittests/CMakeLists.txt index 110b972..22c72f8 100644 --- a/contrib/nnc/unittests/CMakeLists.txt +++ b/contrib/nnc/unittests/CMakeLists.txt @@ -1,5 +1,4 @@ add_subdirectory(module) add_subdirectory(core) -add_subdirectory(plugin_core) add_subdirectory(soft_backend) add_subdirectory(support) diff --git a/contrib/nnc/unittests/module/CMakeLists.txt b/contrib/nnc/unittests/module/CMakeLists.txt index 98608ac..4c0697e 100644 --- a/contrib/nnc/unittests/module/CMakeLists.txt +++ b/contrib/nnc/unittests/module/CMakeLists.txt @@ -2,8 +2,7 @@ file(GLOB_RECURSE TEST_SOURCES "*.cpp") # Plugin module tests add_nncc_test(nnc_module_test ${OPTIONS_SRC} ${TEST_SOURCES} ${HEADERS}) -nncc_target_link_libraries(nnc_module_test nnc_support nnc_module nnc_plugin_core dl) -# target_include_directories(nnc_module_test PUBLIC ../include) +nncc_target_link_libraries(nnc_module_test nnc_support dl) # Set macro in nnc_module_test with some_parser absolute path target_compile_definitions(nnc_module_test PRIVATE diff --git a/contrib/nnc/unittests/module/PluginManager.cpp b/contrib/nnc/unittests/module/PluginManager.cpp index 7db1cc1..ad7e7d8 100644 --- a/contrib/nnc/unittests/module/PluginManager.cpp +++ b/contrib/nnc/unittests/module/PluginManager.cpp @@ -1,5 +1,5 @@ -#include -#include "PluginManager.h" +#include "support/CommandLine.h" +#include "support/PluginManager.h" #include "gtest/gtest.h" diff --git a/contrib/nnc/unittests/module/PluginProxy.cpp b/contrib/nnc/unittests/module/PluginProxy.cpp index 9279a10..2fa5069 100644 --- a/contrib/nnc/unittests/module/PluginProxy.cpp +++ b/contrib/nnc/unittests/module/PluginProxy.cpp @@ -1,5 +1,5 @@ -#include "PluginProxy.h" -#include "PluginException.h" +#include "support/PluginProxy.h" +#include "support/PluginException.h" #include "gtest/gtest.h" diff --git a/contrib/nnc/unittests/module/shared_library.cpp b/contrib/nnc/unittests/module/shared_library.cpp index 42557a5..a62e2e8 100644 --- a/contrib/nnc/unittests/module/shared_library.cpp +++ b/contrib/nnc/unittests/module/shared_library.cpp @@ -1,5 +1,5 @@ -#include "shared_library.h" -#include "PluginException.h" +#include "support/shared_library.h" +#include "support/PluginException.h" #include "gtest/gtest.h" diff --git a/contrib/nnc/unittests/plugin_core/CMakeLists.txt b/contrib/nnc/unittests/plugin_core/CMakeLists.txt deleted file mode 100644 index 11824eb..0000000 --- a/contrib/nnc/unittests/plugin_core/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -file(GLOB_RECURSE HEADERS "${NNC_PLUGIN_CORE_DIR}/include/*.h") -file(GLOB_RECURSE TESTS "*.cpp") - -add_nncc_test(nnc_plugin_core_test ${TESTS} ${HEADERS}) -nncc_target_link_libraries(nnc_plugin_core_test nnc_plugin_core) diff --git a/contrib/nnc/unittests/soft_backend/CMakeLists.txt b/contrib/nnc/unittests/soft_backend/CMakeLists.txt index 590695b..5479caa 100644 --- a/contrib/nnc/unittests/soft_backend/CMakeLists.txt +++ b/contrib/nnc/unittests/soft_backend/CMakeLists.txt @@ -1,13 +1,11 @@ -set(SOFT_BACKEND_CPP_SOURCES ${NNC_SOFT_BACKEND_DIR}/src/cpp_backend.cpp - ${NNC_SOFT_BACKEND_DIR}/src/cpp_generator.cpp) +set(SOFT_BACKEND_CPP_SOURCES ${NNC_SOFT_BACKEND_DIR}/cpp_backend.cpp + ${NNC_SOFT_BACKEND_DIR}/cpp_generator.cpp) -file(GLOB_RECURSE SOFT_DEF_SOURCES ${NNC_SOFT_BACKEND_DIR}/include/*.def) +file(GLOB_RECURSE SOFT_DEF_SOURCES "${NNC_SOFT_BACKEND_DIR}/*.def") file(GLOB_RECURSE TESTS "*.cpp") make_generated_sources("${SOFT_DEF_SOURCES}" ${CMAKE_CURRENT_BINARY_DIR} SOFT_GENERATED_SOURCES) add_nncc_test(nnc_soft_backend_test ${TESTS} ${OPTIONS_SRC} ${SOFT_BACKEND_CPP_SOURCES} ${SOFT_GENERATED_SOURCES}) -nncc_target_link_libraries(nnc_soft_backend_test nnc_support nnc_interpreter_core nnc_core nnc_plugin_core soft_backend_common) -target_include_directories(nnc_soft_backend_test PUBLIC ${NNC_SOFT_BACKEND_DIR}/include) -target_include_directories(nnc_soft_backend_test PUBLIC ${NNC_INTERPRETER_DIR}/include) -target_include_directories(nnc_soft_backend_test PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) +nncc_target_link_libraries(nnc_soft_backend_test nnc_support nnc_interpreter nnc_core soft_backend_common) +target_include_directories(nnc_soft_backend_test PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${NNC_SOFT_BACKEND_DIR}) diff --git a/contrib/nnc/unittests/soft_backend/cpp_header_types.cpp b/contrib/nnc/unittests/soft_backend/cpp_header_types.cpp index 4da45c2..f06b968 100644 --- a/contrib/nnc/unittests/soft_backend/cpp_header_types.cpp +++ b/contrib/nnc/unittests/soft_backend/cpp_header_types.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include "cpp_header_types.def" #include "gtest/gtest.h" diff --git a/contrib/nnc/unittests/soft_backend/cpp_operations.cpp b/contrib/nnc/unittests/soft_backend/cpp_operations.cpp index 5bfe4df..2838e6e 100644 --- a/contrib/nnc/unittests/soft_backend/cpp_operations.cpp +++ b/contrib/nnc/unittests/soft_backend/cpp_operations.cpp @@ -47,7 +47,7 @@ #include "nnc/core/linalg/ShapeRange.h" #include "nnc/core/IR/model/actions/ShapeInference.h" -#include "interpreter/core/Interpreter.h" +#include "plugin/interpreter/Interpreter.h" #include "gtest/gtest.h" diff --git a/contrib/nnc/unittests/soft_backend/generator.cpp b/contrib/nnc/unittests/soft_backend/generator.cpp index 037af10..5584b06 100644 --- a/contrib/nnc/unittests/soft_backend/generator.cpp +++ b/contrib/nnc/unittests/soft_backend/generator.cpp @@ -1,6 +1,6 @@ #include "cpp_generator.h" -#include "PluginException.h" +#include "support/PluginException.h" #include @@ -11,7 +11,7 @@ #include #include #include -#include +#include "support/CommandLine.h" using namespace std; using namespace nncc::contrib; diff --git a/contrib/nnc/unittests/support/CMakeLists.txt b/contrib/nnc/unittests/support/CMakeLists.txt index fbca24e..07672e0 100644 --- a/contrib/nnc/unittests/support/CMakeLists.txt +++ b/contrib/nnc/unittests/support/CMakeLists.txt @@ -1,7 +1,4 @@ -set(CL_HEADERS "${NNC_SUPPORT_DIR}/include/CommandLine.h") -set(CL_SOURCES "${NNC_SUPPORT_DIR}/src/CommandLine.cpp") -set(CL_TESTS "CommandLineTest.cpp") +set(CL_SOURCES ${NNC_SUPPORT_DIR}/CommandLine.cpp) +set(CL_TESTS CommandLineTest.cpp) -add_nncc_test(nnc_support_commandline_test ${CL_TESTS} ${CL_SOURCES} ${CL_HEADERS}) - -target_include_directories(nnc_support_commandline_test PUBLIC ${NNC_SUPPORT_DIR}/include) +add_nncc_test(nnc_support_commandline_test ${CL_TESTS} ${CL_SOURCES}) diff --git a/contrib/nnc/unittests/support/CommandLineTest.cpp b/contrib/nnc/unittests/support/CommandLineTest.cpp index 040abed..517c21d 100644 --- a/contrib/nnc/unittests/support/CommandLineTest.cpp +++ b/contrib/nnc/unittests/support/CommandLineTest.cpp @@ -1,4 +1,4 @@ -#include "CommandLine.h" +#include "support/CommandLine.h" #include "gtest/gtest.h" diff --git a/contrib/nnc/unittests/plugin_core/PluginException.cpp b/contrib/nnc/unittests/support/PluginException.cpp similarity index 92% rename from contrib/nnc/unittests/plugin_core/PluginException.cpp rename to contrib/nnc/unittests/support/PluginException.cpp index 65c2f01..d55168b 100644 --- a/contrib/nnc/unittests/plugin_core/PluginException.cpp +++ b/contrib/nnc/unittests/support/PluginException.cpp @@ -1,4 +1,4 @@ -#include "PluginException.h" +#include "support/PluginException.h" #include "gtest/gtest.h" diff --git a/contrib/nnc/libs/backend/soft/src/def2src.cpp b/contrib/nnc/utils/def2src.cpp similarity index 100% rename from contrib/nnc/libs/backend/soft/src/def2src.cpp rename to contrib/nnc/utils/def2src.cpp