Changeset 823 for soft/giet_vm/applications/rosenfeld/scripts/create_graph.py

Timestamp:

Jun 14, 2016, 5:23:56 PM (8 years ago)

Author:

meunier

Message:

• Improved scripts for simulations and graphes
• Continued to clean up the lib nrc2 (from nrio2x.x to nrmem1.c)
• Added a version (Fast - Parmerge - No stats)

File:

• soft/giet_vm/applications/rosenfeld/scripts/create_graph.py (modified) (6 diffs)

soft/giet_vm/applications/rosenfeld/scripts/create_graph.py

@@ -16 +16 @@
 import filecmp
 import random
+import math
 
 from stack import Stack
@@ -23 +24 @@
 
 use_rand_images = True
-with_features = True
+with_features = False
 
-threads = [1, 2, 4]
-nb_step = 0
+threads = [1, 2, 4, 8, 16, 32, 64]
 use_dsk = True
-img_size = 1024
+img_size = 2048
 granularity = 1
 rand_seed = 7
@@ -42 +42 @@
 # Each of these configuration must have been run with both features activated and deactivated
 configs = [
-        {'SLOW':'1', 'FAST':'0', 'PARMERGE':'0', 'ARSP':'0'},
-        {'SLOW':'0', 'FAST':'1', 'PARMERGE':'0', 'ARSP':'0'},
         #{'SLOW':'1', 'FAST':'0', 'PARMERGE':'0', 'ARSP':'0'},
         #{'SLOW':'0', 'FAST':'1', 'PARMERGE':'0', 'ARSP':'0'},
         #{'SLOW':'0', 'FAST':'1', 'PARMERGE':'1', 'ARSP':'0'},
-        #{'SLOW':'0', 'FAST':'1', 'PARMERGE':'1', 'ARSP':'1'},
+        {'SLOW':'0', 'FAST':'1', 'PARMERGE':'1', 'ARSP':'1'},
 ]
 
@@ -55 +53 @@
     code = compile(f.read(), pyconf_file, 'exec')
     exec(code)
+
+nb_step = 0
 
 if use_dsk:
@@ -125 +125 @@
         plotter.add_x(X)
         assert(nb_step == 4)
-        YPAR1 = [float(exec_time[fconfig][thread]["NF"][density][0]) for density in range(0, 101)] # Parallel Labeling
-        YPAR2 = [float(exec_time[fconfig][thread]["NF"][density][1]) for density in range(0, 101)] # Merging (Parallel or Pyramidal)
-        YPTC2 = [float(exec_time[fconfig][thread]["NF"][density][2]) for density in range(0, 101)] # Parallel Transitive Closure
-        YPAR3 = [float(exec_time[fconfig][thread]["NF"][density][3]) for density in range(0, 101)] # Parallel Relabeling
+        YPAR1 = [float(int(exec_time[fconfig][thread]["NF"][density][0]) / math.pow(img_size, 2)) for density in range(0, 101)] # Parallel Labeling
+        YPAR2 = [float(int(exec_time[fconfig][thread]["NF"][density][1]) / math.pow(img_size, 2)) for density in range(0, 101)] # Merging (Parallel or Pyramidal)
+        YPTC2 = [float(int(exec_time[fconfig][thread]["NF"][density][2]) / math.pow(img_size, 2)) for density in range(0, 101)] # Parallel Transitive Closure
+        YPAR3 = [float(int(exec_time[fconfig][thread]["NF"][density][3]) / math.pow(img_size, 2)) for density in range(0, 101)] # Parallel Relabeling
 
         plotter.add_y(YPAR1)
@@ -136 +136 @@
 
         if with_features:
-            YPAR1f = [float(exec_time[fconfig][thread]["FT"][density][0]) for density in range(0, 101)] # Parallel Labeling
-            YPAR2f = [float(exec_time[fconfig][thread]["FT"][density][1]) for density in range(0, 101)] # Merging (Parallel or Pyramidal)
+            YPAR1f = [float(int(exec_time[fconfig][thread]["FT"][density][0]) / math.pow(img_size, 2)) for density in range(0, 101)] # Parallel Labeling
+            YPAR2f = [float(int(exec_time[fconfig][thread]["FT"][density][1]) / math.pow(img_size, 2)) for density in range(0, 101)] # Merging (Parallel or Pyramidal)
             deltaYPAR1 = [max(0, x - y) for x, y in zip (YPAR1f, YPAR1)]
             deltaYPAR2 = [max(0, x - y) for x, y in zip (YPAR2f, YPAR2)]