Ignore reversed edges on graph loading. Add them back ater intersection.

Author: gsvgit

cfpq_add_context/add_contexts.py

@@ -31,16 +31,18 @@ def to_label_decomposed_graph(graph):
     print("Boolean matrix for alloc nvals: ", alloc.nvals)
 
     alloc_r = Matrix(BOOL, graph.ncols, graph.nrows, name = "alloc_r_after_intersection")
-    alloc_r << graph.select(graphblas.select.select_alloc_r)
+    #alloc_r << graph.select(graphblas.select.select_alloc_r)
+    alloc_r << alloc.T
     print("Boolean matrix for alloc_r nvals: ", alloc_r.nvals)
 
     assign = Matrix(BOOL, graph.ncols, graph.nrows, name = "assign_after_intersection")
     assign << graph.select(graphblas.select.select_assign)
     print("Boolean matrix for assign nvals: ", assign.nvals)
 
     assign_r = Matrix(BOOL, graph.ncols, graph.nrows, name = "assign_r_after_intersection")
-    assign_r << graph.select(graphblas.select.select_assign_r)
-    assign_r << assign_r + graph.select(graphblas.select.select_pass_and_return).T
+    #assign_r << graph.select(graphblas.select.select_assign_r)
+    #assign_r << assign_r + graph.select(graphblas.select.select_pass_and_return).T
+    assign_r << assign.T
     print("Boolean matrix for assign_r nvals: ", assign_r.nvals)
 
     #print_matrix_to_dot(assign_r,"assign_r.dot")
@@ -49,13 +51,15 @@ def to_label_decomposed_graph(graph):
     load_i << graph.select(graphblas.select.select_load).apply(graphblas.unary.decode_load)
 
     load_r_i = Matrix(UINT64, graph.ncols, graph.nrows, name = "load_r_i_after_intersection")
-    load_r_i << graph.select(graphblas.select.select_load_r).apply(graphblas.unary.decode_load_r)
+    #load_r_i << graph.select(graphblas.select.select_load_r).apply(graphblas.unary.decode_load_r)
+    load_r_i << load_i.T
 
     store_i = Matrix(UINT64, graph.ncols, graph.nrows, name = "store_i_after_intersection")
     store_i << graph.select(graphblas.select.select_store).apply(graphblas.unary.decode_store)
 
     store_r_i = Matrix(UINT64, graph.ncols, graph.nrows, name = "store_r_i_after_intersection")
-    store_r_i << graph.select(graphblas.select.select_store_r).apply(graphblas.unary.decode_store_r)
+    #store_r_i << graph.select(graphblas.select.select_store_r).apply(graphblas.unary.decode_store_r)
+    store_r_i << store_i.T
 
     store_block_count = store_i.reduce_scalar("max").get(0) + 1
     load_block_count = load_i.reduce_scalar("max").get(0) + 1

cfpq_add_context/intersection.py

@@ -70,7 +70,7 @@ def intersection (graph, automata) :
     entrypoints << graph.select(graphblas.select.select_not_reversed).reduce_columnwise(graphblas.monoid.lor)
     entrypoints = set(range(0,graph.nrows)).difference(entrypoints.to_coo(values=False)[0])
 
-    print("entypoints:", entrypoints)
+    #print("entypoints:", entrypoints)
 
     #sources = [i * automata.nrows for i in range(0,graph.nrows)]
     sources = [i * automata.nrows for i in entrypoints]
@@ -84,7 +84,7 @@ def intersection (graph, automata) :
     unreachable_vertices_removing_end = time.perf_counter()
     print("Removing of unreachable vertices done in ", unreachable_vertices_removing_end - zeroes_removing_from_intersection_end)
 
-    #print_matrix_to_dot(result, "kron_filtered.dot")
+    print_matrix_to_dot(result, "kron_filtered.dot")
     return result
 
 

cfpq_add_context/labels.py

@@ -29,11 +29,6 @@ def intersection_op (x:int, y:int) -> int:
 BinaryOp.register_new("intersection_op", intersection_op)
 Monoid.register_new("labels_intersection", binary.intersection_op, identity=NOTHING)
 
-#def mk_open_context(x:int) -> int : 
-#    return NOTHING | (x << 43)
-#def mk_close_context(x:int) -> int : 
-#    return NOTHING | (x << 22)
-
 def mk_open_context_from_pass(x:int) -> int : 
     return NOTHING | ((2 * (x + 1) + 1) << 43)
 def mk_close_context_from_ret(x:int) -> int : 

cfpq_add_context/load_graph.py

@@ -25,8 +25,8 @@ def get_edge_lbl(data_arr):
                 return labels.mk_store(int(data_arr[3]))
         elif data_arr[2] == "assign":
             return labels.mk_other(labels.ASSIGN)
-        elif data_arr[2] == "assign_r":
-            return labels.mk_other(labels.ASSIGN_R)
+        #elif data_arr[2] == "assign_r":
+        #    return labels.mk_other(labels.ASSIGN_R)
         elif data_arr[2] == "alloc":
             return labels.mk_other(labels.ALLOC)
         elif data_arr[2] == "alloc_r":
@@ -66,7 +66,7 @@ def handle_line(line):
         return (_from, _to, _lbl)
 
     with open (file_path,'r') as file:
-        edges = [handle_line(line) for line in file if len(line.strip()) > 0]
+        edges = [handle_line(line) for line in file if len(line.strip()) > 0 and not("_r") in line]
         #TODO Remove dup_op! It is a hack to avoid edges duplication.
         result = Matrix.from_edgelist(edges, dtype=UINT64, nrows=nvertices + 1, ncols=nvertices + 1, name="graph",dup_op="max")
         #print_matrix_to_dot(result, "graph.dot")