[Build/Android] option for ml-service

Add new option to build native code for ml-service and mlops-agent.

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

Author: jaeyun-jung

java/android/nnstreamer/build.gradle

@@ -43,6 +43,16 @@ android {
                 if (nnsEdgeRoot == null)
                     throw new GradleException('NNSTREAMER_EDGE_ROOT must be set, or "nnstreamerEdgeRoot" must be defined in your gradle.properties')
 
+                def mlopsAgentRoot
+
+                if (project.hasProperty('mlopsAgentRoot'))
+                    mlopsAgentRoot = project.mlopsAgentRoot
+                else
+                    mlopsAgentRoot = System.env.MLOPS_AGENT_ROOT
+
+                if (mlopsAgentRoot == null)
+                    throw new GradleException('MLOPS_AGENT_ROOT must be set, or "mlopsAgentRoot" must be defined in your gradle.properties')
+
                 def mlApiRoot
 
                 if (project.hasProperty('mlApiRoot'))
@@ -60,6 +70,7 @@ android {
                           "GSTREAMER_ASSETS_DIR=src/main/assets",
                           "NNSTREAMER_ROOT=$nnsRoot",
                           "NNSTREAMER_EDGE_ROOT=$nnsEdgeRoot",
+                          "MLOPS_AGENT_ROOT=$mlopsAgentRoot",
                           "ML_API_ROOT=$mlApiRoot"
 
                 targets "nnstreamer-native"

java/android/nnstreamer/src/main/jni/Android-curl.mk

@@ -0,0 +1,25 @@
+LOCAL_PATH := $(call my-dir)
+
+CURL_DIR := $(LOCAL_PATH)/curl
+CURL_INCLUDE := $(CURL_DIR)/include
+
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+CURL_LIB_PATH := $(CURL_DIR)/lib/armeabi-v7a
+else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
+CURL_LIB_PATH := $(CURL_DIR)/lib/arm64-v8a
+else ifeq ($(TARGET_ARCH_ABI),x86)
+CURL_LIB_PATH := $(CURL_DIR)/lib/x86
+else ifeq ($(TARGET_ARCH_ABI),x86_64)
+CURL_LIB_PATH := $(CURL_DIR)/lib/x86_64
+else
+$(error For curl, target arch ABI is not supported: $(TARGET_ARCH_ABI))
+endif
+
+#------------------------------------------------------
+# curl prebuilt library
+#------------------------------------------------------
+include $(CLEAR_VARS)
+LOCAL_MODULE := libcurl
+LOCAL_SRC_FILES := $(CURL_LIB_PATH)/libcurl.a
+LOCAL_EXPORT_C_INCLUDES := $(CURL_INCLUDE)
+include $(PREBUILT_STATIC_LIBRARY)

java/android/nnstreamer/src/main/jni/Android-nnstreamer.mk

@@ -73,6 +73,24 @@ endif
 NNSTREAMER_CAPI_INCLUDES += $(NNSTREAMER_EDGE_INCLUDES)
 endif
 
+ifeq ($(ENABLE_ML_SERVICE), true)
+NNSTREAMER_SRC_FILES += \
+    $(ML_API_ROOT)/c/src/ml-api-service.c \
+    $(ML_API_ROOT)/c/src/ml-api-service-agent-client.c \
+    $(ML_API_ROOT)/c/src/ml-api-service-extension.c \
+    $(NNSTREAMER_AGENT_SRCS) \
+    $(MLOPS_AGENT_SRCS)
+
+ifeq ($(ENABLE_ML_OFFLOADING), true)
+NNSTREAMER_SRC_FILES += \
+    $(ML_API_ROOT)/c/src/ml-api-service-query-client.c \
+    $(ML_API_ROOT)/c/src/ml-api-service-offloading.c
+
+NNSTREAMER_EXTERNAL_LIBS += libcurl
+endif
+
+NNSTREAMER_CAPI_INCLUDES += $(MLOPS_AGENT_INCLUDE)
+endif
 endif # ifneq ($(NNSTREAMER_API_OPTION),single)
 
 include $(CLEAR_VARS)

java/android/nnstreamer/src/main/jni/Android.mk

@@ -38,6 +38,9 @@ NNSTREAMER_API_OPTION := all
 # support tensor-query and offloading
 ENABLE_ML_OFFLOADING := false
 
+# enable service api and mlops-agent
+ENABLE_ML_SERVICE := false
+
 ENABLE_TF_LITE ?= false
 # TensorFlow Lite  (nnstreamer tf-lite sub-plugin)
 ifeq ($(ENABLE_TF_LITE),true)
@@ -119,6 +122,20 @@ NNS_API_FLAGS += -DENABLE_NNSTREAMER_EDGE=1
 include $(NNSTREAMER_EDGE_ROOT)/jni/nnstreamer-edge.mk
 endif
 
+ifeq ($(ENABLE_ML_SERVICE), true)
+ifndef MLOPS_AGENT_ROOT
+$(error MLOPS_AGENT_ROOT is not defined!)
+endif
+
+NNS_API_FLAGS += -DENABLE_ML_AGENT=1
+include $(MLOPS_AGENT_ROOT)/jni/mlops-agent.mk
+
+ifeq ($(ENABLE_ML_OFFLOADING), true)
+NNS_API_FLAGS += -DENABLE_SERVICE_OFFLOADING=1
+include $(LOCAL_PATH)/Android-curl.mk
+endif
+endif
+
 ifeq ($(ENABLE_MQTT), true)
 NNS_API_FLAGS += -DENABLE_MQTT=1
 include $(LOCAL_PATH)/Android-paho-mqtt-c.mk

java/build-nnstreamer-android.sh

@@ -38,6 +38,8 @@
 ##@@       This option overrides the NNSTREAMER_EDGE_ROOT variable
 ##@@   --nnstreamer_android_resource_dir=(the_source_root_of_nnstreamer_android_resource)
 ##@@       This option overrides the NNSTREAMER_ANDROID_RESOURCE variable
+##@@   --mlops_agent_dir=(the_source_root_of_mlops_agent)
+##@@       This option overrides the MLOPS_AGENT_ROOT variable
 ##@@   --ml_api_dir=(the_source_root_of_ml_api)
 ##@@       This option overrides the ML_API_ROOT variable
 ##@@   --result_dir=(path_to_build_result)
@@ -88,6 +90,11 @@
 ##@@       'yes'      : build with tensor_query elements.
 ##@@       'no'       : [default] build without the tensor_query elements.
 ##@@ 
+##@@ options for ml-service
+##@@   --enable_ml_service=(yes|no)
+##@@       'yes'      : build with ml-service api.
+##@@       'no'       : [default]
+##@@ 
 ##@@ options for mqtt:
 ##@@   --enable_mqtt=(yes|no)
 ##@@       'yes'      : [default] build with paho.mqtt.c prebuilt libs. This option supports the mqtt plugin
@@ -155,6 +162,12 @@ paho_mqtt_c_ver="1.3.7"
 # Enable option for tensor_query and offloading
 enable_ml_offloading="no"
 
+# Enable option for service api and ml-agent
+enable_ml_service="no"
+
+# curl for ml-service offloading
+curl_ver="7.60.0"
+
 # Set tensorflow-lite version (available: 2.8.1 / 2.16.1)
 tf_lite_ver="2.16.1"
 tf_lite_vers_support="2.8.1 2.16.1"
@@ -192,6 +205,9 @@ for arg in "$@"; do
         --nnstreamer_android_resource_dir=*)
             nnstreamer_android_resource_dir=${arg#*=}
             ;;
+        --mlops_agent_dir=*)
+            mlops_agent_dir=${arg#*=}
+            ;;
         --ml_api_dir=*)
             ml_api_dir=${arg#*=}
             ;;
@@ -279,6 +295,9 @@ for arg in "$@"; do
         --enable_ml_offloading=*)
             enable_ml_offloading=${arg#*=}
             ;;
+        --enable_ml_service=*)
+            enable_ml_service=${arg#*=}
+            ;;
         --enable_mqtt=*)
             enable_mqtt=${arg#*=}
             ;;
@@ -311,6 +330,7 @@ if [[ $nnstreamer_api_option == "single" ]]; then
     enable_flatbuf="no"
     enable_mqtt="no"
     enable_ml_offloading="no"
+    enable_ml_service="no"
 fi
 
 # Check target abi and set dir name prefix for each abi
@@ -443,6 +463,15 @@ if [[ $enable_ml_offloading == "yes" ]]; then
     echo "nnstreamer-edge root directory: $nnstreamer_edge_dir"
 fi
 
+# MLOps Agent root directory
+if [[ $enable_ml_service == "yes" ]]; then
+    if [[ -z "$mlops_agent_dir" ]]; then
+        [ -z "$MLOPS_AGENT_ROOT" ] && echo "Need to set MLOPS_AGENT_ROOT." && exit 1
+        mlops_agent_dir=$MLOPS_AGENT_ROOT
+    fi
+    echo "MLOps Agent root directory: $mlops_agent_dir"
+fi
+
 # ML API root directory
 if [[ -z "$ml_api_dir" ]]; then
     [ -z "$ML_API_ROOT" ] && echo "Need to set ML_API_ROOT." && exit 1
@@ -532,6 +561,10 @@ if [[ $enable_mqtt == "yes" ]]; then
     cp $nnstreamer_android_resource_dir/external/paho-mqtt-c-${paho_mqtt_c_ver}.tar.xz ./$build_dir/external
 fi
 
+if [[ $enable_ml_service == "yes" ]]; then
+    cp $nnstreamer_android_resource_dir/external/curl-${curl_ver}.tar.xz ./$build_dir/external
+fi
+
 pushd ./$build_dir
 
 # Update target ABI
@@ -547,6 +580,7 @@ fi
 
 # Update ML_API, nnstreamer-edge, NNStreamer, GStreamer and Android SDK
 sed -i "s|mlApiRoot=ml-api-path|mlApiRoot=$ml_api_dir|" gradle.properties
+sed -i "s|mlopsAgentRoot=mlops-agent-path|mlopsAgentRoot=$mlops_agent_dir|" gradle.properties
 sed -i "s|nnstreamerEdgeRoot=nnstreamer-edge-path|nnstreamerEdgeRoot=$nnstreamer_edge_dir|" gradle.properties
 sed -i "s|nnstreamerRoot=nnstreamer-path|nnstreamerRoot=$nnstreamer_dir|" gradle.properties
 sed -i "s|gstAndroidRoot=gstreamer-path|gstAndroidRoot=$gstreamer_dir|" gradle.properties
@@ -691,6 +725,11 @@ if [[ $enable_ml_offloading == "yes" ]]; then
     sed -i "s|ENABLE_ML_OFFLOADING := false|ENABLE_ML_OFFLOADING := true|" nnstreamer/src/main/jni/Android.mk
 fi
 
+if [[ $enable_ml_service == "yes" ]]; then
+    sed -i "s|ENABLE_ML_SERVICE := false|ENABLE_ML_SERVICE := true|" nnstreamer/src/main/jni/Android.mk
+    tar -xJf ./external/curl-${curl_ver}.tar.xz -C ./nnstreamer/src/main/jni
+fi
+
 if [[ $enable_mqtt == "yes" ]]; then
     sed -i "s|ENABLE_MQTT := false|ENABLE_MQTT := true|" nnstreamer/src/main/jni/Android.mk
     tar -xJf ./external/paho-mqtt-c-${paho_mqtt_c_ver}.tar.xz -C ./nnstreamer/src/main/jni
@@ -742,6 +781,9 @@ if [[ $android_lib_build_res -eq 0 ]]; then
     cp $ml_api_dir/c/include/nnstreamer-single.h main/jni/nnstreamer/include
     cp $ml_api_dir/c/include/ml-api-common.h main/jni/nnstreamer/include
     cp $ml_api_dir/c/include/platform/tizen_error.h main/jni/nnstreamer/include
+    if [[ $enable_ml_service == "yes" ]]; then
+        cp $ml_api_dir/c/include/ml-api-service.h main/jni/nnstreamer/include
+    fi
 
     # header for plugin (copy if necessary)
     ##if [[ $nnstreamer_api_option != "single" ]]; then