From: Jihoon Lee Date: Wed, 18 Nov 2020 02:44:25 +0000 (+0900) Subject: [Deps] Remove openmp dependency X-Git-Tag: submit/tizen/20201201.095355~19 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2058aa58905ae1f38c27f7e769346c11de5a1a93;p=platform%2Fcore%2Fml%2Fnntrainer.git [Deps] Remove openmp dependency Openmp is no longer used. It is deleted to reduce memory consumption **Self evaluation:** 1. Build test: [X]Passed [ ]Failed [ ]Skipped 2. Run test: [X]Passed [ ]Failed [ ]Skipped Signed-off-by: Jihoon Lee --- diff --git a/Applications/KNN/jni/Android.mk b/Applications/KNN/jni/Android.mk index 63b1b3c..03b4224 100644 --- a/Applications/KNN/jni/Android.mk +++ b/Applications/KNN/jni/Android.mk @@ -61,8 +61,8 @@ LOCAL_ARM_NEON := true LOCAL_CFLAGS += -std=c++14 -Ofast -mcpu=cortex-a53 -Ilz4-nougat/lib LOCAL_LDFLAGS += -Llz4-nougat/lib/obj/local/arm64-v8a/ LOCAL_CXXFLAGS += -std=c++14 -LOCAL_CFLAGS += -pthread -fopenmp -fexceptions -LOCAL_LDFLAGS += -fopenmp -fexceptions +LOCAL_CFLAGS += -pthread -fexceptions +LOCAL_LDFLAGS += -fexceptions LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := knn_sample diff --git a/Applications/LogisticRegression/jni/Android.mk b/Applications/LogisticRegression/jni/Android.mk index e8e42df..b038f73 100644 --- a/Applications/LogisticRegression/jni/Android.mk +++ b/Applications/LogisticRegression/jni/Android.mk @@ -33,8 +33,8 @@ LOCAL_ARM_NEON := true LOCAL_CFLAGS += -std=c++14 -Ofast -mcpu=cortex-a53 -Ilz4-nougat/lib LOCAL_LDFLAGS += -Llz4-nougat/lib/obj/local/$(TARGET_ARCH_ABI)/ LOCAL_CXXFLAGS += -std=c++14 -LOCAL_CFLAGS += -pthread -fopenmp -fexceptions -LOCAL_LDFLAGS += -fopenmp -fexceptions +LOCAL_CFLAGS += -pthread -fexceptions +LOCAL_LDFLAGS += -fexceptions LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_logistic diff --git a/Applications/MNIST/jni/Android.mk b/Applications/MNIST/jni/Android.mk index 9d3c64a..4b08936 100644 --- a/Applications/MNIST/jni/Android.mk +++ b/Applications/MNIST/jni/Android.mk @@ -34,8 +34,8 @@ LOCAL_ARM_NEON := true LOCAL_CFLAGS += -std=c++14 -Ofast -mcpu=cortex-a53 -Ilz4-nougat/lib LOCAL_LDFLAGS += -Llz4-nougat/lib/obj/local/$(TARGET_ARCH_ABI)/ LOCAL_CXXFLAGS += -std=c++14 -LOCAL_CFLAGS += -pthread -fopenmp -fexceptions -LOCAL_LDFLAGS += -fopenmp -fexceptions +LOCAL_CFLAGS += -pthread -fexceptions +LOCAL_LDFLAGS += -fexceptions LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_mnist diff --git a/Applications/ReinforcementLearning/DeepQ/jni/Android.mk b/Applications/ReinforcementLearning/DeepQ/jni/Android.mk index fd0a36a..e0f371b 100644 --- a/Applications/ReinforcementLearning/DeepQ/jni/Android.mk +++ b/Applications/ReinforcementLearning/DeepQ/jni/Android.mk @@ -36,8 +36,8 @@ LOCAL_ARM_NEON := true LOCAL_CFLAGS += -std=c++14 -Ofast -mcpu=cortex-a53 -Ilz4-nougat/lib -fexceptions -DUSING_CUSTOM_ENV LOCAL_LDFLAGS += -Llz4-nougat/lib/obj/local/arm64-v8a/ LOCAL_CXXFLAGS += -std=c++14 -DUSING_CUSTOM_ENV -LOCAL_CFLAGS += -pthread -fopenmp -fexceptions -LOCAL_LDFLAGS += -fopenmp -fexceptions +LOCAL_CFLAGS += -pthread -fexceptions +LOCAL_LDFLAGS += -fexceptions LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_deepq diff --git a/Applications/TransferLearning/CIFAR_Classification/jni/Android.mk b/Applications/TransferLearning/CIFAR_Classification/jni/Android.mk index 30e7fc5..8763626 100644 --- a/Applications/TransferLearning/CIFAR_Classification/jni/Android.mk +++ b/Applications/TransferLearning/CIFAR_Classification/jni/Android.mk @@ -74,8 +74,8 @@ LOCAL_ARM_NEON := true LOCAL_CFLAGS += -std=c++14 -Ofast -mcpu=cortex-a53 -Ilz4-nougat/lib LOCAL_LDFLAGS += -Llz4-nougat/lib/obj/local/$(TARGET_ARCH_ABI)/ LOCAL_CXXFLAGS += -std=c++14 -LOCAL_CFLAGS += -pthread -fopenmp -fexceptions -LOCAL_LDFLAGS += -fopenmp -fexceptions +LOCAL_CFLAGS += -pthread -fexceptions +LOCAL_LDFLAGS += -fexceptions LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_classification @@ -97,8 +97,8 @@ LOCAL_ARM_NEON := true LOCAL_CFLAGS += -std=c++14 -Ofast -mcpu=cortex-a53 -Ilz4-nougat/lib LOCAL_LDFLAGS += -Llz4-nougat/lib/obj/local/$(TARGET_ARCH_ABI)/ LOCAL_CXXFLAGS += -std=c++14 -LOCAL_CFLAGS += -pthread -fopenmp -fexceptions -LOCAL_LDFLAGS += -fopenmp -fexceptions +LOCAL_CFLAGS += -pthread -fexceptions +LOCAL_LDFLAGS += -fexceptions LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_classification_func diff --git a/Applications/TransferLearning/Draw_Classification/jni/Android.mk b/Applications/TransferLearning/Draw_Classification/jni/Android.mk index 8b0715c..e5ce1c8 100644 --- a/Applications/TransferLearning/Draw_Classification/jni/Android.mk +++ b/Applications/TransferLearning/Draw_Classification/jni/Android.mk @@ -54,8 +54,8 @@ LOCAL_ARM_NEON := true LOCAL_CFLAGS += -std=c++14 -Ofast -mcpu=cortex-a53 -Ilz4-nougat/lib LOCAL_LDFLAGS += -Llz4-nougat/lib/obj/local/$(TARGET_ARCH_ABI)/ LOCAL_CXXFLAGS += -std=c++14 -LOCAL_CFLAGS += -pthread -fopenmp -fexceptions -LOCAL_LDFLAGS += -fopenmp -fexceptions +LOCAL_CFLAGS += -pthread -fexceptions +LOCAL_LDFLAGS += -fexceptions LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_training diff --git a/Applications/VGG/jni/Android.mk b/Applications/VGG/jni/Android.mk index 202d9d5..7e72d49 100644 --- a/Applications/VGG/jni/Android.mk +++ b/Applications/VGG/jni/Android.mk @@ -41,8 +41,8 @@ LOCAL_ARM_NEON := true LOCAL_CFLAGS += -std=c++14 -Ofast -mcpu=cortex-a53 -Ilz4-nougat/lib LOCAL_LDFLAGS += -Llz4-nougat/lib/obj/local/$(TARGET_ARCH_ABI)/ LOCAL_CXXFLAGS += -std=c++14 -LOCAL_CFLAGS += -pthread -fopenmp -fexceptions -LOCAL_LDFLAGS += -fopenmp -fexceptions +LOCAL_CFLAGS += -pthread -fexceptions +LOCAL_LDFLAGS += -fexceptions LOCAL_MODULE_TAGS := optional LOCAL_ARM_MODE := arm LOCAL_MODULE := nntrainer_vgg diff --git a/Applications/utils/jni/Android.mk b/Applications/utils/jni/Android.mk index 91ed7b0..0da69fe 100644 --- a/Applications/utils/jni/Android.mk +++ b/Applications/utils/jni/Android.mk @@ -13,9 +13,9 @@ UTILS_SRCS := $(NNTRAINER_APPLICATION)/utils/jni/bitmap_helpers.cpp UTILS_INCLUDES := $(NNTRAINER_APPLICATION)/utils/jni/includes LOCAL_ARM_NEON := true -LOCAL_CFLAGS += -pthread -fopenmp -fexceptions +LOCAL_CFLAGS += -pthread -fexceptions LOCAL_CXXFLAGS += -std=c++14 -frtti -fexceptions -LOCAL_LDFLAGS += -fuse-ld=bfd -fopenmp +LOCAL_LDFLAGS += -fuse-ld=bfd LOCAL_MODULE_TAGS := optional LOCAL_LDLIBS := -llog diff --git a/jni/Android.mk b/jni/Android.mk index db51bbf..f5ff150 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -110,9 +110,9 @@ INIPARSER_SRCS := $(INIPARSER_ROOT)/src/iniparser.c \ INIPARSER_INCLUDES := $(INIPARSER_ROOT)/src LOCAL_ARM_NEON := true -LOCAL_CFLAGS += -pthread -fopenmp -fexceptions +LOCAL_CFLAGS += -pthread -fexceptions LOCAL_CXXFLAGS += -std=c++14 -frtti -fexceptions -LOCAL_LDFLAGS += -fuse-ld=bfd -fopenmp +LOCAL_LDFLAGS += -fuse-ld=bfd LOCAL_MODULE_TAGS := optional LOCAL_LDLIBS := -llog @@ -150,9 +150,9 @@ CAPI_NNTRAINER_INCLUDES := $(NNTRAINER_ROOT)/nntrainer \ LOCAL_SHARED_LIBRARIES := nntrainer LOCAL_ARM_NEON := true -LOCAL_CFLAGS += -pthread -fopenmp -fexceptions +LOCAL_CFLAGS += -pthread -fexceptions LOCAL_CXXFLAGS += -std=c++14 -frtti -fexceptions -LOCAL_LDFLAGS += -fuse-ld=bfd -fopenmp +LOCAL_LDFLAGS += -fuse-ld=bfd LOCAL_MODULE_TAGS := optional LOCAL_LDLIBS := -llog @@ -181,9 +181,9 @@ CCAPI_NNTRAINER_INCLUDES := $(NNTRAINER_ROOT)/nntrainer \ LOCAL_SHARED_LIBRARIES := nntrainer LOCAL_ARM_NEON := true -LOCAL_CFLAGS += -pthread -fopenmp -fexceptions +LOCAL_CFLAGS += -pthread -fexceptions LOCAL_CXXFLAGS += -std=c++14 -frtti -fexceptions -LOCAL_LDFLAGS += -fuse-ld=bfd -fopenmp +LOCAL_LDFLAGS += -fuse-ld=bfd LOCAL_MODULE_TAGS := optional LOCAL_LDLIBS := -llog diff --git a/meson.build b/meson.build index 962ca89..48e6b42 100644 --- a/meson.build +++ b/meson.build @@ -84,7 +84,6 @@ nntrainer_conf.set('LIB_INSTALL_DIR', nntrainer_libdir) nntrainer_conf.set('INCLUDE_INSTALL_DIR', nntrainer_includedir) dummy_dep = dependency('', required: false) -openmp_dep = dependency('openmp') blas_dep = dummy_dep # Dependencies diff --git a/nntrainer/meson.build b/nntrainer/meson.build index 7ad0c95..d69bbb0 100644 --- a/nntrainer/meson.build +++ b/nntrainer/meson.build @@ -15,7 +15,6 @@ endif # Dependencies nntrainer_base_deps=[ - openmp_dep, blas_dep, iniparser_dep, libm_dep,