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 --- tests/validation/CL/UNIT/dynamic_fusion/ClCompositeKernel.cpp | 7 +++---- tests/validation/CL/UNIT/dynamic_fusion/DependencyGraph.cpp | 7 +++---- .../dynamic_fusion/Integration_OperatorFuseMovenetSubGraph1.cpp | 7 +++---- 3 files changed, 9 insertions(+), 12 deletions(-) (limited to 'tests/validation') diff --git a/tests/validation/CL/UNIT/dynamic_fusion/ClCompositeKernel.cpp b/tests/validation/CL/UNIT/dynamic_fusion/ClCompositeKernel.cpp index a6b09ccdea..96a845c36e 100644 --- a/tests/validation/CL/UNIT/dynamic_fusion/ClCompositeKernel.cpp +++ b/tests/validation/CL/UNIT/dynamic_fusion/ClCompositeKernel.cpp @@ -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 #include "src/gpu/cl/kernels/experimental/dynamic_fusion/ClCompositeKernel.h" #include "src/core/experimental/dynamic_fusion/ClKernelBuildingAPI.h" @@ -212,4 +210,5 @@ TEST_SUITE_END() // UNIT TEST_SUITE_END() // CL } // namespace validation } // namespace test -} // namespace arm_compute \ No newline at end of file +} // namespace arm_compute +#endif /* ENABLE_EXPERIMENTAL_DYNAMIC_FUSION */ \ No newline at end of file diff --git a/tests/validation/CL/UNIT/dynamic_fusion/DependencyGraph.cpp b/tests/validation/CL/UNIT/dynamic_fusion/DependencyGraph.cpp index 6962f0e6d1..1824efff99 100644 --- a/tests/validation/CL/UNIT/dynamic_fusion/DependencyGraph.cpp +++ b/tests/validation/CL/UNIT/dynamic_fusion/DependencyGraph.cpp @@ -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 #include "arm_compute/core/experimental/DependencyGraph.h" #include "tests/framework/Asserts.h" @@ -264,4 +262,5 @@ TEST_SUITE_END() // UNIT TEST_SUITE_END() // CL } // namespace validation } // namespace test -} // namespace arm_compute \ No newline at end of file +} // namespace arm_compute +#endif /* ENABLE_EXPERIMENTAL_DYNAMIC_FUSION */ \ No newline at end of file diff --git a/tests/validation/CL/UNIT/dynamic_fusion/Integration_OperatorFuseMovenetSubGraph1.cpp b/tests/validation/CL/UNIT/dynamic_fusion/Integration_OperatorFuseMovenetSubGraph1.cpp index 1b04b0cee0..fe8d23ef15 100644 --- a/tests/validation/CL/UNIT/dynamic_fusion/Integration_OperatorFuseMovenetSubGraph1.cpp +++ b/tests/validation/CL/UNIT/dynamic_fusion/Integration_OperatorFuseMovenetSubGraph1.cpp @@ -22,9 +22,7 @@ * 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 #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/CL/CLKernelLibrary.h" @@ -400,4 +398,5 @@ TEST_SUITE_END() // INTEGRATION TEST_SUITE_END() // CL } // namespace validation } // namespace test -} // namespace arm_compute \ No newline at end of file +} // namespace arm_compute +#endif /* ENABLE_EXPERIMENTAL_DYNAMIC_FUSION */ \ No newline at end of file -- cgit v1.2.1