diff options
| author | Giorgio Arena <giorgio.arena@arm.com> | 2022-03-30 12:23:10 +0100 |
|---|---|---|
| committer | Giorgio Arena <giorgio.arena@arm.com> | 2022-03-31 11:08:38 +0000 |
| commit | 892b70a8bb338f0c10c06112c41f6c8e8c3495f9 (patch) | |
| tree | 0a855ad5854335a6c9c48ad30312d3e0b0f0235d /src/core/experimental/dynamic_fusion/ClKernelBuildingImpl | |
| parent | 36a1c119cfabfe3da6ea3ef69a0a21929cb418d6 (diff) | |
| download | ComputeLibrary-892b70a8bb338f0c10c06112c41f6c8e8c3495f9.tar.gz | |
Fix embedded kernel header inclusion for dynamic fusion
Resolves: COMPMID-5155
Signed-off-by: Giorgio Arena <giorgio.arena@arm.com>
Change-Id: Ic16fb12bfa748cac92d73019d08eea53bf470c12
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7354
Reviewed-by: SiCong Li <sicong.li@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/core/experimental/dynamic_fusion/ClKernelBuildingImpl')
| -rw-r--r-- | src/core/experimental/dynamic_fusion/ClKernelBuildingImpl/Common.h | 5 | ||||
| -rw-r--r-- | src/core/experimental/dynamic_fusion/ClKernelBuildingImpl/components/ClGemmNativeKernelComponent.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/core/experimental/dynamic_fusion/ClKernelBuildingImpl/Common.h b/src/core/experimental/dynamic_fusion/ClKernelBuildingImpl/Common.h index 6e1291cdd5..4c720ea1aa 100644 --- a/src/core/experimental/dynamic_fusion/ClKernelBuildingImpl/Common.h +++ b/src/core/experimental/dynamic_fusion/ClKernelBuildingImpl/Common.h @@ -27,6 +27,7 @@ #define ARM_COMPUTE_EXPERIMENTAL_DYNAMICFUSION_IMPL_COMMON_H #include "arm_compute/core/CL/CLCompileContext.h" +#include "arm_compute/core/CL/CLKernelLibrary.h" #include "arm_compute/core/Error.h" #include "arm_compute/core/GPUTarget.h" #include "src/core/common/Macros.h" @@ -494,7 +495,11 @@ public: for(auto &header : headers_list) { +#if defined(EMBEDDED_KERNELS) + code += CLKernelLibrary::get().get_program(header).first; +#else // defined(EMBEDDED_KERNELS) code += "#include \"" + header + "\"\n"; +#endif // defined(EMBEDDED_KERNELS) } for(auto ¯os : additional_macros) diff --git a/src/core/experimental/dynamic_fusion/ClKernelBuildingImpl/components/ClGemmNativeKernelComponent.cpp b/src/core/experimental/dynamic_fusion/ClKernelBuildingImpl/components/ClGemmNativeKernelComponent.cpp index 4bf0b76c3a..7d23128276 100644 --- a/src/core/experimental/dynamic_fusion/ClKernelBuildingImpl/components/ClGemmNativeKernelComponent.cpp +++ b/src/core/experimental/dynamic_fusion/ClKernelBuildingImpl/components/ClGemmNativeKernelComponent.cpp @@ -44,7 +44,7 @@ ComponentType ClGemmNativeKernelComponent::get_component_type() const std::set<std::string> ClGemmNativeKernelComponent::get_headers_list() const { - return std::set<std::string> { "./common/experimental/gemm_fused_post_ops/act_eltwise_op_act/fp_post_ops_act_eltwise_op_act.h", "gemm_helpers.h", "repeat.h" }; + return std::set<std::string> { "common/experimental/gemm_fused_post_ops/act_eltwise_op_act/fp_post_ops_act_eltwise_op_act.h", "gemm_helpers.h", "repeat.h" }; } Window ClGemmNativeKernelComponent::get_window() const |