From: Jaeyun Date: Tue, 13 Dec 2022 09:56:40 +0000 (+0900) Subject: [Meson] cleanup dependencies to common library X-Git-Tag: accepted/tizen/unified/20221226.070013~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f184d52ab0e3adbb295faf1d7e19b3809f49a85;p=platform%2Fcore%2Fapi%2Fmachine-learning.git [Meson] cleanup dependencies to common library Code clean, declare dependency to common library and cleanup meson script. Signed-off-by: Jaeyun --- diff --git a/c/meson.build b/c/meson.build index 849d6f8..3719f4e 100644 --- a/c/meson.build +++ b/c/meson.build @@ -16,6 +16,7 @@ if (get_option('enable-tizen')) tizen_deps = [ dependency('capi-system-info'), + dependency('dlog') ] if get_option('enable-tizen-privilege-check') @@ -30,8 +31,6 @@ if (get_option('enable-tizen')) nns_capi_deps += tizen_deps nns_capi_common_deps += tizen_deps - - nns_capi_common_deps += [dependency('dlog')] endif subdir('include') diff --git a/c/src/meson.build b/c/src/meson.build index b42ca5d..ff5e3fe 100644 --- a/c/src/meson.build +++ b/c/src/meson.build @@ -11,7 +11,6 @@ endif nns_capi_single_srcs = files('ml-api-inference-single.c') nns_capi_pipeline_srcs = files('ml-api-inference-pipeline.c') - nns_capi_service_srcs = files('ml-api-service-common.c','ml-api-service-agent-client.c', 'ml-api-service-query-client.c') # Build ML-API Common Lib First. @@ -34,19 +33,17 @@ nns_capi_common_lib = nns_capi_common_shared_lib if get_option('default_library') == 'static' nns_capi_common_lib = nns_capi_common_static_lib endif -nns_capi_common_dep = declare_dependency(link_with: nns_capi_common_lib) -nns_capi_common_deps += nns_capi_common_dep -nns_capi_deps += nns_capi_common_dep -nns_capi_test_deps = nns_capi_deps -if (get_option('enable-tizen')) - nns_capi_deps += [dependency('dlog')] -endif +nns_capi_common_dep = declare_dependency(link_with: nns_capi_common_lib, + dependencies: nns_capi_common_deps, + include_directories: nns_capi_include +) + # Single-shot API. nns_capi_single_shared_lib = shared_library ('capi-ml-inference-single', nns_capi_single_srcs, - dependencies: [nns_capi_common_deps, gobject_dep], + dependencies: [nns_capi_common_dep, gobject_dep], include_directories: nns_capi_include, install: true, install_dir: api_install_libdir, @@ -55,17 +52,22 @@ nns_capi_single_shared_lib = shared_library ('capi-ml-inference-single', nns_capi_single_static_lib = static_library ('capi-ml-inference-single', nns_capi_single_srcs, - dependencies: [nns_capi_common_deps, gobject_dep], + dependencies: [nns_capi_common_dep, gobject_dep], include_directories: nns_capi_include, install: true, install_dir: api_install_libdir, ) -nns_capi_single_dep = declare_dependency(link_with: nns_capi_single_shared_lib) +nns_capi_single_lib = nns_capi_single_shared_lib if get_option('default_library') == 'static' - nns_capi_single_dep = declare_dependency(link_with: nns_capi_single_static_lib) + nns_capi_single_lib = nns_capi_single_static_lib endif +nns_capi_single_dep = declare_dependency(link_with: nns_capi_single_lib, + dependencies: [nns_capi_common_dep, gobject_dep], + include_directories: nns_capi_include +) + # Pipeline API. (including single-shot API) nns_capi_shared_lib = shared_library ('capi-nnstreamer', @@ -92,7 +94,7 @@ endif nns_capi_dep = declare_dependency(link_with: nns_capi_lib, dependencies: [nns_capi_deps, nns_capi_single_dep], - include_directories: nns_capi_include, + include_directories: nns_capi_include ) @@ -115,12 +117,13 @@ if get_option('enable-ml-service') install_dir: api_install_libdir, ) - nns_capi_service_dep = declare_dependency(link_with: nns_capi_service_shared_lib, - dependencies: [nns_capi_dep, ai_service_daemon_deps] - ) + nns_capi_service_lib = nns_capi_service_shared_lib if get_option('default_library') == 'static' - nns_capi_service_dep = declare_dependency(link_with: nns_capi_service_static_lib, - dependencies: [nns_capi_dep, ai_service_daemon_deps] - ) + nns_capi_service_lib = nns_capi_service_static_lib endif + + nns_capi_service_dep = declare_dependency(link_with: nns_capi_service_lib, + dependencies: [nns_capi_dep, ai_service_daemon_deps], + include_directories: nns_capi_include + ) endif diff --git a/daemon/meson.build b/daemon/meson.build index f42650e..b5dcdcd 100644 --- a/daemon/meson.build +++ b/daemon/meson.build @@ -2,9 +2,6 @@ if get_option('enable-ml-service') nns_ml_agent_gen_srcs = [] nns_ml_agent_incs = include_directories('includes') - - libsystemd_dep = dependency('libsystemd') - nns_ml_agent_srcs = files('main.c', 'modules.c', 'gdbus-util.c', 'service-db.cc', 'pipeline-module.cc', 'model-dbus-impl.cc') # Generate GDbus header and code diff --git a/meson.build b/meson.build index d9e476b..db661fd 100644 --- a/meson.build +++ b/meson.build @@ -27,10 +27,14 @@ gst_dep = dependency('gstreamer-1.0') gst_app_dep = dependency('gstreamer-app-1.0') nnstreamer_single_dep = dependency('nnstreamer-single') nnstreamer_dep = dependency('nnstreamer') -leveldb_dep = dependency('leveldb', required: false) -if (not leveldb_dep.found()) - cpp = meson.get_compiler('cpp') - leveldb_dep = cpp.find_library('leveldb', required: true) + +if get_option('enable-ml-service') + libsystemd_dep = dependency('libsystemd') + + leveldb_dep = dependency('leveldb', required: false) + if (not leveldb_dep.found()) + leveldb_dep = cxx.find_library('leveldb', required: true) + endif endif # Set version info diff --git a/tests/capi/meson.build b/tests/capi/meson.build index 3a27051..ef89998 100644 --- a/tests/capi/meson.build +++ b/tests/capi/meson.build @@ -6,7 +6,7 @@ unittest_util_static = static_library('unittest_util', unittest_capi_inference_single = executable('unittest_capi_inference_single', 'unittest_capi_inference_single.cc', - dependencies: [nns_capi_single_dep, gtest_dep, nns_capi_test_deps], + dependencies: [nns_capi_single_dep, gtest_dep], install: get_option('install-test'), install_dir: unittest_install_dir, include_directories: nns_capi_include, @@ -15,7 +15,7 @@ test('unittest_capi_inference_single', unittest_capi_inference_single, env: test unittest_common_dep = declare_dependency( link_with: [unittest_util_static], - dependencies: [nns_capi_dep, gtest_dep, nns_capi_test_deps], + dependencies: [nns_capi_dep, gtest_dep], compile_args: ['-DFAKEDLOG=1'], include_directories: nns_capi_include, ) diff --git a/tests/capi/unittest_capi_inference_single.cc b/tests/capi/unittest_capi_inference_single.cc index 7a190d7..713149b 100644 --- a/tests/capi/unittest_capi_inference_single.cc +++ b/tests/capi/unittest_capi_inference_single.cc @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include