More logging for evaluation.

Author: gsvgit

cfpq_add_context/add_contexts.py

@@ -56,12 +56,13 @@ def to_label_decomposed_graph(graph):
     alloc_r << alloc.T
     print("Boolean matrix for alloc_r nvals: ", alloc_r.nvals)
 
-    print("mask start")
-    mask_v = Vector(BOOL, graph.ncols, name = "mask_vector")
-    mask_v(op.lor) << alloc.reduce_columnwise("lor")  
-    mask_v(op.lor) << alloc.reduce_rowwise("lor")
+    #print("mask start")
+    #mask_v = Vector(BOOL, graph.ncols, name = "mask_vector")
+    #mask_v(op.lor) << alloc.reduce_columnwise("lor")  
+    #mask_v(op.lor) << alloc.reduce_rowwise("lor")
+
+    #print("entrypoints start")
 
-    print("entrypoints start")
     #entrypoints = Vector(bool,graph.nrows, name="entrypoints")
     #entrypoints << graph.reduce_columnwise(op.lor)
     #mask_v(op.lor) << Vector.from_coo(list(set(range(0,graph.nrows)).difference(entrypoints.to_coo(values=False)[0])), values=True, dtype = BOOL)
@@ -74,11 +75,11 @@ def to_label_decomposed_graph(graph):
     store_i << graph.select(graphblas.select.select_store).apply(graphblas.unary.decode_store)
     print("Matrix for store_i nvals: ", store_i.nvals)
 
-    mask_v(op.lor) << load_i.reduce_columnwise("lor")
-    mask_v(op.lor) << load_i.reduce_rowwise("lor")
+    #mask_v(op.lor) << load_i.reduce_columnwise("lor")
+    #mask_v(op.lor) << load_i.reduce_rowwise("lor")
 
-    mask_v(op.lor) << store_i.reduce_columnwise("lor")
-    mask_v(op.lor) << store_i.reduce_rowwise("lor")
+    #mask_v(op.lor) << store_i.reduce_columnwise("lor")
+    #mask_v(op.lor) << store_i.reduce_rowwise("lor")
 
     store_block_count = store_i.reduce_scalar("max").get(0) + 1
     load_block_count = load_i.reduce_scalar("max").get(0) + 1
@@ -106,7 +107,7 @@ def to_label_decomposed_graph(graph):
 
 
 
-    assign_mask = mask_v.diag(name = "assign_mask")
+    #assign_mask = mask_v.diag(name = "assign_mask")
 
     assign = Matrix(BOOL, graph.ncols, graph.nrows, name = "assign_after_intersection")
     assign << graph.select(graphblas.select.select_assign)
@@ -133,17 +134,6 @@ def to_label_decomposed_graph(graph):
 
     #print_matrix_to_dot(assign_r,"assign_r.dot")
 
-    
-
-    
-
-    
-
-    
-
-    
-    
-
     matrices: Dict[Symbol, Matrix] = {}
 
     matrices[Symbol('alloc')] = alloc
@@ -164,10 +154,10 @@ def to_label_decomposed_graph(graph):
                 matrices=matrices
             )
 
-def add_context(file_path):
+def add_context(file_path, max_num_of_contexts):
     load_graph_start = time.perf_counter()
 
-    graph,number_of_contexts = load_graph(file_path)
+    graph,number_of_contexts = load_graph(file_path, max_num_of_contexts)
 
     load_graph_end = time.perf_counter()
     print("Graph loaded in ", load_graph_end - load_graph_start)

cfpq_add_context/load_graph.py

@@ -8,7 +8,7 @@
 
 
 
-def load_graph(file_path):
+def load_graph(file_path, max_num_of_contexts = 30):
     nvertices = 0
     number_of_contexts = 0
     def get_edge_lbl(terminal):
@@ -25,13 +25,13 @@ def get_edge_lbl(terminal):
         elif data_arr[0] == "alloc":
             return labels.mk_other(labels.ALLOC)
         elif "open" in data_arr[0]:
-            _context =  int(data_arr[0].split('_')[1])
+            _context =  int(data_arr[0].split('_')[1]) % max_num_of_contexts
             res = labels.mk_open_context_from_pass(_context)
 
             number_of_contexts = max(number_of_contexts, _context)
             return res
         elif "close" in data_arr[0]:
-            _context = int(data_arr[0].split('_')[1])
+            _context = int(data_arr[0].split('_')[1]) % max_num_of_contexts
             res = labels.mk_close_context_from_ret(_context)
             number_of_contexts = max(number_of_contexts, _context)
             return res

cfpq_cli/run_all_pairs_cflr.py

@@ -26,10 +26,12 @@ def run_all_pairs_cflr(
         settings: List[AlgoSetting],
         add_contexts: bool = False,
         expected_path: str = "",
+        max_num_of_contexts = 30,
 ):
+    total_start = time()
     algo = get_all_pairs_cfl_reachability_algo(algo_name)
     if add_contexts:
-        graph,initial_graph_nvertices = add_context(graph_path)
+        graph,initial_graph_nvertices = add_context(graph_path, max_num_of_contexts)
     else:
         graph = LabelDecomposedGraph.read_from_pocr_graph_file(graph_path)
     grammar = CnfGrammarTemplate.read_from_pocr_cnf_file(grammar_path)
@@ -53,6 +55,8 @@ def run_all_pairs_cflr(
                 with open(out_path, 'w', encoding="utf-8") as out_file:
                     for (source, target) in res:
                         out_file.write(f"{source}\t{target}\n")
+            print ("Graph name: ", graph_path)
+            print("Total execution time = ", time() - total_start)
     except TimeoutException:
         print("AnalysisTime\tNaN")
         print("#SEdges\tNaN")
@@ -83,6 +87,8 @@ def main(raw_args: List[str]):
                              '`Count:\\n <START_NON_TERMINAL>`.')
     parser.add_argument('--time-limit', dest='time_limit', default=None, type=int,
                         help='Sets a time limit in seconds.')
+    parser.add_argument('--max-num-of-contexts', dest='max_num_of_contexts', default=30, type=int,
+                        help='Sets a maximal number of contexts.')
     parser.add_argument('--out', dest='out', default=None,
                         help='Specifies the output file for saving vertex pairs. '
                              'The line format is: `[START_VERTEX]\t[END_VERTEX]`. '