Rationalize names of #include guard symbols.
Pattern: FRAMEWORKS_ML_${RELPATH}_H, where ${RELPATH} is relative to
frameworks/ml, with "include" path component (if any) removed,
everything in caps, and word breaks indicated by underscores (rather
than by upper case). This is derived from our current practices in frameworks/ml.
Generate name: FRAMEWORKS_ML_$(echo ${RELPATH} | sed -e 's!/include!!g' -e 's![/.]!_!g' -e 's!\([^_A-Z]\)\([A-Z]\)!\1_\2!g' | awk '{ print toupper($1); }')
Bug: 129138718
Test: cd frameworks/ml ; mma
Change-Id: I06f06b6e38f5d263657f4116e5f43b6bb59d036a
diff --git a/common/include/ActivationFunctor.h b/common/include/ActivationFunctor.h
index ed9ef93..14eb5a0 100644
--- a/common/include/ActivationFunctor.h
+++ b/common/include/ActivationFunctor.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_ACTIVATION_FUNCTOR_H
-#define ANDROID_ML_NN_ACTIVATION_FUNCTOR_H
+#ifndef FRAMEWORKS_ML_COMMON_ACTIVATION_FUNCTOR_H
+#define FRAMEWORKS_ML_COMMON_ACTIVATION_FUNCTOR_H
#include "android/log.h"
@@ -60,4 +60,4 @@
ActivationFn act_;
};
-#endif // ANDROID_ML_NN_ACTIVATION_FUNCTOR_H
+#endif // FRAMEWORKS_ML_COMMON_ACTIVATION_FUNCTOR_H
diff --git a/common/include/CpuExecutor.h b/common/include/CpuExecutor.h
index e6c765e..d3d7948 100644
--- a/common/include/CpuExecutor.h
+++ b/common/include/CpuExecutor.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_COMMON_CPU_EXECUTOR_H
-#define ANDROID_ML_NN_COMMON_CPU_EXECUTOR_H
+#ifndef FRAMEWORKS_ML_COMMON_CPU_EXECUTOR_H
+#define FRAMEWORKS_ML_COMMON_CPU_EXECUTOR_H
#include "HalInterfaces.h"
#include "OperationResolver.h"
@@ -275,4 +275,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_COMMON_CPU_EXECUTOR_H
+#endif // FRAMEWORKS_ML_COMMON_CPU_EXECUTOR_H
diff --git a/common/include/CpuOperationUtils.h b/common/include/CpuOperationUtils.h
index c0dd00c..2590e75 100644
--- a/common/include/CpuOperationUtils.h
+++ b/common/include/CpuOperationUtils.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_COMMON_CPU_OPERATION_UTILS_H
-#define ANDROID_ML_NN_COMMON_CPU_OPERATION_UTILS_H
+#ifndef FRAMEWORKS_ML_COMMON_CPU_OPERATION_UTILS_H
+#define FRAMEWORKS_ML_COMMON_CPU_OPERATION_UTILS_H
#include "OperationsUtils.h"
@@ -195,4 +195,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_COMMON_CPU_OPERATION_UTILS_H
+#endif // FRAMEWORKS_ML_COMMON_CPU_OPERATION_UTILS_H
diff --git a/common/include/ExecutionBurstController.h b/common/include/ExecutionBurstController.h
index 030ea4d..5e32726 100644
--- a/common/include/ExecutionBurstController.h
+++ b/common/include/ExecutionBurstController.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_RUNTIME_EXECUTION_BURST_CONTROLLER_H
-#define ANDROID_ML_NN_RUNTIME_EXECUTION_BURST_CONTROLLER_H
+#ifndef FRAMEWORKS_ML_COMMON_EXECUTION_BURST_CONTROLLER_H
+#define FRAMEWORKS_ML_COMMON_EXECUTION_BURST_CONTROLLER_H
#include "HalInterfaces.h"
@@ -332,4 +332,4 @@
} // namespace android::nn
-#endif // ANDROID_ML_NN_RUNTIME_EXECUTION_BURST_CONTROLLER_H
+#endif // FRAMEWORKS_ML_COMMON_EXECUTION_BURST_CONTROLLER_H
diff --git a/common/include/ExecutionBurstServer.h b/common/include/ExecutionBurstServer.h
index f2a9843..aeab862 100644
--- a/common/include/ExecutionBurstServer.h
+++ b/common/include/ExecutionBurstServer.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_COMMON_EXECUTION_BURST_SERVER_H
-#define ANDROID_ML_NN_COMMON_EXECUTION_BURST_SERVER_H
+#ifndef FRAMEWORKS_ML_COMMON_EXECUTION_BURST_SERVER_H
+#define FRAMEWORKS_ML_COMMON_EXECUTION_BURST_SERVER_H
#include "HalInterfaces.h"
@@ -308,4 +308,4 @@
} // namespace android::nn
-#endif // ANDROID_ML_NN_COMMON_EXECUTION_BURST_SERVER_H
+#endif // FRAMEWORKS_ML_COMMON_EXECUTION_BURST_SERVER_H
diff --git a/common/include/GraphDump.h b/common/include/GraphDump.h
index 1e749c7..329b773 100644
--- a/common/include/GraphDump.h
+++ b/common/include/GraphDump.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_COMMON_GRAPH_DUMP_H
-#define ANDROID_ML_NN_COMMON_GRAPH_DUMP_H
+#ifndef FRAMEWORKS_ML_COMMON_GRAPH_DUMP_H
+#define FRAMEWORKS_ML_COMMON_GRAPH_DUMP_H
#include <android/hardware/neuralnetworks/1.2/types.h>
@@ -52,4 +52,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_COMMON_GRAPH_DUMP_H
+#endif // FRAMEWORKS_ML_COMMON_GRAPH_DUMP_H
diff --git a/common/include/HalInterfaces.h b/common/include/HalInterfaces.h
index f4c476c..9040cc4 100644
--- a/common/include/HalInterfaces.h
+++ b/common/include/HalInterfaces.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_COMMON_HAL_INTERFACES_H
-#define ANDROID_ML_NN_COMMON_HAL_INTERFACES_H
+#ifndef FRAMEWORKS_ML_COMMON_HAL_INTERFACES_H
+#define FRAMEWORKS_ML_COMMON_HAL_INTERFACES_H
#include <android/hardware/neuralnetworks/1.0/IDevice.h>
#include <android/hardware/neuralnetworks/1.0/IExecutionCallback.h>
@@ -86,4 +86,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_COMMON_HAL_INTERFACES_H
+#endif // FRAMEWORKS_ML_COMMON_HAL_INTERFACES_H
diff --git a/common/include/IndexedShapeWrapper.h b/common/include/IndexedShapeWrapper.h
index 8ae53cc..c73a38c 100644
--- a/common/include/IndexedShapeWrapper.h
+++ b/common/include/IndexedShapeWrapper.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FRAMEWORKS_ML_NN_INDEXED_SHAPE_WRAPPER_H
-#define FRAMEWORKS_ML_NN_INDEXED_SHAPE_WRAPPER_H
+#ifndef FRAMEWORKS_ML_COMMON_INDEXED_SHAPE_WRAPPER_H
+#define FRAMEWORKS_ML_COMMON_INDEXED_SHAPE_WRAPPER_H
#include "OperationsUtils.h"
@@ -62,4 +62,4 @@
} // namespace nn
} // namespace android
-#endif // FRAMEWORKS_ML_NN_INDEXED_SHAPE_WRAPPER_H
+#endif // FRAMEWORKS_ML_COMMON_INDEXED_SHAPE_WRAPPER_H
diff --git a/common/include/OperationResolver.h b/common/include/OperationResolver.h
index 9bac989..c10427f 100644
--- a/common/include/OperationResolver.h
+++ b/common/include/OperationResolver.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_COMMON_OPERATION_RESOLVER_H
-#define ANDROID_ML_NN_COMMON_OPERATION_RESOLVER_H
+#ifndef FRAMEWORKS_ML_COMMON_OPERATION_RESOLVER_H
+#define FRAMEWORKS_ML_COMMON_OPERATION_RESOLVER_H
#include "HalInterfaces.h"
#include "OperationsUtils.h"
@@ -138,4 +138,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_COMMON_OPERATION_RESOLVER_H
+#endif // FRAMEWORKS_ML_COMMON_OPERATION_RESOLVER_H
diff --git a/common/include/Operations.h b/common/include/Operations.h
index ce3c7ef..b8e3a1d 100644
--- a/common/include/Operations.h
+++ b/common/include/Operations.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_COMMON_OPERATIONS_H
-#define ANDROID_ML_NN_COMMON_OPERATIONS_H
+#ifndef FRAMEWORKS_ML_COMMON_OPERATIONS_H
+#define FRAMEWORKS_ML_COMMON_OPERATIONS_H
#include "operations/BidirectionalSequenceLSTM.h"
#include "operations/Cast.h"
@@ -171,4 +171,4 @@
int32_t axis, uint8_t* outputData, const Shape& outputShape);
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_COMMON_OPERATIONS_H
+#endif // FRAMEWORKS_ML_COMMON_OPERATIONS_H
diff --git a/common/include/OperationsUtils.h b/common/include/OperationsUtils.h
index 879fbcc..b899fe5 100644
--- a/common/include/OperationsUtils.h
+++ b/common/include/OperationsUtils.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_COMMON_OPERATIONS_UTILS_H
-#define ANDROID_ML_NN_COMMON_OPERATIONS_UTILS_H
+#ifndef FRAMEWORKS_ML_COMMON_OPERATIONS_UTILS_H
+#define FRAMEWORKS_ML_COMMON_OPERATIONS_UTILS_H
#include "Utils.h"
@@ -431,4 +431,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_COMMON_OPERATIONS_UTILS_H
+#endif // FRAMEWORKS_ML_COMMON_OPERATIONS_UTILS_H
diff --git a/common/include/TokenHasher.h b/common/include/TokenHasher.h
index 2f06fa5..26ed4f3 100644
--- a/common/include/TokenHasher.h
+++ b/common/include/TokenHasher.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_COMMON_TOKEN_HASHER_H
-#define ANDROID_ML_NN_COMMON_TOKEN_HASHER_H
+#ifndef FRAMEWORKS_ML_COMMON_TOKEN_HASHER_H
+#define FRAMEWORKS_ML_COMMON_TOKEN_HASHER_H
#include <cstring>
#include <vector>
@@ -68,4 +68,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_COMMON_TOKEN_HASHER_H
+#endif // FRAMEWORKS_ML_COMMON_TOKEN_HASHER_H
diff --git a/common/include/Tracing.h b/common/include/Tracing.h
index 5251f94..e50263c 100644
--- a/common/include/Tracing.h
+++ b/common/include/Tracing.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_COMMON_TRACING_H
-#define ANDROID_ML_NN_COMMON_TRACING_H
+#ifndef FRAMEWORKS_ML_COMMON_TRACING_H
+#define FRAMEWORKS_ML_COMMON_TRACING_H
#define ATRACE_TAG ATRACE_TAG_NNAPI
#include "utils/Trace.h"
@@ -171,4 +171,4 @@
#undef ATRACE_NAME
#undef ATRACE_CALL
-#endif // ANDROID_ML_NN_COMMON_TRACING_H
+#endif // FRAMEWORKS_ML_COMMON_TRACING_H
diff --git a/common/include/Utils.h b/common/include/Utils.h
index bf6cffd..d4c26ae 100644
--- a/common/include/Utils.h
+++ b/common/include/Utils.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_COMMON_UTILS_H
-#define ANDROID_ML_NN_COMMON_UTILS_H
+#ifndef FRAMEWORKS_ML_COMMON_UTILS_H
+#define FRAMEWORKS_ML_COMMON_UTILS_H
#include "HalInterfaces.h"
#include "NeuralNetworks.h"
@@ -412,4 +412,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_COMMON_UTILS_H
+#endif // FRAMEWORKS_ML_COMMON_UTILS_H
diff --git a/common/include/ValidateHal.h b/common/include/ValidateHal.h
index 4275a24..3bb641c 100644
--- a/common/include/ValidateHal.h
+++ b/common/include/ValidateHal.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_COMMON_VALIDATEHAL_H
-#define ANDROID_ML_NN_COMMON_VALIDATEHAL_H
+#ifndef FRAMEWORKS_ML_COMMON_VALIDATE_HAL_H
+#define FRAMEWORKS_ML_COMMON_VALIDATE_HAL_H
#include "HalInterfaces.h"
@@ -62,4 +62,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_COMMON_VALIDATEHAL_H
+#endif // FRAMEWORKS_ML_COMMON_VALIDATE_HAL_H
diff --git a/common/operations/BidirectionalSequenceLSTM.h b/common/operations/BidirectionalSequenceLSTM.h
index 3987c23..9f0067a 100644
--- a/common/operations/BidirectionalSequenceLSTM.h
+++ b/common/operations/BidirectionalSequenceLSTM.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FRAMEWORKS_ML_NN_BIDIRECTIONAL_SEQUENCE_LSTM_H
-#define FRAMEWORKS_ML_NN_BIDIRECTIONAL_SEQUENCE_LSTM_H
+#ifndef FRAMEWORKS_ML_COMMON_OPERATIONS_BIDIRECTIONAL_SEQUENCE_LSTM_H
+#define FRAMEWORKS_ML_COMMON_OPERATIONS_BIDIRECTIONAL_SEQUENCE_LSTM_H
#include "ActivationFunctor.h"
#include "HalOperation.h"
@@ -231,4 +231,4 @@
} // namespace nn
} // namespace android
-#endif // FRAMEWORKS_ML_NN_BIDIRECTIONAL_SEQUENCE_LSTM_H
+#endif // FRAMEWORKS_ML_COMMON_OPERATIONS_BIDIRECTIONAL_SEQUENCE_LSTM_H
diff --git a/common/operations/Cast.h b/common/operations/Cast.h
index 47fe87c..4a846ec 100644
--- a/common/operations/Cast.h
+++ b/common/operations/Cast.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FRAMEWORKS_ML_NN_CAST_H
-#define FRAMEWORKS_ML_NN_CAST_H
+#ifndef FRAMEWORKS_ML_COMMON_OPERATIONS_CAST_H
+#define FRAMEWORKS_ML_COMMON_OPERATIONS_CAST_H
#include "CpuOperationUtils.h"
@@ -32,4 +32,4 @@
} // namespace nn
} // namespace android
-#endif // FRAMEWORKS_ML_NN_CAST_H
+#endif // FRAMEWORKS_ML_COMMON_OPERATIONS_CAST_H
diff --git a/common/operations/EmbeddingLookup.h b/common/operations/EmbeddingLookup.h
index 9ef6822..cc7cecc 100644
--- a/common/operations/EmbeddingLookup.h
+++ b/common/operations/EmbeddingLookup.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FRAMEWORKS_ML_NN_EMBEDDING_LOOKUP_H
-#define FRAMEWORKS_ML_NN_EMBEDDING_LOOKUP_H
+#ifndef FRAMEWORKS_ML_COMMON_OPERATIONS_EMBEDDING_LOOKUP_H
+#define FRAMEWORKS_ML_COMMON_OPERATIONS_EMBEDDING_LOOKUP_H
#include "HalOperation.h"
@@ -49,4 +49,4 @@
} // namespace nn
} // namespace android
-#endif // FRAMEWORKS_ML_NN_EMBEDDING_LOOKUP_H
+#endif // FRAMEWORKS_ML_COMMON_OPERATIONS_EMBEDDING_LOOKUP_H
diff --git a/common/operations/ExpandDims.h b/common/operations/ExpandDims.h
index 9200ca9..a544ada 100644
--- a/common/operations/ExpandDims.h
+++ b/common/operations/ExpandDims.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FRAMEWORKS_ML_NN_EXPAND_DIMS_H
-#define FRAMEWORKS_ML_NN_EXPAND_DIMS_H
+#ifndef FRAMEWORKS_ML_COMMON_OPERATIONS_EXPAND_DIMS_H
+#define FRAMEWORKS_ML_COMMON_OPERATIONS_EXPAND_DIMS_H
#include "CpuOperationUtils.h"
@@ -32,4 +32,4 @@
} // namespace nn
} // namespace android
-#endif // FRAMEWORKS_ML_NN_EXPAND_DIMS_H
+#endif // FRAMEWORKS_ML_COMMON_OPERATIONS_EXPAND_DIMS_H
diff --git a/common/operations/HalOperation.h b/common/operations/HalOperation.h
index 001e937..f74fce6 100644
--- a/common/operations/HalOperation.h
+++ b/common/operations/HalOperation.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FRAMEWORKS_ML_NN_HAL_OPERATION_H
-#define FRAMEWORKS_ML_NN_HAL_OPERATION_H
+#ifndef FRAMEWORKS_ML_COMMON_OPERATIONS_HAL_OPERATION_H
+#define FRAMEWORKS_ML_COMMON_OPERATIONS_HAL_OPERATION_H
namespace android {
namespace hardware {
@@ -34,4 +34,4 @@
using ::android::hardware::neuralnetworks::V1_2::Operation;
-#endif // FRAMEWORKS_ML_NN_HAL_OPERATION_H
+#endif // FRAMEWORKS_ML_COMMON_OPERATIONS_HAL_OPERATION_H
diff --git a/common/operations/HashtableLookup.h b/common/operations/HashtableLookup.h
index 3cf28aa..3f84905 100644
--- a/common/operations/HashtableLookup.h
+++ b/common/operations/HashtableLookup.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FRAMEWORKS_ML_NN_HASHTABLE_LOOKUP_H
-#define FRAMEWORKS_ML_NN_HASHTABLE_LOOKUP_H
+#ifndef FRAMEWORKS_ML_COMMON_OPERATIONS_HASHTABLE_LOOKUP_H
+#define FRAMEWORKS_ML_COMMON_OPERATIONS_HASHTABLE_LOOKUP_H
#include "HalOperation.h"
@@ -53,4 +53,4 @@
} // namespace nn
} // namespace android
-#endif // FRAMEWORKS_ML_NN_HASHTABLE_LOOKUP_H
+#endif // FRAMEWORKS_ML_COMMON_OPERATIONS_HASHTABLE_LOOKUP_H
diff --git a/common/operations/LSHProjection.h b/common/operations/LSHProjection.h
index 7a25518..2ebf916 100644
--- a/common/operations/LSHProjection.h
+++ b/common/operations/LSHProjection.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FRAMEWORKS_ML_NN_LSH_PROJECTION_H
-#define FRAMEWORKS_ML_NN_LSH_PROJECTION_H
+#ifndef FRAMEWORKS_ML_COMMON_OPERATIONS_LSHPROJECTION_H
+#define FRAMEWORKS_ML_COMMON_OPERATIONS_LSHPROJECTION_H
#include "HalOperation.h"
@@ -76,4 +76,4 @@
} // namespace nn
} // namespace android
-#endif // FRAMEWORKS_ML_NN_LSH_PROJECTION_H
+#endif // FRAMEWORKS_ML_COMMON_OPERATIONS_LSHPROJECTION_H
diff --git a/common/operations/LSTM.h b/common/operations/LSTM.h
index 58b5099..11094e9 100644
--- a/common/operations/LSTM.h
+++ b/common/operations/LSTM.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FRAMEWORKS_ML_NN_LSTMCELL_H
-#define FRAMEWORKS_ML_NN_LSTMCELL_H
+#ifndef FRAMEWORKS_ML_COMMON_OPERATIONS_LSTM_H
+#define FRAMEWORKS_ML_COMMON_OPERATIONS_LSTM_H
#include "ActivationFunctor.h"
#include "HalOperation.h"
@@ -246,4 +246,4 @@
} // namespace nn
} // namespace android
-#endif // FRAMEWORKS_ML_NN_LSTMCELL_H
+#endif // FRAMEWORKS_ML_COMMON_OPERATIONS_LSTM_H
diff --git a/common/operations/MaximumMinimum.h b/common/operations/MaximumMinimum.h
index 8ef7ccd..4e65ccf 100644
--- a/common/operations/MaximumMinimum.h
+++ b/common/operations/MaximumMinimum.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FRAMEWORKS_ML_NN_MAXIMUM_MINIMUM_H
-#define FRAMEWORKS_ML_NN_MAXIMUM_MINIMUM_H
+#ifndef FRAMEWORKS_ML_COMMON_OPERATIONS_MAXIMUM_MINIMUM_H
+#define FRAMEWORKS_ML_COMMON_OPERATIONS_MAXIMUM_MINIMUM_H
#include "CpuOperationUtils.h"
@@ -32,4 +32,4 @@
} // namespace nn
} // namespace android
-#endif // FRAMEWORKS_ML_NN_MAXIMUM_MINIMUM_H
+#endif // FRAMEWORKS_ML_COMMON_OPERATIONS_MAXIMUM_MINIMUM_H
diff --git a/common/operations/Multinomial.h b/common/operations/Multinomial.h
index 6e80fc5..6067d3d 100644
--- a/common/operations/Multinomial.h
+++ b/common/operations/Multinomial.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FRAMEWORKS_ML_NN_MULTINOMIAL_H
-#define FRAMEWORKS_ML_NN_MULTINOMIAL_H
+#ifndef FRAMEWORKS_ML_COMMON_OPERATIONS_MULTINOMIAL_H
+#define FRAMEWORKS_ML_COMMON_OPERATIONS_MULTINOMIAL_H
#include "HalOperation.h"
@@ -58,4 +58,4 @@
} // namespace nn
} // namespace android
-#endif // FRAMEWORKS_ML_NN_MULTINOMIAL_H
+#endif // FRAMEWORKS_ML_COMMON_OPERATIONS_MULTINOMIAL_H
diff --git a/common/operations/Pow.h b/common/operations/Pow.h
index 6830992..a0a43ca 100644
--- a/common/operations/Pow.h
+++ b/common/operations/Pow.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FRAMEWORKS_ML_NN_POW_H
-#define FRAMEWORKS_ML_NN_POW_H
+#ifndef FRAMEWORKS_ML_COMMON_OPERATIONS_POW_H
+#define FRAMEWORKS_ML_COMMON_OPERATIONS_POW_H
#include "CpuOperationUtils.h"
@@ -32,4 +32,4 @@
} // namespace nn
} // namespace android
-#endif // FRAMEWORKS_ML_NN_POW_H
+#endif // FRAMEWORKS_ML_COMMON_OPERATIONS_POW_H
diff --git a/common/operations/QuantizedLSTM.h b/common/operations/QuantizedLSTM.h
index 11dc02b..9ea479f 100644
--- a/common/operations/QuantizedLSTM.h
+++ b/common/operations/QuantizedLSTM.h
@@ -1,5 +1,5 @@
-#ifndef FRAMEWORKS_ML_NN_QUANTIZEDLSTM_H
-#define FRAMEWORKS_ML_NN_QUANTIZEDLSTM_H
+#ifndef FRAMEWORKS_ML_COMMON_OPERATIONS_QUANTIZED_LSTM_H
+#define FRAMEWORKS_ML_COMMON_OPERATIONS_QUANTIZED_LSTM_H
#include "HalOperation.h"
#include "OperationsUtils.h"
@@ -79,4 +79,4 @@
} // namespace nn
} // namespace android
-#endif // FRAMEWORKS_ML_NN_QUANTIZEDLSTM_H
+#endif // FRAMEWORKS_ML_COMMON_OPERATIONS_QUANTIZED_LSTM_H
diff --git a/common/operations/RNN.h b/common/operations/RNN.h
index b21cacc..b09f185 100644
--- a/common/operations/RNN.h
+++ b/common/operations/RNN.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FRAMEWORKS_ML_NN_RNN_H
-#define FRAMEWORKS_ML_NN_RNN_H
+#ifndef FRAMEWORKS_ML_COMMON_OPERATIONS_RNN_H
+#define FRAMEWORKS_ML_COMMON_OPERATIONS_RNN_H
#include "ActivationFunctor.h"
#include "HalOperation.h"
@@ -75,4 +75,4 @@
} // namespace nn
} // namespace android
-#endif // FRAMEWORKS_ML_NN_RNN_H
+#endif // FRAMEWORKS_ML_COMMON_OPERATIONS_RNN_H
diff --git a/common/operations/SVDF.h b/common/operations/SVDF.h
index ed43dbf..ca5461b 100644
--- a/common/operations/SVDF.h
+++ b/common/operations/SVDF.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FRAMEWORKS_ML_NN_SVDF_H
-#define FRAMEWORKS_ML_NN_SVDF_H
+#ifndef FRAMEWORKS_ML_COMMON_OPERATIONS_SVDF_H
+#define FRAMEWORKS_ML_COMMON_OPERATIONS_SVDF_H
#include "HalOperation.h"
#include "tensorflow/lite/kernels/internal/tensor_utils.h"
diff --git a/common/operations/Tile.h b/common/operations/Tile.h
index 9ba70a6..0e85426 100644
--- a/common/operations/Tile.h
+++ b/common/operations/Tile.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_TILE_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_TILE_H
+#ifndef FRAMEWORKS_ML_COMMON_OPERATIONS_TILE_H
+#define FRAMEWORKS_ML_COMMON_OPERATIONS_TILE_H
#include "CpuOperationUtils.h"
@@ -33,4 +33,4 @@
} // namespace nn
} // namespace android
-#endif // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_TILE_H
+#endif // FRAMEWORKS_ML_COMMON_OPERATIONS_TILE_H
diff --git a/common/operations/TopK_V2.h b/common/operations/TopK_V2.h
index daad30e..db2a443 100644
--- a/common/operations/TopK_V2.h
+++ b/common/operations/TopK_V2.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FRAMEWORKS_ML_NN_TOPK_V2_H
-#define FRAMEWORKS_ML_NN_TOPK_V2_H
+#ifndef FRAMEWORKS_ML_COMMON_OPERATIONS_TOP_K_V2_H
+#define FRAMEWORKS_ML_COMMON_OPERATIONS_TOP_K_V2_H
#include "CpuOperationUtils.h"
@@ -32,4 +32,4 @@
} // namespace nn
} // namespace android
-#endif // FRAMEWORKS_ML_NN_TOPK_V2_H
+#endif // FRAMEWORKS_ML_COMMON_OPERATIONS_TOP_K_V2_H
diff --git a/driver/cache/BlobCache/BlobCache.h b/driver/cache/BlobCache/BlobCache.h
index bd2800a..07be0cf 100644
--- a/driver/cache/BlobCache/BlobCache.h
+++ b/driver/cache/BlobCache/BlobCache.h
@@ -14,8 +14,8 @@
** limitations under the License.
*/
-#ifndef ANDROID_BLOB_CACHE_H
-#define ANDROID_BLOB_CACHE_H
+#ifndef FRAMEWORKS_ML_DRIVER_CACHE_BLOB_CACHE_BLOB_CACHE_H
+#define FRAMEWORKS_ML_DRIVER_CACHE_BLOB_CACHE_BLOB_CACHE_H
#include <stddef.h>
@@ -351,4 +351,4 @@
}
-#endif // ANDROID_BLOB_CACHE_H
+#endif // FRAMEWORKS_ML_DRIVER_CACHE_BLOB_CACHE_BLOB_CACHE_H
diff --git a/driver/cache/nnCache/nnCache.h b/driver/cache/nnCache/nnCache.h
index 0b2d983..2d58128 100644
--- a/driver/cache/nnCache/nnCache.h
+++ b/driver/cache/nnCache/nnCache.h
@@ -14,8 +14,8 @@
** limitations under the License.
*/
-#ifndef ANDROID_NN_CACHE_H
-#define ANDROID_NN_CACHE_H
+#ifndef FRAMEWORKS_ML_DRIVER_CACHE_NN_CACHE_NN_CACHE_H
+#define FRAMEWORKS_ML_DRIVER_CACHE_NN_CACHE_NN_CACHE_H
#include "BlobCache.h"
@@ -156,4 +156,4 @@
}; // namespace android
// ----------------------------------------------------------------------------
-#endif // ANDROID_NN_CACHE_H
+#endif // FRAMEWORKS_ML_DRIVER_CACHE_NN_CACHE_NN_CACHE_H
diff --git a/driver/sample/SampleDriver.h b/driver/sample/SampleDriver.h
index 24a2bf6..47572e8 100644
--- a/driver/sample/SampleDriver.h
+++ b/driver/sample/SampleDriver.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_SAMPLE_DRIVER_SAMPLE_DRIVER_H
-#define ANDROID_ML_NN_SAMPLE_DRIVER_SAMPLE_DRIVER_H
+#ifndef FRAMEWORKS_ML_DRIVER_SAMPLE_SAMPLE_DRIVER_H
+#define FRAMEWORKS_ML_DRIVER_SAMPLE_SAMPLE_DRIVER_H
#include "CpuExecutor.h"
#include "HalInterfaces.h"
@@ -106,4 +106,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_SAMPLE_DRIVER_SAMPLE_DRIVER_H
+#endif // FRAMEWORKS_ML_DRIVER_SAMPLE_SAMPLE_DRIVER_H
diff --git a/driver/sample/SampleDriverFull.h b/driver/sample/SampleDriverFull.h
index 5cfd051..fd71285 100644
--- a/driver/sample/SampleDriverFull.h
+++ b/driver/sample/SampleDriverFull.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_SAMPLE_DRIVER_SAMPLE_DRIVER_FULL_H
-#define ANDROID_ML_NN_SAMPLE_DRIVER_SAMPLE_DRIVER_FULL_H
+#ifndef FRAMEWORKS_ML_DRIVER_SAMPLE_SAMPLE_DRIVER_FULL_H
+#define FRAMEWORKS_ML_DRIVER_SAMPLE_SAMPLE_DRIVER_FULL_H
#include "SampleDriver.h"
@@ -38,4 +38,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_SAMPLE_DRIVER_SAMPLE_DRIVER_FULL_H
+#endif // FRAMEWORKS_ML_DRIVER_SAMPLE_SAMPLE_DRIVER_FULL_H
diff --git a/extensions/test_vendor/fibonacci/FibonacciExtension.h b/extensions/test_vendor/fibonacci/FibonacciExtension.h
index 3afd981..ad4d48d 100644
--- a/extensions/test_vendor/fibonacci/FibonacciExtension.h
+++ b/extensions/test_vendor/fibonacci/FibonacciExtension.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_FRAMEWORKS_ML_NN_EXTENSIONS_TEST_VENDOR_FIBONACCI_FIBONACCI_EXTENSION_H
-#define ANDROID_FRAMEWORKS_ML_NN_EXTENSIONS_TEST_VENDOR_FIBONACCI_FIBONACCI_EXTENSION_H
+#ifndef FRAMEWORKS_ML_EXTENSIONS_TEST_VENDOR_FIBONACCI_FIBONACCI_EXTENSION_H
+#define FRAMEWORKS_ML_EXTENSIONS_TEST_VENDOR_FIBONACCI_FIBONACCI_EXTENSION_H
/**
* A sample extension definition.
@@ -73,4 +73,4 @@
TEST_VENDOR_FIBONACCI = 0,
};
-#endif // ANDROID_FRAMEWORKS_ML_NN_EXTENSIONS_TEST_VENDOR_FIBONACCI_FIBONACCI_EXTENSION_H
+#endif // FRAMEWORKS_ML_EXTENSIONS_TEST_VENDOR_FIBONACCI_FIBONACCI_EXTENSION_H
diff --git a/runtime/BurstBuilder.h b/runtime/BurstBuilder.h
index 8f2982d..f8320af 100644
--- a/runtime/BurstBuilder.h
+++ b/runtime/BurstBuilder.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_RUNTIME_BURST_BUILDER_H
-#define ANDROID_ML_NN_RUNTIME_BURST_BUILDER_H
+#ifndef FRAMEWORKS_ML_RUNTIME_BURST_BUILDER_H
+#define FRAMEWORKS_ML_RUNTIME_BURST_BUILDER_H
#include <atomic>
#include <memory>
@@ -57,4 +57,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_RUNTIME_BURST_BUILDER_H
+#endif // FRAMEWORKS_ML_RUNTIME_BURST_BUILDER_H
diff --git a/runtime/Callbacks.h b/runtime/Callbacks.h
index 227e9ea..9ed8e65 100644
--- a/runtime/Callbacks.h
+++ b/runtime/Callbacks.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_RUNTIME_CALLBACKS_H
-#define ANDROID_ML_NN_RUNTIME_CALLBACKS_H
+#ifndef FRAMEWORKS_ML_RUNTIME_CALLBACKS_H
+#define FRAMEWORKS_ML_RUNTIME_CALLBACKS_H
#include <android-base/thread_annotations.h>
#include <android/hardware/neuralnetworks/1.0/IExecutionCallback.h>
@@ -383,4 +383,4 @@
} // namespace android::nn
-#endif // ANDROID_ML_NN_RUNTIME_CALLBACKS_H
+#endif // FRAMEWORKS_ML_RUNTIME_CALLBACKS_H
diff --git a/runtime/CompilationBuilder.h b/runtime/CompilationBuilder.h
index b0c4d86..7c418f3 100644
--- a/runtime/CompilationBuilder.h
+++ b/runtime/CompilationBuilder.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_RUNTIME_COMPILATION_BUILDER_H
-#define ANDROID_ML_NN_RUNTIME_COMPILATION_BUILDER_H
+#ifndef FRAMEWORKS_ML_RUNTIME_COMPILATION_BUILDER_H
+#define FRAMEWORKS_ML_RUNTIME_COMPILATION_BUILDER_H
#include "ExecutionPlan.h"
#include "NeuralNetworks.h"
@@ -91,4 +91,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_RUNTIME_COMPILATION_BUILDER_H
+#endif // FRAMEWORKS_ML_RUNTIME_COMPILATION_BUILDER_H
diff --git a/runtime/ExecutionBuilder.h b/runtime/ExecutionBuilder.h
index 3fa67f3..5aa9397 100644
--- a/runtime/ExecutionBuilder.h
+++ b/runtime/ExecutionBuilder.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_RUNTIME_EXECUTION_BUILDER_H
-#define ANDROID_ML_NN_RUNTIME_EXECUTION_BUILDER_H
+#ifndef FRAMEWORKS_ML_RUNTIME_EXECUTION_BUILDER_H
+#define FRAMEWORKS_ML_RUNTIME_EXECUTION_BUILDER_H
#include "Callbacks.h"
#include "HalInterfaces.h"
@@ -273,4 +273,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_RUNTIME_EXECUTION_BUILDER_H
+#endif // FRAMEWORKS_ML_RUNTIME_EXECUTION_BUILDER_H
diff --git a/runtime/ExecutionPlan.h b/runtime/ExecutionPlan.h
index 0b7335c..5b10fe1 100644
--- a/runtime/ExecutionPlan.h
+++ b/runtime/ExecutionPlan.h
@@ -16,8 +16,8 @@
// Classes used to plan how to execute a model across multiple devices.
-#ifndef ANDROID_ML_NN_RUNTIME_EXECUTION_PLAN_H
-#define ANDROID_ML_NN_RUNTIME_EXECUTION_PLAN_H
+#ifndef FRAMEWORKS_ML_RUNTIME_EXECUTION_PLAN_H
+#define FRAMEWORKS_ML_RUNTIME_EXECUTION_PLAN_H
#include "HalInterfaces.h"
#include "Memory.h"
@@ -340,4 +340,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_RUNTIME_EXECUTION_PLAN_H
+#endif // FRAMEWORKS_ML_RUNTIME_EXECUTION_PLAN_H
diff --git a/runtime/Manager.h b/runtime/Manager.h
index da686f6..dc84ef5 100644
--- a/runtime/Manager.h
+++ b/runtime/Manager.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_RUNTIME_MANAGER_H
-#define ANDROID_ML_NN_RUNTIME_MANAGER_H
+#ifndef FRAMEWORKS_ML_RUNTIME_MANAGER_H
+#define FRAMEWORKS_ML_RUNTIME_MANAGER_H
#include "HalInterfaces.h"
#include "Utils.h"
@@ -190,4 +190,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_RUNTIME_MANAGER_H
+#endif // FRAMEWORKS_ML_RUNTIME_MANAGER_H
diff --git a/runtime/Memory.h b/runtime/Memory.h
index 4ebfabf..3456774 100644
--- a/runtime/Memory.h
+++ b/runtime/Memory.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_RUNTIME_MEMORY_H
-#define ANDROID_ML_NN_RUNTIME_MEMORY_H
+#ifndef FRAMEWORKS_ML_RUNTIME_MEMORY_H
+#define FRAMEWORKS_ML_RUNTIME_MEMORY_H
#include "NeuralNetworks.h"
#include "Utils.h"
@@ -197,4 +197,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_RUNTIME_MEMORY_H
+#endif // FRAMEWORKS_ML_RUNTIME_MEMORY_H
diff --git a/runtime/ModelBuilder.h b/runtime/ModelBuilder.h
index 2b30442..1b86691 100644
--- a/runtime/ModelBuilder.h
+++ b/runtime/ModelBuilder.h
@@ -17,8 +17,8 @@
// Class used to build a model through a succession of successive calls
// to the NN API.
-#ifndef ANDROID_ML_NN_RUNTIME_MODEL_BUILDER_H
-#define ANDROID_ML_NN_RUNTIME_MODEL_BUILDER_H
+#ifndef FRAMEWORKS_ML_RUNTIME_MODEL_BUILDER_H
+#define FRAMEWORKS_ML_RUNTIME_MODEL_BUILDER_H
#include "HalInterfaces.h"
#include "Memory.h"
@@ -179,4 +179,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_RUNTIME_MODEL_BUILDER_H
+#endif // FRAMEWORKS_ML_RUNTIME_MODEL_BUILDER_H
diff --git a/runtime/TypeManager.h b/runtime/TypeManager.h
index 2b48141..5b9e477 100644
--- a/runtime/TypeManager.h
+++ b/runtime/TypeManager.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_RUNTIME_EXTENSION_MANAGER_H
-#define ANDROID_ML_NN_RUNTIME_EXTENSION_MANAGER_H
+#ifndef FRAMEWORKS_ML_RUNTIME_TYPE_MANAGER_H
+#define FRAMEWORKS_ML_RUNTIME_TYPE_MANAGER_H
#include "HalInterfaces.h"
#include "Manager.h"
@@ -160,4 +160,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_RUNTIME_EXTENSION_MANAGER_H
+#endif // FRAMEWORKS_ML_RUNTIME_TYPE_MANAGER_H
diff --git a/runtime/VersionedInterfaces.h b/runtime/VersionedInterfaces.h
index f0aaf6d..ec95b2b 100644
--- a/runtime/VersionedInterfaces.h
+++ b/runtime/VersionedInterfaces.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_RUNTIME_VERSIONED_INTERFACES_H
-#define ANDROID_ML_NN_RUNTIME_VERSIONED_INTERFACES_H
+#ifndef FRAMEWORKS_ML_RUNTIME_VERSIONED_INTERFACES_H
+#define FRAMEWORKS_ML_RUNTIME_VERSIONED_INTERFACES_H
#include "HalInterfaces.h"
@@ -798,4 +798,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_RUNTIME_VERSIONED_INTERFACES_H
+#endif // FRAMEWORKS_ML_RUNTIME_VERSIONED_INTERFACES_H
diff --git a/runtime/include/NeuralNetworks.h b/runtime/include/NeuralNetworks.h
index 0132277..6a7dce1 100644
--- a/runtime/include/NeuralNetworks.h
+++ b/runtime/include/NeuralNetworks.h
@@ -23,8 +23,8 @@
* @file NeuralNetworks.h
*/
-#ifndef ANDROID_ML_NN_RUNTIME_NEURAL_NETWORKS_H
-#define ANDROID_ML_NN_RUNTIME_NEURAL_NETWORKS_H
+#ifndef FRAMEWORKS_ML_RUNTIME_NEURAL_NETWORKS_H
+#define FRAMEWORKS_ML_RUNTIME_NEURAL_NETWORKS_H
/******************************************************************
*
@@ -6448,6 +6448,6 @@
__END_DECLS
-#endif // ANDROID_ML_NN_RUNTIME_NEURAL_NETWORKS_H
+#endif // FRAMEWORKS_ML_RUNTIME_NEURAL_NETWORKS_H
/** @} */
diff --git a/runtime/include/NeuralNetworksExtensions.h b/runtime/include/NeuralNetworksExtensions.h
index ca2e045..94aa082 100644
--- a/runtime/include/NeuralNetworksExtensions.h
+++ b/runtime/include/NeuralNetworksExtensions.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_RUNTIME_NEURAL_NETWORKS_EXTENSIONS_H
-#define ANDROID_ML_NN_RUNTIME_NEURAL_NETWORKS_EXTENSIONS_H
+#ifndef FRAMEWORKS_ML_RUNTIME_NEURAL_NETWORKS_EXTENSIONS_H
+#define FRAMEWORKS_ML_RUNTIME_NEURAL_NETWORKS_EXTENSIONS_H
#include "NeuralNetworks.h"
@@ -114,4 +114,4 @@
__END_DECLS
-#endif // ANDROID_ML_NN_RUNTIME_NEURAL_NETWORKS_EXTENSIONS_H
+#endif // FRAMEWORKS_ML_RUNTIME_NEURAL_NETWORKS_EXTENSIONS_H
diff --git a/runtime/include/NeuralNetworksOEM.h b/runtime/include/NeuralNetworksOEM.h
index c931906..5993bf7 100644
--- a/runtime/include/NeuralNetworksOEM.h
+++ b/runtime/include/NeuralNetworksOEM.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_RUNTIME_NEURAL_NETWORKS_OEM_H
-#define ANDROID_ML_NN_RUNTIME_NEURAL_NETWORKS_OEM_H
+#ifndef FRAMEWORKS_ML_RUNTIME_NEURAL_NETWORKS_OEM_H
+#define FRAMEWORKS_ML_RUNTIME_NEURAL_NETWORKS_OEM_H
/******************************************************************
*
@@ -70,4 +70,4 @@
#endif // __ANDROID_API__ >= 27
-#endif // ANDROID_ML_NN_RUNTIME_NEURAL_NETWORKS_OEM_H
+#endif // FRAMEWORKS_ML_RUNTIME_NEURAL_NETWORKS_OEM_H
diff --git a/runtime/include/NeuralNetworksWrapper.h b/runtime/include/NeuralNetworksWrapper.h
index 61aad9f..052a461 100644
--- a/runtime/include/NeuralNetworksWrapper.h
+++ b/runtime/include/NeuralNetworksWrapper.h
@@ -16,8 +16,8 @@
// Provides C++ classes to more easily use the Neural Networks API.
-#ifndef ANDROID_ML_NN_RUNTIME_NEURAL_NETWORKS_WRAPPER_H
-#define ANDROID_ML_NN_RUNTIME_NEURAL_NETWORKS_WRAPPER_H
+#ifndef FRAMEWORKS_ML_RUNTIME_NEURAL_NETWORKS_WRAPPER_H
+#define FRAMEWORKS_ML_RUNTIME_NEURAL_NETWORKS_WRAPPER_H
#include "NeuralNetworks.h"
@@ -466,4 +466,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_RUNTIME_NEURAL_NETWORKS_WRAPPER_H
+#endif // FRAMEWORKS_ML_RUNTIME_NEURAL_NETWORKS_WRAPPER_H
diff --git a/runtime/include/NeuralNetworksWrapperExtensions.h b/runtime/include/NeuralNetworksWrapperExtensions.h
index a7345db..def9225 100644
--- a/runtime/include/NeuralNetworksWrapperExtensions.h
+++ b/runtime/include/NeuralNetworksWrapperExtensions.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_ML_NN_RUNTIME_NEURAL_NETWORKS_WRAPPER_EXTENSIONS_H
-#define ANDROID_ML_NN_RUNTIME_NEURAL_NETWORKS_WRAPPER_EXTENSIONS_H
+#ifndef FRAMEWORKS_ML_RUNTIME_NEURAL_NETWORKS_WRAPPER_EXTENSIONS_H
+#define FRAMEWORKS_ML_RUNTIME_NEURAL_NETWORKS_WRAPPER_EXTENSIONS_H
#include "NeuralNetworksExtensions.h"
#include "NeuralNetworksWrapper.h"
@@ -147,4 +147,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_RUNTIME_NEURAL_NETWORKS_WRAPPER_EXTENSIONS_H
+#endif // FRAMEWORKS_ML_RUNTIME_NEURAL_NETWORKS_WRAPPER_EXTENSIONS_H
diff --git a/runtime/test/Bridge.h b/runtime/test/Bridge.h
index 848ff8d..dead78b 100644
--- a/runtime/test/Bridge.h
+++ b/runtime/test/Bridge.h
@@ -20,8 +20,8 @@
// contains a few utilities for tests to call that trampoline to the
// internal headers.
-#ifndef ANDROID_ML_NN_RUNTIME_TEST_BRIDGE_H
-#define ANDROID_ML_NN_RUNTIME_TEST_BRIDGE_H
+#ifndef FRAMEWORKS_ML_RUNTIME_TEST_BRIDGE_H
+#define FRAMEWORKS_ML_RUNTIME_TEST_BRIDGE_H
#include <iostream>
@@ -39,4 +39,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_RUNTIME_TEST_BRIDGE_H
+#endif // FRAMEWORKS_ML_RUNTIME_TEST_BRIDGE_H
diff --git a/runtime/test/TestCompliance.h b/runtime/test/TestCompliance.h
index 2a20fe4..b85483e 100644
--- a/runtime/test/TestCompliance.h
+++ b/runtime/test/TestCompliance.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_FRAMEWORK_ML_NN_RUNTIME_TEST_TESTCOMPLIANCE_H
-#define ANDROID_FRAMEWORK_ML_NN_RUNTIME_TEST_TESTCOMPLIANCE_H
+#ifndef FRAMEWORKS_ML_RUNTIME_TEST_TEST_COMPLIANCE_H
+#define FRAMEWORKS_ML_RUNTIME_TEST_TEST_COMPLIANCE_H
#include <gtest/gtest.h>
@@ -45,4 +45,4 @@
#endif
-#endif // ANDROID_FRAMEWORK_ML_NN_RUNTIME_TEST_TESTCOMPLIANCE_H
+#endif // FRAMEWORKS_ML_RUNTIME_TEST_TEST_COMPLIANCE_H
diff --git a/runtime/test/TestGenerated.h b/runtime/test/TestGenerated.h
index 8b0263a..aef9041 100644
--- a/runtime/test/TestGenerated.h
+++ b/runtime/test/TestGenerated.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_FRAMEWORK_ML_NN_RUNTIME_TEST_TESTGENERATED_H
-#define ANDROID_FRAMEWORK_ML_NN_RUNTIME_TEST_TESTGENERATED_H
+#ifndef FRAMEWORKS_ML_RUNTIME_TEST_TEST_GENERATED_H
+#define FRAMEWORKS_ML_RUNTIME_TEST_TEST_GENERATED_H
#include <gtest/gtest.h>
@@ -96,4 +96,4 @@
using namespace generated_tests;
-#endif // ANDROID_FRAMEWORK_ML_NN_RUNTIME_TEST_TESTGENERATED_H
+#endif // FRAMEWORKS_ML_RUNTIME_TEST_TEST_GENERATED_H
diff --git a/runtime/test/TestMemory.h b/runtime/test/TestMemory.h
index c711077..e7521c0 100644
--- a/runtime/test/TestMemory.h
+++ b/runtime/test/TestMemory.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_MEMORY_H
-#define FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_MEMORY_H
+#ifndef FRAMEWORKS_ML_RUNTIME_TEST_TEST_MEMORY_H
+#define FRAMEWORKS_ML_RUNTIME_TEST_TEST_MEMORY_H
#include <stdio.h>
@@ -52,4 +52,4 @@
} // anonymous namespace
-#endif // FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_MEMORY_H
+#endif // FRAMEWORKS_ML_RUNTIME_TEST_TEST_MEMORY_H
diff --git a/runtime/test/TestNeuralNetworksWrapper.h b/runtime/test/TestNeuralNetworksWrapper.h
index d9de68f..d6464e3 100644
--- a/runtime/test/TestNeuralNetworksWrapper.h
+++ b/runtime/test/TestNeuralNetworksWrapper.h
@@ -17,8 +17,8 @@
// Provides C++ classes to more easily use the Neural Networks API.
// TODO(b/117845862): this should be auto generated from NeuralNetworksWrapper.h.
-#ifndef ANDROID_ML_NN_RUNTIME_TEST_TEST_NEURAL_NETWORKS_WRAPPER_H
-#define ANDROID_ML_NN_RUNTIME_TEST_TEST_NEURAL_NETWORKS_WRAPPER_H
+#ifndef FRAMEWORKS_ML_RUNTIME_TEST_TEST_NEURAL_NETWORKS_WRAPPER_H
+#define FRAMEWORKS_ML_RUNTIME_TEST_TEST_NEURAL_NETWORKS_WRAPPER_H
#include "NeuralNetworks.h"
#include "NeuralNetworksWrapper.h"
@@ -234,4 +234,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_ML_NN_RUNTIME_TEST_TEST_NEURAL_NETWORKS_WRAPPER_H
+#endif // FRAMEWORKS_ML_RUNTIME_TEST_TEST_NEURAL_NETWORKS_WRAPPER_H
diff --git a/runtime/test/fibonacci_extension/FibonacciDriver.h b/runtime/test/fibonacci_extension/FibonacciDriver.h
index c074c0d..9bb1e86 100644
--- a/runtime/test/fibonacci_extension/FibonacciDriver.h
+++ b/runtime/test/fibonacci_extension/FibonacciDriver.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_FIBONACCI_EXTENSION_FIBONACCI_DRIVER_H
-#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_FIBONACCI_EXTENSION_FIBONACCI_DRIVER_H
+#ifndef FRAMEWORKS_ML_RUNTIME_TEST_FIBONACCI_EXTENSION_FIBONACCI_DRIVER_H
+#define FRAMEWORKS_ML_RUNTIME_TEST_FIBONACCI_EXTENSION_FIBONACCI_DRIVER_H
#include "OperationResolver.h"
#include "SampleDriver.h"
@@ -56,4 +56,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_FIBONACCI_EXTENSION_FIBONACCI_DRIVER_H
+#endif // FRAMEWORKS_ML_RUNTIME_TEST_FIBONACCI_EXTENSION_FIBONACCI_DRIVER_H
diff --git a/runtime/test/fuzzing/OperationManager.h b/runtime/test/fuzzing/OperationManager.h
index 4fdc486..3430225 100644
--- a/runtime/test/fuzzing/OperationManager.h
+++ b/runtime/test/fuzzing/OperationManager.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_FRAMEWORK_ML_NN_RUNTIME_TEST_FUZZING_OPERATION_MANAGER_H
-#define ANDROID_FRAMEWORK_ML_NN_RUNTIME_TEST_FUZZING_OPERATION_MANAGER_H
+#ifndef FRAMEWORKS_ML_RUNTIME_TEST_FUZZING_OPERATION_MANAGER_H
+#define FRAMEWORKS_ML_RUNTIME_TEST_FUZZING_OPERATION_MANAGER_H
#include <functional>
#include <map>
@@ -127,4 +127,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_FRAMEWORK_ML_NN_RUNTIME_TEST_FUZZING_OPERATION_MANAGER_H
+#endif // FRAMEWORKS_ML_RUNTIME_TEST_FUZZING_OPERATION_MANAGER_H
diff --git a/runtime/test/fuzzing/RandomGraphGenerator.h b/runtime/test/fuzzing/RandomGraphGenerator.h
index c3e2b67..91657dc 100644
--- a/runtime/test/fuzzing/RandomGraphGenerator.h
+++ b/runtime/test/fuzzing/RandomGraphGenerator.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_FRAMEWORK_ML_NN_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_H
-#define ANDROID_FRAMEWORK_ML_NN_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_H
+#ifndef FRAMEWORKS_ML_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_H
+#define FRAMEWORKS_ML_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_H
#include <string>
#include <vector>
@@ -180,4 +180,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_FRAMEWORK_ML_NN_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_H
+#endif // FRAMEWORKS_ML_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_H
diff --git a/runtime/test/fuzzing/RandomGraphGeneratorUtils.h b/runtime/test/fuzzing/RandomGraphGeneratorUtils.h
index 7799806..de298c2 100644
--- a/runtime/test/fuzzing/RandomGraphGeneratorUtils.h
+++ b/runtime/test/fuzzing/RandomGraphGeneratorUtils.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_FRAMEWORK_ML_NN_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_UTILS_H
-#define ANDROID_FRAMEWORK_ML_NN_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_UTILS_H
+#ifndef FRAMEWORKS_ML_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_UTILS_H
+#define FRAMEWORKS_ML_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_UTILS_H
#include <chrono>
#include <fstream>
@@ -455,4 +455,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_FRAMEWORK_ML_NN_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_UTILS_H
+#endif // FRAMEWORKS_ML_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_UTILS_H
diff --git a/runtime/test/fuzzing/operation_signatures/OperationSignatureUtils.h b/runtime/test/fuzzing/operation_signatures/OperationSignatureUtils.h
index ca65cc4..86ed0fe 100644
--- a/runtime/test/fuzzing/operation_signatures/OperationSignatureUtils.h
+++ b/runtime/test/fuzzing/operation_signatures/OperationSignatureUtils.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_FRAMEWORK_ML_NN_RUNTIME_TEST_FUZZING_OPERATION_SIGNATURE_UTILS_H
-#define ANDROID_FRAMEWORK_ML_NN_RUNTIME_TEST_FUZZING_OPERATION_SIGNATURE_UTILS_H
+#ifndef FRAMEWORKS_ML_RUNTIME_TEST_FUZZING_OPERATION_SIGNATURES_OPERATION_SIGNATURE_UTILS_H
+#define FRAMEWORKS_ML_RUNTIME_TEST_FUZZING_OPERATION_SIGNATURES_OPERATION_SIGNATURE_UTILS_H
#include <functional>
#include <string>
@@ -404,4 +404,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_FRAMEWORK_ML_NN_RUNTIME_TEST_FUZZING_OPERATION_SIGNATURE_UTILS_H
+#endif // FRAMEWORKS_ML_RUNTIME_TEST_FUZZING_OPERATION_SIGNATURES_OPERATION_SIGNATURE_UTILS_H
diff --git a/tools/test_generator/include/TestHarness.h b/tools/test_generator/include/TestHarness.h
index 604af57..1c909cc 100644
--- a/tools/test_generator/include/TestHarness.h
+++ b/tools/test_generator/include/TestHarness.h
@@ -17,8 +17,8 @@
/* Header-only library for various helpers of test harness
* See frameworks/ml/nn/runtime/test/TestGenerated.cpp for how this is used.
*/
-#ifndef ANDROID_ML_NN_TOOLS_TEST_GENERATOR_TEST_HARNESS_H
-#define ANDROID_ML_NN_TOOLS_TEST_GENERATOR_TEST_HARNESS_H
+#ifndef FRAMEWORKS_ML_TOOLS_TEST_GENERATOR_TEST_HARNESS_H
+#define FRAMEWORKS_ML_TOOLS_TEST_GENERATOR_TEST_HARNESS_H
#include <gmock/gmock-matchers.h>
#include <gtest/gtest.h>
@@ -424,4 +424,4 @@
}; // namespace test_helper
-#endif // ANDROID_ML_NN_TOOLS_TEST_GENERATOR_TEST_HARNESS_H
+#endif // FRAMEWORKS_ML_TOOLS_TEST_GENERATOR_TEST_HARNESS_H
