[BUILD] Remove Flag and Add FLECIBLE PAGE Option

Remove Flag on Android.mk
Add APP_SUPPORT_FLEXIBLE_PAGE_SIZE to Application.mk

**Self evaluation:**
1. Build test:	 [X]Passed [ ]Failed [ ]Skipped
2. Run test:	 [X]Passed [ ]Failed [ ]Skipped

Signed-off-by: Donghak PARK <donghak.park@samsung.com>

diff --git a/Applications/AlexNet/jni/Android.mk b/Applications/AlexNet/jni/Android.mk
index bb0e1acb9f85fc8826c54edfeabeeb90bc82ee85..d2cbf8dce28e53bc22355b032a3f883fe1ba8411 100644 (file)
--- a/Applications/AlexNet/jni/Android.mk
+++ b/Applications/AlexNet/jni/Android.mk
@@ -51,7 +51,6 @@ 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/AlexNet/jni/Application.mk b/Applications/AlexNet/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/AlexNet/jni/Application.mk
+++ b/Applications/AlexNet/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/Applications/Android/NNDetector/app/src/main/jni/Android.mk b/Applications/Android/NNDetector/app/src/main/jni/Android.mk
index bdc135e94873914ae08a9587a1105c8d6139ec89..00fdb1ffc178a59f30cf10e7eade8976ac40f76b 100644 (file)
--- a/Applications/Android/NNDetector/app/src/main/jni/Android.mk
+++ b/Applications/Android/NNDetector/app/src/main/jni/Android.mk
@@ -39,7 +39,6 @@ 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 4e2056914cca7a85068e66f82afb71c7e30c2b33..0c1dbaba8b257dcc4f71cfff13548d6576a23276 100644 (file)
--- a/Applications/Android/PicoGPTJNI/app/src/main/jni/Android.mk
+++ b/Applications/Android/PicoGPTJNI/app/src/main/jni/Android.mk
@@ -41,7 +41,6 @@ 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/PicoGPTJNI/app/src/main/jni/Application.mk b/Applications/Android/PicoGPTJNI/app/src/main/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/Android/PicoGPTJNI/app/src/main/jni/Application.mk
+++ b/Applications/Android/PicoGPTJNI/app/src/main/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/Applications/Android/ResnetJNI/app/src/main/jni/Android.mk b/Applications/Android/ResnetJNI/app/src/main/jni/Android.mk
index 96706fb144e841d2d1e29645c46f8dce5674ce94..aa7e4355a255250aa798d75fb0fcb80fee51447c 100644 (file)
--- a/Applications/Android/ResnetJNI/app/src/main/jni/Android.mk
+++ b/Applications/Android/ResnetJNI/app/src/main/jni/Android.mk
@@ -39,7 +39,6 @@ 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 2a3e19d0d2d82bb145190b8ed530d5381b2c0d3e..3e74c84e615c3237ee77214e0175226977694cca 100644 (file)
--- a/Applications/Android/kotlin/app/src/main/jni/Android.mk
+++ b/Applications/Android/kotlin/app/src/main/jni/Android.mk
@@ -34,7 +34,6 @@ 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/Android/kotlin/app/src/main/jni/Application.mk b/Applications/Android/kotlin/app/src/main/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/Android/kotlin/app/src/main/jni/Application.mk
+++ b/Applications/Android/kotlin/app/src/main/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/Applications/Custom/LayerClient/jni/Android.mk b/Applications/Custom/LayerClient/jni/Android.mk
index 2d81d7ba4f71f75d0b64ff60a3d8f7fd512c682d..56dd4286eb6043a5a2cc649754d58ab303e53420 100644 (file)
--- a/Applications/Custom/LayerClient/jni/Android.mk
+++ b/Applications/Custom/LayerClient/jni/Android.mk
@@ -62,7 +62,6 @@ 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/Custom/LayerClient/jni/Application.mk b/Applications/Custom/LayerClient/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/Custom/LayerClient/jni/Application.mk
+++ b/Applications/Custom/LayerClient/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/Applications/KNN/jni/Android.mk b/Applications/KNN/jni/Android.mk
index e320e909d628832d24f51fb83ca66d3910ac67ac..f648e7ebf8668a0441b8fb9efcc378957f7155eb 100644 (file)
--- a/Applications/KNN/jni/Android.mk
+++ b/Applications/KNN/jni/Android.mk
@@ -74,7 +74,6 @@ 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/KNN/jni/Application.mk b/Applications/KNN/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/KNN/jni/Application.mk
+++ b/Applications/KNN/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/Applications/LLaMA/jni/Android.mk b/Applications/LLaMA/jni/Android.mk
index 1279fef5a65411852c8c2c89e2b56f79e1c422c6..f1a9c2f117ef2ee68857bd3efc8b1783a500a066 100644 (file)
--- a/Applications/LLaMA/jni/Android.mk
+++ b/Applications/LLaMA/jni/Android.mk
@@ -49,7 +49,6 @@ 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
 
