From 4e9f568f1055db8d5b6a969550787032b91854a5 Mon Sep 17 00:00:00 2001 From: SiCong Li Date: Tue, 10 May 2022 10:15:59 +0100 Subject: Fix inclusion guard for dynamic fusion module Resolves COMPMID-5318 Signed-off-by: SiCong Li Change-Id: I59594632c9891b9569089764ae26cc7be6b78fcd Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7550 Reviewed-by: Nikhil Raj Arm Reviewed-by: Giorgio Arena Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- arm_compute/core/experimental/ClWorkload.h | 7 +++---- arm_compute/core/experimental/DependencyGraph.h | 7 +++---- arm_compute/core/experimental/IWorkload.h | 7 +++---- arm_compute/core/experimental/OperatorGraph.h | 7 +++---- 4 files changed, 12 insertions(+), 16 deletions(-) (limited to 'arm_compute/core') diff --git a/arm_compute/core/experimental/ClWorkload.h b/arm_compute/core/experimental/ClWorkload.h index bcac08b9f7..9b2040a046 100644 --- a/arm_compute/core/experimental/ClWorkload.h +++ b/arm_compute/core/experimental/ClWorkload.h @@ -21,9 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef ENABLE_EXPERIMENTAL_DYNAMIC_FUSION -#error "This experimental feature must be enabled with -DENABLE_EXPERIMENTAL_DYNAMIC_FUSION" -#endif /* ENABLE_EXPERIMENTAL_DYNAMIC_FUSION */ +#ifdef ENABLE_EXPERIMENTAL_DYNAMIC_FUSION #ifndef ARM_COMPUTE_EXPERIMENTAL_DYNAMICFUSION_CLWORKLOAD_H #define ARM_COMPUTE_EXPERIMENTAL_DYNAMICFUSION_CLWORKLOAD_H @@ -217,4 +215,5 @@ Status build(ClWorkload &workload, const OperatorGraph &op_graph, const ClWorklo } // namespace experimental } // namespace arm_compute -#endif //ARM_COMPUTE_EXPERIMENTAL_DYNAMICFUSION_CLWORKLOAD_H \ No newline at end of file +#endif //ARM_COMPUTE_EXPERIMENTAL_DYNAMICFUSION_CLWORKLOAD_H +#endif /* ENABLE_EXPERIMENTAL_DYNAMIC_FUSION */ \ No newline at end of file diff --git a/arm_compute/core/experimental/DependencyGraph.h b/arm_compute/core/experimental/DependencyGraph.h index 794bf0e344..e0d6ff9ba9 100644 --- a/arm_compute/core/experimental/DependencyGraph.h +++ b/arm_compute/core/experimental/DependencyGraph.h @@ -21,9 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef ENABLE_EXPERIMENTAL_DYNAMIC_FUSION -#error "This experimental feature must be enabled with -DENABLE_EXPERIMENTAL_DYNAMIC_FUSION" -#endif /* ENABLE_EXPERIMENTAL_DYNAMIC_FUSION */ +#ifdef ENABLE_EXPERIMENTAL_DYNAMIC_FUSION #ifndef ARM_COMPUTE_EXPERIMENTAL_DYNAMICFUSION_DEPENDENCYGRAPH_H #define ARM_COMPUTE_EXPERIMENTAL_DYNAMICFUSION_DEPENDENCYGRAPH_H @@ -275,4 +273,5 @@ private: } // namespace experimental } // namespace arm_compute -#endif //ARM_COMPUTE_EXPERIMENTAL_DYNAMICFUSION_DEPENDENCYGRAPH_H \ No newline at end of file +#endif //ARM_COMPUTE_EXPERIMENTAL_DYNAMICFUSION_DEPENDENCYGRAPH_H +#endif /* ENABLE_EXPERIMENTAL_DYNAMIC_FUSION */ \ No newline at end of file diff --git a/arm_compute/core/experimental/IWorkload.h b/arm_compute/core/experimental/IWorkload.h index 942dbb70bb..54855c1084 100644 --- a/arm_compute/core/experimental/IWorkload.h +++ b/arm_compute/core/experimental/IWorkload.h @@ -21,9 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef ENABLE_EXPERIMENTAL_DYNAMIC_FUSION -#error "This experimental feature must be enabled with -DENABLE_EXPERIMENTAL_DYNAMIC_FUSION" -#endif /* ENABLE_EXPERIMENTAL_DYNAMIC_FUSION */ +#ifdef ENABLE_EXPERIMENTAL_DYNAMIC_FUSION #ifndef ARM_COMPUTE_EXPERIMENTAL_DYNAMICFUSION_IWORKLOAD_H #define ARM_COMPUTE_EXPERIMENTAL_DYNAMICFUSION_IWORKLOAD_H @@ -130,4 +128,5 @@ struct IWorkload } // namespace dynamic_fusion } // namespace experimental } // namespace arm_compute -#endif //ARM_COMPUTE_EXPERIMENTAL_DYNAMICFUSION_IWORKLOAD_H \ No newline at end of file +#endif //ARM_COMPUTE_EXPERIMENTAL_DYNAMICFUSION_IWORKLOAD_H +#endif /* ENABLE_EXPERIMENTAL_DYNAMIC_FUSION */ \ No newline at end of file diff --git a/arm_compute/core/experimental/OperatorGraph.h b/arm_compute/core/experimental/OperatorGraph.h index 621a719fe6..fd8fcd5c47 100644 --- a/arm_compute/core/experimental/OperatorGraph.h +++ b/arm_compute/core/experimental/OperatorGraph.h @@ -21,9 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef ENABLE_EXPERIMENTAL_DYNAMIC_FUSION -#error "This experimental feature must be enabled with -DENABLE_EXPERIMENTAL_DYNAMIC_FUSION" -#endif /* ENABLE_EXPERIMENTAL_DYNAMIC_FUSION */ +#ifdef ENABLE_EXPERIMENTAL_DYNAMIC_FUSION #ifndef ARM_COMPUTE_EXPERIMENTAL_DYNAMICFUSION_OPERATORGRAPH #define ARM_COMPUTE_EXPERIMENTAL_DYNAMICFUSION_OPERATORGRAPH @@ -208,4 +206,5 @@ bool operator==(const AddDescriptor &, const AddDescriptor &); } // namespace dynamic_fusion } // namespace experimental } // namespace arm_compute -#endif //ARM_COMPUTE_EXPERIMENTAL_DYNAMICFUSION_OPERATORGRAPH \ No newline at end of file +#endif //ARM_COMPUTE_EXPERIMENTAL_DYNAMICFUSION_OPERATORGRAPH +#endif /* ENABLE_EXPERIMENTAL_DYNAMIC_FUSION */ \ No newline at end of file -- cgit v1.2.1