diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-04-13 18:36:53 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-04-13 18:36:53 -0400 |
| commit | f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2 (patch) | |
| tree | 7e846386b9eb1676f9a93fc4a1e55916b9accc97 /gnuradio-core/src/examples/volk_benchmark | |
| parent | 6a1e9783fec6ed827f49db27c171591d30f32933 (diff) | |
Removed whitespace and added dtools/bin/remove-whitespace as a tool to do this in the future.
The sed script was provided by Moritz Fischer.
Diffstat (limited to 'gnuradio-core/src/examples/volk_benchmark')
6 files changed, 16 insertions, 16 deletions
diff --git a/gnuradio-core/src/examples/volk_benchmark/CMakeLists.txt b/gnuradio-core/src/examples/volk_benchmark/CMakeLists.txt index dfae03f83..255d9bf5c 100644 --- a/gnuradio-core/src/examples/volk_benchmark/CMakeLists.txt +++ b/gnuradio-core/src/examples/volk_benchmark/CMakeLists.txt @@ -1,17 +1,17 @@ # Copyright 2012 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/examples/volk_benchmark/README b/gnuradio-core/src/examples/volk_benchmark/README index 516fc15bd..c58b40d11 100644 --- a/gnuradio-core/src/examples/volk_benchmark/README +++ b/gnuradio-core/src/examples/volk_benchmark/README @@ -221,7 +221,7 @@ variables to point to the v3.5.1 installation: And when we run the test, we use the same command line, but the GNU Radio libraries and Python files used come from v3.5.1. We also change the label to indicate the different version to store. - + ./volk_math.py -D volk_results_math.db --all -L v3_5_1 We now have a database populated with three tables for the three diff --git a/gnuradio-core/src/examples/volk_benchmark/volk_math.py b/gnuradio-core/src/examples/volk_benchmark/volk_math.py index 8bf9ed6f3..1d8bf04cc 100755 --- a/gnuradio-core/src/examples/volk_benchmark/volk_math.py +++ b/gnuradio-core/src/examples/volk_benchmark/volk_math.py @@ -125,7 +125,7 @@ def main(): if(args.list): print "Available Tests to Run:" print "\n".join(["\t{0}: {1}".format(i,f.__name__) for i,f in enumerate(avail_tests)]) - sys.exit(0) + sys.exit(0) N = int(args.nitems) iters = args.iterations @@ -143,7 +143,7 @@ def main(): res = run_tests(avail_tests[test], N, iters) if res is not None: replace_results(conn, label, N, iters, res) - + if __name__ == "__main__": try: main() diff --git a/gnuradio-core/src/examples/volk_benchmark/volk_plot.py b/gnuradio-core/src/examples/volk_benchmark/volk_plot.py index 823dfbf64..48f992205 100755 --- a/gnuradio-core/src/examples/volk_benchmark/volk_plot.py +++ b/gnuradio-core/src/examples/volk_benchmark/volk_plot.py @@ -29,7 +29,7 @@ def main(): default=None, metavar="table", help='Show percent difference to the given type [default: %(default)s]') args = parser.parse_args() - + # Set up global plotting properties matplotlib.rcParams['figure.subplot.bottom'] = 0.2 matplotlib.rcParams['figure.subplot.top'] = 0.95 @@ -37,7 +37,7 @@ def main(): matplotlib.rcParams['ytick.labelsize'] = 16 matplotlib.rcParams['xtick.labelsize'] = 16 matplotlib.rcParams['legend.fontsize'] = 18 - + # Get list of tables to compare conn = create_connection(args.database) tables = list_tables(conn) @@ -64,7 +64,7 @@ def main(): except ValueError: tmp_regs[-1].append(r['kernel']) - # Get only those names that are common in all tables + # Get only those names that are common in all tables name_reg = tmp_regs[0] for t in tmp_regs[1:]: name_reg = list(set(name_reg) & set(t)) @@ -97,7 +97,7 @@ def main(): norm_data.append(table_data[t][name]['min']) elif(args.plot == 'mean'): norm_data.append(table_data[t][name]['avg']) - + # Plot the results x0 = xrange(len(name_reg)) diff --git a/gnuradio-core/src/examples/volk_benchmark/volk_test_funcs.py b/gnuradio-core/src/examples/volk_benchmark/volk_test_funcs.py index 4f4e4afd3..0ce25fcc6 100644 --- a/gnuradio-core/src/examples/volk_benchmark/volk_test_funcs.py +++ b/gnuradio-core/src/examples/volk_benchmark/volk_test_funcs.py @@ -56,7 +56,7 @@ def insert_results(conn, tablename, nitems, iters, res): ''' cols = "kernel, nitems, iters, avg, var, max, min" cmd = "INSERT INTO {0} ({1}) VALUES ('{2}', {3}, {4}, {5}, {6}, {7}, {8})".format( - tablename, cols, res["kernel"], nitems, iters, + tablename, cols, res["kernel"], nitems, iters, res["avg"], res["var"], res["max"], res["min"]) execute(conn, cmd) @@ -71,7 +71,7 @@ def list_tables(conn): c.close() return t - + def get_results(conn, tablename): ''' Gets all results in tablename. @@ -95,7 +95,7 @@ def get_results(conn, tablename): res.append(r) return res - + class helper(gr.top_block): ''' diff --git a/gnuradio-core/src/examples/volk_benchmark/volk_types.py b/gnuradio-core/src/examples/volk_benchmark/volk_types.py index 3bc5a22ae..5dac23c53 100755 --- a/gnuradio-core/src/examples/volk_benchmark/volk_types.py +++ b/gnuradio-core/src/examples/volk_benchmark/volk_types.py @@ -156,7 +156,7 @@ def main(): if(args.list): print "Available Tests to Run:" print "\n".join(["\t{0}: {1}".format(i,f.__name__) for i,f in enumerate(avail_tests)]) - sys.exit(0) + sys.exit(0) N = int(args.nitems) iters = args.iterations @@ -174,7 +174,7 @@ def main(): res = run_tests(avail_tests[test], N, iters) if res is not None: replace_results(conn, label, N, iters, res) - + if __name__ == "__main__": try: main() |