aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Ward <james.ward@arm.com>2020-10-20 15:50:33 +0100
committerJames Ward <james.ward@arm.com>2020-10-29 18:53:22 +0000
commit4e22f607bfb85d31146d96c937fc0706e12a0fa7 (patch)
treeec436ba4be38c507252eb7cad4c1434c43e8c42f
parent7f492ac8aa24a1ff90e1b4e7800ef9fc30b73d36 (diff)
downloadandroid-nn-driver-4e22f607bfb85d31146d96c937fc0706e12a0fa7.tar.gz
IVGCVSW-5267 Remove boost from core android-nn-driver
* WIP !armnn:4231 !armnn:4287 Signed-off-by: James Ward <james.ward@arm.com> Change-Id: I7844efc84fac018d8aad1f72dd236ede3fd8e7f2
-rw-r--r--Android.bp32
-rw-r--r--Android.mk64
-rw-r--r--ConversionUtils.hpp9
-rw-r--r--test/Android.mk16
4 files changed, 4 insertions, 117 deletions
diff --git a/Android.bp b/Android.bp
index a2c80531..73c67e5b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -108,38 +108,6 @@ cc_library_static {
],
}
-cc_library_static {
- name: "libboost_program_options",
- defaults: ["libboost-defaults"],
- srcs: [
- "boost_1_64_0/libs/program_options/src/cmdline.cpp",
- "boost_1_64_0/libs/program_options/src/config_file.cpp",
- "boost_1_64_0/libs/program_options/src/convert.cpp",
- "boost_1_64_0/libs/program_options/src/options_description.cpp",
- "boost_1_64_0/libs/program_options/src/parsers.cpp",
- "boost_1_64_0/libs/program_options/src/positional_options.cpp",
- "boost_1_64_0/libs/program_options/src/split.cpp",
- "boost_1_64_0/libs/program_options/src/utf8_codecvt_facet.cpp",
- "boost_1_64_0/libs/program_options/src/value_semantic.cpp",
- "boost_1_64_0/libs/program_options/src/variables_map.cpp",
- "boost_1_64_0/libs/program_options/src/winmain.cpp",
- ],
-}
-
-cc_library_static {
- name: "libboost_filesystem",
- defaults: ["libboost-defaults"],
- srcs: [
- "boost_1_64_0/libs/filesystem/src/codecvt_error_category.cpp",
- "boost_1_64_0/libs/filesystem/src/operations.cpp",
- "boost_1_64_0/libs/filesystem/src/path.cpp",
- "boost_1_64_0/libs/filesystem/src/path_traits.cpp",
- "boost_1_64_0/libs/filesystem/src/portability.cpp",
- "boost_1_64_0/libs/filesystem/src/unique_path.cpp",
- "boost_1_64_0/libs/filesystem/src/utf8_codecvt_facet.cpp",
- "boost_1_64_0/libs/filesystem/src/windows_file_codecvt.cpp",
- ],
-}
subdirs = [
"armnn",
diff --git a/Android.mk b/Android.mk
index ce3582fc..9cbf71f3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -129,11 +129,6 @@ LOCAL_CFLAGS+= \
-UNDEBUG
endif # ARMNN_DRIVER_DEBUG == 1
-ifeq ($(Q_OR_LATER),1)
-LOCAL_CFLAGS += \
- -DBOOST_NO_AUTO_PTR
-endif # PLATFORM_VERSION == Q or later
-
ifeq ($(ARMNN_COMPUTE_CL_ENABLED),1)
LOCAL_CFLAGS += \
-DARMCOMPUTECL_ENABLED
@@ -168,11 +163,6 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
- libboost_log \
- libboost_program_options \
- libboost_system \
- libboost_thread \
- libboost_filesystem \
arm_compute_library
LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn
@@ -258,11 +248,6 @@ LOCAL_CFLAGS+= \
-UNDEBUG
endif # ARMNN_DRIVER_DEBUG == 1
-ifeq ($(Q_OR_LATER),1)
-LOCAL_CFLAGS += \
- -DBOOST_NO_AUTO_PTR
-endif # PLATFORM_VERSION == Q or later
-
# Required to build with the changes made to the Android ML framework specific to Android R
ifeq ($(ANDROID_R),1)
LOCAL_CFLAGS+= \
@@ -305,11 +290,6 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
- libboost_log \
- libboost_program_options \
- libboost_system \
- libboost_thread \
- libboost_filesystem \
arm_compute_library
LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn
@@ -378,7 +358,6 @@ LOCAL_CFLAGS := \
-fexceptions \
-Werror \
-Wno-format-security \
- -DBOOST_NO_AUTO_PTR \
-DARMNN_ANDROID_NN_V1_2
ifeq ($(ARMNN_DRIVER_DEBUG),1)
@@ -431,11 +410,6 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
- libboost_log \
- libboost_program_options \
- libboost_system \
- libboost_thread \
- libboost_filesystem \
arm_compute_library
LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn
@@ -500,7 +474,6 @@ LOCAL_CFLAGS := \
-fexceptions \
-Werror \
-Wno-format-security \
- -DBOOST_NO_AUTO_PTR \
-DARMNN_ANDROID_NN_V1_3 \
-DARMNN_ANDROID_R
@@ -555,11 +528,6 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
- libboost_log \
- libboost_program_options \
- libboost_system \
- libboost_thread \
- libboost_filesystem \
arm_compute_library
LOCAL_WHOLE_STATIC_LIBRARIES := libarmnn
@@ -625,11 +593,6 @@ LOCAL_CFLAGS += \
-UNDEBUG
endif # ARMNN_DRIVER_DEBUG == 1
-ifeq ($(Q_OR_LATER),1)
-LOCAL_CFLAGS += \
- -DBOOST_NO_AUTO_PTR
-endif # PLATFORM_VERSION == Q or later
-
# Required to build with the changes made to the Android ML framework specific to Android R
ifeq ($(ANDROID_R),1)
LOCAL_CFLAGS+= \
@@ -641,11 +604,6 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
- libboost_log \
- libboost_program_options \
- libboost_system \
- libboost_thread \
- libboost_filesystem \
arm_compute_library
LOCAL_WHOLE_STATIC_LIBRARIES := \
@@ -731,11 +689,6 @@ LOCAL_CFLAGS += \
-UNDEBUG
endif # ARMNN_DRIVER_DEBUG == 1
-ifeq ($(Q_OR_LATER),1)
-LOCAL_CFLAGS += \
- -DBOOST_NO_AUTO_PTR
-endif # PLATFORM_VERSION == Q or later
-
# Required to build with the changes made to the Android ML framework specific to Android R
ifeq ($(ANDROID_R),1)
LOCAL_CFLAGS+= \
@@ -747,11 +700,6 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
- libboost_log \
- libboost_program_options \
- libboost_system \
- libboost_thread \
- libboost_filesystem \
arm_compute_library
LOCAL_WHOLE_STATIC_LIBRARIES := \
@@ -822,7 +770,6 @@ LOCAL_CFLAGS := \
-std=$(CPP_VERSION) \
-fexceptions \
-DARMNN_ANDROID_NN_V1_2 \
- -DBOOST_NO_AUTO_PTR
ifeq ($(ARMNN_DRIVER_DEBUG),1)
LOCAL_CFLAGS += \
@@ -840,11 +787,6 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
- libboost_log \
- libboost_program_options \
- libboost_system \
- libboost_thread \
- libboost_filesystem \
arm_compute_library
LOCAL_WHOLE_STATIC_LIBRARIES := \
@@ -911,7 +853,6 @@ LOCAL_CFLAGS := \
-std=$(CPP_VERSION) \
-fexceptions \
-DARMNN_ANDROID_NN_V1_3 \
- -DBOOST_NO_AUTO_PTR \
-DARMNN_ANDROID_R
ifeq ($(ARMNN_DRIVER_DEBUG),1)
@@ -924,11 +865,6 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
- libboost_log \
- libboost_program_options \
- libboost_system \
- libboost_thread \
- libboost_filesystem \
arm_compute_library
LOCAL_WHOLE_STATIC_LIBRARIES := \
diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index f139383e..c1476845 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -23,7 +23,7 @@
#include <CpuExecutor.h>
#include <OperationsUtils.h>
-#include <boost/test/tools/floating_point_comparison.hpp>
+#include <armnnUtils/FloatingPointComparison.hpp>
#include <log/log.h>
#include <vector>
@@ -477,8 +477,7 @@ void SanitizeBiasQuantizationScale(armnn::TensorInfo& biasInfo,
const float expectedBiasScale = weightInfo.GetQuantizationScale() * inputInfo.GetQuantizationScale();
if (biasInfo.GetQuantizationScale() != expectedBiasScale)
{
- boost::math::fpc::close_at_tolerance<float> comparer(boost::math::fpc::percent_tolerance(1.0f));
- if (comparer(biasInfo.GetQuantizationScale(), expectedBiasScale))
+ if (armnnUtils::within_percentage_tolerance(biasInfo.GetQuantizationScale(), expectedBiasScale, 1.0f))
{
ALOGW("Bias quantization scale has been modified to match input * weights");
biasInfo.SetQuantizationScale(expectedBiasScale);
@@ -1209,7 +1208,7 @@ LayerInputHandle ConvertToLayerInputHandle(const HalOperation& operation,
return LayerInputHandle();
}
- BOOST_FALLTHROUGH; // intentional fallthrough
+ [[clang::fallthrough]]; // intentional fallthrough
}
case HalOperandLifeTime::TEMPORARY_VARIABLE: // intentional fallthrough
case HalOperandLifeTime::MODEL_OUTPUT:
@@ -1336,7 +1335,7 @@ LayerInputHandle ConvertToLayerInputHandle(const ::android::hardware::neuralnetw
return LayerInputHandle();
}
- BOOST_FALLTHROUGH; // intentional fallthrough
+ [[clang::fallthrough]]; // intentional fallthrough
}
case HalOperandLifeTime::TEMPORARY_VARIABLE: // intentional fallthrough
case HalOperandLifeTime::SUBGRAPH_OUTPUT:
diff --git a/test/Android.mk b/test/Android.mk
index 5e40f0a1..f6439c6f 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -73,11 +73,7 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
- libboost_log \
- libboost_system \
libboost_unit_test_framework \
- libboost_thread \
- libboost_filesystem \
arm_compute_library
LOCAL_WHOLE_STATIC_LIBRARIES := \
@@ -191,11 +187,7 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
- libboost_log \
- libboost_system \
libboost_unit_test_framework \
- libboost_thread \
- libboost_filesystem \
arm_compute_library
LOCAL_WHOLE_STATIC_LIBRARIES := \
@@ -300,11 +292,7 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
- libboost_log \
- libboost_system \
libboost_unit_test_framework \
- libboost_thread \
- libboost_filesystem \
arm_compute_library
LOCAL_WHOLE_STATIC_LIBRARIES := \
@@ -402,11 +390,7 @@ LOCAL_SRC_FILES := \
LOCAL_STATIC_LIBRARIES := \
libneuralnetworks_common \
- libboost_log \
- libboost_system \
libboost_unit_test_framework \
- libboost_thread \
- libboost_filesystem \
arm_compute_library
LOCAL_WHOLE_STATIC_LIBRARIES := \