Get all existing tests passing again

wmdi · Oct 4, 2024 · 5d22c6d · 5d22c6d
1 parent e4073bc
commit 5d22c6d
Show file tree

Hide file tree

Showing 10 changed files with 241 additions and 363 deletions.
diff --git a/lib/compiler/src/compiler/series_parallel/pcg_binary_sp_decomposition.cc b/lib/compiler/src/compiler/series_parallel/pcg_binary_sp_decomposition.cc
@@ -24,19 +24,19 @@ SPDecompositionTreeNodeType get_node_type(PCGBinarySPDecomposition const &d) {
 
 PCGBinarySPDecomposition make_pcg_series_split(PCGBinarySPDecomposition const &lhs, PCGBinarySPDecomposition const &rhs) {
   return PCGBinarySPDecomposition{
-    leaf_only_make_series_split(lhs.raw_tree, rhs.raw_tree),
+    leaf_only_binary_sp_tree_make_series_split(lhs.raw_tree, rhs.raw_tree),
   };
 }
 
 PCGBinarySPDecomposition make_pcg_parallel_split(PCGBinarySPDecomposition const &lhs, PCGBinarySPDecomposition const &rhs) {
   return PCGBinarySPDecomposition{
-    leaf_only_make_parallel_split(lhs.raw_tree, rhs.raw_tree),
+    leaf_only_binary_sp_tree_make_parallel_split(lhs.raw_tree, rhs.raw_tree),
   };
 }
 
 PCGBinarySPDecomposition make_pcg_leaf_node(parallel_layer_guid_t const &l) {
   return PCGBinarySPDecomposition{
-    leaf_only_make_leaf_node(l),
+    leaf_only_binary_sp_tree_make_leaf(l),
   };
 }
 

diff --git a/...eries_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/make.h b/...eries_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/make.h
@@ -7,7 +7,7 @@
 namespace FlexFlow {
 
 template <typename LeafLabel>
-LeafOnlyBinarySPDecompositionTree<LeafLabel> leaf_only_make_series_split(LeafOnlyBinarySPDecompositionTree<LeafLabel> const &pre,
+LeafOnlyBinarySPDecompositionTree<LeafLabel> leaf_only_binary_sp_tree_make_series_split(LeafOnlyBinarySPDecompositionTree<LeafLabel> const &pre,
                                                                LeafOnlyBinarySPDecompositionTree<LeafLabel> const &post) {
   return LeafOnlyBinarySPDecompositionTree<LeafLabel>{
     make_generic_binary_series_split(
@@ -18,7 +18,7 @@ LeafOnlyBinarySPDecompositionTree<LeafLabel> leaf_only_make_series_split(LeafOnl
 }
 
 template <typename LeafLabel>
-LeafOnlyBinarySPDecompositionTree<LeafLabel> leaf_only_make_parallel_split(LeafOnlyBinarySPDecompositionTree<LeafLabel> const &lhs,
+LeafOnlyBinarySPDecompositionTree<LeafLabel> leaf_only_binary_sp_tree_make_parallel_split(LeafOnlyBinarySPDecompositionTree<LeafLabel> const &lhs,
                                                                LeafOnlyBinarySPDecompositionTree<LeafLabel> const &rhs) {
   return LeafOnlyBinarySPDecompositionTree<LeafLabel>{
     make_generic_binary_parallel_split(
@@ -29,12 +29,11 @@ LeafOnlyBinarySPDecompositionTree<LeafLabel> leaf_only_make_parallel_split(LeafO
 }
 
 template <typename LeafLabel>
-LeafOnlyBinarySPDecompositionTree<LeafLabel> leaf_only_make_leaf_node(LeafLabel const &label) {
+LeafOnlyBinarySPDecompositionTree<LeafLabel> leaf_only_binary_sp_tree_make_leaf(LeafLabel const &label) {
   return LeafOnlyBinarySPDecompositionTree<LeafLabel>{
     make_generic_binary_sp_leaf<
       std::monostate,
-      std::monostate,
-      LeafLabel>(label),
+      std::monostate, LeafLabel>(label),
   };
 }
 

diff --git a/.../utils/graph/series_parallel/binary_sp_decomposition_tree/binary_sp_decomposition_tree.cc b/.../utils/graph/series_parallel/binary_sp_decomposition_tree/binary_sp_decomposition_tree.cc
@@ -12,21 +12,21 @@ BinarySPDecompositionTree
     make_series_split(BinarySPDecompositionTree const &lhs,
                       BinarySPDecompositionTree const &rhs) {
   return BinarySPDecompositionTree{
-      leaf_only_make_series_split(lhs.raw_tree, rhs.raw_tree),
+      leaf_only_binary_sp_tree_make_series_split(lhs.raw_tree, rhs.raw_tree),
   };
 }
 
 BinarySPDecompositionTree
     make_parallel_split(BinarySPDecompositionTree const &lhs,
                         BinarySPDecompositionTree const &rhs) {
   return BinarySPDecompositionTree{
-      leaf_only_make_parallel_split(lhs.raw_tree, rhs.raw_tree),
+      leaf_only_binary_sp_tree_make_parallel_split(lhs.raw_tree, rhs.raw_tree),
   };
 }
 
 BinarySPDecompositionTree make_leaf_node(Node const &n) {
   return BinarySPDecompositionTree{
-      leaf_only_make_leaf_node(n),
+      leaf_only_binary_sp_tree_make_leaf(n),
   };
 }
 

diff --git a/...ries_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/make.cc b/...ries_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/make.cc
@@ -3,12 +3,12 @@
 namespace FlexFlow {
 
 template 
-  LeafOnlyBinarySPDecompositionTree<int> leaf_only_make_series_split(LeafOnlyBinarySPDecompositionTree<int> const &,
+  LeafOnlyBinarySPDecompositionTree<int> leaf_only_binary_sp_tree_make_series_split(LeafOnlyBinarySPDecompositionTree<int> const &,
                                                                      LeafOnlyBinarySPDecompositionTree<int> const &);
 template
-  LeafOnlyBinarySPDecompositionTree<int> leaf_only_make_parallel_split(LeafOnlyBinarySPDecompositionTree<int> const &,
+  LeafOnlyBinarySPDecompositionTree<int> leaf_only_binary_sp_tree_make_parallel_split(LeafOnlyBinarySPDecompositionTree<int> const &,
                                                                        LeafOnlyBinarySPDecompositionTree<int> const &);
 template
-  LeafOnlyBinarySPDecompositionTree<int> leaf_only_make_leaf_node(int const &);
+  LeafOnlyBinarySPDecompositionTree<int> leaf_only_binary_sp_tree_make_leaf(int const &);
 
 } // namespace FlexFlow
diff --git a/...series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/hash.cc b/...series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/hash.cc
diff --git a/...mposition_tree/generic_binary_sp_decomposition_tree/is_binary_sp_tree_left_associative.cc b/...mposition_tree/generic_binary_sp_decomposition_tree/is_binary_sp_tree_left_associative.cc