Graph Library

lib/utils/include/utils/containers/find.h

@@ -2,6 +2,7 @@
 #define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_CONTAINERS_FIND_H
 
 #include <algorithm>
+#include <unordered_set>
 
 namespace FlexFlow {
 
@@ -11,6 +12,12 @@ typename Container::const_iterator
   return std::find(c.cbegin(), c.cend(), e);
 }
 
+template <typename V>
+typename std::unordered_set<V>::const_iterator
+    find(std::unordered_set<V> const &c, V const &e) {
+  return c.find(e);
+}
+
 } // namespace FlexFlow
 
 #endif

lib/utils/include/utils/graph/dataflow_graph/dataflow_graph.h

@@ -42,8 +42,6 @@ struct DataflowGraph : virtual public DataflowGraphView {
 private:
   IDataflowGraph &get_interface();
   IDataflowGraph const &get_interface() const;
-
-  friend struct GraphInternal;
 };
 
 } // namespace FlexFlow

lib/utils/include/utils/graph/digraph/algorithms/get_dominators.h

@@ -5,7 +5,22 @@
 
 namespace FlexFlow {
 
+/**
+ * @brief See https://en.wikipedia.org/wiki/Dominator_(graph_theory)
+ *
+ * @note By definition, the root node dominates every node and every node
+ * dominates itself.
+ *
+ */
 std::unordered_set<Node> get_dominators(DiGraphView const &, Node const &);
+
+/**
+ * @brief Returns the intersection of the dominators of the given set of nodes.
+ * @note This is conceptually equivalent to merging the given set of nodes and
+ * then finding the set of dominators of the new merged node (where merged means
+ * that all edges belonging to the set of nodes now pass through a single
+ * unified node).
+ */
 std::unordered_set<Node> get_dominators(DiGraphView const &,
                                         std::unordered_set<Node> const &);
 

lib/utils/include/utils/graph/digraph/digraph.h

@@ -40,8 +40,6 @@ struct DiGraph : virtual DiGraphView {
 private:
   IDiGraph &get_ptr();
   IDiGraph const &get_ptr() const;
-
-  friend struct GraphInternal;
 };
 CHECK_WELL_BEHAVED_VALUE_TYPE_NO_EQ(DiGraph);
 

lib/utils/include/utils/graph/digraph/digraph_view.h

@@ -31,8 +31,6 @@ struct DiGraphView : virtual public GraphView {
 
 private:
   IDiGraphView const &get_ptr() const;
-
-  friend struct GraphInternal;
 };
 CHECK_WELL_BEHAVED_VALUE_TYPE_NO_EQ(DiGraphView);
 

lib/utils/include/utils/graph/multidigraph/algorithms/get_incoming_edges.h

@@ -8,6 +8,9 @@ namespace FlexFlow {
 std::unordered_set<MultiDiEdge> get_incoming_edges(MultiDiGraphView const &,
                                                    Node const &);
 
+std::unordered_map<Node, std::unordered_set<MultiDiEdge>>
+    get_incoming_edges(MultiDiGraphView const &g);
+
 } // namespace FlexFlow
 
 #endif

lib/utils/include/utils/graph/multidigraph/algorithms/get_outgoing_edges.h

@@ -8,6 +8,9 @@ namespace FlexFlow {
 std::unordered_set<MultiDiEdge> get_outgoing_edges(MultiDiGraphView const &,
                                                    Node const &);
 
+std::unordered_map<Node, std::unordered_set<MultiDiEdge>>
+    get_outgoing_edges(MultiDiGraphView const &g);
+
 } // namespace FlexFlow
 
 #endif

lib/utils/include/utils/graph/multidigraph/multidigraph.h

@@ -40,8 +40,6 @@ struct MultiDiGraph : virtual public MultiDiGraphView {
 private:
   IMultiDiGraph &get_interface();
   IMultiDiGraph const &get_interface() const;
-
-  friend struct GraphInternal;
 };
 
 } // namespace FlexFlow

lib/utils/include/utils/graph/node/graph.h

@@ -31,8 +31,6 @@ struct Graph : virtual GraphView {
 private:
   IGraph const &get_ptr() const;
   IGraph &get_ptr();
-
-  friend struct GraphInternal;
 };
 
 } // namespace FlexFlow

lib/utils/include/utils/graph/node/graph_view.h

@@ -22,8 +22,6 @@ struct GraphView {
   GraphView();
   cow_ptr_t<IGraphView> ptr;
   GraphView(cow_ptr_t<IGraphView> ptr);
-
-  friend struct GraphInternal;
 };
 
 } // namespace FlexFlow

lib/utils/include/utils/graph/node/node.struct.toml

