Skip to content

Commit 8fc0c70

Browse files
committed
[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 <jijoong.moon@samsung.com>
1 parent 2ff7d98 commit 8fc0c70

File tree

2 files changed

+33
-20
lines changed

2 files changed

+33
-20
lines changed

test/jni/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,11 @@ please do
1313
#cp ${ANDROIND_SDK_HOME}/Sdk/ndk/${NDK_VERSION}/sources/third_party/googletest .
1414
```
1515

16+
and to use android builddir/android_build_result, do
17+
``` bash
18+
#ln -s ../../builddir/android_build_result ../nntrainer
19+
20+
```
21+
22+
23+

test/unittest/jni/Android.mk

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,19 @@ ifndef ANDROID_NDK
77
$(error ANDROID_NDK is not defined!)
88
endif
99

10-
ifndef NNTRAINER_ROOT
11-
NNTRAINER_ROOT := $(LOCAL_PATH)/../../..
12-
endif
10+
NNTRAINER_ROOT := ../nntrainer
1311

14-
ML_API_COMMON_INCLUDES := ${NNTRAINER_ROOT}/ml_api_common/include
15-
NNTRAINER_INCLUDES := $(NNTRAINER_ROOT)/nntrainer \
16-
$(NNTRAINER_ROOT)/nntrainer/dataset \
17-
$(NNTRAINER_ROOT)/nntrainer/models \
18-
$(NNTRAINER_ROOT)/nntrainer/layers \
19-
$(NNTRAINER_ROOT)/nntrainer/compiler \
20-
$(NNTRAINER_ROOT)/nntrainer/graph \
21-
$(NNTRAINER_ROOT)/nntrainer/optimizers \
22-
$(NNTRAINER_ROOT)/nntrainer/tensor \
23-
$(NNTRAINER_ROOT)/nntrainer/utils \
24-
$(NNTRAINER_ROOT)/api \
25-
$(NNTRAINER_ROOT)/api/ccapi/include \
26-
${ML_API_COMMON_INCLUDES}
12+
NNTRAINER_INCLUDES := $(NNTRAINER_ROOT)/include/
2713

2814
LOCAL_MODULE := nntrainer
29-
LOCAL_SRC_FILES := $(NNTRAINER_ROOT)/libs/$(TARGET_ARCH_ABI)/libnntrainer.so
15+
LOCAL_SRC_FILES := $(NNTRAINER_ROOT)/lib/$(TARGET_ARCH_ABI)/libnntrainer.so
16+
LOCAL_EXPORT_C_INCLUDES := $(NNTRAINER_INCLUDES)
3017

3118
include $(PREBUILT_SHARED_LIBRARY)
3219

33-
include $(CLEAR_VARS)
34-
3520
LOCAL_MODULE := ccapi-nntrainer
36-
LOCAL_SRC_FILES := $(NNTRAINER_ROOT)/libs/$(TARGET_ARCH_ABI)/libccapi-nntrainer.so
21+
LOCAL_SRC_FILES := $(NNTRAINER_ROOT)/lib/$(TARGET_ARCH_ABI)/libccapi-nntrainer.so
22+
LOCAL_EXPORT_C_INCLUDES := $(NNTRAINER_INCLUDES) $(NNTRAINER_INCLUDES)/nntrainer
3723

3824
include $(PREBUILT_SHARED_LIBRARY)
3925

@@ -67,3 +53,22 @@ LOCAL_C_INCLUDES += $(NNTRAINER_INCLUDES)
6753
LOCAL_SHARED_LIBRARIES := nntrainer ccapi-nntrainer
6854
LOCAL_STATIC_LIBRARIES := googletest_main
6955
include $(BUILD_EXECUTABLE)
56+
57+
include $(CLEAR_VARS)
58+
59+
LOCAL_MODULE := tensor_unittest
60+
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
61+
LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions
62+
LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp
63+
64+
LOCAL_SRC_FILES := \
65+
tests/unittest_nntrainer_tensor_neon_fp16.cpp \
66+
# tests/unittest_nntrainer_tensor_fp16.cpp \
67+
tests/nntrainer_test_util.cpp
68+
69+
LOCAL_C_INCLUDES += $(NNTRAINER_INCLUDES)
70+
71+
LOCAL_SHARED_LIBRARIES := nntrainer ccapi-nntrainer
72+
LOCAL_STATIC_LIBRARIES := googletest_main
73+
include $(BUILD_EXECUTABLE)
74+

0 commit comments

Comments
 (0)