added bean to the straming suites

bh107 · Dec 15, 2016 · 6f3edea · 6f3edea
1 parent b316187
commit 6f3edea
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 37 deletions.
diff --git a/suites/streaming.py b/suites/streaming.py
@@ -1,38 +1,43 @@
 from benchpress.default import *
 
 scripts = [
-    ('X-ray 020^3 40^2',  'xraysim',     '--size=20*40*5'),
-    ('MC Pi 0.1G',   'montecarlo_pi',    '--size=100000000*5'),
-    ('MFE 040^2',    'idl_init_explode', '--size=40*40*5'),
+    ('X-ray 1e10',   'xraysim',             '--size=20*40*10'),
+    ('MC Pi 1.2e10', 'montecarlo_pi',       '--size=100000000*10'),
+    ('MFE 2.3e10',   'idl_init_explode',    '--size=40*40*10'),
+    ('BEAN 5e9',     'galton_bean_machine', '--size=1000000*1000'),   
 
-    ('X-ray 043^3 040^2',  'xraysim',    '--size=43*40*5'),
-    ('X-ray 093^3 040^2',  'xraysim',    '--size=93*40*5'),
-    ('X-ray 200^3 040^2',  'xraysim',    '--size=200*40*5'),
+    ('X-ray 1e11', 'xraysim',  '--size=43*40*10'),
+    ('X-ray 1e12', 'xraysim',  '--size=93*40*10'),
+    ('X-ray 1e13', 'xraysim',  '--size=200*40*10'),
 
-    ('MC Pi 1G',     'montecarlo_pi',    '--size=1000000000*5'),
-    ('MC Pi 10G',    'montecarlo_pi',    '--size=10000000000*5'),
-    ('MC Pi 100G',   'montecarlo_pi',    '--size=100000000000*5'),
+    ('MC Pi 1.2e11', 'montecarlo_pi',  '--size=1000000000*10'),
+    ('MC Pi 1.2e12', 'montecarlo_pi',  '--size=10000000000*10'),
+    ('MC Pi 1.2e13', 'montecarlo_pi',  '--size=100000000000*10'),
 
-    ('MFE 063^2',    'idl_init_explode', '--size=63*63*5'),
-    ('MFE 100^2',    'idl_init_explode', '--size=100*100*5'),
-    ('MFE 159^2',    'idl_init_explode', '--size=159*159*5'),
+    ('MFE 2.3e11', 'idl_init_explode', '--size=63*63*10'),
+    ('MFE 2.3e12', 'idl_init_explode', '--size=100*100*10'),
+    ('MFE 2.3e13', 'idl_init_explode', '--size=159*159*10'),
+
+    ('BEAN 5e10', 'galton_bean_machine', '--size=10000000*1000'),   
+    ('BEAN 5e11', 'galton_bean_machine', '--size=100000000*1000'), 
+    ('BEAN 5e12', 'galton_bean_machine', '--size=1000000000*1000'),
 ]
 
 stack_openmp = [
-    [('default',    'bridge',       None)],
-    [('bcexp',      'bcexp_openmp', None)],
-    [('bccon',      'bccon_openmp', None)],
-    [('node',       'node',         None)],
-    [('openmp',     'openmp',       None)],
+    [('default',    'bridge',  None)],
+    [('bcexp',      'bcexp',   None)],
+    [('bccon',      'bccon',   None)],
+    [('node',       'node',    None)],
+    [('openmp',     'openmp',  None)],
 ]
 
 stack_opencl = [
-    [('default',    'bridge',       None)],
-    [('bcexp',      'bcexp_openmp', None)],
-    [('bccon',      'bccon_openmp', None)],
-    [('node',       'node',         None)],
-    [('opencl',     'opencl',       None)],
-    [('openmp',     'openmp',       None)],
+    [('default',    'bridge',  None)],
+    [('bcexp',      'bcexp',   None)],
+    [('bccon',      'bccon',   None)],
+    [('node',       'node',    None)],
+    [('opencl',     'opencl',  None)],
+    [('openmp',     'openmp',  None)],
 ]
 
 suite_openmp = {
@@ -46,7 +51,7 @@
     'bohrium': stack_opencl
 }
 suite_numpy = {
-    'scripts': scripts[:3], # NumPy can only do the three smallest tests
+    'scripts': scripts[:4], # NumPy can only do the three smallest tests
     'launchers':  [python_numpy],
     'bohrium': bh_stack_none
 }

diff --git a/suites/streamingOff.py b/suites/streamingOff.py
@@ -1,35 +1,30 @@
 from benchpress.default import *
 
 scripts = [
-    ('X-ray 020^3 40^2',  'xraysim',     '--size=20*40*5'),
-    ('MC Pi 0.1G',   'montecarlo_pi',    '--size=100000000*5'),
-    ('MFE 040^2',    'idl_init_explode', '--size=40*40*5'),
+    ('X-ray 1e10',   'xraysim',          '--size=20*40*10'),
+    ('MC Pi 1.2e10', 'montecarlo_pi',    '--size=100000000*10'),
+    ('MFE 2.3e10',   'idl_init_explode', '--size=40*40*10'),
+    ('BEAN 5e9',     'galton_bean_machine', '--size=1000000*1000'),   
 ]
 
 stack_openmp = [
-    [('default',    'bridge',       None)],
-    [('bcexp',      'bcexp_openmp', None)],
-    [('bccon',      'bccon_openmp', None)],
+    [('default',    'bridge',None)],
+    [('bcexp',      'bcexp', None)],
+    [('bccon',      'bccon', None)],
     [\
       ('streamOn',  'node',  {"BH_OPENMP_ARRAY_CONTRACTION":"1"}),
       ('streamOff', 'node',  {"BH_OPENMP_ARRAY_CONTRACTION":"0"}) \
     ],
-    [('openmp',     'openmp',       None)],
+    [('openmp',     'openmp',None)],
 ]
 
 suite_openmp = {
     'scripts': scripts,
     'launchers':  [python_bohrium],
     'bohrium': stack_openmp
 }
-suite_numpy = {
-    'scripts': scripts,
-    'launchers':  [python_numpy],
-    'bohrium': bh_stack_none
-}
 
 suites = [
     suite_openmp,
-    suite_numpy,
 ]