@@ -71,7 +70,6 @@ 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
 
@@ -93,7 +91,6 @@ 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
 
@@ -116,7 +113,6 @@ 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/LLaMA/jni/Application.mk b/Applications/LLaMA/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/LLaMA/jni/Application.mk
+++ b/Applications/LLaMA/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/Applications/Layers/jni/Android.mk b/Applications/Layers/jni/Android.mk
index 911164de8aaec87775ef0fa3ce47b73e1d2ba8a9..bef36d8739249684b5730d6d70e4922699e8db1e 100644 (file)
--- a/Applications/Layers/jni/Android.mk
+++ b/Applications/Layers/jni/Android.mk
@@ -51,7 +51,6 @@ 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/Layers/jni/Application.mk b/Applications/Layers/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/Layers/jni/Application.mk
+++ b/Applications/Layers/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/Applications/LogisticRegression/jni/Android.mk b/Applications/LogisticRegression/jni/Android.mk
index a4167cb287a1ae7f34641f1156f51a4f923c910d..a049ab62ce79f8a1e70cd4e16c7f9a2a97687869 100644 (file)
--- a/Applications/LogisticRegression/jni/Android.mk
+++ b/Applications/LogisticRegression/jni/Android.mk
@@ -42,7 +42,6 @@ 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/LogisticRegression/jni/Application.mk b/Applications/LogisticRegression/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/LogisticRegression/jni/Application.mk
+++ b/Applications/LogisticRegression/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/Applications/MNIST/jni/Android.mk b/Applications/MNIST/jni/Android.mk
index 5d52cd7b3d0c66202aefd809701e1e27f5067587..6bb33ac757c0e7a1c7a9147eef54110d4b742b18 100644 (file)
--- a/Applications/MNIST/jni/Android.mk
+++ b/Applications/MNIST/jni/Android.mk
@@ -41,7 +41,6 @@ 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/MNIST/jni/Application.mk b/Applications/MNIST/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/MNIST/jni/Application.mk
+++ b/Applications/MNIST/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/Applications/Multi_input/jni/Android.mk b/Applications/Multi_input/jni/Android.mk
index 421dd74f32c98f2d76bbe816ed4b99090f80ac54..93445867b4deb02a7ff085a113f2cf71dd8c104d 100644 (file)
--- a/Applications/Multi_input/jni/Android.mk
+++ b/Applications/Multi_input/jni/Android.mk
@@ -49,7 +49,6 @@ 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/Multi_input/jni/Application.mk b/Applications/Multi_input/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/Multi_input/jni/Application.mk
+++ b/Applications/Multi_input/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/Applications/PicoGPT/jni/Android.mk b/Applications/PicoGPT/jni/Android.mk
index 3572dc9a99503e2ccefc187f849758adbf21e160..f7cc55d4364fb4851da6f17d7230f3e98c1e49ba 100644 (file)
--- a/Applications/PicoGPT/jni/Android.mk
+++ b/Applications/PicoGPT/jni/Android.mk
@@ -49,7 +49,6 @@ 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/PicoGPT/jni/Application.mk b/Applications/PicoGPT/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/PicoGPT/jni/Application.mk
+++ b/Applications/PicoGPT/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/Applications/ProductRatings/jni/Android.mk b/Applications/ProductRatings/jni/Android.mk
index e5b0e4f12ffcc27d1fa2c5f03ba8c30bbc2dbf03..7a475d643c38b988cfebc3927a099a2063633890 100644 (file)
--- a/Applications/ProductRatings/jni/Android.mk
+++ b/Applications/ProductRatings/jni/Android.mk
@@ -50,7 +50,6 @@ 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/ProductRatings/jni/Application.mk b/Applications/ProductRatings/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/ProductRatings/jni/Application.mk
+++ b/Applications/ProductRatings/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/Applications/ReinforcementLearning/DeepQ/jni/Android.mk b/Applications/ReinforcementLearning/DeepQ/jni/Android.mk
index 8023402ee8ff1a2166c90c185aaed23851a8a901..67173ad256483ea2521395f080d71f247170ba2e 100644 (file)
--- a/Applications/ReinforcementLearning/DeepQ/jni/Android.mk
+++ b/Applications/ReinforcementLearning/DeepQ/jni/Android.mk
@@ -45,7 +45,6 @@ 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/ReinforcementLearning/DeepQ/jni/Application.mk b/Applications/ReinforcementLearning/DeepQ/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/ReinforcementLearning/DeepQ/jni/Application.mk
+++ b/Applications/ReinforcementLearning/DeepQ/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/Applications/Resnet/jni/Android.mk b/Applications/Resnet/jni/Android.mk
index 9fd1be4772b971935e2e6a816db0f69d331fcb46..1c807ec39388710bbe54c013a5bf899354ec887c 100644 (file)
--- a/Applications/Resnet/jni/Android.mk
+++ b/Applications/Resnet/jni/Android.mk
@@ -51,7 +51,6 @@ 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/Resnet/jni/Application.mk b/Applications/Resnet/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/Resnet/jni/Application.mk
+++ b/Applications/Resnet/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/Applications/TransferLearning/CIFAR_Classification/jni/Android.mk b/Applications/TransferLearning/CIFAR_Classification/jni/Android.mk
index 6be4fd3aebbfd760c00d830be05a8242880f70d5..22be25c1dc0e5186a7491f2e36c45501545a455c 100644 (file)
--- a/Applications/TransferLearning/CIFAR_Classification/jni/Android.mk
+++ b/Applications/TransferLearning/CIFAR_Classification/jni/Android.mk
@@ -89,7 +89,6 @@ 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
 
