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 /SConscript | |
| 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 'SConscript')
| -rw-r--r-- | SConscript | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/SConscript b/SConscript index dd0f1488ac..3e5fa2f449 100644 --- a/SConscript +++ b/SConscript @@ -74,7 +74,7 @@ def build_obj_list(arch_info, sources, static=False): objs = tmp_env.StaticObject(sources) else: objs = tmp_env.SharedObject(sources) - + tmp_env.Default(objs) return objs @@ -96,7 +96,7 @@ def build_lib_objects(): # Build all the common files for the base architecture lib_static_objs += build_obj_list(filedefs["armv8.2-a"], lib_files, static=True) lib_shared_objs += build_obj_list(filedefs["armv8.2-a"], lib_files, static=False) - + # Build the SVE specific files lib_static_objs += build_obj_list(filedefs["armv8.2-a-sve"], lib_files_sve, static=True) lib_shared_objs += build_obj_list(filedefs["armv8.2-a-sve"], lib_files_sve, static=False) @@ -325,7 +325,7 @@ cpp_compiler = os.environ.get('CXX', default_cpp_compiler) # Generate embed files generate_embed = [ version_file ] if env['opencl'] and env['embed_kernels']: - + # Header files cl_helper_files = [ 'src/core/CL/cl_kernels/activation_float_helpers.h', 'src/core/CL/cl_kernels/activation_quant_helpers.h', @@ -496,12 +496,8 @@ lib_files = filelist['common'] # Experimental files # Dynamic fusion if env['experimental_dynamic_fusion']: - if env['embed_kernels']: - # COMPMID-5176 - print("Dynamic fusion with embed_kernels=1 not supported. Skipping.") - else: - lib_files += filelist['experimental']['dynamic_fusion'] - arm_compute_env.Append(CPPDEFINES = ['ENABLE_EXPERIMENTAL_DYNAMIC_FUSION']) + lib_files += filelist['experimental']['dynamic_fusion'] + arm_compute_env.Append(CPPDEFINES = ['ENABLE_EXPERIMENTAL_DYNAMIC_FUSION']) # Logging files |