@@ -6,6 +6,7 @@ features = [
   "hash",
   "fmt",
   "json",
+  "rapidcheck",
 ]
 
 includes = [

lib/utils/include/utils/graph/series_parallel/parallel_reduction.h

@@ -12,8 +12,15 @@ ParallelReduction make_parallel_reduction(MultiDiEdge const &,
 std::optional<ParallelReduction>
     find_parallel_reduction(MultiDiGraphView const &);
 
+std::unordered_map<DirectedEdge, std::unordered_set<MultiDiEdge>>
+    find_all_extended_parallel_reductions(MultiDiGraphView const &);
+
 MultiDiEdge apply_parallel_reduction(MultiDiGraph &, ParallelReduction const &);
 
+MultiDiEdge
+    apply_extended_parallel_reduction(MultiDiGraph &,
+                                      std::unordered_set<MultiDiEdge> const &);
+
 } // namespace FlexFlow
 
 #endif

lib/utils/include/utils/graph/series_parallel/series_parallel_decomposition.h

@@ -17,6 +17,25 @@ std::unordered_multiset<Node> get_nodes(SeriesSplit const &);
 std::unordered_multiset<Node> get_nodes(ParallelSplit const &);
 std::unordered_multiset<Node> get_nodes(Node const &);
 
+bool is_empty(Node const &node);
+bool is_empty(SeriesSplit const &serial);
+bool is_empty(ParallelSplit const &parallel);
+bool is_empty(SeriesParallelDecomposition const &sp);
+
+bool has_no_duplicate_nodes(SeriesParallelDecomposition const &sp);
+
+SeriesParallelDecomposition delete_node(SeriesParallelDecomposition sp,
+                                        Node const &node);
+
+// duplicate nodes within `sp` are counted multiple times
+size_t num_nodes(SeriesParallelDecomposition const &sp);
+
+SeriesParallelDecomposition serial_composition(
+    std::vector<SeriesParallelDecomposition> const &sp_compositions);
+SeriesParallelDecomposition parallel_composition(
+    std::unordered_multiset<SeriesParallelDecomposition> const
+        &sp_compositions);
+
 } // namespace FlexFlow
 
 #endif

lib/utils/include/utils/graph/series_parallel/series_reduction.h

@@ -4,6 +4,7 @@
 #include "utils/graph/multidigraph/multidiedge.dtg.h"
 #include "utils/graph/multidigraph/multidigraph.h"
 #include "utils/graph/series_parallel/series_reduction.dtg.h"
+#include "utils/hash/vector.h"
 
 namespace FlexFlow {
 
@@ -14,8 +15,14 @@ Node get_center_node(MultiDiGraphView const &, SeriesReduction const &);
 SeriesReduction make_series_reduction(MultiDiEdge const &, MultiDiEdge const &);
 std::optional<SeriesReduction> find_series_reduction(MultiDiGraphView const &);
 
+std::unordered_set<std::vector<MultiDiEdge>>
+    find_all_extended_series_reductions(MultiDiGraphView const &g);
+
 MultiDiEdge apply_series_reduction(MultiDiGraph &, SeriesReduction const &);
 
+MultiDiEdge apply_extended_series_reduction(
+    MultiDiGraph &g, std::vector<MultiDiEdge> const &series_edges);
+
 } // namespace FlexFlow
 
 #endif

lib/utils/include/utils/graph/undirected/undirected_edge.h

@@ -2,33 +2,12 @@
 #define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_UNDIRECTED_UNDIRECTED_EDGE_H
 
 #include "utils/graph/node/node.dtg.h"
-namespace FlexFlow {
-
-struct UndirectedEdge {
-public:
-  UndirectedEdge() = delete;
-  UndirectedEdge(Node const &src, Node const &dst);
+#include "utils/graph/undirected/undirected_edge.dtg.h"
 
-  bool operator==(UndirectedEdge const &) const;
-  bool operator!=(UndirectedEdge const &) const;
-  bool operator<(UndirectedEdge const &) const;
-
-public:
-  Node smaller;
-  Node bigger;
-};
+namespace FlexFlow {
 
-bool is_connected_to(UndirectedEdge const &, Node const &);
+bool is_connected_to(UndirectedEdge const &e, Node const &n);
 
 } // namespace FlexFlow
 
-namespace std {
-
-template <>
-struct hash<::FlexFlow::UndirectedEdge> {
-  size_t operator()(::FlexFlow::UndirectedEdge const &) const;
-};
-
-} // namespace std
-
 #endif

lib/utils/include/utils/graph/undirected/undirected_edge.struct.toml

@@ -0,0 +1,18 @@
+namespace = "FlexFlow"
+name = "UndirectedEdge"
+features = [
+  "eq",
+  "ord",
+  "hash",
+  "fmt",
+  "rapidcheck"
+]
+
+includes = [
+  "utils/commutative_pair.h",
+  "utils/graph/node/node.dtg.h",
+]
+
+[[fields]]
+name = "endpoints"
+type = "::FlexFlow::commutative_pair<::FlexFlow::Node>"

lib/utils/include/utils/graph/undirected/undirected_graph.h

@@ -34,8 +34,6 @@ struct UndirectedGraph : virtual UndirectedGraphView {
 
   using UndirectedGraphView::UndirectedGraphView;
 
-  friend struct GraphInternal;
-
 private:
   IUndirectedGraph const &get_ptr() const;
   IUndirectedGraph &get_ptr();

lib/utils/include/utils/graph/undirected/undirected_graph_view.h

@@ -29,8 +29,6 @@ struct UndirectedGraphView : virtual GraphView {
 
   using GraphView::GraphView;
 
-  friend struct GraphInternal;
-
 private:
   IUndirectedGraphView const &get_ptr() const;
 };