diff options
| -rw-r--r-- | .gitmodules | 4 | ||||
| m--------- | 3rdparty | 0 | ||||
| -rw-r--r-- | examples/SConscript | 16 | ||||
| -rw-r--r-- | tests/SConscript | 6 |
4 files changed, 2 insertions, 24 deletions
diff --git a/.gitmodules b/.gitmodules index da9bc32fee..e69de29bb2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +0,0 @@ -[submodule "3rdparty"] - path = 3rdparty - url = https://eu-gerrit-1.euhpc.arm.com/VisualCompute/3rdparty - branch = master diff --git a/3rdparty b/3rdparty deleted file mode 160000 -Subproject ba65985c4a47effae4620b95b158ecae8764d2e diff --git a/examples/SConscript b/examples/SConscript index cd07c6a15a..225abbb9b1 100644 --- a/examples/SConscript +++ b/examples/SConscript @@ -131,19 +131,3 @@ if env['gles_compute']: alias = examples_env.Alias(example, prog) Default(alias) -#FIXME Delete 3rdparty builds before release -for file in Glob("#3rdparty/examples/graph_*.cpp"): - example = os.path.basename(os.path.splitext(str(file))[0]) - prog = None - - if env['os'] in ['android', 'bare_metal'] or env['standalone']: - prog = examples_env.Program(example, [examples_env.Object(source=file, target=example), utils, graph_utils], LIBS = examples_libs + arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+['-Wl,--whole-archive',graph_dependency,'-Wl,--no-whole-archive'] + extra_link_flags) - Depends(prog, graph_dependency) - prog = install_bin(prog) - else: - #-Wl,--allow-shlib-undefined: Ignore dependencies of dependencies - prog = examples_env.Program(example, [examples_env.Object(source=file, target=example), utils, graph_utils], LIBS = examples_libs + arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+['-Wl,--allow-shlib-undefined'] ) - Depends(prog, graph_dependency) - prog = install_bin(prog) - alias = examples_env.Alias(example, prog) - Default(alias) diff --git a/tests/SConscript b/tests/SConscript index 42f9f35552..b625f032bc 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -31,9 +31,8 @@ variables = [ BoolVariable("benchmark_examples", "Build benchmark examples programs", True), BoolVariable("validate_examples", "Build validate examples programs", True), BoolVariable("reference_openmp", "Build reference validation with openmp", True), - #FIXME Switch the following two options to False before releasing - BoolVariable("validation_tests", "Build validation test programs", True), - BoolVariable("benchmark_tests", "Build benchmark test programs", True), + BoolVariable("validation_tests", "Build validation test programs", False), + BoolVariable("benchmark_tests", "Build benchmark test programs", False), ("test_filter", "Pattern to specify the tests' filenames to be compiled", "*.cpp") ] @@ -111,7 +110,6 @@ if env['opencl']: files_benchmark += Glob('benchmark/CL/*/' + filter_pattern) files_benchmark += Glob('benchmark/CL/' + filter_pattern) - files_validation += Glob('validation/CL/*/' + filter_pattern) files_validation += Glob('validation/CL/' + filter_pattern) |