From e5e67c609a4c607c724be32197bd869befa3dc89 Mon Sep 17 00:00:00 2001 From: Jaeyun Date: Tue, 8 Jan 2019 14:12:40 +0900 Subject: [PATCH] [Build] change dir structure 1. update meson/cmake to change directory structure (move common files and plugins to gst/nnstreamer) 2. move nnstreamer meson-build to gst/nnstreamer 3. set project args to build nnstreamer Signed-off-by: Jaeyun Jung --- CMakeLists.txt | 28 +++--- gst/meson.build | 1 + gst/nnstreamer/meson.build | 93 +++++++++++++++++++- .../tensor_aggregator/CMakeLists.txt | 0 gst/{ => nnstreamer}/tensor_aggregator/README.md | 0 gst/{ => nnstreamer}/tensor_aggregator/meson.build | 0 .../tensor_aggregator/tensor_aggregator.c | 0 .../tensor_aggregator/tensor_aggregator.h | 0 .../tensor_converter/CMakeLists.txt | 0 gst/{ => nnstreamer}/tensor_converter/README.md | 0 gst/{ => nnstreamer}/tensor_converter/meson.build | 0 .../tensor_converter/tensor_converter.c | 0 .../tensor_converter/tensor_converter.h | 0 gst/{ => nnstreamer}/tensor_decoder/CMakeLists.txt | 0 gst/{ => nnstreamer}/tensor_decoder/README.md | 0 gst/{ => nnstreamer}/tensor_decoder/font.h | 0 gst/{ => nnstreamer}/tensor_decoder/meson.build | 0 .../tensor_decoder/tensordec-boundingbox.c | 0 .../tensor_decoder/tensordec-directvideo.c | 0 .../tensor_decoder/tensordec-imagelabel.c | 0 .../tensor_decoder/tensordec-plugins.c | 0 gst/{ => nnstreamer}/tensor_decoder/tensordec.c | 0 gst/{ => nnstreamer}/tensor_decoder/tensordec.h | 0 gst/{ => nnstreamer}/tensor_demux/CMakeLists.txt | 0 gst/{ => nnstreamer}/tensor_demux/gsttensordemux.c | 0 gst/{ => nnstreamer}/tensor_demux/gsttensordemux.h | 0 gst/{ => nnstreamer}/tensor_demux/meson.build | 0 gst/{ => nnstreamer}/tensor_filter/CMakeLists.txt | 0 gst/{ => nnstreamer}/tensor_filter/README.md | 0 gst/{ => nnstreamer}/tensor_filter/meson.build | 8 +- gst/{ => nnstreamer}/tensor_filter/tensor_filter.c | 0 gst/{ => nnstreamer}/tensor_filter/tensor_filter.h | 0 .../tensor_filter/tensor_filter_custom.c | 0 .../tensor_filter/tensor_filter_tensorflow.c | 0 .../tensor_filter/tensor_filter_tensorflow_core.cc | 0 .../tensor_filter/tensor_filter_tensorflow_core.h | 0 .../tensor_filter/tensor_filter_tensorflow_lite.c | 0 .../tensor_filter_tensorflow_lite_core.cc | 0 .../tensor_filter_tensorflow_lite_core.h | 0 gst/{ => nnstreamer}/tensor_merge/CMakeLists.txt | 0 gst/{ => nnstreamer}/tensor_merge/README.md | 0 gst/{ => nnstreamer}/tensor_merge/gsttensormerge.c | 0 gst/{ => nnstreamer}/tensor_merge/gsttensormerge.h | 0 gst/{ => nnstreamer}/tensor_merge/meson.build | 0 gst/{ => nnstreamer}/tensor_mux/CMakeLists.txt | 0 gst/{ => nnstreamer}/tensor_mux/gsttensormux.c | 0 gst/{ => nnstreamer}/tensor_mux/gsttensormux.h | 0 gst/{ => nnstreamer}/tensor_mux/meson.build | 0 .../tensor_reposink/CMakeLists.txt | 0 gst/{ => nnstreamer}/tensor_reposink/meson.build | 0 .../tensor_reposink/tensor_reposink.c | 0 .../tensor_reposink/tensor_reposink.h | 0 gst/{ => nnstreamer}/tensor_reposrc/CMakeLists.txt | 0 gst/{ => nnstreamer}/tensor_reposrc/meson.build | 0 .../tensor_reposrc/tensor_reposrc.c | 0 .../tensor_reposrc/tensor_reposrc.h | 0 .../tensor_saveload/CMakeLists.txt | 0 gst/{ => nnstreamer}/tensor_saveload/README.md | 0 gst/{ => nnstreamer}/tensor_saveload/meson.build | 0 gst/{ => nnstreamer}/tensor_saveload/tensor_load.c | 0 gst/{ => nnstreamer}/tensor_saveload/tensor_load.h | 0 gst/{ => nnstreamer}/tensor_sink/CMakeLists.txt | 0 gst/{ => nnstreamer}/tensor_sink/README.md | 0 gst/{ => nnstreamer}/tensor_sink/meson.build | 0 gst/{ => nnstreamer}/tensor_sink/tensor_sink.c | 0 gst/{ => nnstreamer}/tensor_sink/tensor_sink.h | 0 gst/{ => nnstreamer}/tensor_source/README.md | 0 gst/{ => nnstreamer}/tensor_split/CMakeLists.txt | 0 gst/{ => nnstreamer}/tensor_split/gsttensorsplit.c | 0 gst/{ => nnstreamer}/tensor_split/gsttensorsplit.h | 0 gst/{ => nnstreamer}/tensor_split/meson.build | 0 .../tensor_transform/CMakeLists.txt | 0 gst/{ => nnstreamer}/tensor_transform/README.md | 0 gst/{ => nnstreamer}/tensor_transform/meson.build | 0 .../tensor_transform/tensor_transform.c | 0 .../tensor_transform/tensor_transform.h | 0 .../tensor_transform/transform-orc.orc | 0 meson.build | 99 +++------------------- packaging/nnstreamer.spec | 10 ++- tests/meson.build | 5 -- tests/nnstreamer_plugins/unittest_plugins.cpp | 2 +- 81 files changed, 130 insertions(+), 116 deletions(-) create mode 100644 gst/meson.build rename gst/{ => nnstreamer}/tensor_aggregator/CMakeLists.txt (100%) rename gst/{ => nnstreamer}/tensor_aggregator/README.md (100%) rename gst/{ => nnstreamer}/tensor_aggregator/meson.build (100%) rename gst/{ => nnstreamer}/tensor_aggregator/tensor_aggregator.c (100%) rename gst/{ => nnstreamer}/tensor_aggregator/tensor_aggregator.h (100%) rename gst/{ => nnstreamer}/tensor_converter/CMakeLists.txt (100%) rename gst/{ => nnstreamer}/tensor_converter/README.md (100%) rename gst/{ => nnstreamer}/tensor_converter/meson.build (100%) rename gst/{ => nnstreamer}/tensor_converter/tensor_converter.c (100%) rename gst/{ => nnstreamer}/tensor_converter/tensor_converter.h (100%) rename gst/{ => nnstreamer}/tensor_decoder/CMakeLists.txt (100%) rename gst/{ => nnstreamer}/tensor_decoder/README.md (100%) rename gst/{ => nnstreamer}/tensor_decoder/font.h (100%) rename gst/{ => nnstreamer}/tensor_decoder/meson.build (100%) rename gst/{ => nnstreamer}/tensor_decoder/tensordec-boundingbox.c (100%) rename gst/{ => nnstreamer}/tensor_decoder/tensordec-directvideo.c (100%) rename gst/{ => nnstreamer}/tensor_decoder/tensordec-imagelabel.c (100%) rename gst/{ => nnstreamer}/tensor_decoder/tensordec-plugins.c (100%) rename gst/{ => nnstreamer}/tensor_decoder/tensordec.c (100%) rename gst/{ => nnstreamer}/tensor_decoder/tensordec.h (100%) rename gst/{ => nnstreamer}/tensor_demux/CMakeLists.txt (100%) rename gst/{ => nnstreamer}/tensor_demux/gsttensordemux.c (100%) rename gst/{ => nnstreamer}/tensor_demux/gsttensordemux.h (100%) rename gst/{ => nnstreamer}/tensor_demux/meson.build (100%) rename gst/{ => nnstreamer}/tensor_filter/CMakeLists.txt (100%) rename gst/{ => nnstreamer}/tensor_filter/README.md (100%) rename gst/{ => nnstreamer}/tensor_filter/meson.build (90%) rename gst/{ => nnstreamer}/tensor_filter/tensor_filter.c (100%) rename gst/{ => nnstreamer}/tensor_filter/tensor_filter.h (100%) rename gst/{ => nnstreamer}/tensor_filter/tensor_filter_custom.c (100%) rename gst/{ => nnstreamer}/tensor_filter/tensor_filter_tensorflow.c (100%) rename gst/{ => nnstreamer}/tensor_filter/tensor_filter_tensorflow_core.cc (100%) rename gst/{ => nnstreamer}/tensor_filter/tensor_filter_tensorflow_core.h (100%) rename gst/{ => nnstreamer}/tensor_filter/tensor_filter_tensorflow_lite.c (100%) rename gst/{ => nnstreamer}/tensor_filter/tensor_filter_tensorflow_lite_core.cc (100%) rename gst/{ => nnstreamer}/tensor_filter/tensor_filter_tensorflow_lite_core.h (100%) rename gst/{ => nnstreamer}/tensor_merge/CMakeLists.txt (100%) rename gst/{ => nnstreamer}/tensor_merge/README.md (100%) rename gst/{ => nnstreamer}/tensor_merge/gsttensormerge.c (100%) rename gst/{ => nnstreamer}/tensor_merge/gsttensormerge.h (100%) rename gst/{ => nnstreamer}/tensor_merge/meson.build (100%) rename gst/{ => nnstreamer}/tensor_mux/CMakeLists.txt (100%) rename gst/{ => nnstreamer}/tensor_mux/gsttensormux.c (100%) rename gst/{ => nnstreamer}/tensor_mux/gsttensormux.h (100%) rename gst/{ => nnstreamer}/tensor_mux/meson.build (100%) rename gst/{ => nnstreamer}/tensor_reposink/CMakeLists.txt (100%) rename gst/{ => nnstreamer}/tensor_reposink/meson.build (100%) rename gst/{ => nnstreamer}/tensor_reposink/tensor_reposink.c (100%) rename gst/{ => nnstreamer}/tensor_reposink/tensor_reposink.h (100%) rename gst/{ => nnstreamer}/tensor_reposrc/CMakeLists.txt (100%) rename gst/{ => nnstreamer}/tensor_reposrc/meson.build (100%) rename gst/{ => nnstreamer}/tensor_reposrc/tensor_reposrc.c (100%) rename gst/{ => nnstreamer}/tensor_reposrc/tensor_reposrc.h (100%) rename gst/{ => nnstreamer}/tensor_saveload/CMakeLists.txt (100%) rename gst/{ => nnstreamer}/tensor_saveload/README.md (100%) rename gst/{ => nnstreamer}/tensor_saveload/meson.build (100%) rename gst/{ => nnstreamer}/tensor_saveload/tensor_load.c (100%) rename gst/{ => nnstreamer}/tensor_saveload/tensor_load.h (100%) rename gst/{ => nnstreamer}/tensor_sink/CMakeLists.txt (100%) rename gst/{ => nnstreamer}/tensor_sink/README.md (100%) rename gst/{ => nnstreamer}/tensor_sink/meson.build (100%) rename gst/{ => nnstreamer}/tensor_sink/tensor_sink.c (100%) rename gst/{ => nnstreamer}/tensor_sink/tensor_sink.h (100%) rename gst/{ => nnstreamer}/tensor_source/README.md (100%) rename gst/{ => nnstreamer}/tensor_split/CMakeLists.txt (100%) rename gst/{ => nnstreamer}/tensor_split/gsttensorsplit.c (100%) rename gst/{ => nnstreamer}/tensor_split/gsttensorsplit.h (100%) rename gst/{ => nnstreamer}/tensor_split/meson.build (100%) rename gst/{ => nnstreamer}/tensor_transform/CMakeLists.txt (100%) rename gst/{ => nnstreamer}/tensor_transform/README.md (100%) rename gst/{ => nnstreamer}/tensor_transform/meson.build (100%) rename gst/{ => nnstreamer}/tensor_transform/tensor_transform.c (100%) rename gst/{ => nnstreamer}/tensor_transform/tensor_transform.h (100%) rename gst/{ => nnstreamer}/tensor_transform/transform-orc.orc (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b431b46..058eb90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,7 +104,7 @@ ENDIF(ENABLE_TEST) SET(OBJECTS) FOREACH(PRJ IN LISTS PROJECTS) - ADD_SUBDIRECTORY(gst/${PRJ}) + ADD_SUBDIRECTORY(gst/nnstreamer/${PRJ}) LIST(APPEND OBJECTS $) ENDFOREACH(PRJ) @@ -120,12 +120,20 @@ IF(ENABLE_TENSORFLOW) ENDIF(ENABLE_TENSORFLOW) LIST(LENGTH FILTER_DEP FILTER_DEP_LEN) -ADD_LIBRARY(nnstreamerStatic STATIC gst/nnstreamer/nnstreamer.c gst/nnstreamer/tensor_common.c gst/nnstreamer/tensor_repo.c gst/nnstreamer/nnstreamer_conf.c gst/nnstreamer/nnstreamer_subplugin.c ${OBJECTS}) +SET(NNST_COMMON_SRCS + gst/nnstreamer/nnstreamer.c + gst/nnstreamer/nnstreamer_conf.c + gst/nnstreamer/nnstreamer_subplugin.c + gst/nnstreamer/tensor_common.c + gst/nnstreamer/tensor_repo.c +) + +ADD_LIBRARY(nnstreamerStatic STATIC ${NNST_COMMON_SRCS} ${OBJECTS}) SET_TARGET_PROPERTIES(nnstreamerStatic PROPERTIES OUTPUT_NAME nnstreamer) TARGET_INCLUDE_DIRECTORIES(nnstreamerStatic PUBLIC ${pkgs_INCLUDE_DIRS}) TARGET_COMPILE_OPTIONS(nnstreamerStatic PUBLIC ${pkgs_CFLAGS_OTHER}) -ADD_LIBRARY(nnstreamer SHARED gst/nnstreamer/nnstreamer.c gst/nnstreamer/tensor_common.c gst/nnstreamer/tensor_repo.c ${OBJECTS}) +ADD_LIBRARY(nnstreamer SHARED ${NNST_COMMON_SRCS} ${OBJECTS}) TARGET_INCLUDE_DIRECTORIES(nnstreamer PUBLIC ${pkgs_INCLUDE_DIRS}) TARGET_COMPILE_OPTIONS(nnstreamer PUBLIC ${pkgs_CFLAGS_OTHER}) TARGET_LINK_LIBRARIES(nnstreamer ${pkgs_LIBRARIES} ${FILTER_LIB}) @@ -143,16 +151,12 @@ INSTALL(TARGETS nnstreamerStatic nnstreamer CONFIGURE_FILE(nnstreamer.pc.in nnstreamer.pc @ONLY) -# For nnstreamer users (gst app developers using via gstreamer API) -INSTALL(FILES gst/nnstreamer/tensor_typedef.h - DESTINATION ${INCLUDE_INSTALL_DIR}/nnstreamer - ) - -# For nnstreamer custom filter developers -INSTALL(FILES gst/nnstreamer/tensor_common.h gst/nnstreamer/tensor_filter_custom.h +# tensor_typedef.h for nnstreamer users (gst app developers using via gstreamer API) +# tensor_filter_custom.h for nnstreamer custom filter developers +INSTALL(FILES gst/nnstreamer/tensor_typedef.h gst/nnstreamer/tensor_filter_custom.h DESTINATION ${INCLUDE_INSTALL_DIR}/nnstreamer - ) +) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/nnstreamer.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig - ) +) diff --git a/gst/meson.build b/gst/meson.build new file mode 100644 index 0000000..94861f5 --- /dev/null +++ b/gst/meson.build @@ -0,0 +1 @@ +subdir('nnstreamer') diff --git a/gst/nnstreamer/meson.build b/gst/nnstreamer/meson.build index 0357c41..4ed7d6b 100644 --- a/gst/nnstreamer/meson.build +++ b/gst/nnstreamer/meson.build @@ -1,9 +1,98 @@ +nnstreamer_inc = include_directories('.') +nnstreamer_sources = [] +nnstreamer_headers = [] + +# Dependencies +nnstreamer_base_deps = [ + glib_dep, + gst_dep, + gst_base_dep, + gst_controller_dep, + gst_video_dep, + gst_audio_dep, + libm_dep, + libdl_dep, + libpthread_dep +] + +if have_orcc + nnstreamer_base_deps += [orc_dep] +endif + +# For extra dependencies (subplugins, filters) +nnstreamer_extra_deps = [] + +# Add nnstreamer registerer and common sources nnst_common_sources = [ 'nnstreamer.c', - 'tensor_repo.c', - 'tensor_common.c' + 'nnstreamer_conf.c', + 'nnstreamer_subplugin.c', + 'tensor_common.c', + 'tensor_repo.c' ] foreach s : nnst_common_sources nnstreamer_sources += join_paths(meson.current_source_dir(), s) endforeach + +# Common headers to be installed +nnst_common_headers = [ + 'tensor_typedef.h', + 'tensor_filter_custom.h' +] + +foreach h : nnst_common_headers + nnstreamer_headers += join_paths(meson.current_source_dir(), h) +endforeach + +# Add plugins +nnst_plugins = [ + 'tensor_aggregator', + 'tensor_converter', + 'tensor_decoder', + 'tensor_demux', + 'tensor_merge', + 'tensor_mux', + 'tensor_saveload', + 'tensor_sink', + 'tensor_split', + 'tensor_transform', + 'tensor_filter', + 'tensor_reposrc', + 'tensor_reposink' +] + +foreach p : nnst_plugins + subdir(p) +endforeach + +# Build libraries ("both_libraries" are supported from 0.46.) +nnstreamer_shared = shared_library('nnstreamer', + nnstreamer_sources, + dependencies: [nnstreamer_base_deps, nnstreamer_extra_deps], + include_directories: nnstreamer_inc, + install: true, + install_dir: plugins_install_dir +) + +nnstreamer_static = static_library('nnstreamer', + nnstreamer_sources, + dependencies: [nnstreamer_base_deps, nnstreamer_extra_deps], + include_directories: nnstreamer_inc, + install: true, + install_dir: libs_install_dir +) + +nnstreamer_lib = nnstreamer_shared +if get_option('default_library') == 'static' + nnstreamer_lib = nnstreamer_static +endif + +nnstreamer_dep = declare_dependency(link_with: nnstreamer_lib, + dependencies: nnstreamer_base_deps, + include_directories: nnstreamer_inc) + +# Install headers into /{includedir}/nnstreamer +install_headers(nnstreamer_headers, + subdir: 'nnstreamer' +) diff --git a/gst/tensor_aggregator/CMakeLists.txt b/gst/nnstreamer/tensor_aggregator/CMakeLists.txt similarity index 100% rename from gst/tensor_aggregator/CMakeLists.txt rename to gst/nnstreamer/tensor_aggregator/CMakeLists.txt diff --git a/gst/tensor_aggregator/README.md b/gst/nnstreamer/tensor_aggregator/README.md similarity index 100% rename from gst/tensor_aggregator/README.md rename to gst/nnstreamer/tensor_aggregator/README.md diff --git a/gst/tensor_aggregator/meson.build b/gst/nnstreamer/tensor_aggregator/meson.build similarity index 100% rename from gst/tensor_aggregator/meson.build rename to gst/nnstreamer/tensor_aggregator/meson.build diff --git a/gst/tensor_aggregator/tensor_aggregator.c b/gst/nnstreamer/tensor_aggregator/tensor_aggregator.c similarity index 100% rename from gst/tensor_aggregator/tensor_aggregator.c rename to gst/nnstreamer/tensor_aggregator/tensor_aggregator.c diff --git a/gst/tensor_aggregator/tensor_aggregator.h b/gst/nnstreamer/tensor_aggregator/tensor_aggregator.h similarity index 100% rename from gst/tensor_aggregator/tensor_aggregator.h rename to gst/nnstreamer/tensor_aggregator/tensor_aggregator.h diff --git a/gst/tensor_converter/CMakeLists.txt b/gst/nnstreamer/tensor_converter/CMakeLists.txt similarity index 100% rename from gst/tensor_converter/CMakeLists.txt rename to gst/nnstreamer/tensor_converter/CMakeLists.txt diff --git a/gst/tensor_converter/README.md b/gst/nnstreamer/tensor_converter/README.md similarity index 100% rename from gst/tensor_converter/README.md rename to gst/nnstreamer/tensor_converter/README.md diff --git a/gst/tensor_converter/meson.build b/gst/nnstreamer/tensor_converter/meson.build similarity index 100% rename from gst/tensor_converter/meson.build rename to gst/nnstreamer/tensor_converter/meson.build diff --git a/gst/tensor_converter/tensor_converter.c b/gst/nnstreamer/tensor_converter/tensor_converter.c similarity index 100% rename from gst/tensor_converter/tensor_converter.c rename to gst/nnstreamer/tensor_converter/tensor_converter.c diff --git a/gst/tensor_converter/tensor_converter.h b/gst/nnstreamer/tensor_converter/tensor_converter.h similarity index 100% rename from gst/tensor_converter/tensor_converter.h rename to gst/nnstreamer/tensor_converter/tensor_converter.h diff --git a/gst/tensor_decoder/CMakeLists.txt b/gst/nnstreamer/tensor_decoder/CMakeLists.txt similarity index 100% rename from gst/tensor_decoder/CMakeLists.txt rename to gst/nnstreamer/tensor_decoder/CMakeLists.txt diff --git a/gst/tensor_decoder/README.md b/gst/nnstreamer/tensor_decoder/README.md similarity index 100% rename from gst/tensor_decoder/README.md rename to gst/nnstreamer/tensor_decoder/README.md diff --git a/gst/tensor_decoder/font.h b/gst/nnstreamer/tensor_decoder/font.h similarity index 100% rename from gst/tensor_decoder/font.h rename to gst/nnstreamer/tensor_decoder/font.h diff --git a/gst/tensor_decoder/meson.build b/gst/nnstreamer/tensor_decoder/meson.build similarity index 100% rename from gst/tensor_decoder/meson.build rename to gst/nnstreamer/tensor_decoder/meson.build diff --git a/gst/tensor_decoder/tensordec-boundingbox.c b/gst/nnstreamer/tensor_decoder/tensordec-boundingbox.c similarity index 100% rename from gst/tensor_decoder/tensordec-boundingbox.c rename to gst/nnstreamer/tensor_decoder/tensordec-boundingbox.c diff --git a/gst/tensor_decoder/tensordec-directvideo.c b/gst/nnstreamer/tensor_decoder/tensordec-directvideo.c similarity index 100% rename from gst/tensor_decoder/tensordec-directvideo.c rename to gst/nnstreamer/tensor_decoder/tensordec-directvideo.c diff --git a/gst/tensor_decoder/tensordec-imagelabel.c b/gst/nnstreamer/tensor_decoder/tensordec-imagelabel.c similarity index 100% rename from gst/tensor_decoder/tensordec-imagelabel.c rename to gst/nnstreamer/tensor_decoder/tensordec-imagelabel.c diff --git a/gst/tensor_decoder/tensordec-plugins.c b/gst/nnstreamer/tensor_decoder/tensordec-plugins.c similarity index 100% rename from gst/tensor_decoder/tensordec-plugins.c rename to gst/nnstreamer/tensor_decoder/tensordec-plugins.c diff --git a/gst/tensor_decoder/tensordec.c b/gst/nnstreamer/tensor_decoder/tensordec.c similarity index 100% rename from gst/tensor_decoder/tensordec.c rename to gst/nnstreamer/tensor_decoder/tensordec.c diff --git a/gst/tensor_decoder/tensordec.h b/gst/nnstreamer/tensor_decoder/tensordec.h similarity index 100% rename from gst/tensor_decoder/tensordec.h rename to gst/nnstreamer/tensor_decoder/tensordec.h diff --git a/gst/tensor_demux/CMakeLists.txt b/gst/nnstreamer/tensor_demux/CMakeLists.txt similarity index 100% rename from gst/tensor_demux/CMakeLists.txt rename to gst/nnstreamer/tensor_demux/CMakeLists.txt diff --git a/gst/tensor_demux/gsttensordemux.c b/gst/nnstreamer/tensor_demux/gsttensordemux.c similarity index 100% rename from gst/tensor_demux/gsttensordemux.c rename to gst/nnstreamer/tensor_demux/gsttensordemux.c diff --git a/gst/tensor_demux/gsttensordemux.h b/gst/nnstreamer/tensor_demux/gsttensordemux.h similarity index 100% rename from gst/tensor_demux/gsttensordemux.h rename to gst/nnstreamer/tensor_demux/gsttensordemux.h diff --git a/gst/tensor_demux/meson.build b/gst/nnstreamer/tensor_demux/meson.build similarity index 100% rename from gst/tensor_demux/meson.build rename to gst/nnstreamer/tensor_demux/meson.build diff --git a/gst/tensor_filter/CMakeLists.txt b/gst/nnstreamer/tensor_filter/CMakeLists.txt similarity index 100% rename from gst/tensor_filter/CMakeLists.txt rename to gst/nnstreamer/tensor_filter/CMakeLists.txt diff --git a/gst/tensor_filter/README.md b/gst/nnstreamer/tensor_filter/README.md similarity index 100% rename from gst/tensor_filter/README.md rename to gst/nnstreamer/tensor_filter/README.md diff --git a/gst/tensor_filter/meson.build b/gst/nnstreamer/tensor_filter/meson.build similarity index 90% rename from gst/tensor_filter/meson.build rename to gst/nnstreamer/tensor_filter/meson.build index 7479b4c..12d2fb6 100644 --- a/gst/tensor_filter/meson.build +++ b/gst/nnstreamer/tensor_filter/meson.build @@ -8,7 +8,7 @@ if have_tensorflow tensor_filter_tfcore_lib_shared = shared_library('tensor_filter_tfcore', ['tensor_filter_tensorflow_core.cc'], - cpp_args: nnstreamer_base_args + ['-Wno-sign-compare'], + cpp_args: ['-Wno-sign-compare'], dependencies: [tf_dep, protobuf_dep, glib_dep, gst_dep], include_directories: nnstreamer_inc, install: true, @@ -17,7 +17,7 @@ if have_tensorflow tensor_filter_tfcore_lib_static = static_library('tensor_filter_tfcore', ['tensor_filter_tensorflow_core.cc'], - cpp_args: nnstreamer_base_args + ['-Wno-sign-compare'], + cpp_args: ['-Wno-sign-compare'], dependencies: [tf_dep, protobuf_dep, glib_dep, gst_dep], include_directories: nnstreamer_inc, install: true, @@ -38,7 +38,7 @@ if have_tensorflow_lite tensor_filter_tflitecore_lib_shared = shared_library('tensor_filter_tflitecore', ['tensor_filter_tensorflow_lite_core.cc'], - cpp_args: nnstreamer_base_args + ['-Wno-sign-compare'], + cpp_args: ['-Wno-sign-compare'], dependencies: [tflite_dep, libpthread_dep, libdl_dep, glib_dep, gst_dep], include_directories: nnstreamer_inc, install: true, @@ -47,7 +47,7 @@ if have_tensorflow_lite tensor_filter_tflitecore_lib_static = static_library('tensor_filter_tflitecore', ['tensor_filter_tensorflow_lite_core.cc'], - cpp_args: nnstreamer_base_args + ['-Wno-sign-compare'], + cpp_args: ['-Wno-sign-compare'], dependencies: [tflite_dep, libpthread_dep, libdl_dep, glib_dep, gst_dep], include_directories: nnstreamer_inc, install: true, diff --git a/gst/tensor_filter/tensor_filter.c b/gst/nnstreamer/tensor_filter/tensor_filter.c similarity index 100% rename from gst/tensor_filter/tensor_filter.c rename to gst/nnstreamer/tensor_filter/tensor_filter.c diff --git a/gst/tensor_filter/tensor_filter.h b/gst/nnstreamer/tensor_filter/tensor_filter.h similarity index 100% rename from gst/tensor_filter/tensor_filter.h rename to gst/nnstreamer/tensor_filter/tensor_filter.h diff --git a/gst/tensor_filter/tensor_filter_custom.c b/gst/nnstreamer/tensor_filter/tensor_filter_custom.c similarity index 100% rename from gst/tensor_filter/tensor_filter_custom.c rename to gst/nnstreamer/tensor_filter/tensor_filter_custom.c diff --git a/gst/tensor_filter/tensor_filter_tensorflow.c b/gst/nnstreamer/tensor_filter/tensor_filter_tensorflow.c similarity index 100% rename from gst/tensor_filter/tensor_filter_tensorflow.c rename to gst/nnstreamer/tensor_filter/tensor_filter_tensorflow.c diff --git a/gst/tensor_filter/tensor_filter_tensorflow_core.cc b/gst/nnstreamer/tensor_filter/tensor_filter_tensorflow_core.cc similarity index 100% rename from gst/tensor_filter/tensor_filter_tensorflow_core.cc rename to gst/nnstreamer/tensor_filter/tensor_filter_tensorflow_core.cc diff --git a/gst/tensor_filter/tensor_filter_tensorflow_core.h b/gst/nnstreamer/tensor_filter/tensor_filter_tensorflow_core.h similarity index 100% rename from gst/tensor_filter/tensor_filter_tensorflow_core.h rename to gst/nnstreamer/tensor_filter/tensor_filter_tensorflow_core.h diff --git a/gst/tensor_filter/tensor_filter_tensorflow_lite.c b/gst/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite.c similarity index 100% rename from gst/tensor_filter/tensor_filter_tensorflow_lite.c rename to gst/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite.c diff --git a/gst/tensor_filter/tensor_filter_tensorflow_lite_core.cc b/gst/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite_core.cc similarity index 100% rename from gst/tensor_filter/tensor_filter_tensorflow_lite_core.cc rename to gst/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite_core.cc diff --git a/gst/tensor_filter/tensor_filter_tensorflow_lite_core.h b/gst/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite_core.h similarity index 100% rename from gst/tensor_filter/tensor_filter_tensorflow_lite_core.h rename to gst/nnstreamer/tensor_filter/tensor_filter_tensorflow_lite_core.h diff --git a/gst/tensor_merge/CMakeLists.txt b/gst/nnstreamer/tensor_merge/CMakeLists.txt similarity index 100% rename from gst/tensor_merge/CMakeLists.txt rename to gst/nnstreamer/tensor_merge/CMakeLists.txt diff --git a/gst/tensor_merge/README.md b/gst/nnstreamer/tensor_merge/README.md similarity index 100% rename from gst/tensor_merge/README.md rename to gst/nnstreamer/tensor_merge/README.md diff --git a/gst/tensor_merge/gsttensormerge.c b/gst/nnstreamer/tensor_merge/gsttensormerge.c similarity index 100% rename from gst/tensor_merge/gsttensormerge.c rename to gst/nnstreamer/tensor_merge/gsttensormerge.c diff --git a/gst/tensor_merge/gsttensormerge.h b/gst/nnstreamer/tensor_merge/gsttensormerge.h similarity index 100% rename from gst/tensor_merge/gsttensormerge.h rename to gst/nnstreamer/tensor_merge/gsttensormerge.h diff --git a/gst/tensor_merge/meson.build b/gst/nnstreamer/tensor_merge/meson.build similarity index 100% rename from gst/tensor_merge/meson.build rename to gst/nnstreamer/tensor_merge/meson.build diff --git a/gst/tensor_mux/CMakeLists.txt b/gst/nnstreamer/tensor_mux/CMakeLists.txt similarity index 100% rename from gst/tensor_mux/CMakeLists.txt rename to gst/nnstreamer/tensor_mux/CMakeLists.txt diff --git a/gst/tensor_mux/gsttensormux.c b/gst/nnstreamer/tensor_mux/gsttensormux.c similarity index 100% rename from gst/tensor_mux/gsttensormux.c rename to gst/nnstreamer/tensor_mux/gsttensormux.c diff --git a/gst/tensor_mux/gsttensormux.h b/gst/nnstreamer/tensor_mux/gsttensormux.h similarity index 100% rename from gst/tensor_mux/gsttensormux.h rename to gst/nnstreamer/tensor_mux/gsttensormux.h diff --git a/gst/tensor_mux/meson.build b/gst/nnstreamer/tensor_mux/meson.build similarity index 100% rename from gst/tensor_mux/meson.build rename to gst/nnstreamer/tensor_mux/meson.build diff --git a/gst/tensor_reposink/CMakeLists.txt b/gst/nnstreamer/tensor_reposink/CMakeLists.txt similarity index 100% rename from gst/tensor_reposink/CMakeLists.txt rename to gst/nnstreamer/tensor_reposink/CMakeLists.txt diff --git a/gst/tensor_reposink/meson.build b/gst/nnstreamer/tensor_reposink/meson.build similarity index 100% rename from gst/tensor_reposink/meson.build rename to gst/nnstreamer/tensor_reposink/meson.build diff --git a/gst/tensor_reposink/tensor_reposink.c b/gst/nnstreamer/tensor_reposink/tensor_reposink.c similarity index 100% rename from gst/tensor_reposink/tensor_reposink.c rename to gst/nnstreamer/tensor_reposink/tensor_reposink.c diff --git a/gst/tensor_reposink/tensor_reposink.h b/gst/nnstreamer/tensor_reposink/tensor_reposink.h similarity index 100% rename from gst/tensor_reposink/tensor_reposink.h rename to gst/nnstreamer/tensor_reposink/tensor_reposink.h diff --git a/gst/tensor_reposrc/CMakeLists.txt b/gst/nnstreamer/tensor_reposrc/CMakeLists.txt similarity index 100% rename from gst/tensor_reposrc/CMakeLists.txt rename to gst/nnstreamer/tensor_reposrc/CMakeLists.txt diff --git a/gst/tensor_reposrc/meson.build b/gst/nnstreamer/tensor_reposrc/meson.build similarity index 100% rename from gst/tensor_reposrc/meson.build rename to gst/nnstreamer/tensor_reposrc/meson.build diff --git a/gst/tensor_reposrc/tensor_reposrc.c b/gst/nnstreamer/tensor_reposrc/tensor_reposrc.c similarity index 100% rename from gst/tensor_reposrc/tensor_reposrc.c rename to gst/nnstreamer/tensor_reposrc/tensor_reposrc.c diff --git a/gst/tensor_reposrc/tensor_reposrc.h b/gst/nnstreamer/tensor_reposrc/tensor_reposrc.h similarity index 100% rename from gst/tensor_reposrc/tensor_reposrc.h rename to gst/nnstreamer/tensor_reposrc/tensor_reposrc.h diff --git a/gst/tensor_saveload/CMakeLists.txt b/gst/nnstreamer/tensor_saveload/CMakeLists.txt similarity index 100% rename from gst/tensor_saveload/CMakeLists.txt rename to gst/nnstreamer/tensor_saveload/CMakeLists.txt diff --git a/gst/tensor_saveload/README.md b/gst/nnstreamer/tensor_saveload/README.md similarity index 100% rename from gst/tensor_saveload/README.md rename to gst/nnstreamer/tensor_saveload/README.md diff --git a/gst/tensor_saveload/meson.build b/gst/nnstreamer/tensor_saveload/meson.build similarity index 100% rename from gst/tensor_saveload/meson.build rename to gst/nnstreamer/tensor_saveload/meson.build diff --git a/gst/tensor_saveload/tensor_load.c b/gst/nnstreamer/tensor_saveload/tensor_load.c similarity index 100% rename from gst/tensor_saveload/tensor_load.c rename to gst/nnstreamer/tensor_saveload/tensor_load.c diff --git a/gst/tensor_saveload/tensor_load.h b/gst/nnstreamer/tensor_saveload/tensor_load.h similarity index 100% rename from gst/tensor_saveload/tensor_load.h rename to gst/nnstreamer/tensor_saveload/tensor_load.h diff --git a/gst/tensor_sink/CMakeLists.txt b/gst/nnstreamer/tensor_sink/CMakeLists.txt similarity index 100% rename from gst/tensor_sink/CMakeLists.txt rename to gst/nnstreamer/tensor_sink/CMakeLists.txt diff --git a/gst/tensor_sink/README.md b/gst/nnstreamer/tensor_sink/README.md similarity index 100% rename from gst/tensor_sink/README.md rename to gst/nnstreamer/tensor_sink/README.md diff --git a/gst/tensor_sink/meson.build b/gst/nnstreamer/tensor_sink/meson.build similarity index 100% rename from gst/tensor_sink/meson.build rename to gst/nnstreamer/tensor_sink/meson.build diff --git a/gst/tensor_sink/tensor_sink.c b/gst/nnstreamer/tensor_sink/tensor_sink.c similarity index 100% rename from gst/tensor_sink/tensor_sink.c rename to gst/nnstreamer/tensor_sink/tensor_sink.c diff --git a/gst/tensor_sink/tensor_sink.h b/gst/nnstreamer/tensor_sink/tensor_sink.h similarity index 100% rename from gst/tensor_sink/tensor_sink.h rename to gst/nnstreamer/tensor_sink/tensor_sink.h diff --git a/gst/tensor_source/README.md b/gst/nnstreamer/tensor_source/README.md similarity index 100% rename from gst/tensor_source/README.md rename to gst/nnstreamer/tensor_source/README.md diff --git a/gst/tensor_split/CMakeLists.txt b/gst/nnstreamer/tensor_split/CMakeLists.txt similarity index 100% rename from gst/tensor_split/CMakeLists.txt rename to gst/nnstreamer/tensor_split/CMakeLists.txt diff --git a/gst/tensor_split/gsttensorsplit.c b/gst/nnstreamer/tensor_split/gsttensorsplit.c similarity index 100% rename from gst/tensor_split/gsttensorsplit.c rename to gst/nnstreamer/tensor_split/gsttensorsplit.c diff --git a/gst/tensor_split/gsttensorsplit.h b/gst/nnstreamer/tensor_split/gsttensorsplit.h similarity index 100% rename from gst/tensor_split/gsttensorsplit.h rename to gst/nnstreamer/tensor_split/gsttensorsplit.h diff --git a/gst/tensor_split/meson.build b/gst/nnstreamer/tensor_split/meson.build similarity index 100% rename from gst/tensor_split/meson.build rename to gst/nnstreamer/tensor_split/meson.build diff --git a/gst/tensor_transform/CMakeLists.txt b/gst/nnstreamer/tensor_transform/CMakeLists.txt similarity index 100% rename from gst/tensor_transform/CMakeLists.txt rename to gst/nnstreamer/tensor_transform/CMakeLists.txt diff --git a/gst/tensor_transform/README.md b/gst/nnstreamer/tensor_transform/README.md similarity index 100% rename from gst/tensor_transform/README.md rename to gst/nnstreamer/tensor_transform/README.md diff --git a/gst/tensor_transform/meson.build b/gst/nnstreamer/tensor_transform/meson.build similarity index 100% rename from gst/tensor_transform/meson.build rename to gst/nnstreamer/tensor_transform/meson.build diff --git a/gst/tensor_transform/tensor_transform.c b/gst/nnstreamer/tensor_transform/tensor_transform.c similarity index 100% rename from gst/tensor_transform/tensor_transform.c rename to gst/nnstreamer/tensor_transform/tensor_transform.c diff --git a/gst/tensor_transform/tensor_transform.h b/gst/nnstreamer/tensor_transform/tensor_transform.h similarity index 100% rename from gst/tensor_transform/tensor_transform.h rename to gst/nnstreamer/tensor_transform/tensor_transform.h diff --git a/gst/tensor_transform/transform-orc.orc b/gst/nnstreamer/tensor_transform/transform-orc.orc similarity index 100% rename from gst/tensor_transform/transform-orc.orc rename to gst/nnstreamer/tensor_transform/transform-orc.orc diff --git a/meson.build b/meson.build index 0e45b49..7076772 100644 --- a/meson.build +++ b/meson.build @@ -12,7 +12,7 @@ project('nnstreamer', 'c', 'cpp', ] ) -add_project_arguments('-DVERSION="'+meson.project_version()+'"', language: 'c') +add_project_arguments('-DVERSION="'+meson.project_version()+'"', language: ['c', 'cpp']) cc = meson.get_compiler('c') cxx = meson.get_compiler('cpp') @@ -23,17 +23,6 @@ gst_api_verision = '1.0' nnstreamer_conf = configuration_data() nnstreamer_conf.set('VERSION', meson.project_version()) -nnstreamer_inc = include_directories('gst/nnstreamer') -nnstreamer_sources = [] -nnstreamer_base_args = [] - -# Common headers to be installed -nnstreamer_headers = [ - 'gst/nnstreamer/tensor_common.h', - 'gst/nnstreamer/tensor_typedef.h', - 'gst/nnstreamer/tensor_filter_custom.h' -] - # Set install path nnstreamer_prefix = get_option('prefix') nnstreamer_libdir = join_paths(nnstreamer_prefix, get_option('libdir')) @@ -65,21 +54,6 @@ libm_dep = cc.find_library('m') # cmath library libdl_dep = cc.find_library('dl') # DL library libpthread_dep = cxx.find_library('pthread') # pthread for tensorflow-lite -nnstreamer_base_deps = [ - glib_dep, - gst_dep, - gst_base_dep, - gst_controller_dep, - gst_video_dep, - gst_audio_dep, - libm_dep, - libdl_dep, - libpthread_dep -] - -# For extra dependencies (subplugins, filters) -nnstreamer_extra_deps = [] - # Orc have_orcc = false @@ -88,11 +62,10 @@ orcc = find_program('orcc', required: false) if orc_dep.found() and orcc.found() have_orcc = true orcc_args = [orcc, '--include', 'glib.h'] - nnstreamer_base_deps += [orc_dep] - nnstreamer_base_args += ['-DHAVE_ORC=1'] + add_project_arguments('-DHAVE_ORC=1', language: ['c', 'cpp']) else message('Cannot find orc library') - nnstreamer_base_args += ['-DDISABLE_ORC=1'] + add_project_arguments('-DDISABLE_ORC=1', language: ['c', 'cpp']) endif # Tensorflow @@ -104,7 +77,7 @@ if get_option('ENABLE_TENSORFLOW') if tf_dep.found() and protobuf_dep.found() have_tensorflow = true - nnstreamer_base_args += ['-DENABLE_TENSORFLOW=1'] + add_project_arguments('-DENABLE_TENSORFLOW=1', language: ['c', 'cpp']) else message('Cannot find tensorflow') endif @@ -118,75 +91,25 @@ if get_option('ENABLE_TENSORFLOW_LITE') if tflite_dep.found() have_tensorflow_lite = true - nnstreamer_base_args += ['-DENABLE_TENSORFLOW_LITE=1'] + add_project_arguments('-DENABLE_TENSORFLOW_LITE=1', language: ['c', 'cpp']) else message('Cannot find tensorflow-lite') endif endif # Build nnstreamer (common, plugins) -projects = [ - 'nnstreamer', - 'tensor_aggregator', - 'tensor_converter', - 'tensor_decoder', - 'tensor_demux', - 'tensor_merge', - 'tensor_mux', - 'tensor_saveload', - 'tensor_sink', - 'tensor_split', - 'tensor_transform', - 'tensor_filter', - 'tensor_reposrc', - 'tensor_reposink' -] - -foreach p : projects - subdir('gst/'+ p) -endforeach - -# "both_libraries" are supported from 0.46. -nnstreamer_shared = shared_library('nnstreamer', - nnstreamer_sources, - c_args: nnstreamer_base_args, - dependencies: [nnstreamer_base_deps, nnstreamer_extra_deps], - include_directories: nnstreamer_inc, - install: true, - install_dir: plugins_install_dir -) +subdir('gst') -nnstreamer_static = static_library('nnstreamer', - nnstreamer_sources, - c_args: nnstreamer_base_args, - dependencies: [nnstreamer_base_deps, nnstreamer_extra_deps], - include_directories: nnstreamer_inc, - install: true, - install_dir: libs_install_dir -) +# Build nnstreamer examples +subdir('nnstreamer_example') -nnstreamer_lib = nnstreamer_shared -if get_option('default_library') == 'static' - nnstreamer_lib = nnstreamer_static +# Build unittests +if get_option('ENABLE_TEST') + subdir('tests') endif -nnstreamer_dep = declare_dependency(link_with: nnstreamer_lib, include_directories: nnstreamer_inc) - -# Install headers into /{includedir}/nnstreamer -install_headers(nnstreamer_headers, - subdir: 'nnstreamer' -) - configure_file(input: 'nnstreamer.pc.in', output: 'nnstreamer.pc', install: true, install_dir: join_paths(libs_install_dir, 'pkgconfig'), configuration: nnstreamer_conf ) - -# Build nnstreamer examples -subdir('nnstreamer_example') - -# Build unittests -if get_option('ENABLE_TEST') - subdir('tests') -endif diff --git a/packaging/nnstreamer.spec b/packaging/nnstreamer.spec index 61cf327..b2eca4d 100644 --- a/packaging/nnstreamer.spec +++ b/packaging/nnstreamer.spec @@ -99,7 +99,6 @@ mkdir -p build %ifarch x86_64 aarch64 meson --buildtype=plain --werror --prefix=%{_prefix} --libdir=%{_libdir} --bindir=%{nnstexampledir} --includedir=%{_includedir} -DINSTALL_EXAMPLES=true build - export TEST_TENSORFLOW=1 %else meson --buildtype=plain --werror --prefix=%{_prefix} --libdir=%{_libdir} --bindir=%{nnstexampledir} --includedir=%{_includedir} -DINSTALL_EXAMPLES=true -DENABLE_TENSORFLOW=false build %endif @@ -110,7 +109,10 @@ ninja -C build %{?_smp_mflags} pushd build # Copy bmp2png for ssat cp ./tests/bmp2png ../tests - export LD_LIBRARY_PATH=$(pwd):$(pwd)/gst/tensor_filter + export LD_LIBRARY_PATH=$(pwd)/gst/nnstreamer:$(pwd)/gst/nnstreamer/tensor_filter + %ifarch x86_64 aarch64 + export TEST_TENSORFLOW=1 + %endif ./tests/unittest_common ./tests/unittest_sink --gst-plugin-path=. ./tests/unittest_plugins --gst-plugin-path=. @@ -158,8 +160,8 @@ mkdir -p %{buildroot}%{_datadir}/nnstreamer/unittest/ cp -r result %{buildroot}%{_datadir}/nnstreamer/unittest/ %endif -install build/libnnstreamer.a %{buildroot}%{_libdir}/ -install build/gst/tensor_filter/*.a %{buildroot}%{_libdir}/ +install build/gst/nnstreamer/libnnstreamer.a %{buildroot}%{_libdir}/ +install build/gst/nnstreamer/tensor_filter/*.a %{buildroot}%{_libdir}/ %post -p /sbin/ldconfig %postun -p /sbin/ldconfig diff --git a/tests/meson.build b/tests/meson.build index c5ebfca..75b0583 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -13,12 +13,10 @@ if gtest_dep.found() # This custom filter is used in unittest_sink. nnscustom_framecounter_lib = library('nnscustom_framecounter', 'nnstreamer_sink/nnscustom_framecounter.c', - c_args: nnstreamer_base_args, dependencies: [glib_dep], include_directories: nnstreamer_inc) nnstreamer_unittest_deps = [ - nnstreamer_base_deps, nnstreamer_dep, gst_app_dep, gst_check_dep, @@ -28,7 +26,6 @@ if gtest_dep.found() # Run unittest_common unittest_common = executable('unittest_common', 'common/unittest_common.cpp', - cpp_args: nnstreamer_base_args, dependencies: [nnstreamer_unittest_deps]) test('unittest_common', unittest_common) @@ -36,7 +33,6 @@ if gtest_dep.found() # Run unittest_sink unittest_sink = executable('unittest_sink', 'nnstreamer_sink/unittest_sink.cpp', - cpp_args: nnstreamer_base_args, dependencies: [nnstreamer_unittest_deps]) test('unittest_sink', unittest_sink, args: ['--gst-plugin-path=../']) @@ -44,7 +40,6 @@ if gtest_dep.found() # Run unittest_plugins unittest_plugins = executable('unittest_plugins', 'nnstreamer_plugins/unittest_plugins.cpp', - cpp_args: nnstreamer_base_args, dependencies: [nnstreamer_unittest_deps]) test('unittest_plugins', unittest_plugins, args: ['--gst-plugin-path=../']) diff --git a/tests/nnstreamer_plugins/unittest_plugins.cpp b/tests/nnstreamer_plugins/unittest_plugins.cpp index c18891b..08cfb01 100644 --- a/tests/nnstreamer_plugins/unittest_plugins.cpp +++ b/tests/nnstreamer_plugins/unittest_plugins.cpp @@ -2096,7 +2096,7 @@ TEST (test_tensor_aggregator, aggregate_4) } #ifdef HAVE_ORC -#include "../../gst/tensor_transform/transform-orc.h" +#include "../../gst/nnstreamer/tensor_transform/transform-orc.h" /** * @brief Test for tensor_transform orc functions (add constant value) -- 2.7.4