Adds LOG_TAG to cpp files not including it already
Adds missing LOG_TAG to non-test files.
Files under driver/cache/ have the LOG_TAG set at build time and
I didn't want to alter that. It could also have been an option
for all operations but that would have required some restructuring of
the build. Created issue b/136627182 to track this.
Bug: 131829301
Test: NeuralNetworksTest_static
Change-Id: I7f0f37401c8ad496074faa208021405b24daf855
Merged-In: I7f0f37401c8ad496074faa208021405b24daf855
(cherry picked from commit 0b7510811c3a5424282a49fa9051ca3f41aee22a)
diff --git a/common/TokenHasher.cpp b/common/TokenHasher.cpp
index 31c71d7..76df02a 100644
--- a/common/TokenHasher.cpp
+++ b/common/TokenHasher.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "TokenHasher"
+
#include "TokenHasher.h"
#include "NeuralNetworks.h"
diff --git a/common/operations/Activation.cpp b/common/operations/Activation.cpp
index 167bf30..31ce03c 100644
--- a/common/operations/Activation.cpp
+++ b/common/operations/Activation.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "ActivationFunctor.h"
#include "CpuOperationUtils.h"
#include "OperationResolver.h"
diff --git a/common/operations/BidirectionalSequenceLSTM.cpp b/common/operations/BidirectionalSequenceLSTM.cpp
index 78c1a21..c7391da 100644
--- a/common/operations/BidirectionalSequenceLSTM.cpp
+++ b/common/operations/BidirectionalSequenceLSTM.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "BidirectionalSequenceLSTM.h"
#include "CpuExecutor.h"
diff --git a/common/operations/Concatenation.cpp b/common/operations/Concatenation.cpp
index 89f4baa..04bb2e2 100644
--- a/common/operations/Concatenation.cpp
+++ b/common/operations/Concatenation.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "CpuOperationUtils.h"
#include "OperationResolver.h"
diff --git a/common/operations/Conv2D.cpp b/common/operations/Conv2D.cpp
index aa1bf43..0debed2 100644
--- a/common/operations/Conv2D.cpp
+++ b/common/operations/Conv2D.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "CpuOperationUtils.h"
#include "OperationResolver.h"
#include "Operations.h"
diff --git a/common/operations/DepthwiseConv2D.cpp b/common/operations/DepthwiseConv2D.cpp
index 1d9755f..e3aa17b 100644
--- a/common/operations/DepthwiseConv2D.cpp
+++ b/common/operations/DepthwiseConv2D.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "CpuOperationUtils.h"
#include "Operations.h"
diff --git a/common/operations/EmbeddingLookup.cpp b/common/operations/EmbeddingLookup.cpp
index c03c343..d705d95 100644
--- a/common/operations/EmbeddingLookup.cpp
+++ b/common/operations/EmbeddingLookup.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "EmbeddingLookup.h"
#include "CpuExecutor.h"
diff --git a/common/operations/FullyConnected.cpp b/common/operations/FullyConnected.cpp
index 1a5f685..509a70e 100644
--- a/common/operations/FullyConnected.cpp
+++ b/common/operations/FullyConnected.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "CpuOperationUtils.h"
#include "OperationResolver.h"
diff --git a/common/operations/GenerateProposals.cpp b/common/operations/GenerateProposals.cpp
index 9b0df04..fd28a74 100644
--- a/common/operations/GenerateProposals.cpp
+++ b/common/operations/GenerateProposals.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "CpuOperationUtils.h"
#include "OperationResolver.h"
#include "OperationsUtils.h"
diff --git a/common/operations/GroupedConv2D.cpp b/common/operations/GroupedConv2D.cpp
index 8918000..f46d0d8 100644
--- a/common/operations/GroupedConv2D.cpp
+++ b/common/operations/GroupedConv2D.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "CpuOperationUtils.h"
#include "Operations.h"
#include "Tracing.h"
diff --git a/common/operations/HashtableLookup.cpp b/common/operations/HashtableLookup.cpp
index f8ee5f6..d718e8c 100644
--- a/common/operations/HashtableLookup.cpp
+++ b/common/operations/HashtableLookup.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "HashtableLookup.h"
#include "CpuExecutor.h"
diff --git a/common/operations/HeatmapMaxKeypoint.cpp b/common/operations/HeatmapMaxKeypoint.cpp
index 0e3e976..65a4afa 100644
--- a/common/operations/HeatmapMaxKeypoint.cpp
+++ b/common/operations/HeatmapMaxKeypoint.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "CpuOperationUtils.h"
#include "OperationResolver.h"
#include "OperationsUtils.h"
diff --git a/common/operations/L2Normalization.cpp b/common/operations/L2Normalization.cpp
index de730ab..566dace 100644
--- a/common/operations/L2Normalization.cpp
+++ b/common/operations/L2Normalization.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "CpuOperationUtils.h"
#include "OperationResolver.h"
diff --git a/common/operations/LSHProjection.cpp b/common/operations/LSHProjection.cpp
index 046c328..742e887 100644
--- a/common/operations/LSHProjection.cpp
+++ b/common/operations/LSHProjection.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "LSHProjection.h"
#include "CpuExecutor.h"
diff --git a/common/operations/LSTM.cpp b/common/operations/LSTM.cpp
index b219e75..a772274 100644
--- a/common/operations/LSTM.cpp
+++ b/common/operations/LSTM.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "LSTM.h"
#include "CpuExecutor.h"
diff --git a/common/operations/Multinomial.cpp b/common/operations/Multinomial.cpp
index 65801b0..797063d 100644
--- a/common/operations/Multinomial.cpp
+++ b/common/operations/Multinomial.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "Multinomial.h"
#include "CpuExecutor.h"
diff --git a/common/operations/Normalization.cpp b/common/operations/Normalization.cpp
index c7beeff..d6c428a 100644
--- a/common/operations/Normalization.cpp
+++ b/common/operations/Normalization.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "CpuOperationUtils.h"
#include "Operations.h"
#include "Tracing.h"
diff --git a/common/operations/Pooling.cpp b/common/operations/Pooling.cpp
index 20258a9..3e3b781 100644
--- a/common/operations/Pooling.cpp
+++ b/common/operations/Pooling.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "CpuOperationUtils.h"
#include "OperationResolver.h"
diff --git a/common/operations/QuantizedLSTM.cpp b/common/operations/QuantizedLSTM.cpp
index 60b24be..62060f9 100644
--- a/common/operations/QuantizedLSTM.cpp
+++ b/common/operations/QuantizedLSTM.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "QuantizedLSTM.h"
#include "CpuExecutor.h"
diff --git a/common/operations/RNN.cpp b/common/operations/RNN.cpp
index 64cc583..2394961 100644
--- a/common/operations/RNN.cpp
+++ b/common/operations/RNN.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "RNN.h"
#include "CpuExecutor.h"
diff --git a/common/operations/RoiAlign.cpp b/common/operations/RoiAlign.cpp
index 1be8036..ddf7b8e 100644
--- a/common/operations/RoiAlign.cpp
+++ b/common/operations/RoiAlign.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "CpuOperationUtils.h"
#include "OperationResolver.h"
#include "OperationsUtils.h"
diff --git a/common/operations/RoiPooling.cpp b/common/operations/RoiPooling.cpp
index 37914fd..bfcf78b 100644
--- a/common/operations/RoiPooling.cpp
+++ b/common/operations/RoiPooling.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "CpuOperationUtils.h"
#include "OperationResolver.h"
#include "OperationsUtils.h"
diff --git a/common/operations/SVDF.cpp b/common/operations/SVDF.cpp
index ac3ce35..669e92e 100644
--- a/common/operations/SVDF.cpp
+++ b/common/operations/SVDF.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "SVDF.h"
#include "CpuExecutor.h"
diff --git a/common/operations/Slice.cpp b/common/operations/Slice.cpp
index 67663f4..4ecfcb5 100644
--- a/common/operations/Slice.cpp
+++ b/common/operations/Slice.cpp
@@ -13,6 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+#define LOG_TAG "Operations"
+
#include "CpuOperationUtils.h"
#include "IndexedShapeWrapper.h"
#include "OperationResolver.h"
diff --git a/common/operations/Softmax.cpp b/common/operations/Softmax.cpp
index 87e7ffb..209f60e 100644
--- a/common/operations/Softmax.cpp
+++ b/common/operations/Softmax.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "CpuOperationUtils.h"
#include "OperationResolver.h"
diff --git a/common/operations/TopK_V2.cpp b/common/operations/TopK_V2.cpp
index 95b4ae1..5d377c0 100644
--- a/common/operations/TopK_V2.cpp
+++ b/common/operations/TopK_V2.cpp
@@ -13,6 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+#define LOG_TAG "Operations"
+
#include "TopK_V2.h"
#include "OperationsUtils.h"
diff --git a/common/operations/Transpose.cpp b/common/operations/Transpose.cpp
index 13eba21..e72eb10 100644
--- a/common/operations/Transpose.cpp
+++ b/common/operations/Transpose.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "CpuOperationUtils.h"
#include "OperationResolver.h"
diff --git a/common/operations/TransposeConv2D.cpp b/common/operations/TransposeConv2D.cpp
index 530dcbf..e6ec1a6 100644
--- a/common/operations/TransposeConv2D.cpp
+++ b/common/operations/TransposeConv2D.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Operations"
+
#include "CpuOperationUtils.h"
#include "OperationResolver.h"
#include "Tracing.h"
diff --git a/common/random/Android.bp b/common/random/Android.bp
index 8d660f6..0b8a240 100644
--- a/common/random/Android.bp
+++ b/common/random/Android.bp
@@ -34,6 +34,7 @@
cflags: [
"-Wno-unused-parameter",
"-Wno-invalid-partial-specialization",
+ "-DLOG_TAG=\"Random\"",
],
header_libs: [
"libeigen",
diff --git a/runtime/Callbacks.cpp b/runtime/Callbacks.cpp
index 660def7..4fd4f0b 100644
--- a/runtime/Callbacks.cpp
+++ b/runtime/Callbacks.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "Callbacks"
+
#include "Callbacks.h"
#include <android-base/logging.h>
diff --git a/runtime/VersionedInterfaces.cpp b/runtime/VersionedInterfaces.cpp
index 0a35958..a07d0b1 100644
--- a/runtime/VersionedInterfaces.cpp
+++ b/runtime/VersionedInterfaces.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "VersionedInterfaces"
+
#include "VersionedInterfaces.h"
#include "Callbacks.h"
diff --git a/tools/ion_watcher/ion_watcher.cpp b/tools/ion_watcher/ion_watcher.cpp
index b8510a7..0061086 100644
--- a/tools/ion_watcher/ion_watcher.cpp
+++ b/tools/ion_watcher/ion_watcher.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "IonWatcher"
+
#include <fstream>
#include <iostream>
#include <sstream>
