From 99432278a61002edbccbcafc0f9dfb52130d440f Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=84=9C=EC=83=81=EB=AF=BC/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Senior=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Thu, 3 May 2018 09:52:29 +0900 Subject: [PATCH] Change ifdef guard to changed namespace rule (#1008) (#1018) This commit changes ifdef guard to changed namespace rule. close : #1006 Signed-off-by: sjsujinkim --- runtimes/nn/common/NNFWKernels.h | 6 +++--- runtimes/nn/common/include/ActivationFunctor.h | 6 +++--- runtimes/nn/common/include/CpuExecutor.h | 6 +++--- runtimes/nn/common/include/HalInterfaces.h | 6 +++--- runtimes/nn/common/include/Logging.h | 6 +++--- runtimes/nn/common/include/Operations.h | 6 +++--- runtimes/nn/common/include/OperationsUtils.h | 6 +++--- runtimes/nn/common/include/Utils.h | 6 +++--- runtimes/nn/common/operations/internal/common.h | 6 +++--- runtimes/nn/common/operations/internal/compatibility.h | 11 +++-------- .../operations/internal/optimized/depthwiseconv_float.h | 6 +++--- .../operations/internal/optimized/depthwiseconv_uint8.h | 6 +++--- .../common/operations/internal/optimized/neon_tensor_utils.h | 6 +++--- .../nn/common/operations/internal/optimized/optimized_ops.h | 6 +++--- .../common/operations/internal/optimized/tensor_utils_impl.h | 6 +++--- runtimes/nn/common/operations/internal/tensor_utils.h | 6 +++--- runtimes/nn/common/operations/internal/types.h | 6 +++--- runtimes/nn/runtime/Callbacks.h | 6 +++--- runtimes/nn/runtime/CompilationBuilder.h | 6 +++--- runtimes/nn/runtime/ExecutionBuilder.h | 6 +++--- runtimes/nn/runtime/Memory.h | 6 +++--- runtimes/nn/runtime/ModelBuilder.h | 6 +++--- runtimes/tests/include/NeuralNetworksWrapper.h | 6 +++--- 23 files changed, 69 insertions(+), 74 deletions(-) diff --git a/runtimes/nn/common/NNFWKernels.h b/runtimes/nn/common/NNFWKernels.h index e6d02aa..f38431d 100644 --- a/runtimes/nn/common/NNFWKernels.h +++ b/runtimes/nn/common/NNFWKernels.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __NNFW_KERNELS_H__ -#define __NNFW_KERNELS_H__ +#ifndef __NNFW_RT_NNFW_KERNELS_H__ +#define __NNFW_RT_NNFW_KERNELS_H__ #include "CpuExecutor.h" #include "NeuralNetworks.h" @@ -38,4 +38,4 @@ void init_nnfw_kernels(); } // namespace rt } // namespace nnfw -#endif // __NNFW_KERNELS_H__ +#endif // __NNFW_RT_NNFW_KERNELS_H__ diff --git a/runtimes/nn/common/include/ActivationFunctor.h b/runtimes/nn/common/include/ActivationFunctor.h index 566f8e4..788962e 100644 --- a/runtimes/nn/common/include/ActivationFunctor.h +++ b/runtimes/nn/common/include/ActivationFunctor.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef ANDROID_ML_NN_ACTIVATION_FUNCTOR_H -#define ANDROID_ML_NN_ACTIVATION_FUNCTOR_H +#ifndef __NNFW_RT_ACTIVATION_FUNCTOR_H__ +#define __NNFW_RT_ACTIVATION_FUNCTOR_H__ #if 0 // REF-ANN #include "android/log.h" @@ -67,4 +67,4 @@ class ActivationFunctor { ActivationFn act_; }; -#endif // ANDROID_ML_NN_ACTIVATION_FUNCTOR_H +#endif // __NNFW_RT_ACTIVATION_FUNCTOR_H__ diff --git a/runtimes/nn/common/include/CpuExecutor.h b/runtimes/nn/common/include/CpuExecutor.h index 876ce68..385a461 100644 --- a/runtimes/nn/common/include/CpuExecutor.h +++ b/runtimes/nn/common/include/CpuExecutor.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef ANDROID_ML_NN_COMMON_CPU_EXECUTOR_H -#define ANDROID_ML_NN_COMMON_CPU_EXECUTOR_H +#ifndef __NNFW_RT_CPU_EXECUTOR_H__ +#define __NNFW_RT_CPU_EXECUTOR_H__ #include "HalInterfaces.h" #include "OperationsUtils.h" @@ -162,4 +162,4 @@ inline RunTimeOperandInfo *GetOutput(const Operation &operation, } // namespace rt } // namespace nnfw -#endif // ANDROID_ML_NN_COMMON_CPU_EXECUTOR_H +#endif // __NNFW_RT_CPU_EXECUTOR_H__ diff --git a/runtimes/nn/common/include/HalInterfaces.h b/runtimes/nn/common/include/HalInterfaces.h index 61d76ba..9a086c0 100644 --- a/runtimes/nn/common/include/HalInterfaces.h +++ b/runtimes/nn/common/include/HalInterfaces.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef ANDROID_ML_NN_COMMON_HAL_INTERFACES_H -#define ANDROID_ML_NN_COMMON_HAL_INTERFACES_H +#ifndef __NNFW_RT_HAL_INTERFACES_H__ +#define __NNFW_RT_HAL_INTERFACES_H__ #if 0 // REF-ANN #include @@ -79,4 +79,4 @@ namespace rt { } // namespace rt } // namespace nnfw -#endif // ANDROID_ML_NN_COMMON_HAL_INTERFACES_H +#endif // __NNFW_RT_HAL_INTERFACES_H__ diff --git a/runtimes/nn/common/include/Logging.h b/runtimes/nn/common/include/Logging.h index 948f192..060458b 100644 --- a/runtimes/nn/common/include/Logging.h +++ b/runtimes/nn/common/include/Logging.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ANDROID_BASE_LOGGING_H -#define ANDROID_BASE_LOGGING_H +#ifndef __NNFW_RT_LOGGING_H__ +#define __NNFW_RT_LOGGING_H__ #include @@ -58,4 +58,4 @@ private: } // namespace rt } // namespace nnfw -#endif // ANDROID_BASE_LOGGING_H +#endif // __NNFW_RT_LOGGING_H__ diff --git a/runtimes/nn/common/include/Operations.h b/runtimes/nn/common/include/Operations.h index 8cbf2c5..33730ea 100644 --- a/runtimes/nn/common/include/Operations.h +++ b/runtimes/nn/common/include/Operations.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef ANDROID_ML_NN_COMMON_OPERATIONS_H -#define ANDROID_ML_NN_COMMON_OPERATIONS_H +#ifndef __NNFW_RT_OPERATIONS_H__ +#define __NNFW_RT_OPERATIONS_H__ #if 0 // REF-ANN #include "operations/EmbeddingLookup.h" @@ -200,4 +200,4 @@ bool spaceToDepthGeneric(const uint8_t* inputData, const Shape& inputShape, } // namespace rt } // namespace nnfw -#endif // ANDROID_ML_NN_COMMON_OPERATIONS_H +#endif // __NNFW_RT_OPERATIONS_H__ diff --git a/runtimes/nn/common/include/OperationsUtils.h b/runtimes/nn/common/include/OperationsUtils.h index c8089f2..c66ad89 100644 --- a/runtimes/nn/common/include/OperationsUtils.h +++ b/runtimes/nn/common/include/OperationsUtils.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef ANDROID_ML_NN_COMMON_OPERATIONS_UTILS_H -#define ANDROID_ML_NN_COMMON_OPERATIONS_UTILS_H +#ifndef __NNFW_RT_OPERATIONS_UTILS_H__ +#define __NNFW_RT_OPERATIONS_UTILS_H__ #include "Utils.h" @@ -244,4 +244,4 @@ bool hashtableLookupPrepare(const Shape &lookupShape, } // namespace rt } // namespace nnfw -#endif // ANDROID_ML_NN_COMMON_OPERATIONS_UTILS_H +#endif // __NNFW_RT_OPERATIONS_UTILS_H__ diff --git a/runtimes/nn/common/include/Utils.h b/runtimes/nn/common/include/Utils.h index bbf24ad..aae4cff 100644 --- a/runtimes/nn/common/include/Utils.h +++ b/runtimes/nn/common/include/Utils.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef ANDROID_ML_NN_COMMON_UTILS_H -#define ANDROID_ML_NN_COMMON_UTILS_H +#ifndef __NNFW_RT_UTILS_H__ +#define __NNFW_RT_UTILS_H__ #include "HalInterfaces.h" #include "NeuralNetworks.h" @@ -125,4 +125,4 @@ inline size_t getSizeFromInts(int lower, int higher) { } // namespace rt } // namespace nnfw -#endif // ANDROID_ML_NN_COMMON_UTILS_H +#endif // __NNFW_RT_UTILS_H__ diff --git a/runtimes/nn/common/operations/internal/common.h b/runtimes/nn/common/operations/internal/common.h index 1cf9b35..1bf1050 100644 --- a/runtimes/nn/common/operations/internal/common.h +++ b/runtimes/nn/common/operations/internal/common.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef ANDROID_ML_NN_COMMON_OPERATIONS_INTERNAL_COMMON_H_ -#define ANDROID_ML_NN_COMMON_OPERATIONS_INTERNAL_COMMON_H_ +#ifndef __NNFW_RT_COMMON_H__ +#define __NNFW_RT_COMMON_H__ #ifndef USE_NEON #if defined(__ARM_NEON__) || defined(__ARM_NEON) @@ -77,4 +77,4 @@ inline int32 MultiplyByQuantizedMultiplierGreaterThanOne( } // namespace rt } // namespace nnfw -#endif // ANDROID_ML_NN_COMMON_OPERATIONS_INTERNAL_COMMON_H_ +#endif // __NNFW_RT_COMMON_H__ diff --git a/runtimes/nn/common/operations/internal/compatibility.h b/runtimes/nn/common/operations/internal/compatibility.h index 9d9cdb7..fd33cbd 100644 --- a/runtimes/nn/common/operations/internal/compatibility.h +++ b/runtimes/nn/common/operations/internal/compatibility.h @@ -14,11 +14,8 @@ * limitations under the License. */ -#ifndef ANDROID_ML_NN_COMMON_OPERATIONS_INTERNAL_COMPATIBILITY_H_ -#define ANDROID_ML_NN_COMMON_OPERATIONS_INTERNAL_COMPATIBILITY_H_ - -#ifndef ANDROID_ML_NN_COMPATIBILITY -#define ANDROID_ML_NN_COMPATIBILITY +#ifndef __NNFW_RT_COMPATIBILITY_H__ +#define __NNFW_RT_COMPATIBILITY_H__ #include #include @@ -57,6 +54,4 @@ using uint16 = std::uint16_t; using int32 = std::int32_t; using uint32 = std::uint32_t; -#endif - -#endif // ANDROID_ML_NN_COMMON_OPERATIONS_INTERNAL_COMPATIBILITY_H_ +#endif // __NNFW_RT_COMPATIBILITY_H__ diff --git a/runtimes/nn/common/operations/internal/optimized/depthwiseconv_float.h b/runtimes/nn/common/operations/internal/optimized/depthwiseconv_float.h index 3f5581f..5c05bf2 100644 --- a/runtimes/nn/common/operations/internal/optimized/depthwiseconv_float.h +++ b/runtimes/nn/common/operations/internal/optimized/depthwiseconv_float.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef ANDROID_ML_NN_COMMON_OPERATIONS_INTERNAL_OPTIMIZED_DEPTHWISECONV_FLOAT_H_ -#define ANDROID_ML_NN_COMMON_OPERATIONS_INTERNAL_OPTIMIZED_DEPTHWISECONV_FLOAT_H_ +#ifndef __NNFW_RT_OPTIMIZED_OPS_DEPTHWISECONV_FLOAT_H__ +#define __NNFW_RT_OPTIMIZED_OPS_DEPTHWISECONV_FLOAT_H__ #include "gemmlowp.h" #include "../common.h" @@ -789,4 +789,4 @@ void DepthwiseConv(const float* input_data, const Dims<4>& input_dims, } // namespace nnfw -#endif // ANDROID_ML_NN_COMMON_OPERATIONS_INTERNAL_OPTIMIZED_DEPTHWISECONV_FLOAT_H_ +#endif // __NNFW_RT_OPTIMIZED_OPS_DEPTHWISECONV_FLOAT_H__ diff --git a/runtimes/nn/common/operations/internal/optimized/depthwiseconv_uint8.h b/runtimes/nn/common/operations/internal/optimized/depthwiseconv_uint8.h index d187dc6..220f879 100644 --- a/runtimes/nn/common/operations/internal/optimized/depthwiseconv_uint8.h +++ b/runtimes/nn/common/operations/internal/optimized/depthwiseconv_uint8.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef ANDROID_ML_NN_COMMON_OPERATIONS_INTERNAL_OPTIMIZED_DEPTHWISECONV_UINT8_H_ -#define ANDROID_ML_NN_COMMON_OPERATIONS_INTERNAL_OPTIMIZED_DEPTHWISECONV_UINT8_H_ +#ifndef __NNFW_RT_OPTIMIZED_OPS_DEPTHWISECONV_UINT8_H__ +#define __NNFW_RT_OPTIMIZED_OPS_DEPTHWISECONV_UINT8_H__ #include "fixedpoint.h" #include "gemmlowp.h" @@ -1603,4 +1603,4 @@ void DepthwiseConv(const uint8* input_data, const Dims<4>& input_dims, } // namespace rt } // namespace nnfw -#endif // ANDROID_ML_NN_COMMON_OPERATIONS_INTERNAL_OPTIMIZED_DEPTHWISECONV_UINT8_H_ +#endif // __NNFW_RT_OPTIMIZED_OPS_DEPTHWISECONV_UINT8_H__ diff --git a/runtimes/nn/common/operations/internal/optimized/neon_tensor_utils.h b/runtimes/nn/common/operations/internal/optimized/neon_tensor_utils.h index 290bd0c..2a6f315 100644 --- a/runtimes/nn/common/operations/internal/optimized/neon_tensor_utils.h +++ b/runtimes/nn/common/operations/internal/optimized/neon_tensor_utils.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_INTERNAL_OPTIMIZED_NEON_TENSOR_UTILS_H_ -#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_INTERNAL_OPTIMIZED_NEON_TENSOR_UTILS_H_ +#ifndef __NNFW_RT_NEON_TENSOR_UTILS_H__ +#define __NNFW_RT_NEON_TENSOR_UTILS_H__ #include "ActivationFunctor.h" #include "cpu_check.h" @@ -116,4 +116,4 @@ void ReductionSumVector(const float* input_vector, int input_stride, } // namespace rt } // namespace nnfw -#endif // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_INTERNAL_OPTIMIZED_NEON_TENSOR_UTILS_H_ +#endif // __NNFW_RT_NEON_TENSOR_UTILS_H__ diff --git a/runtimes/nn/common/operations/internal/optimized/optimized_ops.h b/runtimes/nn/common/operations/internal/optimized/optimized_ops.h index 402baa7..33862a0 100644 --- a/runtimes/nn/common/operations/internal/optimized/optimized_ops.h +++ b/runtimes/nn/common/operations/internal/optimized/optimized_ops.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef ANDROID_ML_NN_COMMON_OPERATIONS_INTERNAL_OPTIMIZED_OPS_H_ -#define ANDROID_ML_NN_COMMON_OPERATIONS_INTERNAL_OPTIMIZED_OPS_H_ +#ifndef __NNFW_RT_OPTIMIZED_OPS_H__ +#define __NNFW_RT_OPTIMIZED_OPS_H__ #include #include @@ -2714,4 +2714,4 @@ inline void ResizeBilinear(const float* input_data, const Dims<4>& input_dims, #pragma GCC diagnostic pop #endif -#endif // ANDROID_ML_NN_COMMON_OPERATIONS_INTERNAL_OPTIMIZED_OPS_H_ +#endif // __NNFW_RT_OPTIMIZED_OPS_H__ diff --git a/runtimes/nn/common/operations/internal/optimized/tensor_utils_impl.h b/runtimes/nn/common/operations/internal/optimized/tensor_utils_impl.h index 8914ad7..bf659d0 100644 --- a/runtimes/nn/common/operations/internal/optimized/tensor_utils_impl.h +++ b/runtimes/nn/common/operations/internal/optimized/tensor_utils_impl.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_INTERNAL_OPTIMIZED_TENSOR_UTILS_IMPL_H_ -#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_INTERNAL_OPTIMIZED_TENSOR_UTILS_IMPL_H_ +#ifndef __NNFW_RT_TENSOR_UTILS_IMPL_H__ +#define __NNFW_RT_TENSOR_UTILS_IMPL_H__ #include "ActivationFunctor.h" @@ -130,4 +130,4 @@ void PortableReductionSumVector(const float* input_vector, int input_stride, } // namespace rt } // namespace nnfw -#endif // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_INTERNAL_OPTIMIZED_TENSOR_UTILS_IMPL_H_ +#endif // __NNFW_RT_TENSOR_UTILS_IMPL_H__ diff --git a/runtimes/nn/common/operations/internal/tensor_utils.h b/runtimes/nn/common/operations/internal/tensor_utils.h index 09fbe24..df3d4e2 100644 --- a/runtimes/nn/common/operations/internal/tensor_utils.h +++ b/runtimes/nn/common/operations/internal/tensor_utils.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_INTERNAL_TENSOR_UTILS_H_ -#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_INTERNAL_TENSOR_UTILS_H_ +#ifndef __NNFW_RT_TENSOR_UTILS_H__ +#define __NNFW_RT_TENSOR_UTILS_H__ #include "ActivationFunctor.h" @@ -120,4 +120,4 @@ void ReductionSumVector(const float* input_vector, int input_stride, } // namespace rt } // namespace nnfw -#endif // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_INTERNAL_TENSOR_UTILS_H_ +#endif // __NNFW_RT_TENSOR_UTILS_H__ diff --git a/runtimes/nn/common/operations/internal/types.h b/runtimes/nn/common/operations/internal/types.h index d2ccaed..bd5880e 100644 --- a/runtimes/nn/common/operations/internal/types.h +++ b/runtimes/nn/common/operations/internal/types.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef ANDROID_ML_NN_COMMON_OPERATIONS_INTERNAL_TYPES_H_ -#define ANDROID_ML_NN_COMMON_OPERATIONS_INTERNAL_TYPES_H_ +#ifndef __NNFW_RT_TYPES_H__ +#define __NNFW_RT_TYPES_H__ #include "compatibility.h" @@ -109,4 +109,4 @@ bool IsPackedWithoutStrides(const Dims& dims) { } // namespace rt } // namespace nnfw -#endif // ANDROID_ML_NN_COMMON_OPERATIONS_INTERNAL_TYPES_H_ +#endif // __NNFW_RT_TYPES_H__ diff --git a/runtimes/nn/runtime/Callbacks.h b/runtimes/nn/runtime/Callbacks.h index ce0ca19..5909714 100644 --- a/runtimes/nn/runtime/Callbacks.h +++ b/runtimes/nn/runtime/Callbacks.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef ANDROID_HARDWARE_NEURALNETWORKS_V1_0_CALLBACKS_H -#define ANDROID_HARDWARE_NEURALNETWORKS_V1_0_CALLBACKS_H +#ifndef __NNFW_RT_CALLBACKS_H__ +#define __NNFW_RT_CALLBACKS_H__ #include #include @@ -246,4 +246,4 @@ std::cv_status CallbackBase::wait_for(const std::chrono::duration& t } // namespace rt } // namespace nnfw -#endif // ANDROID_HARDWARE_NEURALNETWORKS_V1_0_CALLBACKS_H +#endif // __NNFW_RT_CALLBACKS_H__ diff --git a/runtimes/nn/runtime/CompilationBuilder.h b/runtimes/nn/runtime/CompilationBuilder.h index d1d0e91..77afa13 100644 --- a/runtimes/nn/runtime/CompilationBuilder.h +++ b/runtimes/nn/runtime/CompilationBuilder.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef ANDROID_ML_NN_RUNTIME_COMPILATION_BUILDER_H -#define ANDROID_ML_NN_RUNTIME_COMPILATION_BUILDER_H +#ifndef __NNFW_RT_COMPILATION_BUILDER_H__ +#define __NNFW_RT_COMPILATION_BUILDER_H__ #include "NeuralNetworks.h" @@ -52,4 +52,4 @@ private: } // namespace rt } // namespace nnfw -#endif // ANDROID_ML_NN_RUNTIME_COMPILATION_BUILDER_H +#endif // __NNFW_RT_COMPILATION_BUILDER_H__ diff --git a/runtimes/nn/runtime/ExecutionBuilder.h b/runtimes/nn/runtime/ExecutionBuilder.h index 0f54e51..2b05ef4 100644 --- a/runtimes/nn/runtime/ExecutionBuilder.h +++ b/runtimes/nn/runtime/ExecutionBuilder.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef ANDROID_ML_NN_RUNTIME_EXECUTION_BUILDER_H -#define ANDROID_ML_NN_RUNTIME_EXECUTION_BUILDER_H +#ifndef __NNFW_RT_EXECUTION_BUILDER_H__ +#define __NNFW_RT_EXECUTION_BUILDER_H__ #include "Callbacks.h" #include "HalInterfaces.h" @@ -144,4 +144,4 @@ private: } // namespace rt } // namespace nnfw -#endif // ANDROID_ML_NN_RUNTIME_EXECUTION_BUILDER_H +#endif // __NNFW_RT_EXECUTION_BUILDER_H__ diff --git a/runtimes/nn/runtime/Memory.h b/runtimes/nn/runtime/Memory.h index 09675aa..a1058c8 100644 --- a/runtimes/nn/runtime/Memory.h +++ b/runtimes/nn/runtime/Memory.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef ANDROID_ML_NN_RUNTIME_MEMORY_H -#define ANDROID_ML_NN_RUNTIME_MEMORY_H +#ifndef __NNFW_RT_MEMORY_H__ +#define __NNFW_RT_MEMORY_H__ #include "NeuralNetworks.h" #include "Utils.h" @@ -119,4 +119,4 @@ private: } // namespace rt } // namespace nnfw -#endif // ANDROID_ML_NN_RUNTIME_MEMORY_H +#endif // __NNFW_RT_MEMORY_H__ diff --git a/runtimes/nn/runtime/ModelBuilder.h b/runtimes/nn/runtime/ModelBuilder.h index ca1e4dd..67d8b77 100644 --- a/runtimes/nn/runtime/ModelBuilder.h +++ b/runtimes/nn/runtime/ModelBuilder.h @@ -18,8 +18,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 __NNFW_RT_MODEL_BUILDER_H__ +#define __NNFW_RT_MODEL_BUILDER_H__ #include "Memory.h" #include "NeuralNetworks.h" @@ -126,4 +126,4 @@ public: } // namespace rt } // namespace nnfw -#endif // ANDROID_ML_NN_RUNTIME_MODEL_BUILDER_H +#endif // __NNFW_RT_MODEL_BUILDER_H__ diff --git a/runtimes/tests/include/NeuralNetworksWrapper.h b/runtimes/tests/include/NeuralNetworksWrapper.h index 79bb101..c0db78d 100644 --- a/runtimes/tests/include/NeuralNetworksWrapper.h +++ b/runtimes/tests/include/NeuralNetworksWrapper.h @@ -17,8 +17,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 __NNFW_RT_NEURAL_NETWORKS_WRAPPER_H__ +#define __NNFW_RT_NEURAL_NETWORKS_WRAPPER_H__ #include "NeuralNetworks.h" @@ -341,4 +341,4 @@ private: } // namespace rt } // namespace nnfw -#endif // ANDROID_ML_NN_RUNTIME_NEURAL_NETWORKS_WRAPPER_H +#endif // __NNFW_RT_NEURAL_NETWORKS_WRAPPER_H__ -- 2.7.4