updated the streaming suites

bh107 · Dec 5, 2016 · 28f362b · 28f362b
1 parent c7afaee
commit 28f362b
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 2 deletions.
diff --git a/suites/streaming.py b/suites/streaming.py
@@ -1,15 +1,15 @@
 from benchpress.default import *
 
 scripts = [
-    ('X-ray 020^3 40^2',  'xraysim',    '--size=20*40*5'),
+    ('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 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'),
 
-    ('MC Pi 1G',    'montecarlo_pi',    '--size=1000000000*5'),
+    ('MC Pi 1G',     'montecarlo_pi',    '--size=1000000000*5'),
     ('MC Pi 10G',    'montecarlo_pi',    '--size=10000000000*5'),
     ('MC Pi 100G',   'montecarlo_pi',    '--size=100000000000*5'),
 

diff --git a/suites/streamingOff.py b/suites/streamingOff.py
@@ -0,0 +1,35 @@
+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'),
+]
+
+stack_openmp = [
+    [('default',    'bridge',       None)],
+    [('bcexp',      'bcexp_openmp', None)],
+    [('bccon',      'bccon_openmp', None)],
+    [\
+      ('streamOn',  'node',  {"BH_OPENMP_ARRAY_CONTRACTION":"1"}),
+      ('streamOff', 'node',  {"BH_OPENMP_ARRAY_CONTRACTION":"0"}) \
+    ],
+    [('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,
+]
+