commit a75fa2c9aaa3f12de910610f7c575f4b02145a01
author Slava Shklyaev <slavash@google.com> Wed Jan 13 16:12:02 2021 +0000
committer Slava Shklyaev <slavash@google.com> Mon Feb 15 15:30:35 2021 +0000
tree 6d6d62eba1f18548b2ba75d714756b43ab44c8fa
parent c958cd8cc7eb6f2e19a712b7775bc75c1c2d073a

Use system includes for libneuralnetworks_common headers

Command used to generate the bulk this change:

    for file in $(ls -1 common/include/*.h); do
      header="${file#"common/include/"}"
      perl -pi -e "s@^#include \"$header\"@#include <$header>@g" **/*.{h,cpp}
    done
    git checkout common/
    clang-format -i **/*.{h,cpp}

Also added these missing headers:

    driver/cache/nnCache/nnCache_test.cpp:122:  Add #include <algorithm> for min  [build/include_what_you_use] [4]
    runtime/BurstBuilder.cpp:45:  Add #include <memory> for shared_ptr<>  [build/include_what_you_use] [4]
    runtime/BurstBuilder.cpp:30:  Add #include <utility> for move  [build/include_what_you_use] [4]
    runtime/BurstBuilder.cpp:29:  Add #include <vector> for vector<>  [build/include_what_you_use] [4]
    runtime/include/NeuralNetworksWrapperExtensions.h:88:  Add #include <utility> for move  [build/include_what_you_use] [4]
    runtime/include/NeuralNetworksWrapperExtensions.h:87:  Add #include <vector> for vector<>  [build/include_what_you_use] [4]

Also reordered conditionally included headers to go at the end.

Bug: N/A
Test: m
Change-Id: Ice4cb0682de1bf2fcf07c377ef9e0deec6a2de7e
Merged-In: Ice4cb0682de1bf2fcf07c377ef9e0deec6a2de7e
(cherry picked from commit 19582f204a2669716dd0f1bdf44e94b667923925)

common/operations/PRelu.cpp

diff --git a/common/operations/PRelu.cpp b/common/operations/PRelu.cpp
index 60d7210..718093a 100644
--- a/common/operations/PRelu.cpp
+++ b/common/operations/PRelu.cpp
@@ -16,10 +16,6 @@
 
 #define LOG_TAG "Operations"
 
-#ifndef NN_COMPATIBILITY_LIBRARY_BUILD
-#include <tensorflow/lite/kernels/internal/optimized/legacy_optimized_ops.h>
-#endif  // NN_COMPATIBILITY_LIBRARY_BUILD
-
 #include <algorithm>
 #include <vector>
 
@@ -28,6 +24,10 @@
 #include "OperationsUtils.h"
 #include "Tracing.h"
 
+#ifndef NN_COMPATIBILITY_LIBRARY_BUILD
+#include <tensorflow/lite/kernels/internal/optimized/legacy_optimized_ops.h>
+#endif  // NN_COMPATIBILITY_LIBRARY_BUILD
+
 namespace android {
 namespace nn {
 namespace prelu {

common/operations/QLSTM.cpp

diff --git a/common/operations/QLSTM.cpp b/common/operations/QLSTM.cpp
index 4dad7f7..d9b22e2 100644
--- a/common/operations/QLSTM.cpp
+++ b/common/operations/QLSTM.cpp
@@ -20,6 +20,7 @@
 
 #include "CpuExecutor.h"
 #include "OperationsUtils.h"
+
 #ifndef NN_COMPATIBILITY_LIBRARY_BUILD
 #include "QuantUtils.h"
 #endif  // NN_COMPATIBILITY_LIBRARY_BUILD

common/operations/Reduce.cpp

diff --git a/common/operations/Reduce.cpp b/common/operations/Reduce.cpp
index a73b652..794992c 100644
--- a/common/operations/Reduce.cpp
+++ b/common/operations/Reduce.cpp
@@ -16,10 +16,6 @@
 
 #define LOG_TAG "Operations"
 
-#ifndef NN_COMPATIBILITY_LIBRARY_BUILD
-#include <tensorflow/lite/kernels/internal/reference/reference_ops.h>
-#endif  // NN_COMPATIBILITY_LIBRARY_BUILD
-
 #include <algorithm>
 #include <limits>
 #include <vector>
@@ -28,6 +24,10 @@
 #include "OperationsUtils.h"
 #include "Tracing.h"
 
+#ifndef NN_COMPATIBILITY_LIBRARY_BUILD
+#include <tensorflow/lite/kernels/internal/reference/reference_ops.h>
+#endif  // NN_COMPATIBILITY_LIBRARY_BUILD
+
 namespace android {
 namespace nn {
 namespace reduce {

common/operations/UnidirectionalSequenceLSTM.cpp

diff --git a/common/operations/UnidirectionalSequenceLSTM.cpp b/common/operations/UnidirectionalSequenceLSTM.cpp
index 7d34023..0e639a3 100644
--- a/common/operations/UnidirectionalSequenceLSTM.cpp
+++ b/common/operations/UnidirectionalSequenceLSTM.cpp
@@ -19,11 +19,12 @@
 #include <vector>
 
 #include "IndexedShapeWrapper.h"
+#include "OperationResolver.h"
+#include "OperationsUtils.h"
+
 #ifndef NN_COMPATIBILITY_LIBRARY_BUILD
 #include "LSTM.h"
 #endif  // NN_COMPATIBILITY_LIBRARY_BUILD
-#include "OperationResolver.h"
-#include "OperationsUtils.h"
 
 namespace android {
 namespace nn {