Rename cmake target `nnc_core` to `mir`.
Signed-off-by: Sergei Barannikov <s.barannikov@samsung.com>
set(SERIALIZER_SOURCES "modelIR/Serializer.cpp"
"modelIR/Deserializer.cpp")
- add_nncc_library(nnc_core SHARED ${SOURCES} ${SERIALIZER_SOURCES})
- target_link_libraries(nnc_core PUBLIC model_ir_proto)
+ add_nncc_library(mir SHARED ${SOURCES} ${SERIALIZER_SOURCES})
+ target_link_libraries(mir PUBLIC model_ir_proto)
else()
message(WARNING "Protobuf not found, NNC serialization not available")
- add_nncc_library(nnc_core SHARED ${SOURCES})
+ add_nncc_library(mir SHARED ${SOURCES})
endif()
-target_link_libraries(nnc_core PUBLIC adtidas)
+target_link_libraries(mir PUBLIC adtidas)
-set_target_properties(nnc_core PROPERTIES LINKER_LANGUAGE CXX)
+set_target_properties(mir PROPERTIES LINKER_LANGUAGE CXX)
# install nnc core library
-nnc_install_library(nnc_core)
+nnc_install_library(mir)
set(PASS_MANAGER_SRC PassManager.cpp)
nnc_add_library(nnc_pass STATIC ${PASS_MANAGER_SRC})
-target_link_libraries(nnc_pass PUBLIC nnc_core)
+target_link_libraries(nnc_pass PUBLIC mir)
set_target_properties(nnc_pass PROPERTIES LINKER_LANGUAGE CXX)
nnc_add_library(acl_soft_backend_cpp SHARED ${ACL_SOFT_BACKEND_CPP_SOURCES} ${ACL_GENERATED_SOURCES})
target_include_directories(acl_soft_backend_cpp PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
target_link_libraries(acl_soft_backend_cpp PRIVATE nnc_support)
-target_link_libraries(acl_soft_backend_cpp PRIVATE nnc_core)
+target_link_libraries(acl_soft_backend_cpp PRIVATE mir)
# install soft backend c++ library
nnc_install_library(acl_soft_backend_cpp)
target_link_libraries(caffe2_importer PUBLIC nnc_pass)
target_link_libraries(caffe2_importer PRIVATE nn_import_common)
target_link_libraries(caffe2_importer PRIVATE nnc_support)
-target_link_libraries(caffe2_importer PRIVATE nnc_core)
+target_link_libraries(caffe2_importer PRIVATE mir)
target_link_libraries(caffe_importer PUBLIC nnc_pass)
target_link_libraries(caffe_importer PRIVATE 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 mir)
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)
+target_link_libraries(nn_import_common PRIVATE mir nnc_support)
#
# This library depends on other frontends to provide uniform interface for those who use frontends
file(GLOB_RECURSE DUMPER_SRC ./*.cpp ./*.h)
nnc_add_library(nnc_dumper SHARED ${DUMPER_SRC})
-target_link_libraries(nnc_dumper PRIVATE nnc_core nnc_support)
+target_link_libraries(nnc_dumper PRIVATE mir nnc_support)
# install dumper library
nnc_install_library(nnc_dumper)
file(GLOB_RECURSE interp_src ./*.cpp ./*.h)
nnc_add_library(nnc_interpreter SHARED ${interp_src})
-target_link_libraries(nnc_interpreter PRIVATE nnc_core nnc_support)
+target_link_libraries(nnc_interpreter PRIVATE mir nnc_support)
if(NNC_HDF5_SUPPORTED)
target_include_directories(nnc_interpreter PRIVATE ${HDF5_INCLUDE_DIRS})
target_link_libraries(onnx_importer PUBLIC nnc_pass)
target_link_libraries(onnx_importer PRIVATE nn_import_common)
target_link_libraries(onnx_importer PRIVATE nnc_support)
-target_link_libraries(onnx_importer PRIVATE nnc_core)
+target_link_libraries(onnx_importer PRIVATE mir)
add_definitions (-DONNX_NAMESPACE=onnx)
get_target_property(INCLUDE_DIRS onnxproto INCLUDE_DIRECTORIES)
set(OPTIMIZATIONS_SRC "CombineTransposes.cpp")
nnc_add_library(nnc_optimizations SHARED ${OPTIMIZATIONS_SRC})
-target_link_libraries(nnc_optimizations PRIVATE nnc_core nnc_support)
+target_link_libraries(nnc_optimizations PRIVATE mir nnc_support)
# install optimizations library
nnc_install_library(nnc_optimizations)
set_property(TARGET soft_backend_common PROPERTY POSITION_INDEPENDENT_CODE ON)
target_include_directories(soft_backend_common PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
target_link_libraries(soft_backend_common PRIVATE nnc_support)
-target_link_libraries(soft_backend_common PRIVATE nnc_core)
+target_link_libraries(soft_backend_common PRIVATE mir)
function(make_soft_backend NAME)
nnc_add_library(${NAME} SHARED ${ARGN} ${SOFT_GENERATED_SOURCES})
target_link_libraries(${NAME} PRIVATE soft_backend_common)
target_link_libraries(${NAME} PRIVATE nnc_support)
- target_link_libraries(${NAME} PRIVATE nnc_core)
+ target_link_libraries(${NAME} PRIVATE mir)
# install soft backend c++ library
nnc_install_library(${NAME})
target_link_libraries(tflite_importer PUBLIC nnc_pass)
target_link_libraries(tflite_importer PRIVATE nn_import_common)
target_link_libraries(tflite_importer PRIVATE nnc_support)
-target_link_libraries(tflite_importer PRIVATE nnc_core)
+target_link_libraries(tflite_importer PRIVATE mir)
nnc_make_generated_sources("${SOFT_TEST_DEF_SOURCES}" ${CMAKE_CURRENT_BINARY_DIR} SOFT_TEST_GENERATED_SOURCES)
add_executable(nnc_system_soft_backend_cpp_compile CompileCPP.cpp ${OPTIONS_SRC} ${SOFT_TEST_GENERATED_SOURCES})
-target_link_libraries(nnc_system_soft_backend_cpp_compile PRIVATE nnc_support soft_backend_cpp nnc_core)
+target_link_libraries(nnc_system_soft_backend_cpp_compile PRIVATE nnc_support soft_backend_cpp mir)
target_include_directories(nnc_system_soft_backend_cpp_compile PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${NNC_SOFT_BACKEND_DIR})
add_test(NAME nnc_system_test_soft_backend_cpp_compile COMMAND nnc_system_soft_backend_cpp_compile -d test_output --target=x86-c++ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
nnc_add_unit_test(nnc_acl_cpp_backend_test ${ACL_CPP_BACKEND_UTEST_SOURCES} ${OPTIONS_SRC} ${ACL_GENERATED_SOURCES})
-nncc_target_link_libraries(nnc_acl_cpp_backend_test nnc_core nnc_support acl_soft_backend_cpp)
+nncc_target_link_libraries(nnc_acl_cpp_backend_test mir nnc_support acl_soft_backend_cpp)
target_include_directories(nnc_acl_cpp_backend_test PRIVATE ${NNC_ACL_BACKEND_DIR} ${CMAKE_CURRENT_BINARY_DIR})
if (NOT ${test_create_failed})
add_definitions(-DTEST_DIR="${CMAKE_CURRENT_BINARY_DIR}")
nnc_add_unit_test(nnc_caffe2_frontend_test ${TESTS} ${OPTIONS_SRC})
- nncc_target_link_libraries(nnc_caffe2_frontend_test caffe2_importer nnc_support nnc_core)
+ nncc_target_link_libraries(nnc_caffe2_frontend_test caffe2_importer nnc_support mir)
target_include_directories(nnc_caffe2_frontend_test PRIVATE ${NNC_CAFFE2_FRONTEND_DIR})
endif()
add_definitions(-DTEST_DIR="${CMAKE_CURRENT_SOURCE_DIR}/test_data/")
nnc_add_unit_test(nnc_caffe_frontend_test ${TESTS} ${OPTIONS_SRC})
-nncc_target_link_libraries(nnc_caffe_frontend_test caffe_importer nnc_support nnc_core)
+nncc_target_link_libraries(nnc_caffe_frontend_test caffe_importer nnc_support mir)
target_include_directories(nnc_caffe_frontend_test PRIVATE ${NNC_CAFFE_FRONTEND_DIR})
nnc_add_unit_test(nnc_core_test ${TESTS})
endif()
-nncc_target_link_libraries(nnc_core_test nnc_core)
+nncc_target_link_libraries(nnc_core_test mir)
set(TESTS_OPTIMIZATIONS_SRC "CombineTransposes.cpp")
nnc_add_unit_test(tests_for_optimizations ${TESTS} ${TESTS_OPTIMIZATIONS_SRC})
-nncc_target_link_libraries(tests_for_optimizations nnc_optimizations nnc_support nnc_core)
+nncc_target_link_libraries(tests_for_optimizations nnc_optimizations nnc_support mir)
file(GLOB_RECURSE TEST_SOURCES "*.cpp")
nnc_add_unit_test(nnc_pass_test ${TEST_SOURCES} ${OPTIONS_SRC})
-nncc_target_link_libraries(nnc_pass_test nnc_support nnc_core)
+nncc_target_link_libraries(nnc_pass_test nnc_support mir)
set(CPU_CPP_BACKEND_HT_SOURCES CPPHeaderTypes.cpp)
nnc_add_unit_test(nnc_cpu_cpp_backend_ops_test ${CPU_CPP_BACKEND_OP_SOURCES} ${CPU_BACKEND_CPP_OP_SOURCES} ${OPTIONS_SRC} ${SOFT_DEF_SOURCES})
-nncc_target_link_libraries(nnc_cpu_cpp_backend_ops_test nnc_support nnc_interpreter nnc_core soft_backend_common)
+nncc_target_link_libraries(nnc_cpu_cpp_backend_ops_test nnc_support nnc_interpreter mir soft_backend_common)
target_include_directories(nnc_cpu_cpp_backend_ops_test PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${NNC_SOFT_BACKEND_DIR})
nnc_add_unit_test(nnc_cpu_cpp_backend_general_test ${CPU_CPP_BACKEND_GN_SOURCES} ${CPU_CPP_BACKEND_HT_SOURCES}
${CPU_CPP_BACKEND_MA_SOURCES} ${OPTIONS_SRC} ${SOFT_DEF_SOURCES})
-nncc_target_link_libraries(nnc_cpu_cpp_backend_general_test nnc_support nnc_core soft_backend_common)
+nncc_target_link_libraries(nnc_cpu_cpp_backend_general_test nnc_support mir soft_backend_common)
target_include_directories(nnc_cpu_cpp_backend_general_test PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${NNC_SOFT_BACKEND_DIR})
if (NOT ${test_create_failed})
add_definitions(-DTFLITE_TEST_DIR="${CMAKE_CURRENT_BINARY_DIR}/")
nnc_add_unit_test(nnc_tflite_frontend_test ${TESTS} ${OPTIONS_SRC})
- nncc_target_link_libraries(nnc_tflite_frontend_test tflite_importer nnc_support nnc_core )
+ nncc_target_link_libraries(nnc_tflite_frontend_test tflite_importer nnc_support mir )
target_include_directories(nnc_tflite_frontend_test PRIVATE ${NNC_TFLITE_FRONTEND_DIR})
endif()