From 23da51e3d2b6509a7bfdb772927bad744d43fd83 Mon Sep 17 00:00:00 2001 From: Donghak PARK Date: Tue, 13 Aug 2024 10:28:12 +0900 Subject: [PATCH] [BUILD] Add more 16k shared lib package option on Android.mk After #2699 : add option's for all android.mk file **Self evaluation:** 1. Build test: [X]Passed [ ]Failed [ ]Skipped 2. Run test: [X]Passed [ ]Failed [ ]Skipped Signed-off-by: Donghak PARK --- Applications/AlexNet/jni/Android.mk | 1 + .../NNDetector/app/src/main/jni/Android.mk | 1 + .../PicoGPTJNI/app/src/main/jni/Android.mk | 1 + .../ResnetJNI/app/src/main/jni/Android.mk | 1 + .../kotlin/app/src/main/jni/Android.mk | 1 + .../Custom/LayerClient/jni/Android.mk | 1 + Applications/KNN/jni/Android.mk | 1 + Applications/LLaMA/jni/Android.mk | 4 +++ Applications/Layers/jni/Android.mk | 1 + .../LogisticRegression/jni/Android.mk | 1 + Applications/MNIST/jni/Android.mk | 1 + Applications/Multi_input/jni/Android.mk | 1 + Applications/PicoGPT/jni/Android.mk | 1 + Applications/ProductRatings/jni/Android.mk | 1 + .../DeepQ/jni/Android.mk | 1 + Applications/Resnet/jni/Android.mk | 1 + .../CIFAR_Classification/jni/Android.mk | 2 ++ .../Draw_Classification/jni/Android.mk | 1 + Applications/VGG/jni/Android.mk | 1 + Applications/YOLOv2/jni/Android.mk | 1 + Applications/YOLOv3/jni/Android.mk | 1 + Applications/utils/jni/Android.mk | 1 + test/jni/Android.mk | 25 +++++++++++++++++++ test/unittest/jni/Android.mk | 1 + 24 files changed, 52 insertions(+) diff --git a/Applications/AlexNet/jni/Android.mk b/Applications/AlexNet/jni/Android.mk index d2cbf8dc..bb0e1acb 100644 --- a/Applications/AlexNet/jni/Android.mk +++ b/Applications/AlexNet/jni/Android.mk @@ -51,6 +51,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_alexnet LOCAL_LDLIBS := -llog -landroid -fopenmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := main.cpp $(CIFARDIR)/cifar_dataloader.cpp diff --git a/Applications/Android/NNDetector/app/src/main/jni/Android.mk b/Applications/Android/NNDetector/app/src/main/jni/Android.mk index 00fdb1ff..bdc135e9 100644 --- a/Applications/Android/NNDetector/app/src/main/jni/Android.mk +++ b/Applications/Android/NNDetector/app/src/main/jni/Android.mk @@ -39,6 +39,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := simpleshot_jni LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp -ljnigraphics +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := simpleshot.cpp simpleshot_jni.cpp dataloader.cpp image.cpp LOCAL_SHARED_LIBRARIES := ccapi-nntrainer nntrainer diff --git a/Applications/Android/PicoGPTJNI/app/src/main/jni/Android.mk b/Applications/Android/PicoGPTJNI/app/src/main/jni/Android.mk index 0c1dbaba..4e205691 100644 --- a/Applications/Android/PicoGPTJNI/app/src/main/jni/Android.mk +++ b/Applications/Android/PicoGPTJNI/app/src/main/jni/Android.mk @@ -41,6 +41,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := picogpt_jni LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp -ljnigraphics +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := picogpt.cpp picogpt_jni.cpp LOCAL_SHARED_LIBRARIES := ccapi-nntrainer nntrainer diff --git a/Applications/Android/ResnetJNI/app/src/main/jni/Android.mk b/Applications/Android/ResnetJNI/app/src/main/jni/Android.mk index aa7e4355..96706fb1 100644 --- a/Applications/Android/ResnetJNI/app/src/main/jni/Android.mk +++ b/Applications/Android/ResnetJNI/app/src/main/jni/Android.mk @@ -39,6 +39,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := resnet_jni LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp -ljnigraphics +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := resnet.cpp resnet_jni.cpp dataloader.cpp image.cpp LOCAL_SHARED_LIBRARIES := ccapi-nntrainer nntrainer diff --git a/Applications/Android/kotlin/app/src/main/jni/Android.mk b/Applications/Android/kotlin/app/src/main/jni/Android.mk index 3e74c84e..2a3e19d0 100644 --- a/Applications/Android/kotlin/app/src/main/jni/Android.mk +++ b/Applications/Android/kotlin/app/src/main/jni/Android.mk @@ -34,6 +34,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_resnet LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := NNTrainer.cpp $(CIFARDIR)/cifar_dataloader.cpp diff --git a/Applications/Custom/LayerClient/jni/Android.mk b/Applications/Custom/LayerClient/jni/Android.mk index 56dd4286..2d81d7ba 100644 --- a/Applications/Custom/LayerClient/jni/Android.mk +++ b/Applications/Custom/LayerClient/jni/Android.mk @@ -62,6 +62,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_layer_client_example LOCAL_LDLIBS := -llog -landroid -fopenmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := main.cpp $(LOCAL_PATH)/../../pow.cpp $(LOCAL_PATH)/../../mae_loss.cpp diff --git a/Applications/KNN/jni/Android.mk b/Applications/KNN/jni/Android.mk index f648e7eb..e320e909 100644 --- a/Applications/KNN/jni/Android.mk +++ b/Applications/KNN/jni/Android.mk @@ -74,6 +74,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := knn_sample LOCAL_LDLIBS := -llog -landroid -fopenmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := main.cpp diff --git a/Applications/LLaMA/jni/Android.mk b/Applications/LLaMA/jni/Android.mk index f1a9c2f1..1279fef5 100644 --- a/Applications/LLaMA/jni/Android.mk +++ b/Applications/LLaMA/jni/Android.mk @@ -49,6 +49,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := rms_norm_layer LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp -DENABLE_FP16=1 -DUSE__FP16=1 +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := rms_norm.cpp @@ -70,6 +71,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := swiglu_layer LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp -DENABLE_FP16=1 -DUSE__FP16=1 +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := swiglu.cpp @@ -91,6 +93,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := custom_multi_head_attention_layer LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp -DENABLE_FP16=1 -DUSE__FP16=1 +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := custom_multi_head_attention_layer.cpp @@ -113,6 +116,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_llama LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp -DENABLE_FP16=1 -DUSE__FP16=1 +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := main.cpp diff --git a/Applications/Layers/jni/Android.mk b/Applications/Layers/jni/Android.mk index bef36d87..911164de 100644 --- a/Applications/Layers/jni/Android.mk +++ b/Applications/Layers/jni/Android.mk @@ -51,6 +51,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_Layers LOCAL_LDLIBS := -llog -landroid -fopenmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := main.cpp $(CIFARDIR)/cifar_dataloader.cpp diff --git a/Applications/LogisticRegression/jni/Android.mk b/Applications/LogisticRegression/jni/Android.mk index a049ab62..a4167cb2 100644 --- a/Applications/LogisticRegression/jni/Android.mk +++ b/Applications/LogisticRegression/jni/Android.mk @@ -42,6 +42,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_logistic LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := main.cpp diff --git a/Applications/MNIST/jni/Android.mk b/Applications/MNIST/jni/Android.mk index 6bb33ac7..5d52cd7b 100644 --- a/Applications/MNIST/jni/Android.mk +++ b/Applications/MNIST/jni/Android.mk @@ -41,6 +41,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_mnist LOCAL_LDLIBS := -llog -landroid -fopenmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := main.cpp diff --git a/Applications/Multi_input/jni/Android.mk b/Applications/Multi_input/jni/Android.mk index 93445867..421dd74f 100644 --- a/Applications/Multi_input/jni/Android.mk +++ b/Applications/Multi_input/jni/Android.mk @@ -49,6 +49,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_multi_input LOCAL_LDLIBS := -llog -landroid -fopenmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := main.cpp multi_loader.cpp diff --git a/Applications/PicoGPT/jni/Android.mk b/Applications/PicoGPT/jni/Android.mk index f7cc55d4..3572dc9a 100644 --- a/Applications/PicoGPT/jni/Android.mk +++ b/Applications/PicoGPT/jni/Android.mk @@ -49,6 +49,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_pico_gpt LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := main.cpp diff --git a/Applications/ProductRatings/jni/Android.mk b/Applications/ProductRatings/jni/Android.mk index 7a475d64..e5b0e4f1 100644 --- a/Applications/ProductRatings/jni/Android.mk +++ b/Applications/ProductRatings/jni/Android.mk @@ -50,6 +50,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_product_ratings LOCAL_LDLIBS := -llog -landroid -fopenmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := main.cpp diff --git a/Applications/ReinforcementLearning/DeepQ/jni/Android.mk b/Applications/ReinforcementLearning/DeepQ/jni/Android.mk index 67173ad2..8023402e 100644 --- a/Applications/ReinforcementLearning/DeepQ/jni/Android.mk +++ b/Applications/ReinforcementLearning/DeepQ/jni/Android.mk @@ -45,6 +45,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_deepq LOCAL_LDLIBS := -llog -landroid -fopenmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := main.cpp $(ENVDIR)/CartPole/cartpole.cpp diff --git a/Applications/Resnet/jni/Android.mk b/Applications/Resnet/jni/Android.mk index 1c807ec3..9fd1be47 100644 --- a/Applications/Resnet/jni/Android.mk +++ b/Applications/Resnet/jni/Android.mk @@ -51,6 +51,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_resnet LOCAL_LDLIBS := -llog -landroid -fopenmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := main.cpp $(CIFARDIR)/cifar_dataloader.cpp diff --git a/Applications/TransferLearning/CIFAR_Classification/jni/Android.mk b/Applications/TransferLearning/CIFAR_Classification/jni/Android.mk index 22be25c1..6be4fd3a 100644 --- a/Applications/TransferLearning/CIFAR_Classification/jni/Android.mk +++ b/Applications/TransferLearning/CIFAR_Classification/jni/Android.mk @@ -89,6 +89,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_classification LOCAL_LDLIBS := -llog -landroid -fopenmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := main.cpp @@ -113,6 +114,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_classification_func LOCAL_LDLIBS := -llog -landroid -fopenmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := main_func.cpp diff --git a/Applications/TransferLearning/Draw_Classification/jni/Android.mk b/Applications/TransferLearning/Draw_Classification/jni/Android.mk index 9e933db2..1cca6200 100644 --- a/Applications/TransferLearning/Draw_Classification/jni/Android.mk +++ b/Applications/TransferLearning/Draw_Classification/jni/Android.mk @@ -88,6 +88,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_training LOCAL_LDLIBS := -llog -landroid -fopenmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := main.cpp diff --git a/Applications/VGG/jni/Android.mk b/Applications/VGG/jni/Android.mk index 76aa559a..6a2f0b05 100644 --- a/Applications/VGG/jni/Android.mk +++ b/Applications/VGG/jni/Android.mk @@ -51,6 +51,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_vgg LOCAL_LDLIBS := -llog -landroid -fopenmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := main.cpp $(CIFARDIR)/cifar_dataloader.cpp diff --git a/Applications/YOLOv2/jni/Android.mk b/Applications/YOLOv2/jni/Android.mk index 9f0dfb71..b14f8048 100644 --- a/Applications/YOLOv2/jni/Android.mk +++ b/Applications/YOLOv2/jni/Android.mk @@ -49,6 +49,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_yolo LOCAL_LDLIBS := -llog -landroid -fopenmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := main.cpp det_dataloader.cpp yolo_v2_loss.cpp reorg_layer.cpp LOCAL_SHARED_LIBRARIES := nntrainer ccapi-nntrainer diff --git a/Applications/YOLOv3/jni/Android.mk b/Applications/YOLOv3/jni/Android.mk index 115218f4..019fbde6 100644 --- a/Applications/YOLOv3/jni/Android.mk +++ b/Applications/YOLOv3/jni/Android.mk @@ -50,6 +50,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_yolov3 LOCAL_LDLIBS := -llog -landroid -fopenmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := main.cpp det_dataloader.cpp upsample_layer.cpp yolo_v3_loss.cpp LOCAL_SHARED_LIBRARIES := nntrainer ccapi-nntrainer diff --git a/Applications/utils/jni/Android.mk b/Applications/utils/jni/Android.mk index 30c7e671..b30afc22 100644 --- a/Applications/utils/jni/Android.mk +++ b/Applications/utils/jni/Android.mk @@ -18,6 +18,7 @@ LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_MODULE_TAGS := optional LOCAL_LDLIBS := -llog -landroid -fopenmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_MODULE := app_utils LOCAL_SRC_FILES := $(UTILS_SRCS) diff --git a/test/jni/Android.mk b/test/jni/Android.mk index 153b4eb8..11236dc7 100644 --- a/test/jni/Android.mk +++ b/test/jni/Android.mk @@ -58,6 +58,7 @@ LOCAL_MODULE := test_util LOCAL_CFLAGS := -Igoogletest/include -I../include -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 -O3 -frtti -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_C_INCLUDES += $(NNTRAINER_INCLUDES) ../include @@ -72,6 +73,7 @@ LOCAL_MODULE := unittest_nntrainer_activations LOCAL_CFLAGS := -Igoogletest/include -I../include -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 -O3 -frtti -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/unittest_nntrainer_activations.cpp @@ -89,6 +91,7 @@ LOCAL_MODULE := unittest_nntrainer_exe_order LOCAL_CFLAGS := -Igoogletest/include -I../include -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 -O3 -frtti -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/unittest_nntrainer_exe_order.cpp @@ -106,6 +109,7 @@ LOCAL_MODULE := unittest_nntrainer_internal LOCAL_CFLAGS := -Igoogletest/include -I../include -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 -O3 -frtti -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/unittest_nntrainer_internal.cpp @@ -123,6 +127,7 @@ LOCAL_MODULE := unittest_nntrainer_lazy_tensor LOCAL_CFLAGS := -Igoogletest/include -I../include -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 -O3 -frtti -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/unittest_nntrainer_lazy_tensor.cpp @@ -140,6 +145,7 @@ LOCAL_MODULE := unittest_nntrainer_tensor LOCAL_CFLAGS := -Igoogletest/include -I../include -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 -O3 -frtti -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/unittest_nntrainer_tensor.cpp @@ -157,6 +163,7 @@ LOCAL_MODULE := unittest_nntrainer_tensor_nhwc LOCAL_CFLAGS := -Igoogletest/include -I../include -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 -O3 -frtti -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/unittest_nntrainer_tensor_nhwc.cpp @@ -174,6 +181,7 @@ LOCAL_MODULE := unittest_nntrainer_tensor_fp16 LOCAL_CFLAGS := -Igoogletest/include -I../include -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 -O3 -frtti -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/unittest_nntrainer_tensor_fp16.cpp @@ -191,6 +199,7 @@ LOCAL_MODULE := unittest_util_func LOCAL_CFLAGS := -Igoogletest/include -I../include -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 -O3 -frtti -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/unittest_util_func.cpp @@ -208,6 +217,7 @@ LOCAL_MODULE := unittest_nntrainer_modelfile LOCAL_CFLAGS := -Igoogletest/include -I../include -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 -O3 -frtti -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/unittest_nntrainer_modelfile.cpp @@ -225,6 +235,7 @@ LOCAL_MODULE := unittest_nntrainer_graph LOCAL_CFLAGS := -Igoogletest/include -I../include -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 -O3 -frtti -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/unittest_nntrainer_graph.cpp @@ -242,6 +253,7 @@ LOCAL_MODULE := unittest_nntrainer_appcontext LOCAL_CFLAGS := -Igoogletest/include -I../include -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 -O3 -frtti -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/unittest_nntrainer_appcontext.cpp @@ -258,6 +270,7 @@ LOCAL_MODULE := unittest_base_properties LOCAL_CFLAGS := -Igoogletest/include -I../include -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 -O3 -frtti -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/unittest_base_properties.cpp @@ -274,6 +287,7 @@ LOCAL_MODULE := unittest_common_properties LOCAL_CFLAGS := -Igoogletest/include -I../include -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 -O3 -frtti -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/unittest_common_properties.cpp @@ -290,6 +304,7 @@ LOCAL_MODULE := unittest_nntrainer_tensor_neon_fp16 LOCAL_CFLAGS := -Igoogletest/include -I../include -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 -O3 -frtti -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/unittest_nntrainer_tensor_neon_fp16.cpp @@ -306,6 +321,7 @@ LOCAL_MODULE := unittest_nntrainer_tensor_pool LOCAL_CFLAGS := -Igoogletest/include -I../include -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 -O3 -frtti -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/unittest_nntrainer_tensor_pool.cpp @@ -322,6 +338,7 @@ LOCAL_MODULE := unittest_nntrainer_tensor_pool_fp16 LOCAL_CFLAGS := -Igoogletest/include -I../include -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 -O3 -frtti -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/unittest_nntrainer_tensor_pool_fp16.cpp @@ -338,6 +355,7 @@ LOCAL_MODULE := unittest_nntrainer_lr_scheduler LOCAL_CFLAGS := -Igoogletest/include -I../include -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 -O3 -frtti -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/unittest_nntrainer_lr_scheduler.cpp @@ -354,6 +372,7 @@ LOCAL_MODULE := unittest_compiler LOCAL_CFLAGS := -Igoogletest/include -I../include -I../unittest/compiler -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 -O3 -frtti -DNDK_BUILD=1 -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/compiler/compiler_test_util.cpp \ @@ -372,6 +391,7 @@ LOCAL_MODULE := unittest_nntrainer_models LOCAL_CFLAGS := -Igoogletest/include -I../include -I../unittest/models -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 -O3 -frtti -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/unittest_nntrainer_models.cpp \ @@ -390,6 +410,7 @@ LOCAL_MODULE := unittest_models LOCAL_CFLAGS := -Igoogletest/include -I../include -I../unittest/models -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 -O3 -frtti -DNDK_BUILD=1 -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/models/models_test_utils.cpp \ @@ -410,6 +431,7 @@ LOCAL_MODULE := unittest_datasets LOCAL_CFLAGS := -Igoogletest/include -I../include -I../unittest/datasets -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 -O3 -frtti -DNDK_BUILD=1 -DENABLE_FP16=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/datasets/data_producer_common_tests.cpp \ @@ -434,6 +456,7 @@ LOCAL_MODULE := unittest_layers LOCAL_CFLAGS := -Igoogletest/include -I../include -I../unittest/layers -I../../nntrainer/layers/loss -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 -O3 -frtti -DNDK_BUILD=1 -DENABLE_FP16=1 -DENABLE_OPENCL=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/layers/layers_dependent_common_tests.cpp \ @@ -489,6 +512,7 @@ LOCAL_MODULE := unittest_blas_kernels_cl LOCAL_CFLAGS := -Igoogletest/include -I../include -I../unittest/layers -I../../nntrainer/layers/loss -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 -O3 -frtti -DNDK_BUILD=1 -DENABLE_FP16=1 -DENABLE_OPENCL=1 LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../unittest/unittest_blas_kernels_cl.cpp @@ -506,6 +530,7 @@ LOCAL_MODULE := unittest_ccapi LOCAL_CFLAGS := -Igoogletest/include -I../include -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 -O3 -frtti LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ ../ccapi/unittest_ccapi.cpp diff --git a/test/unittest/jni/Android.mk b/test/unittest/jni/Android.mk index 40fe50d2..0fb7dcc8 100644 --- a/test/unittest/jni/Android.mk +++ b/test/unittest/jni/Android.mk @@ -56,6 +56,7 @@ 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 -O3 -frtti LOCAL_CXXFLAGS += -std=c++17 -frtti -fexceptions LOCAL_LDLIBS := -llog -landroid -fopenmp -static-openmp +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" LOCAL_SRC_FILES := \ tests/unittest_nntrainer_tensor.cpp \ -- 2.34.1