[TEST] using builddir/android_build_result to build test

This PR includes changes in Android.mk to use builddir/android_build_result. In order to use, soft link of android_build_reuslt dir is necessary in upper dir (../) ln -s ../../buildir/android_build_result ../nntrainer Resolves: **Self evaluation:** 1. Build test: [X]Passed [ ]Failed [ ]Skipped 2. Run test: [X]Passed [ ]Failed [ ]Skipped Signed-off-by: jijoong.moon <[email protected]>
nnstreamer · Jul 3, 2024 · f6ad00f · f6ad00f
1 parent 2ff7d98
commit f6ad00f
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 22 deletions.
diff --git a/nntrainer/layers/layer_node.cpp b/nntrainer/layers/layer_node.cpp
@@ -817,8 +817,8 @@ void LayerNode::forwarding(bool training) {
     if (executeInPlace() == InPlace::NONE) {
       for (unsigned int i = 0; i < run_context->getNumOutputs(); ++i) {
         run_context->getOutput(i).setValue(0);
-	if(!run_context->getOutputGradUnsafe(i).isValid())
-	  run_context->getOutputGradUnsafe(i).setValue(0);
+        if (!run_context->getOutputGradUnsafe(i).isValid())
+          run_context->getOutputGradUnsafe(i).setValue(0);
       }
       for (unsigned int i = 0; i < run_context->getNumWeights(); ++i) {
         if (run_context->weightHasGradient(i)) {

diff --git a/test/jni/README.md b/test/jni/README.md
@@ -13,3 +13,11 @@ please do
 #cp ${ANDROIND_SDK_HOME}/Sdk/ndk/${NDK_VERSION}/sources/third_party/googletest .
 ```
 
+and to use android builddir/android_build_result, do 
+``` bash
+#ln -s ../../builddir/android_build_result ../nntrainer
+
+```
+
+
+
diff --git a/test/unittest/jni/Android.mk b/test/unittest/jni/Android.mk
@@ -7,33 +7,19 @@ ifndef ANDROID_NDK
 $(error ANDROID_NDK is not defined!)
 endif
 
-ifndef NNTRAINER_ROOT
-NNTRAINER_ROOT := $(LOCAL_PATH)/../../..
-endif
+NNTRAINER_ROOT := ../nntrainer
 
-ML_API_COMMON_INCLUDES := ${NNTRAINER_ROOT}/ml_api_common/include
-NNTRAINER_INCLUDES := $(NNTRAINER_ROOT)/nntrainer \
-	$(NNTRAINER_ROOT)/nntrainer/dataset \
-	$(NNTRAINER_ROOT)/nntrainer/models \
-	$(NNTRAINER_ROOT)/nntrainer/layers \
-	$(NNTRAINER_ROOT)/nntrainer/compiler \
-	$(NNTRAINER_ROOT)/nntrainer/graph \
-	$(NNTRAINER_ROOT)/nntrainer/optimizers \
-	$(NNTRAINER_ROOT)/nntrainer/tensor \
-	$(NNTRAINER_ROOT)/nntrainer/utils \
-	$(NNTRAINER_ROOT)/api \
-	$(NNTRAINER_ROOT)/api/ccapi/include \
-	${ML_API_COMMON_INCLUDES}
+NNTRAINER_INCLUDES := $(NNTRAINER_ROOT)/include/
 
 LOCAL_MODULE := nntrainer
-LOCAL_SRC_FILES := $(NNTRAINER_ROOT)/libs/$(TARGET_ARCH_ABI)/libnntrainer.so
+LOCAL_SRC_FILES := $(NNTRAINER_ROOT)/lib/$(TARGET_ARCH_ABI)/libnntrainer.so
+LOCAL_EXPORT_C_INCLUDES := $(NNTRAINER_INCLUDES)
 
 include $(PREBUILT_SHARED_LIBRARY)
 
-include $(CLEAR_VARS)
-
 LOCAL_MODULE := ccapi-nntrainer
-LOCAL_SRC_FILES := $(NNTRAINER_ROOT)/libs/$(TARGET_ARCH_ABI)/libccapi-nntrainer.so
+LOCAL_SRC_FILES := $(NNTRAINER_ROOT)/lib/$(TARGET_ARCH_ABI)/libccapi-nntrainer.so
+LOCAL_EXPORT_C_INCLUDES := $(NNTRAINER_INCLUDES) $(NNTRAINER_INCLUDES)/nntrainer
 
 include $(PREBUILT_SHARED_LIBRARY)
 
@@ -67,3 +53,22 @@ LOCAL_C_INCLUDES += $(NNTRAINER_INCLUDES)
 LOCAL_SHARED_LIBRARIES := nntrainer ccapi-nntrainer
 LOCAL_STATIC_LIBRARIES := googletest_main
 include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := tensor_unittest
+LOCAL_CFLAGS := -Itests/googletest/include -Itests -pthread -fexceptions -fopenmp -static-openmp -DMIN_CPP_VERSION=201703L -DNNTR_NUM_THREADS=1 -D__LOGGING__=1 -DENABLE_TEST=1 -DREDUCE_TOLERANCE=1 -march=armv8.2-a+fp16 -mfpu=neon-fp16 -mfloat-abi=softfp -O3 -frtti -DENABLE_FP16=1
+LOCAL_CXXFLAGS      += -std=c++17 -frtti -fexceptions
+LOCAL_LDLIBS        := -llog -landroid -fopenmp -static-openmp
+
+LOCAL_SRC_FILES := \
+    tests/unittest_nntrainer_tensor_neon_fp16.cpp \
+    # tests/unittest_nntrainer_tensor_fp16.cpp \
+    tests/nntrainer_test_util.cpp
+
+LOCAL_C_INCLUDES += $(NNTRAINER_INCLUDES)
+
+LOCAL_SHARED_LIBRARIES := nntrainer ccapi-nntrainer
+LOCAL_STATIC_LIBRARIES := googletest_main
+include $(BUILD_EXECUTABLE)
+