[CodeClean] dependency to ml-agent

Prepare deleting ml-agent from api repo, set dependency to ml-agent and remove unnecessary line.

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>

diff --git a/c/src/meson.build b/c/src/meson.build
index bbd3144..f2a8ec5 100644 (file)
--- a/c/src/meson.build
+++ b/c/src/meson.build
@@ -102,28 +102,29 @@ nns_capi_dep = declare_dependency(link_with: nns_capi_lib,
 
 # Service API
 if get_option('enable-ml-service')
-  ml_service_deps = [nns_capi_dep, ml_agent_deps]
+  ml_service_deps = [nns_capi_dep, ml_agent_dep, gio_dep, json_glib_dep]
   if support_remote_service
     ml_service_deps += [nnstreamer_edge_dep, curl_dep]
   endif
+  if get_option('enable-tizen')
+    ml_service_deps += dependency('capi-appfw-app-common')
+  endif
 
   nns_capi_service_shared_lib = shared_library ('capi-ml-service',
     nns_capi_service_srcs,
     dependencies: ml_service_deps,
-    include_directories: [nns_capi_include, ml_agent_incs],
+    include_directories: nns_capi_include,
     install: true,
     install_dir: api_install_libdir,
-    link_with: ml_agent_lib,
-    version: api_version,
+    version: api_version
   )
 
   nns_capi_service_static_lib = static_library ('capi-ml-service',
     nns_capi_service_srcs,
     dependencies: ml_service_deps,
-    include_directories: [nns_capi_include, ml_agent_incs],
+    include_directories: nns_capi_include,
     install: true,
-    link_with: ml_agent_lib,
-    install_dir: api_install_libdir,
+    install_dir: api_install_libdir
   )
 
   nns_capi_service_lib = nns_capi_service_shared_lib

diff --git a/c/src/ml-api-service-private.h b/c/src/ml-api-service-private.h
index 174db19..efa63e3 100644 (file)
--- a/c/src/ml-api-service-private.h
+++ b/c/src/ml-api-service-private.h
@@ -17,11 +17,6 @@
 #include <ml-api-service.h>
 #include <ml-api-inference-internal.h>
 
-#include "pipeline-dbus.h"
-#include "model-dbus.h"
-#include "resource-dbus.h"
-#include "nnstreamer-tizen-internal.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */

diff --git a/c/src/ml-api-service-remote.c b/c/src/ml-api-service-remote.c
index 30e6bda..c5c40ec 100644 (file)
--- a/c/src/ml-api-service-remote.c
+++ b/c/src/ml-api-service-remote.c
@@ -12,6 +12,7 @@
 
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <gio/gio.h>
 #include <gst/gst.h>
 #include <gst/gstbuffer.h>
 #include <gst/app/app.h>
@@ -23,6 +24,9 @@
 #include "ml-api-service.h"
 #include "ml-api-service-private.h"
 
+/** @todo remove this header after ACR for ml-remote API is done. */
+#include "nnstreamer-tizen-internal.h"
+
 #define MAX_PORT_NUM_LEN 6U
 
 /**

diff --git a/daemon/meson.build b/daemon/meson.build
index 08e368c..e933264 100644 (file)
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -87,6 +87,11 @@ if get_option('default_library') == 'static'
   ml_agent_lib = ml_agent_static_lib
 endif
 
+ml_agent_dep = declare_dependency(link_with: ml_agent_lib,
+  dependencies: ml_agent_deps,
+  include_directories: ml_agent_incs
+)
+
 ml_agent_lib_common_objs = ml_agent_shared_lib.extract_objects(ml_agent_lib_common_srcs)
 ml_agent_test_both_lib = both_libraries('ml-agent-test',
   ml_agent_lib_service_db_srcs,

diff --git a/tests/capi/meson.build b/tests/capi/meson.build
index 4df9451..d6aecba 100644 (file)
--- a/tests/capi/meson.build
+++ b/tests/capi/meson.build
@@ -2,8 +2,7 @@ unittest_capi_inference_single = executable('unittest_capi_inference_single',
   'unittest_capi_inference_single.cc',
   dependencies: [nns_capi_single_dep, gtest_dep],
   install: get_option('install-test'),
-  install_dir: unittest_install_dir,
-  include_directories: nns_capi_include,
+  install_dir: unittest_install_dir
 )
 test('unittest_capi_inference_single', unittest_capi_inference_single, env: testenv, timeout: 100)
 
@@ -36,8 +35,7 @@ if get_option('enable-ml-service')
     'unittest_capi_service_agent_client.cc',
     dependencies: [unittest_common_dep, nns_capi_service_dep, gdbus_gen_test_dep, lib_ml_agent_test_dep],
     install: get_option('install-test'),
-    install_dir: unittest_install_dir,
-    include_directories: nns_capi_include,
+    install_dir: unittest_install_dir
   )
   test('unittest_capi_service_agent_client', unittest_capi_service_agent_client, env: testenv, timeout: 100)
 
@@ -46,8 +44,7 @@ if get_option('enable-ml-service')
       'unittest_capi_remote_service.cc',
       dependencies: [unittest_common_dep, nns_capi_service_dep, gdbus_gen_test_dep, lib_ml_agent_test_dep],
       install: get_option('install-test'),
-      install_dir: unittest_install_dir,
-      include_directories: nns_capi_include,
+      install_dir: unittest_install_dir
     )
     test('unittest_capi_remote_service', unittest_capi_remote_service, env: testenv, timeout: 100)
   endif

diff --git a/tests/capi/unittest_capi_remote_service.cc b/tests/capi/unittest_capi_remote_service.cc
index 8bcc7a4..e2d3e5c 100644 (file)
--- a/tests/capi/unittest_capi_remote_service.cc
+++ b/tests/capi/unittest_capi_remote_service.cc
@@ -8,7 +8,6 @@
  */
 
 #include <gtest/gtest.h>
-#include <gdbus-util.h>
 #include <gio/gio.h>
 #include <glib/gstdio.h>
 #include <ml-api-inference-pipeline-internal.h>
@@ -19,6 +18,9 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 
+/** @todo remove this header after ACR for ml-remote API is done. */
+#include "nnstreamer-tizen-internal.h"
+
 /**
  * @brief Test base class for Database of ML Service API.
  */

diff --git a/tests/capi/unittest_capi_service_agent_client.cc b/tests/capi/unittest_capi_service_agent_client.cc
index a2ee547..e758770 100644 (file)
--- a/tests/capi/unittest_capi_service_agent_client.cc
+++ b/tests/capi/unittest_capi_service_agent_client.cc
@@ -8,7 +8,6 @@
  */
 
 #include <gtest/gtest.h>
-#include <gdbus-util.h>
 #include <gio/gio.h>
 #include <ml-api-inference-pipeline-internal.h>
 #include <ml-api-internal.h>
@@ -18,7 +17,8 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 
-#include "dbus-interface.h"
+/** @todo remove below header after deleting ml-agent from api repo. */
+#include "gdbus-util.h"
 
 /**
  * @brief Test base class for Database of ML Service API.
@@ -1281,112 +1281,6 @@ TEST_F (MLServiceAgentTest, model_scenario)
 }
 
 /**
- * @brief Negative testcase of pipeline gdbus call.
- */
-TEST_F (MLServiceAgentTest, pipeline_gdbus_call_n)
-{
-  int ret;
-  GError *error = NULL;
-
-  MachinelearningServicePipeline *proxy_for_pipeline
-      = machinelearning_service_pipeline_proxy_new_for_bus_sync (bus_type,
-          G_DBUS_PROXY_FLAGS_NONE, DBUS_ML_BUS_NAME, DBUS_PIPELINE_PATH, NULL, &error);
-
-  if (!proxy_for_pipeline || error) {
-    g_critical ("Failed to create proxy_for_pipeline for machinelearning service pipeline");
-    if (error) {
-      g_critical ("Error Message : %s", error->message);
-      g_clear_error (&error);
-    }
-    ASSERT_TRUE (false);
-  }
-
-  /* gdbus call with empty string */
-  machinelearning_service_pipeline_call_set_pipeline_sync (
-      proxy_for_pipeline, "", "", &ret, nullptr, nullptr);
-  EXPECT_EQ (ML_ERROR_INVALID_PARAMETER, ret);
-}
-
-/**
- * @brief Negative testcase of model gdbus call.
- */
-TEST_F (MLServiceAgentTest, model_gdbus_call_n)
-{
-  int ret;
-  GError *error = NULL;
-
-  MachinelearningServiceModel *proxy_for_model
-      = machinelearning_service_model_proxy_new_for_bus_sync (bus_type,
-          G_DBUS_PROXY_FLAGS_NONE, DBUS_ML_BUS_NAME, DBUS_MODEL_PATH, NULL, &error);
-
-  if (!proxy_for_model || error) {
-    g_critical ("Failed to create proxy_for_model for machinelearning service model");
-    if (error) {
-      g_critical ("Error Message : %s", error->message);
-      g_clear_error (&error);
-    }
-    ASSERT_TRUE (false);
-  }
-
-  /* empty string */
-  machinelearning_service_model_call_register_sync (
-      proxy_for_model, "", "", false, "test", "", NULL, &ret, nullptr, nullptr);
-  EXPECT_EQ (ML_ERROR_INVALID_PARAMETER, ret);
-
-  /* empty string */
-  machinelearning_service_model_call_get_all_sync (
-      proxy_for_model, "", NULL, &ret, nullptr, nullptr);
-  EXPECT_EQ (ML_ERROR_INVALID_PARAMETER, ret);
-
-  g_object_unref (proxy_for_model);
-}
-
-/**
- * @brief Negative testcase of resource gdbus call.
- */
-TEST_F (MLServiceAgentTest, resource_gdbus_call_n)
-{
-  int ret;
-  gchar *res_info = NULL;
-  GError *error = NULL;
-
-  MachinelearningServiceResource *proxy_for_resource
-      = machinelearning_service_resource_proxy_new_for_bus_sync (bus_type,
-          G_DBUS_PROXY_FLAGS_NONE, DBUS_ML_BUS_NAME, DBUS_RESOURCE_PATH, NULL, &error);
-
-  if (!proxy_for_resource || error) {
-    g_critical ("Failed to create proxy_for_resource for machinelearning service resource");
-    if (error) {
-      g_critical ("Error Message : %s", error->message);
-      g_clear_error (&error);
-    }
-    ASSERT_TRUE (false);
-  }
-
-  machinelearning_service_resource_call_add_sync (
-      proxy_for_resource, "", "path", "description", "", &ret, nullptr, nullptr);
-  EXPECT_EQ (ML_ERROR_INVALID_PARAMETER, ret);
-
-  machinelearning_service_resource_call_add_sync (
-      proxy_for_resource, "name", "", "description", "", &ret, nullptr, nullptr);
-  EXPECT_EQ (ML_ERROR_INVALID_PARAMETER, ret);
-
-  machinelearning_service_resource_call_get_sync (
-      proxy_for_resource, "", &res_info, &ret, nullptr, nullptr);
-  EXPECT_EQ (ML_ERROR_INVALID_PARAMETER, ret);
-
-  machinelearning_service_resource_call_get_sync (
-      proxy_for_resource, "unknown", &res_info, &ret, nullptr, nullptr);
-  EXPECT_EQ (ML_ERROR_INVALID_PARAMETER, ret);
-
-  machinelearning_service_resource_call_delete_sync (
-      proxy_for_resource, "", &ret, nullptr, nullptr);
-  EXPECT_EQ (ML_ERROR_INVALID_PARAMETER, ret);
-
-  g_object_unref (proxy_for_resource);
-}
-
-/**
  * @brief Test the usecase of ml_service for resource.
  */
 TEST_F (MLServiceAgentTest, resource_scenario)