# Dependencies
-nns_capi_common_deps = [nnstreamer_dep, glib_dep, gmodule_dep, gst_dep]
+nns_capi_common_deps = [glib_dep, gmodule_dep, nnstreamer_single_dep]
nns_capi_deps = [nnstreamer_dep, glib_dep, gmodule_dep, gst_dep, gst_app_dep, leveldb_dep]
if (get_option('enable-tizen'))
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
# Single-shot API.
nns_capi_single_shared_lib = shared_library ('capi-ml-inference-single',
nns_capi_single_srcs,
- dependencies: nns_capi_deps,
+ dependencies: [nns_capi_common_deps, gobject_dep],
include_directories: nns_capi_include,
install: true,
install_dir: api_install_libdir,
nns_capi_single_static_lib = static_library ('capi-ml-inference-single',
nns_capi_single_srcs,
- dependencies: nns_capi_deps,
+ dependencies: [nns_capi_common_deps, gobject_dep],
include_directories: nns_capi_include,
install: true,
install_dir: api_install_libdir,
#include <string.h>
-#include <nnstreamer_plugin_api.h>
+#include <nnstreamer_plugin_api_util.h>
#include <tensor_typedef.h>
#include "ml-api-inference-internal.h"
#include "ml-api-internal.h"
#define __ML_API_INTERNAL_NNSTREAMER_H__
#include <glib.h>
-#include <gst/gst.h>
#include <nnstreamer_plugin_api_filter.h>
#include "ml-api-internal.h"
#define __ML_API_INF_SINGLE_INTERNAL_H__
#include <glib.h>
-#include <gst/gst.h>
#include "ml-api-internal.h"
#include <nnstreamer-single.h>
#include <nnstreamer-tizen-internal.h> /* Tizen platform header */
#include <nnstreamer_internal.h>
-#include <nnstreamer_plugin_api.h>
+#include <nnstreamer_plugin_api_util.h>
#include <tensor_filter_single.h>
#include "ml-api-inference-internal.h"
nnfw_type = ML_NNFW_TYPE_SNAP;
else
_ml_error_report ("Cannot find nnfw, %s is an invalid name.",
- GST_STR_NULL (name));
+ _STR_NULL (name));
} else {
nnfw_type = (ml_nnfw_type_e) idx;
}
if (single_h->klass)
single_h->klass->stop (single_h->filter);
- gst_object_unref (single_h->filter);
+ g_object_unref (single_h->filter);
single_h->filter = NULL;
}
if (!model[i] || !g_file_test (model[i], G_FILE_TEST_IS_REGULAR)) {
_ml_error_report_return (ML_ERROR_INVALID_PARAMETER,
"The given param, model path [%d] = \"%s\" is invalid or the file is not found or accessible.",
- i, GST_STR_NULL (model[i]));
+ i, _STR_NULL (model[i]));
}
}
# Dependencies
glib_dep = dependency('glib-2.0')
+gobject_dep = dependency('gobject-2.0')
gmodule_dep = dependency('gmodule-2.0')
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())