diff options
author | David Gross <dgross@google.com> | 2019-07-30 12:53:58 -0700 |
---|---|---|
committer | David Gross <dgross@google.com> | 2019-07-30 12:53:58 -0700 |
commit | bd98a9f6c0f5f2e48953c67c86ddd5e82ed6d74e (patch) | |
tree | 6e18eb0f51a944e19596485fbfd16fafde5a1c56 /nn/common/include | |
parent | aa3047535a0a8bc0dd4bc92c2c51f60201ea9871 (diff) | |
download | ml-bd98a9f6c0f5f2e48953c67c86ddd5e82ed6d74e.tar.gz |
Fix names of #include guard symbols.
Subsequent discussion recommended "ANDROID_" prefix.
Pattern: ANDROID_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: ANDROID_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: Ida001ba3767e8a6984e47b3570c69b1ba91f8bd4
Merged-In: Ida001ba3767e8a6984e47b3570c69b1ba91f8bd4
Diffstat (limited to 'nn/common/include')
-rw-r--r-- | nn/common/include/ActivationFunctor.h | 6 | ||||
-rw-r--r-- | nn/common/include/CpuExecutor.h | 6 | ||||
-rw-r--r-- | nn/common/include/CpuOperationUtils.h | 6 | ||||
-rw-r--r-- | nn/common/include/ExecutionBurstController.h | 6 | ||||
-rw-r--r-- | nn/common/include/ExecutionBurstServer.h | 6 | ||||
-rw-r--r-- | nn/common/include/GraphDump.h | 6 | ||||
-rw-r--r-- | nn/common/include/HalInterfaces.h | 6 | ||||
-rw-r--r-- | nn/common/include/IndexedShapeWrapper.h | 6 | ||||
-rw-r--r-- | nn/common/include/MemoryUtils.h | 6 | ||||
-rw-r--r-- | nn/common/include/MetaModel.h | 6 | ||||
-rw-r--r-- | nn/common/include/OperationResolver.h | 6 | ||||
-rw-r--r-- | nn/common/include/Operations.h | 6 | ||||
-rw-r--r-- | nn/common/include/OperationsUtils.h | 6 | ||||
-rw-r--r-- | nn/common/include/TokenHasher.h | 6 | ||||
-rw-r--r-- | nn/common/include/Tracing.h | 6 | ||||
-rw-r--r-- | nn/common/include/Utils.h | 6 | ||||
-rw-r--r-- | nn/common/include/ValidateHal.h | 6 |
17 files changed, 51 insertions, 51 deletions
diff --git a/nn/common/include/ActivationFunctor.h b/nn/common/include/ActivationFunctor.h index ec3d200aa..d667ae1c0 100644 --- a/nn/common/include/ActivationFunctor.h +++ b/nn/common/include/ActivationFunctor.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_ACTIVATION_FUNCTOR_H -#define FRAMEWORKS_ML_NN_COMMON_ACTIVATION_FUNCTOR_H +#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_ACTIVATION_FUNCTOR_H +#define ANDROID_FRAMEWORKS_ML_NN_COMMON_ACTIVATION_FUNCTOR_H #include <android/log.h> @@ -60,4 +60,4 @@ class ActivationFunctor { ActivationFn act_; }; -#endif // FRAMEWORKS_ML_NN_COMMON_ACTIVATION_FUNCTOR_H +#endif // ANDROID_FRAMEWORKS_ML_NN_COMMON_ACTIVATION_FUNCTOR_H diff --git a/nn/common/include/CpuExecutor.h b/nn/common/include/CpuExecutor.h index a6367d1ff..db8509e85 100644 --- a/nn/common/include/CpuExecutor.h +++ b/nn/common/include/CpuExecutor.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_CPU_EXECUTOR_H -#define FRAMEWORKS_ML_NN_COMMON_CPU_EXECUTOR_H +#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_CPU_EXECUTOR_H +#define ANDROID_FRAMEWORKS_ML_NN_COMMON_CPU_EXECUTOR_H #include "HalInterfaces.h" #include "OperationResolver.h" @@ -272,4 +272,4 @@ inline RunTimeOperandInfo* GetOutput(const hal::Operation& operation, } // namespace nn } // namespace android -#endif // FRAMEWORKS_ML_NN_COMMON_CPU_EXECUTOR_H +#endif // ANDROID_FRAMEWORKS_ML_NN_COMMON_CPU_EXECUTOR_H diff --git a/nn/common/include/CpuOperationUtils.h b/nn/common/include/CpuOperationUtils.h index 16acfa5ca..45404573b 100644 --- a/nn/common/include/CpuOperationUtils.h +++ b/nn/common/include/CpuOperationUtils.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_CPU_OPERATION_UTILS_H -#define FRAMEWORKS_ML_NN_COMMON_CPU_OPERATION_UTILS_H +#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_CPU_OPERATION_UTILS_H +#define ANDROID_FRAMEWORKS_ML_NN_COMMON_CPU_OPERATION_UTILS_H #include "OperationsUtils.h" @@ -195,4 +195,4 @@ class OutputWithLayout { } // namespace nn } // namespace android -#endif // FRAMEWORKS_ML_NN_COMMON_CPU_OPERATION_UTILS_H +#endif // ANDROID_FRAMEWORKS_ML_NN_COMMON_CPU_OPERATION_UTILS_H diff --git a/nn/common/include/ExecutionBurstController.h b/nn/common/include/ExecutionBurstController.h index e12855c8e..df7e91cc0 100644 --- a/nn/common/include/ExecutionBurstController.h +++ b/nn/common/include/ExecutionBurstController.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_CONTROLLER_H -#define FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_CONTROLLER_H +#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_CONTROLLER_H +#define ANDROID_FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_CONTROLLER_H #include "HalInterfaces.h" @@ -336,4 +336,4 @@ class ExecutionBurstController { } // namespace android::nn -#endif // FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_CONTROLLER_H +#endif // ANDROID_FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_CONTROLLER_H diff --git a/nn/common/include/ExecutionBurstServer.h b/nn/common/include/ExecutionBurstServer.h index 870e46879..977d0d375 100644 --- a/nn/common/include/ExecutionBurstServer.h +++ b/nn/common/include/ExecutionBurstServer.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_SERVER_H -#define FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_SERVER_H +#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_SERVER_H +#define ANDROID_FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_SERVER_H #include "HalInterfaces.h" @@ -310,4 +310,4 @@ class ExecutionBurstServer : public hal::IBurstContext { } // namespace android::nn -#endif // FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_SERVER_H +#endif // ANDROID_FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_SERVER_H diff --git a/nn/common/include/GraphDump.h b/nn/common/include/GraphDump.h index 1697e574c..1bf02b90e 100644 --- a/nn/common/include/GraphDump.h +++ b/nn/common/include/GraphDump.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_GRAPH_DUMP_H -#define FRAMEWORKS_ML_NN_COMMON_GRAPH_DUMP_H +#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_GRAPH_DUMP_H +#define ANDROID_FRAMEWORKS_ML_NN_COMMON_GRAPH_DUMP_H #include <android/hardware/neuralnetworks/1.2/types.h> @@ -52,4 +52,4 @@ void graphDump(const char* name, } // namespace nn } // namespace android -#endif // FRAMEWORKS_ML_NN_COMMON_GRAPH_DUMP_H +#endif // ANDROID_FRAMEWORKS_ML_NN_COMMON_GRAPH_DUMP_H diff --git a/nn/common/include/HalInterfaces.h b/nn/common/include/HalInterfaces.h index 1163a637e..a518b4347 100644 --- a/nn/common/include/HalInterfaces.h +++ b/nn/common/include/HalInterfaces.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_HAL_INTERFACES_H -#define FRAMEWORKS_ML_NN_COMMON_HAL_INTERFACES_H +#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_HAL_INTERFACES_H +#define ANDROID_FRAMEWORKS_ML_NN_COMMON_HAL_INTERFACES_H #include <android/hardware/neuralnetworks/1.0/IDevice.h> #include <android/hardware/neuralnetworks/1.0/IExecutionCallback.h> @@ -93,4 +93,4 @@ using namespace hal; using ::android::hardware::neuralnetworks::V1_0::ErrorStatus; using ::android::hardware::neuralnetworks::V1_1::ExecutionPreference; -#endif // FRAMEWORKS_ML_NN_COMMON_HAL_INTERFACES_H +#endif // ANDROID_FRAMEWORKS_ML_NN_COMMON_HAL_INTERFACES_H diff --git a/nn/common/include/IndexedShapeWrapper.h b/nn/common/include/IndexedShapeWrapper.h index ebdf124e8..0298de465 100644 --- a/nn/common/include/IndexedShapeWrapper.h +++ b/nn/common/include/IndexedShapeWrapper.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_INDEXED_SHAPE_WRAPPER_H -#define FRAMEWORKS_ML_NN_COMMON_INDEXED_SHAPE_WRAPPER_H +#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_INDEXED_SHAPE_WRAPPER_H +#define ANDROID_FRAMEWORKS_ML_NN_COMMON_INDEXED_SHAPE_WRAPPER_H #include "OperationsUtils.h" @@ -62,4 +62,4 @@ class IndexedShapeWrapper { } // namespace nn } // namespace android -#endif // FRAMEWORKS_ML_NN_COMMON_INDEXED_SHAPE_WRAPPER_H +#endif // ANDROID_FRAMEWORKS_ML_NN_COMMON_INDEXED_SHAPE_WRAPPER_H diff --git a/nn/common/include/MemoryUtils.h b/nn/common/include/MemoryUtils.h index bc272620c..5470fd9c5 100644 --- a/nn/common/include/MemoryUtils.h +++ b/nn/common/include/MemoryUtils.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ANDROID_ML_NN_COMMON_MEMORY_UTILS_H -#define ANDROID_ML_NN_COMMON_MEMORY_UTILS_H +#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_MEMORY_UTILS_H +#define ANDROID_FRAMEWORKS_ML_NN_COMMON_MEMORY_UTILS_H #include <hidlmemory/mapping.h> @@ -30,4 +30,4 @@ hardware::hidl_memory allocateSharedMemory(int64_t size); } // namespace nn } // namespace android -#endif // ANDROID_ML_NN_COMMON_MEMORY_UTILS_H +#endif // ANDROID_FRAMEWORKS_ML_NN_COMMON_MEMORY_UTILS_H diff --git a/nn/common/include/MetaModel.h b/nn/common/include/MetaModel.h index 2f9a1b1d3..89aee9f0b 100644 --- a/nn/common/include/MetaModel.h +++ b/nn/common/include/MetaModel.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_META_MODEL_H -#define FRAMEWORKS_ML_NN_COMMON_META_MODEL_H +#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_META_MODEL_H +#define ANDROID_FRAMEWORKS_ML_NN_COMMON_META_MODEL_H #include "HalInterfaces.h" @@ -140,4 +140,4 @@ class MetaModel { } // namespace android::nn -#endif // FRAMEWORKS_ML_NN_COMMON_META_MODEL_H +#endif // ANDROID_FRAMEWORKS_ML_NN_COMMON_META_MODEL_H diff --git a/nn/common/include/OperationResolver.h b/nn/common/include/OperationResolver.h index d17cc343a..ab70e4c3a 100644 --- a/nn/common/include/OperationResolver.h +++ b/nn/common/include/OperationResolver.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATION_RESOLVER_H -#define FRAMEWORKS_ML_NN_COMMON_OPERATION_RESOLVER_H +#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATION_RESOLVER_H +#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATION_RESOLVER_H #include "HalInterfaces.h" #include "OperationsUtils.h" @@ -138,4 +138,4 @@ class BuiltinOperationResolver : public IOperationResolver { } // namespace nn } // namespace android -#endif // FRAMEWORKS_ML_NN_COMMON_OPERATION_RESOLVER_H +#endif // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATION_RESOLVER_H diff --git a/nn/common/include/Operations.h b/nn/common/include/Operations.h index 254c4ecc6..7e6a9b200 100644 --- a/nn/common/include/Operations.h +++ b/nn/common/include/Operations.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_H -#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_H +#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_H +#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_H #include "operations/BidirectionalSequenceLSTM.h" #include "operations/Cast.h" @@ -171,4 +171,4 @@ bool channelShuffleGeneric(const uint8_t* inputData, const Shape& inputShape, in int32_t axis, uint8_t* outputData, const Shape& outputShape); } // namespace nn } // namespace android -#endif // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_H +#endif // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_H diff --git a/nn/common/include/OperationsUtils.h b/nn/common/include/OperationsUtils.h index fa2c11e20..381bc8e16 100644 --- a/nn/common/include/OperationsUtils.h +++ b/nn/common/include/OperationsUtils.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_UTILS_H -#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_UTILS_H +#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_UTILS_H +#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_UTILS_H #include "HalInterfaces.h" #include "Utils.h" @@ -431,4 +431,4 @@ inline bool mergeThirdDimension(const T* bufferA, const std::vector<uint32_t>& d } // namespace nn } // namespace android -#endif // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_UTILS_H +#endif // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_UTILS_H diff --git a/nn/common/include/TokenHasher.h b/nn/common/include/TokenHasher.h index db5ebe62e..3245138dd 100644 --- a/nn/common/include/TokenHasher.h +++ b/nn/common/include/TokenHasher.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_TOKEN_HASHER_H -#define FRAMEWORKS_ML_NN_COMMON_TOKEN_HASHER_H +#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_TOKEN_HASHER_H +#define ANDROID_FRAMEWORKS_ML_NN_COMMON_TOKEN_HASHER_H #include <cstring> #include <vector> @@ -68,4 +68,4 @@ class TokenHasher { } // namespace nn } // namespace android -#endif // FRAMEWORKS_ML_NN_COMMON_TOKEN_HASHER_H +#endif // ANDROID_FRAMEWORKS_ML_NN_COMMON_TOKEN_HASHER_H diff --git a/nn/common/include/Tracing.h b/nn/common/include/Tracing.h index 6b7775a3b..01535d831 100644 --- a/nn/common/include/Tracing.h +++ b/nn/common/include/Tracing.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_TRACING_H -#define FRAMEWORKS_ML_NN_COMMON_TRACING_H +#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_TRACING_H +#define ANDROID_FRAMEWORKS_ML_NN_COMMON_TRACING_H #define ATRACE_TAG ATRACE_TAG_NNAPI #include <utils/Trace.h> @@ -171,4 +171,4 @@ #undef ATRACE_NAME #undef ATRACE_CALL -#endif // FRAMEWORKS_ML_NN_COMMON_TRACING_H +#endif // ANDROID_FRAMEWORKS_ML_NN_COMMON_TRACING_H diff --git a/nn/common/include/Utils.h b/nn/common/include/Utils.h index 343557f83..c7d86863b 100644 --- a/nn/common/include/Utils.h +++ b/nn/common/include/Utils.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_UTILS_H -#define FRAMEWORKS_ML_NN_COMMON_UTILS_H +#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_UTILS_H +#define ANDROID_FRAMEWORKS_ML_NN_COMMON_UTILS_H #include "HalInterfaces.h" #include "NeuralNetworks.h" @@ -368,4 +368,4 @@ uint32_t getProp(const char* str, uint32_t defaultValue = 0); } // namespace nn } // namespace android -#endif // FRAMEWORKS_ML_NN_COMMON_UTILS_H +#endif // ANDROID_FRAMEWORKS_ML_NN_COMMON_UTILS_H diff --git a/nn/common/include/ValidateHal.h b/nn/common/include/ValidateHal.h index ed5e70623..40733bb5a 100644 --- a/nn/common/include/ValidateHal.h +++ b/nn/common/include/ValidateHal.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_VALIDATE_HAL_H -#define FRAMEWORKS_ML_NN_COMMON_VALIDATE_HAL_H +#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_VALIDATE_HAL_H +#define ANDROID_FRAMEWORKS_ML_NN_COMMON_VALIDATE_HAL_H #include "HalInterfaces.h" @@ -62,4 +62,4 @@ bool validatePool(const hal::hidl_memory& pool, HalVersion ver = HalVersion::LAT } // namespace nn } // namespace android -#endif // FRAMEWORKS_ML_NN_COMMON_VALIDATE_HAL_H +#endif // ANDROID_FRAMEWORKS_ML_NN_COMMON_VALIDATE_HAL_H |