[error code] Common error codes re-define issue

many ML_ERROR error codes are defined twice in nntrainer/include/nntrainer_error.h and api/capi/include/platform/ml-api-common.h
this patch reuses the definition from ml-api-common.h in nntrainer_error.h
this allows nntrainer.h to be included in source code as it contains certain callback declarations which are used in library

Signed-off-by: Parichay Kapoor <pk.kapoor@samsung.com>

diff --git a/jni/Android.mk b/jni/Android.mk
index b472863..71bd063 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -40,7 +40,8 @@ NNTRAINER_SRCS := $(NNTRAINER_ROOT)/nntrainer/src/neuralnet.cpp \
                   $(NNTRAINER_ROOT)/nntrainer/src/activation_layer.cpp \
                   $(NNTRAINER_ROOT)/nntrainer/src/flatten_layer.cpp
 
-NNTRAINER_INCLUDES := $(NNTRAINER_ROOT)/nntrainer/include
+NNTRAINER_INCLUDES := $(NNTRAINER_ROOT)/nntrainer/include \
+                  $(NNTRAINER_ROOT)/api/capi/include/platform
 
 INIPARSER_SRCS := $(INIPARSER_ROOT)/src/iniparser.c \
                   $(INIPARSER_ROOT)/src/dictionary.c

diff --git a/nntrainer/include/nntrainer_error.h b/nntrainer/include/nntrainer_error.h
index d4ec669..ce31ab0 100644 (file)
--- a/nntrainer/include/nntrainer_error.h
+++ b/nntrainer/include/nntrainer_error.h
@@ -23,27 +23,14 @@
 #ifndef __NNTRAINER_ERROR_H__
 #define __NNTRAINER_ERROR_H__
 
+#include <ml-api-common.h>
 #if defined(__TIZEN__)
 #include <tizen_error.h>
-#define ML_ERROR_NONE TIZEN_ERROR_NONE
-#define ML_ERROR_INVALID_PARAMETER TIZEN_ERROR_INVALID_PARAMETER
-#define ML_ERROR_UNKNOWN TIZEN_ERROR_UNKNOWN
-#define ML_ERROR_TIMED_OUT TIZEN_ERROR_TIMED_OUT
-#define ML_ERROR_NOT_SUPPORTED TIZEN_ERROR_NOT_SUPPORTED
-#define ML_ERROR_PERMISSION_DENIED TIZEN_ERROR_PERMISSION_DENIED
-#define ML_ERROR_OUT_OF_MEMORY TIZEN_ERROR_OUT_OF_MEMORY
 #define ML_ERROR_CANNOT_ASSIGN_ADDRESS TIZEN_ERROR_CANNOT_ASSIGN_ADDRESS
 #define ML_ERROR_BAD_ADDRESS TIZEN_ERROR_BAD_ADDRESS
 #define ML_ERROR_RESULT_OUT_OF_RANGE TIZEN_ERROR_RESULT_OUT_OF_RANGE
 #else
 #include <errno.h>
-#define ML_ERROR_NONE (0)
-#define ML_ERROR_INVALID_PARAMETER (-EINVAL)
-#define ML_ERROR_UNKNOWN (-1073741824LL)
-#define ML_ERROR_TIMED_OUT (ML_ERROR_UNKNOWN + 1)
-#define ML_ERROR_NOT_SUPPORTED (ML_ERROR_UNKNOWN + 2)
-#define ML_ERROR_PERMISSION_DENIED (-EACCES)
-#define ML_ERROR_OUT_OF_MEMORY (-ENOMEM)
 #define ML_ERROR_CANNOT_ASSIGN_ADDRESS (-EADDRNOTAVAIL)
 #define ML_ERROR_BAD_ADDRESS (-EFAULT)
 #define ML_ERROR_RESULT_OUT_OF_RANGE (-ERANGE)

diff --git a/nntrainer/meson.build b/nntrainer/meson.build
index cc67cf5..ee4722a 100644 (file)
--- a/nntrainer/meson.build
+++ b/nntrainer/meson.build
@@ -1,4 +1,13 @@
-nntrainer_inc = include_directories('./include')
+nntrainer_inc = [
+  include_directories('./include')
+]
+
+# pc file is not present for 'ml-api-common' yet
+if cxx.has_header('nnstreamer/ml-api-common.h', required: false)
+  nntrainer_inc += include_directories ('/usr/include/nnstreamer')
+else
+  nntrainer_inc += include_directories ('../api/capi/include/platform')
+endif
 
 # Dependencies
 nntrainer_base_deps=[