Remove INTERNAL_ONLY
authormorgolock <pablo.tello@arm.com>
Thu, 19 Nov 2020 14:38:22 +0000 (14:38 +0000)
committerPablo Marquez Tello <pablo.tello@arm.com>
Thu, 19 Nov 2020 15:55:31 +0000 (15:55 +0000)
Change-Id: I39f0296fdb8c9be36c2775fab9b91ef22db7b136
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4479
Reviewed-by: SiCong Li <sicong.li@arm.com>
Tested-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
SConstruct
tests/SConscript

index e5a60c0ad4fd2af9821ceefa51baffe9b4127f8e..5dac49409782d363a764c38754bc7e86f8ff1c3d 100644 (file)
@@ -64,8 +64,6 @@ vars.AddVariables(
     PathVariable("install_dir", "Specify sub-folder for the install", "", PathVariable.PathAccept),
     BoolVariable("exceptions", "Enable/disable C++ exception support", True),
     PathVariable("linker_script", "Use an external linker script", "", PathVariable.PathAccept),
-    #FIXME Remove before release (And remove all references to INTERNAL_ONLY)
-    BoolVariable("internal_only", "Enable ARM internal only tests", False),
     ListVariable("custom_options", "Custom options that can be used to turn on/off features", "none", ["disable_mmla_fp"]),
     ListVariable("data_type_support", "Enable a list of data types to support", "all", ["qasymm8", "qasymm8_signed", "qsymm16", "fp16", "fp32"]),
     ("toolchain_prefix", "Override the toolchain prefix", ""),
index 6fc67af747d3ad083978234b979931e2a82fe4b3..42f9f3555227d91bfd8b29ec968e455bbd84f03a 100644 (file)
@@ -88,10 +88,6 @@ else:
 if env['os'] in ['bare_metal']:
     Import("bootcode_o")
 
-#FIXME Delete before release
-if env['internal_only']:
-    test_env.Append(CPPDEFINES=['INTERNAL_ONLY'])
-
 test_env.Append(CPPPATH = ["#3rdparty/include"])
 test_env.Append(LIBPATH = ["#3rdparty/%s/%s" % (env['os'], env['arch'])])
 
@@ -99,9 +95,6 @@ common_files = Glob('*.cpp')
 common_objects = [test_env.StaticObject(f) for f in common_files]
 
 files_benchmark = Glob('benchmark/*.cpp')
-#FIXME Delete before release
-if env['internal_only']:
-    files_benchmark += Glob('../3rdparty/tests/benchmark/*.cpp')
 
 # Add unit tests
 files_validation = Glob('validation/UNIT/*/*.cpp')
@@ -118,24 +111,14 @@ if env['opencl']:
 
     files_benchmark += Glob('benchmark/CL/*/' + filter_pattern)
     files_benchmark += Glob('benchmark/CL/' + filter_pattern)
-    #FIXME Delete before release
-    if env['internal_only']:
-        files_benchmark += Glob('../3rdparty/tests/benchmark/CL/' + filter_pattern)
 
     files_validation += Glob('validation/CL/*/' + filter_pattern)
     files_validation += Glob('validation/CL/' + filter_pattern)
-    #FIXME Delete before release
-    if env['internal_only']:
-        files_validation += Glob('../3rdparty/tests/validation/CL/' + filter_pattern)
 
 if env['neon']:
     filter_pattern = test_env['test_filter']
     files_benchmark += Glob('benchmark/NEON/*/' + filter_pattern)
     files_benchmark += Glob('benchmark/NEON/' + filter_pattern)
-    #FIXME Delete before release
-    if env['internal_only']:
-        files_benchmark += Glob('../3rdparty/tests/benchmark/NEON/' + filter_pattern)
-
     files_validation += Glob('validation/NEON/' + filter_pattern)
     if env['os'] == 'bare_metal':
         files_validation += Glob('validation/NEON/UNIT/MemoryManager.cpp' + filter_pattern)