[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 <[email protected]>
nnstreamer · Aug 29, 2024 · 0c9c6d7 · 0c9c6d7
1 parent b755fc7
commit 0c9c6d7
Show file tree

Hide file tree

Showing 46 changed files with 22 additions and 52 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,4 @@
 APP_ABI := arm64-v8a
 APP_STL := c++_shared
 APP_PLATFORM := android-29
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true