@@ -114,7 +113,6 @@ 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/CIFAR_Classification/jni/Application.mk b/Applications/TransferLearning/CIFAR_Classification/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/TransferLearning/CIFAR_Classification/jni/Application.mk
+++ b/Applications/TransferLearning/CIFAR_Classification/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/Applications/TransferLearning/Draw_Classification/jni/Android.mk b/Applications/TransferLearning/Draw_Classification/jni/Android.mk
index 1cca6200a73a84755a7ceab5528621114dd334d8..9e933db23ab284c99a2e207af3678d245cf434eb 100644 (file)
--- a/Applications/TransferLearning/Draw_Classification/jni/Android.mk
+++ b/Applications/TransferLearning/Draw_Classification/jni/Android.mk
@@ -88,7 +88,6 @@ 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/TransferLearning/Draw_Classification/jni/Application.mk b/Applications/TransferLearning/Draw_Classification/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/TransferLearning/Draw_Classification/jni/Application.mk
+++ b/Applications/TransferLearning/Draw_Classification/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/Applications/VGG/jni/Android.mk b/Applications/VGG/jni/Android.mk
index 6a2f0b054a8798508f80c2e96da2ca8410233ff4..76aa559a51bd1f9e9252c4dbf94882015a4168e0 100644 (file)
--- a/Applications/VGG/jni/Android.mk
+++ b/Applications/VGG/jni/Android.mk
@@ -51,7 +51,6 @@ 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/VGG/jni/Application.mk b/Applications/VGG/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/VGG/jni/Application.mk
+++ b/Applications/VGG/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/Applications/YOLOv2/jni/Android.mk b/Applications/YOLOv2/jni/Android.mk
index b14f8048d26fe9fe55ee813a642df2c08db78508..9f0dfb71654693ea4d60eb2cb40da87e760c9288 100644 (file)
--- a/Applications/YOLOv2/jni/Android.mk
+++ b/Applications/YOLOv2/jni/Android.mk
@@ -49,7 +49,6 @@ 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/YOLOv2/jni/Application.mk b/Applications/YOLOv2/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/YOLOv2/jni/Application.mk
+++ b/Applications/YOLOv2/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/Applications/YOLOv3/jni/Android.mk b/Applications/YOLOv3/jni/Android.mk
index 019fbde6691fca6e1272525ba9b6f4d7922c5091..115218f45c43854ec7781ab8968e871031cc181b 100644 (file)
--- a/Applications/YOLOv3/jni/Android.mk
+++ b/Applications/YOLOv3/jni/Android.mk
@@ -50,7 +50,6 @@ 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/YOLOv3/jni/Application.mk b/Applications/YOLOv3/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/YOLOv3/jni/Application.mk
+++ b/Applications/YOLOv3/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/Applications/utils/jni/Android.mk b/Applications/utils/jni/Android.mk
index b30afc22f645686f235406b8680ab0e3a3a0f5e0..30c7e67152eb427a6d075c014c2dfa6552923641 100644 (file)
--- a/Applications/utils/jni/Android.mk
+++ b/Applications/utils/jni/Android.mk
@@ -18,7 +18,6 @@ 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/Applications/utils/jni/Application.mk b/Applications/utils/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/Applications/utils/jni/Application.mk
+++ b/Applications/utils/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/test/jni/Android.mk b/test/jni/Android.mk
index 11236dc774aca8ba11e65dafaa0a0381d22a8363..153b4eb84020119f9d376232655c468a139a0a05 100644 (file)
--- a/test/jni/Android.mk
+++ b/test/jni/Android.mk
@@ -58,7 +58,6 @@ 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
 
