Reorganize nnc project file hierarchy (#1219)

* reorganize frontend part (last part)

Signed-off-by: Roman Rusyaev <r.rusyaev@samsung.com>

diff --git a/contrib/nnc/CMakeLists.txt b/contrib/nnc/CMakeLists.txt
index 406164c..86c84ef 100644 (file)
--- a/contrib/nnc/CMakeLists.txt
+++ b/contrib/nnc/CMakeLists.txt
@@ -65,9 +65,13 @@ endfunction(install_common_library)
 # end functions
 #
 
+#
 # Used by unit tests
+#
 set(NNC_SOFT_BACKEND_DIR ${CMAKE_CURRENT_SOURCE_DIR}/plugin/soft_backend)
 set(NNC_INTERPRETER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/plugin/interpreter)
+set(NNC_CAFFE_FRONTEND_DIR ${CMAKE_CURRENT_SOURCE_DIR}/plugin/caffe_frontend)
+set(NNC_TFLITE_FRONTEND_DIR ${CMAKE_CURRENT_SOURCE_DIR}/plugin/tflite_frontend)
 set(NNC_CORE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/core)
 set(NNC_SUPPORT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/support)
 

diff --git a/contrib/nnc/examples/caffe_frontend/CMakeLists.txt b/contrib/nnc/examples/caffe_frontend/CMakeLists.txt
new file mode 100644 (file)
index 0000000..dc3fe20
--- /dev/null
+++ b/contrib/nnc/examples/caffe_frontend/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_nncc_example_executable(caffe_model_dumper ${OPTIONS_SRC} model_dump.cpp)
+nncc_target_link_libraries(caffe_model_dumper nnc_support caffe_importer)
+target_include_directories(caffe_model_dumper PRIVATE ${NNC_CAFFE_FRONTEND_DIR})
\ No newline at end of file

diff --git a/contrib/nnc/plugin/frontend/caffe/examples/model_dump.cpp b/contrib/nnc/examples/caffe_frontend/model_dump.cpp
similarity index 100%
rename from contrib/nnc/plugin/frontend/caffe/examples/model_dump.cpp
rename to contrib/nnc/examples/caffe_frontend/model_dump.cpp

diff --git a/contrib/nnc/examples/plugin_example/CMakeLists.txt b/contrib/nnc/examples/plugin/CMakeLists.txt
similarity index 100%
rename from contrib/nnc/examples/plugin_example/CMakeLists.txt
rename to contrib/nnc/examples/plugin/CMakeLists.txt

diff --git a/contrib/nnc/examples/plugin_example/samplePlugin.cpp b/contrib/nnc/examples/plugin/samplePlugin.cpp
similarity index 100%
rename from contrib/nnc/examples/plugin_example/samplePlugin.cpp
rename to contrib/nnc/examples/plugin/samplePlugin.cpp

diff --git a/contrib/nnc/examples/tflite_frontend/CMakeLists.txt b/contrib/nnc/examples/tflite_frontend/CMakeLists.txt
new file mode 100644 (file)
index 0000000..5a26def
--- /dev/null
+++ b/contrib/nnc/examples/tflite_frontend/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_executable(tflite_import_example sanity_check.cpp ${OPTIONS_SRC})
+
+target_link_libraries(tflite_import_example PUBLIC tflite_schema)
+target_link_libraries(tflite_import_example PRIVATE tflite_import)
+target_include_directories(tflite_import_example PRIVATE ${NNC_TFLITE_FRONTEND_DIR})

diff --git a/contrib/nnc/plugin/frontend/tflite/examples/sanity_check.cpp b/contrib/nnc/examples/tflite_frontend/sanity_check.cpp
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/examples/sanity_check.cpp
rename to contrib/nnc/examples/tflite_frontend/sanity_check.cpp

diff --git a/contrib/nnc/plugin/frontend/include/model_allocation.h b/contrib/nnc/include/plugin/common_frontend/model_allocation.h
similarity index 100%
rename from contrib/nnc/plugin/frontend/include/model_allocation.h
rename to contrib/nnc/include/plugin/common_frontend/model_allocation.h

diff --git a/contrib/nnc/plugin/frontend/include/nn_importer.h b/contrib/nnc/include/plugin/common_frontend/nn_importer.h
similarity index 100%
rename from contrib/nnc/plugin/frontend/include/nn_importer.h
rename to contrib/nnc/include/plugin/common_frontend/nn_importer.h

diff --git a/contrib/nnc/plugin/frontend/include/shape_helper.h b/contrib/nnc/include/plugin/common_frontend/shape_helper.h
similarity index 100%
rename from contrib/nnc/plugin/frontend/include/shape_helper.h
rename to contrib/nnc/include/plugin/common_frontend/shape_helper.h

diff --git a/contrib/nnc/plugin/CMakeLists.txt b/contrib/nnc/plugin/CMakeLists.txt
index 32b7245..e390c7c 100644 (file)
--- a/contrib/nnc/plugin/CMakeLists.txt
+++ b/contrib/nnc/plugin/CMakeLists.txt
@@ -1,3 +1,12 @@
-add_subdirectory(frontend)
+#
+# FRONTENDs
+#
+add_subdirectory(common_frontend)
+add_subdirectory(tflite_frontend)
+add_subdirectory(caffe_frontend)
+
+#
+# BACKENDs
+#
 add_subdirectory(interpreter)
 add_subdirectory(soft_backend)

diff --git a/contrib/nnc/plugin/frontend/caffe/CMakeLists.txt b/contrib/nnc/plugin/caffe_frontend/CMakeLists.txt
similarity index 63%
rename from contrib/nnc/plugin/frontend/caffe/CMakeLists.txt
rename to contrib/nnc/plugin/caffe_frontend/CMakeLists.txt
index 814b411..d884787 100644 (file)
--- a/contrib/nnc/plugin/frontend/caffe/CMakeLists.txt
+++ b/contrib/nnc/plugin/caffe_frontend/CMakeLists.txt
@@ -11,21 +11,16 @@ endif()
 # Caffe importer  #
 ###################
 
-file(GLOB caffe_importer_sources ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
-file(GLOB caffe_importer_headers ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h)
+file(GLOB caffe_importer_sources *.cpp)
+file(GLOB caffe_importer_headers *.h)
 
 add_nncc_library(caffe_importer SHARED ${caffe_importer_sources}
                                        ${caffe_importer_headers})
 
-target_include_directories(caffe_importer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
-
 target_link_libraries(caffe_importer PUBLIC caffeproto)
-target_link_libraries(caffe_importer PUBLIC ${nn_import_common})
+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)
 
-add_nncc_example_executable(caffe_model_dumper ${OPTIONS_SRC} examples/model_dump.cpp)
-nncc_target_link_libraries(caffe_model_dumper nnc_support caffe_importer)
-
 # install caffe frontend library
 install_nnc_plugin(caffe_importer)

diff --git a/contrib/nnc/plugin/frontend/caffe/src/caffe_dump_visitor.cpp b/contrib/nnc/plugin/caffe_frontend/caffe_dump_visitor.cpp
similarity index 100%
rename from contrib/nnc/plugin/frontend/caffe/src/caffe_dump_visitor.cpp
rename to contrib/nnc/plugin/caffe_frontend/caffe_dump_visitor.cpp

diff --git a/contrib/nnc/plugin/frontend/caffe/include/caffe_dump_visitor.h b/contrib/nnc/plugin/caffe_frontend/caffe_dump_visitor.h
similarity index 100%
rename from contrib/nnc/plugin/frontend/caffe/include/caffe_dump_visitor.h
rename to contrib/nnc/plugin/caffe_frontend/caffe_dump_visitor.h

diff --git a/contrib/nnc/plugin/frontend/caffe/src/caffe_importer.cpp b/contrib/nnc/plugin/caffe_frontend/caffe_importer.cpp
similarity index 100%
rename from contrib/nnc/plugin/frontend/caffe/src/caffe_importer.cpp
rename to contrib/nnc/plugin/caffe_frontend/caffe_importer.cpp

diff --git a/contrib/nnc/plugin/frontend/caffe/include/caffe_importer.h b/contrib/nnc/plugin/caffe_frontend/caffe_importer.h
similarity index 93%
rename from contrib/nnc/plugin/frontend/caffe/include/caffe_importer.h
rename to contrib/nnc/plugin/caffe_frontend/caffe_importer.h
index b8c12b0..3a461f9 100644 (file)
--- a/contrib/nnc/plugin/frontend/caffe/include/caffe_importer.h
+++ b/contrib/nnc/plugin/caffe_frontend/caffe_importer.h
@@ -6,7 +6,7 @@
 
 #include "caffe/proto/caffe.pb.h"
 
-#include "nn_importer.h"
+#include "plugin/common_frontend/nn_importer.h"
 
 namespace nncc
 {

diff --git a/contrib/nnc/plugin/frontend/caffe/src/caffe_model_visitor.cpp b/contrib/nnc/plugin/caffe_frontend/caffe_model_visitor.cpp
similarity index 99%
rename from contrib/nnc/plugin/frontend/caffe/src/caffe_model_visitor.cpp
rename to contrib/nnc/plugin/caffe_frontend/caffe_model_visitor.cpp
index 5934480..2e4907b 100644 (file)
--- a/contrib/nnc/plugin/frontend/caffe/src/caffe_model_visitor.cpp
+++ b/contrib/nnc/plugin/caffe_frontend/caffe_model_visitor.cpp
@@ -6,7 +6,7 @@
 #include "core/modelIR/TensorUtil.h"
 #include "support/PluginException.h"
 
-#include "shape_helper.h"
+#include "plugin/common_frontend/shape_helper.h"
 #include "caffe_model_visitor.h"
 
 namespace nncc

diff --git a/contrib/nnc/plugin/frontend/caffe/include/caffe_model_visitor.h b/contrib/nnc/plugin/caffe_frontend/caffe_model_visitor.h
similarity index 100%
rename from contrib/nnc/plugin/frontend/caffe/include/caffe_model_visitor.h
rename to contrib/nnc/plugin/caffe_frontend/caffe_model_visitor.h

diff --git a/contrib/nnc/plugin/frontend/caffe/src/caffe_op_creator.cpp b/contrib/nnc/plugin/caffe_frontend/caffe_op_creator.cpp
similarity index 99%
rename from contrib/nnc/plugin/frontend/caffe/src/caffe_op_creator.cpp
rename to contrib/nnc/plugin/caffe_frontend/caffe_op_creator.cpp
index 83c5c6d..7c92b39 100644 (file)
--- a/contrib/nnc/plugin/frontend/caffe/src/caffe_op_creator.cpp
+++ b/contrib/nnc/plugin/caffe_frontend/caffe_op_creator.cpp
@@ -9,7 +9,7 @@
 #include "core/modelIR/operations/reshape_op.h"
 #include "core/modelIR/operations/fully_connected_op.h"
 
-#include "shape_helper.h"
+#include "plugin/common_frontend/shape_helper.h"
 #include "caffe_op_creator.h"
 
 namespace nncc

diff --git a/contrib/nnc/plugin/frontend/caffe/include/caffe_op_creator.h b/contrib/nnc/plugin/caffe_frontend/caffe_op_creator.h
similarity index 100%
rename from contrib/nnc/plugin/frontend/caffe/include/caffe_op_creator.h
rename to contrib/nnc/plugin/caffe_frontend/caffe_op_creator.h

diff --git a/contrib/nnc/plugin/frontend/caffe/src/caffe_plugin.cpp b/contrib/nnc/plugin/caffe_frontend/caffe_plugin.cpp
similarity index 100%
rename from contrib/nnc/plugin/frontend/caffe/src/caffe_plugin.cpp
rename to contrib/nnc/plugin/caffe_frontend/caffe_plugin.cpp

diff --git a/contrib/nnc/plugin/frontend/caffe/include/caffe_visitor.h b/contrib/nnc/plugin/caffe_frontend/caffe_visitor.h
similarity index 100%
rename from contrib/nnc/plugin/frontend/caffe/include/caffe_visitor.h
rename to contrib/nnc/plugin/caffe_frontend/caffe_visitor.h

diff --git a/contrib/nnc/plugin/frontend/caffe/src/caffe_walker.cpp b/contrib/nnc/plugin/caffe_frontend/caffe_walker.cpp
similarity index 100%
rename from contrib/nnc/plugin/frontend/caffe/src/caffe_walker.cpp
rename to contrib/nnc/plugin/caffe_frontend/caffe_walker.cpp

diff --git a/contrib/nnc/plugin/frontend/caffe/include/caffe_walker.h b/contrib/nnc/plugin/caffe_frontend/caffe_walker.h
similarity index 100%
rename from contrib/nnc/plugin/frontend/caffe/include/caffe_walker.h
rename to contrib/nnc/plugin/caffe_frontend/caffe_walker.h

diff --git a/contrib/nnc/plugin/frontend/caffe/src/proto_reader.cpp b/contrib/nnc/plugin/caffe_frontend/proto_reader.cpp
similarity index 100%
rename from contrib/nnc/plugin/frontend/caffe/src/proto_reader.cpp
rename to contrib/nnc/plugin/caffe_frontend/proto_reader.cpp

diff --git a/contrib/nnc/plugin/frontend/caffe/include/proto_reader.h b/contrib/nnc/plugin/caffe_frontend/proto_reader.h
similarity index 100%
rename from contrib/nnc/plugin/frontend/caffe/include/proto_reader.h
rename to contrib/nnc/plugin/caffe_frontend/proto_reader.h

diff --git a/contrib/nnc/plugin/common_frontend/CMakeLists.txt b/contrib/nnc/plugin/common_frontend/CMakeLists.txt
new file mode 100644 (file)
index 0000000..7d6578d
--- /dev/null
+++ b/contrib/nnc/plugin/common_frontend/CMakeLists.txt
@@ -0,0 +1,11 @@
+##########################################
+# Common for every importer code library #
+##########################################
+
+set(COMMON_SOURCES
+        model_allocation.cpp
+        shape_helper.cpp)
+
+add_library(nn_import_common STATIC ${COMMON_SOURCES})
+set_target_properties(nn_import_common PROPERTIES POSITION_INDEPENDENT_CODE ON)
+target_link_libraries(nn_import_common PRIVATE nnc_core nnc_support)
\ No newline at end of file

diff --git a/contrib/nnc/plugin/frontend/common/model_allocation.cpp b/contrib/nnc/plugin/common_frontend/model_allocation.cpp
similarity index 94%
rename from contrib/nnc/plugin/frontend/common/model_allocation.cpp
rename to contrib/nnc/plugin/common_frontend/model_allocation.cpp
index 01bd6b5..592d98c 100644 (file)
--- a/contrib/nnc/plugin/frontend/common/model_allocation.cpp
+++ b/contrib/nnc/plugin/common_frontend/model_allocation.cpp
@@ -3,7 +3,7 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#include "model_allocation.h"
+#include "plugin/common_frontend/model_allocation.h"
 
 using namespace nncc::contrib::frontend::common;
 

diff --git a/contrib/nnc/plugin/frontend/common/shape_helper.cpp b/contrib/nnc/plugin/common_frontend/shape_helper.cpp
similarity index 94%
rename from contrib/nnc/plugin/frontend/common/shape_helper.cpp
rename to contrib/nnc/plugin/common_frontend/shape_helper.cpp
index 39a21a8..f716095 100644 (file)
--- a/contrib/nnc/plugin/frontend/common/shape_helper.cpp
+++ b/contrib/nnc/plugin/common_frontend/shape_helper.cpp
@@ -1,6 +1,6 @@
 #include <vector>
 
-#include "shape_helper.h"
+#include "plugin/common_frontend/shape_helper.h"
 #include "support/PluginException.h"
 
 namespace nncc

diff --git a/contrib/nnc/plugin/frontend/CMakeLists.txt b/contrib/nnc/plugin/frontend/CMakeLists.txt
deleted file mode 100644 (file)
index c17cba3..0000000
--- a/contrib/nnc/plugin/frontend/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-##########################################
-# Common for every importer code library #
-##########################################
-
-file(GLOB common_sources common/*)
-file(GLOB common_headers include/*)
-
-set(nn_import_common nn_import_common)
-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 nnc_support)
-
-add_subdirectory(tflite)
-add_subdirectory(caffe)

diff --git a/contrib/nnc/plugin/frontend/tflite/CMakeLists.txt b/contrib/nnc/plugin/tflite_frontend/CMakeLists.txt
similarity index 51%
rename from contrib/nnc/plugin/frontend/tflite/CMakeLists.txt
rename to contrib/nnc/plugin/tflite_frontend/CMakeLists.txt
index af562d4..c24b7a8 100644 (file)
--- a/contrib/nnc/plugin/frontend/tflite/CMakeLists.txt
+++ b/contrib/nnc/plugin/tflite_frontend/CMakeLists.txt
@@ -20,36 +20,22 @@ target_include_directories(tflite_schema PUBLIC ${FB_GEN_INCLUDE_DIRS})
 # TFLITE importer #
 ###################
 
-set(tflite_importer_sources ${CMAKE_CURRENT_SOURCE_DIR}/src/tflite_walker.cpp
-                            ${CMAKE_CURRENT_SOURCE_DIR}/src/tflite_dump_visitor.cpp
-                            ${CMAKE_CURRENT_SOURCE_DIR}/src/tflite_ir_visitor.cpp
-                            ${CMAKE_CURRENT_SOURCE_DIR}/src/tflite_op_creator.cpp
-                            ${CMAKE_CURRENT_SOURCE_DIR}/src/tflite_v3_importer.cpp
-                            ${CMAKE_CURRENT_SOURCE_DIR}/src/tflite_plugin.cpp)
-file(GLOB tflite_importer_headers include/*.h)
+set(tflite_importer_sources tflite_walker.cpp
+                            tflite_dump_visitor.cpp
+                            tflite_ir_visitor.cpp
+                            tflite_op_creator.cpp
+                            tflite_v3_importer.cpp
+                            tflite_plugin.cpp)
+file(GLOB tflite_importer_headers *.h)
 
 set(tflite_import tflite_import)
 add_library(${tflite_import} SHARED ${tflite_importer_sources} ${tflite_importer_headers})
 
-target_include_directories(${tflite_import} PUBLIC include)
-
 target_link_libraries(${tflite_import} PUBLIC tflite_schema)
 target_link_libraries(${tflite_import} PUBLIC flatbuffers)
-target_link_libraries(${tflite_import} PUBLIC ${nn_import_common})
+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)
 
-###################
-# TFLITE examples #
-###################
-
-file(GLOB tflite_example_sources examples/*)
-
-set(tflite_import_example tflite_import_example)
-add_executable(${tflite_import_example} ${tflite_example_sources} ${OPTIONS_SRC})
-
-target_link_libraries(${tflite_import_example} PUBLIC tflite_schema)
-target_link_libraries(${tflite_import_example} PRIVATE ${tflite_import})
-
 # install tflite frontend library
 install_nnc_plugin(tflite_import)

diff --git a/contrib/nnc/plugin/frontend/tflite/schema/schema.fbs b/contrib/nnc/plugin/tflite_frontend/schema/schema.fbs
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/schema/schema.fbs
rename to contrib/nnc/plugin/tflite_frontend/schema/schema.fbs

diff --git a/contrib/nnc/plugin/frontend/tflite/schema/schema.meta b/contrib/nnc/plugin/tflite_frontend/schema/schema.meta
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/schema/schema.meta
rename to contrib/nnc/plugin/tflite_frontend/schema/schema.meta

diff --git a/contrib/nnc/plugin/frontend/tflite/schema/schema_v0.fbs b/contrib/nnc/plugin/tflite_frontend/schema/schema_v0.fbs
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/schema/schema_v0.fbs
rename to contrib/nnc/plugin/tflite_frontend/schema/schema_v0.fbs

diff --git a/contrib/nnc/plugin/frontend/tflite/schema/schema_v0.meta b/contrib/nnc/plugin/tflite_frontend/schema/schema_v0.meta
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/schema/schema_v0.meta
rename to contrib/nnc/plugin/tflite_frontend/schema/schema_v0.meta

diff --git a/contrib/nnc/plugin/frontend/tflite/schema/schema_v1.fbs b/contrib/nnc/plugin/tflite_frontend/schema/schema_v1.fbs
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/schema/schema_v1.fbs
rename to contrib/nnc/plugin/tflite_frontend/schema/schema_v1.fbs

diff --git a/contrib/nnc/plugin/frontend/tflite/schema/schema_v1.meta b/contrib/nnc/plugin/tflite_frontend/schema/schema_v1.meta
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/schema/schema_v1.meta
rename to contrib/nnc/plugin/tflite_frontend/schema/schema_v1.meta

diff --git a/contrib/nnc/plugin/frontend/tflite/schema/schema_v2.fbs b/contrib/nnc/plugin/tflite_frontend/schema/schema_v2.fbs
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/schema/schema_v2.fbs
rename to contrib/nnc/plugin/tflite_frontend/schema/schema_v2.fbs

diff --git a/contrib/nnc/plugin/frontend/tflite/schema/schema_v2.meta b/contrib/nnc/plugin/tflite_frontend/schema/schema_v2.meta
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/schema/schema_v2.meta
rename to contrib/nnc/plugin/tflite_frontend/schema/schema_v2.meta

diff --git a/contrib/nnc/plugin/frontend/tflite/schema/schema_v3.fbs b/contrib/nnc/plugin/tflite_frontend/schema/schema_v3.fbs
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/schema/schema_v3.fbs
rename to contrib/nnc/plugin/tflite_frontend/schema/schema_v3.fbs

diff --git a/contrib/nnc/plugin/frontend/tflite/schema/schema_v3.meta b/contrib/nnc/plugin/tflite_frontend/schema/schema_v3.meta
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/schema/schema_v3.meta
rename to contrib/nnc/plugin/tflite_frontend/schema/schema_v3.meta

diff --git a/contrib/nnc/plugin/frontend/tflite/include/schema_v3.h b/contrib/nnc/plugin/tflite_frontend/schema_v3.h
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/include/schema_v3.h
rename to contrib/nnc/plugin/tflite_frontend/schema_v3.h

diff --git a/contrib/nnc/plugin/frontend/tflite/src/tflite_dump_visitor.cpp b/contrib/nnc/plugin/tflite_frontend/tflite_dump_visitor.cpp
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/src/tflite_dump_visitor.cpp
rename to contrib/nnc/plugin/tflite_frontend/tflite_dump_visitor.cpp

diff --git a/contrib/nnc/plugin/frontend/tflite/include/tflite_dump_visitor.h b/contrib/nnc/plugin/tflite_frontend/tflite_dump_visitor.h
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/include/tflite_dump_visitor.h
rename to contrib/nnc/plugin/tflite_frontend/tflite_dump_visitor.h

diff --git a/contrib/nnc/plugin/frontend/tflite/src/tflite_importer.inline.cpp b/contrib/nnc/plugin/tflite_frontend/tflite_importer.inline.cpp
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/src/tflite_importer.inline.cpp
rename to contrib/nnc/plugin/tflite_frontend/tflite_importer.inline.cpp

diff --git a/contrib/nnc/plugin/frontend/tflite/include/tflite_importer.inline.h b/contrib/nnc/plugin/tflite_frontend/tflite_importer.inline.h
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/include/tflite_importer.inline.h
rename to contrib/nnc/plugin/tflite_frontend/tflite_importer.inline.h

diff --git a/contrib/nnc/plugin/frontend/tflite/src/tflite_ir_visitor.cpp b/contrib/nnc/plugin/tflite_frontend/tflite_ir_visitor.cpp
similarity index 99%
rename from contrib/nnc/plugin/frontend/tflite/src/tflite_ir_visitor.cpp
rename to contrib/nnc/plugin/tflite_frontend/tflite_ir_visitor.cpp
index b39c174..36617ea 100644 (file)
--- a/contrib/nnc/plugin/frontend/tflite/src/tflite_ir_visitor.cpp
+++ b/contrib/nnc/plugin/tflite_frontend/tflite_ir_visitor.cpp
@@ -9,7 +9,7 @@
 #include "core/modelIR/TensorUtil.h"
 #include "core/modelIR/operations/variable_op.h"
 
-#include "shape_helper.h"
+#include "plugin/common_frontend/shape_helper.h"
 #include "tflite_ir_visitor.h"
 #include "tflite_op_creator.h"
 

diff --git a/contrib/nnc/plugin/frontend/tflite/include/tflite_ir_visitor.h b/contrib/nnc/plugin/tflite_frontend/tflite_ir_visitor.h
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/include/tflite_ir_visitor.h
rename to contrib/nnc/plugin/tflite_frontend/tflite_ir_visitor.h

diff --git a/contrib/nnc/plugin/frontend/tflite/src/tflite_op_creator.cpp b/contrib/nnc/plugin/tflite_frontend/tflite_op_creator.cpp
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/src/tflite_op_creator.cpp
rename to contrib/nnc/plugin/tflite_frontend/tflite_op_creator.cpp

diff --git a/contrib/nnc/plugin/frontend/tflite/include/tflite_op_creator.h b/contrib/nnc/plugin/tflite_frontend/tflite_op_creator.h
similarity index 98%
rename from contrib/nnc/plugin/frontend/tflite/include/tflite_op_creator.h
rename to contrib/nnc/plugin/tflite_frontend/tflite_op_creator.h
index 64f3418..b038396 100644 (file)
--- a/contrib/nnc/plugin/frontend/tflite/include/tflite_op_creator.h
+++ b/contrib/nnc/plugin/tflite_frontend/tflite_op_creator.h
@@ -15,7 +15,7 @@
 #include "core/modelIR/operations/common.h"
 
 #include "schema_v3.h"
-#include "shape_helper.h"
+#include "plugin/common_frontend/shape_helper.h"
 
 namespace nncc
 {

diff --git a/contrib/nnc/plugin/frontend/tflite/src/tflite_plugin.cpp b/contrib/nnc/plugin/tflite_frontend/tflite_plugin.cpp
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/src/tflite_plugin.cpp
rename to contrib/nnc/plugin/tflite_frontend/tflite_plugin.cpp

diff --git a/contrib/nnc/plugin/frontend/tflite/src/tflite_v3_importer.cpp b/contrib/nnc/plugin/tflite_frontend/tflite_v3_importer.cpp
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/src/tflite_v3_importer.cpp
rename to contrib/nnc/plugin/tflite_frontend/tflite_v3_importer.cpp

diff --git a/contrib/nnc/plugin/frontend/tflite/include/tflite_v3_importer.h b/contrib/nnc/plugin/tflite_frontend/tflite_v3_importer.h
similarity index 81%
rename from contrib/nnc/plugin/frontend/tflite/include/tflite_v3_importer.h
rename to contrib/nnc/plugin/tflite_frontend/tflite_v3_importer.h
index 683f7e3..7d255a8 100644 (file)
--- a/contrib/nnc/plugin/frontend/tflite/include/tflite_v3_importer.h
+++ b/contrib/nnc/plugin/tflite_frontend/tflite_v3_importer.h
@@ -5,8 +5,8 @@
 #include <string>
 
 #include "schema_v3.h"
-#include "nn_importer.h"
-#include "model_allocation.h"
+#include "plugin/common_frontend/nn_importer.h"
+#include "plugin/common_frontend/model_allocation.h"
 
 namespace nncc
 {

diff --git a/contrib/nnc/plugin/frontend/tflite/include/tflite_visitor.h b/contrib/nnc/plugin/tflite_frontend/tflite_visitor.h
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/include/tflite_visitor.h
rename to contrib/nnc/plugin/tflite_frontend/tflite_visitor.h

diff --git a/contrib/nnc/plugin/frontend/tflite/src/tflite_walker.cpp b/contrib/nnc/plugin/tflite_frontend/tflite_walker.cpp
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/src/tflite_walker.cpp
rename to contrib/nnc/plugin/tflite_frontend/tflite_walker.cpp

diff --git a/contrib/nnc/plugin/frontend/tflite/include/tflite_walker.h b/contrib/nnc/plugin/tflite_frontend/tflite_walker.h
similarity index 100%
rename from contrib/nnc/plugin/frontend/tflite/include/tflite_walker.h
rename to contrib/nnc/plugin/tflite_frontend/tflite_walker.h

diff --git a/contrib/nnc/tests/import/CMakeLists.txt b/contrib/nnc/tests/import/CMakeLists.txt
index f0d4087..023ddba 100644 (file)
--- a/contrib/nnc/tests/import/CMakeLists.txt
+++ b/contrib/nnc/tests/import/CMakeLists.txt
@@ -12,6 +12,8 @@
 
 add_executable(system_test_import_tflite tflite.cpp ${OPTIONS_SRC})
 target_link_libraries(system_test_import_tflite PRIVATE nnc_support tflite_import)
+target_include_directories(system_test_import_tflite PRIVATE ${NNC_TFLITE_FRONTEND_DIR})
 
 add_executable(system_test_import_caffe caffe.cpp ${OPTIONS_SRC})
 target_link_libraries(system_test_import_caffe PRIVATE nnc_support caffe_importer)
+target_include_directories(system_test_import_caffe PRIVATE ${NNC_CAFFE_FRONTEND_DIR})

diff --git a/contrib/nnc/tests/interpreter/graph_creator.cpp b/contrib/nnc/tests/interpreter/graph_creator.cpp
index d2fed1d..14631d6 100644 (file)
--- a/contrib/nnc/tests/interpreter/graph_creator.cpp
+++ b/contrib/nnc/tests/interpreter/graph_creator.cpp
@@ -14,7 +14,7 @@
 #include "core/modelIR/operations/softmax_op.h"
 
 #include "core/modelIR/ShapeInference.h"
-#include "shape_helper.h"
+#include "plugin/common_frontend/shape_helper.h"
 
 #include "op_info_generated.h"
 #include "graph_creator.h"

diff --git a/contrib/nnc/tests/interpreter/op_info_util.h b/contrib/nnc/tests/interpreter/op_info_util.h
index 6abb2fa..09d24da 100644 (file)
--- a/contrib/nnc/tests/interpreter/op_info_util.h
+++ b/contrib/nnc/tests/interpreter/op_info_util.h
@@ -11,7 +11,7 @@
 #include "core/modelIR/ShapeInference.h"
 
 #include "op_info_generated.h"
-#include "shape_helper.h"
+#include "plugin/common_frontend/shape_helper.h"
 #include "graph_creator.h"
 
 using namespace nncc::contrib::frontend::common;