@@ -73,7 +72,6 @@ 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
@@ -91,7 +89,6 @@ 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
@@ -109,7 +106,6 @@ 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
@@ -127,7 +123,6 @@ 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
@@ -145,7 +140,6 @@ 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
@@ -163,7 +157,6 @@ 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
@@ -181,7 +174,6 @@ 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
@@ -199,7 +191,6 @@ 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
@@ -217,7 +208,6 @@ 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
@@ -235,7 +225,6 @@ 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
@@ -253,7 +242,6 @@ 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
@@ -270,7 +258,6 @@ 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
@@ -287,7 +274,6 @@ 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
@@ -304,7 +290,6 @@ 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
@@ -321,7 +306,6 @@ 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
@@ -338,7 +322,6 @@ 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
@@ -355,7 +338,6 @@ 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
@@ -372,7 +354,6 @@ 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 \
@@ -391,7 +372,6 @@ 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 \
@@ -410,7 +390,6 @@ 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 \
@@ -431,7 +410,6 @@ 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 \
@@ -456,7 +434,6 @@ 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 \
@@ -512,7 +489,6 @@ 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 
@@ -530,7 +506,6 @@ 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/jni/Application.mk b/test/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/test/jni/Application.mk
+++ b/test/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

diff --git a/test/unittest/jni/Android.mk b/test/unittest/jni/Android.mk
index 0fb7dcc853e520ca70458e987d70e9f2165448ae..40fe50d28e985ea7205ef872b993b3d60c5f1d90 100644 (file)
--- a/test/unittest/jni/Android.mk
+++ b/test/unittest/jni/Android.mk
@@ -56,7 +56,6 @@ 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 \

diff --git a/test/unittest/jni/Application.mk b/test/unittest/jni/Application.mk
index 659caaf792cbf4a179413218eb98079643f48e8b..efe7ccfbc8ab08926ac9bc5e16a0969f40f95f1d 100644 (file)
--- a/test/unittest/jni/Application.mk
+++ b/test/unittest/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true