diff --git a/bin/export-model-arch/src/export_model_arch.cc b/bin/export-model-arch/src/export_model_arch.cc index 8b3b90b21b..9da33023a0 100644 --- a/bin/export-model-arch/src/export_model_arch.cc +++ b/bin/export-model-arch/src/export_model_arch.cc @@ -13,7 +13,6 @@ #include "utils/cli/cli_parse.h" #include "utils/cli/cli_parse_result.h" #include "utils/cli/cli_spec.h" -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/transform.h" #include "utils/graph/series_parallel/binary_sp_decomposition_tree/right_associative_binary_sp_tree_from_nary.h" #include "utils/graph/series_parallel/get_series_parallel_decomposition.h" diff --git a/lib/utils/include/utils/full_binary_tree/full_binary_tree.variant.toml b/lib/utils/include/utils/full_binary_tree/full_binary_tree.variant.toml deleted file mode 100644 index 2183abe900..0000000000 --- a/lib/utils/include/utils/full_binary_tree/full_binary_tree.variant.toml +++ /dev/null @@ -1,24 +0,0 @@ -namespace = "FlexFlow" -name = "FullBinaryTree" -features = [ - "eq", - "hash", - "fmt", -] - -template_params = [ - "ParentLabel", - "LeafLabel", -] - -includes = [ - "utils/full_binary_tree/full_binary_tree_parent_node.dtg.h", -] - -[[values]] -type = "::FlexFlow::FullBinaryTreeParentNode" -key = "parent" - -[[values]] -type = "LeafLabel" -key = "leaf" diff --git a/lib/utils/include/utils/full_binary_tree/full_binary_tree_parent_node.struct.toml b/lib/utils/include/utils/full_binary_tree/full_binary_tree_parent_node.struct.toml deleted file mode 100644 index 3403271621..0000000000 --- a/lib/utils/include/utils/full_binary_tree/full_binary_tree_parent_node.struct.toml +++ /dev/null @@ -1,34 +0,0 @@ -namespace = "FlexFlow" -name = "FullBinaryTreeParentNode" -features = [ - "eq", - "hash", - "fmt", -] - -fwd_decls = [ - "template struct FullBinaryTree", -] - -post_includes = [ - "utils/full_binary_tree/full_binary_tree.dtg.h", -] - -template_params = [ - "ParentLabel", - "LeafLabel", -] - -[[fields]] -name = "label" -type = "ParentLabel" - -[[fields]] -name = "left_child" -type = "::FlexFlow::FullBinaryTree" -indirect = true - -[[fields]] -name = "right_child" -type = "::FlexFlow::FullBinaryTree" -indirect = true diff --git a/lib/utils/include/utils/full_binary_tree/get_node_type.h b/lib/utils/include/utils/full_binary_tree/get_node_type.h deleted file mode 100644 index d49faa3694..0000000000 --- a/lib/utils/include/utils/full_binary_tree/get_node_type.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_FULL_BINARY_TREE_GET_NODE_TYPE_H -#define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_FULL_BINARY_TREE_GET_NODE_TYPE_H - -#include "utils/full_binary_tree/full_binary_tree.dtg.h" -#include "utils/full_binary_tree/full_binary_tree_node_type.dtg.h" -#include "utils/overload.h" - -namespace FlexFlow { - -template -FullBinaryTreeNodeType - get_node_type(FullBinaryTree const &tree) { - return tree.template visit(overload { - [](FullBinaryTreeParentNode const &) { return FullBinaryTreeNodeType::PARENT; }, - [](LeafLabel const &) { return FullBinaryTreeNodeType::LEAF; }, - }); -} - -} // namespace FlexFlow - -#endif diff --git a/lib/utils/include/utils/full_binary_tree/json.h b/lib/utils/include/utils/full_binary_tree/json.h deleted file mode 100644 index a589c541da..0000000000 --- a/lib/utils/include/utils/full_binary_tree/json.h +++ /dev/null @@ -1,84 +0,0 @@ -#ifndef _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_FULL_BINARY_TREE_JSON_H -#define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_FULL_BINARY_TREE_JSON_H - -#include "utils/exception.h" -#include "utils/full_binary_tree/full_binary_tree.h" -#include "utils/full_binary_tree/get_left_child.h" -#include "utils/full_binary_tree/get_right_child.h" -#include "utils/full_binary_tree/visit.h" -#include "utils/overload.h" -#include - -namespace nlohmann { - -template -struct adl_serializer< - ::FlexFlow::FullBinaryTreeParentNode> { - static ::FlexFlow::FullBinaryTreeParentNode - from_json(json const &j) { - return ::FlexFlow::FullBinaryTreeParentNode{ - j.at("left_child") - .template get< - ::FlexFlow::FullBinaryTreeParentNode>(), - j.at("right_child") - .template get< - ::FlexFlow::FullBinaryTreeParentNode>(), - }; - } - - static void to_json( - json &j, - ::FlexFlow::FullBinaryTreeParentNode const &v) { - j["__type"] = "FullBinaryTreeParentNode"; - j["left_child"] = get_left_child(v); - j["right_child"] = get_right_child(v); - } -}; - -template -struct adl_serializer<::FlexFlow::FullBinaryTree> { - static ::FlexFlow::FullBinaryTree - from_json(json const &j) { - std::string key = j.at("type").get(); - - if (key == "parent") { - return ::FlexFlow::FullBinaryTree{ - j.at("value") - .get<::FlexFlow::FullBinaryTreeParentNode>(), - }; - } else if (key == "leaf") { - return ::FlexFlow::FullBinaryTree{ - j.at("value").get(), - }; - } else { - throw ::FlexFlow::mk_runtime_error( - fmt::format("Unknown json type key: {}", key)); - } - } - - static void - to_json(json &j, - ::FlexFlow::FullBinaryTree const &v) { - j["__type"] = "FullBinaryTree"; - ::FlexFlow::visit( - v, - ::FlexFlow::overload{ - [&](::FlexFlow::FullBinaryTreeParentNode const &s) { - j["type"] = "parent"; - j["value"] = s; - return std::monostate{}; - }, - [&](LeafLabel const &t) { - j["type"] = "leaf"; - j["value"] = t; - return std::monostate{}; - }, - }); - } -}; - -} // namespace nlohmann - -#endif diff --git a/lib/utils/include/utils/full_binary_tree/require.h b/lib/utils/include/utils/full_binary_tree/require.h deleted file mode 100644 index 7b2625a9e8..0000000000 --- a/lib/utils/include/utils/full_binary_tree/require.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_FULL_BINARY_TREE_REQUIRE_H -#define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_FULL_BINARY_TREE_REQUIRE_H - -#include "utils/full_binary_tree/full_binary_tree.dtg.h" -#include "utils/full_binary_tree/full_binary_tree_parent_node.dtg.h" - -namespace FlexFlow { - -template -FullBinaryTreeParentNode const & - require_full_binary_tree_parent_node( - FullBinaryTree const &t) { - return t.template get>(); -} - -template -LeafLabel const &require_full_binary_tree_leaf( - FullBinaryTree const &t) { - return t.template get(); -} - -} // namespace FlexFlow - -#endif diff --git a/lib/utils/include/utils/full_binary_tree/transform.h b/lib/utils/include/utils/full_binary_tree/transform.h deleted file mode 100644 index 6e33064025..0000000000 --- a/lib/utils/include/utils/full_binary_tree/transform.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_FULL_BINARY_TREE_TRANSFORM_H -#define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_FULL_BINARY_TREE_TRANSFORM_H - -#include "utils/full_binary_tree/full_binary_tree.dtg.h" -#include "utils/full_binary_tree/get_left_child.h" -#include "utils/full_binary_tree/get_right_child.h" -#include "utils/full_binary_tree/visit.h" -#include "utils/overload.h" - -namespace FlexFlow { - -template , - typename LeafLabel2 = std::invoke_result_t> -FullBinaryTreeParentNode - transform(FullBinaryTreeParentNode const &t, F f) { - return FullBinaryTreeParentNode{ - transform(get_left_child(t), f), - transform(get_right_child(t), f), - }; -} - -template , - typename LeafLabel2 = std::invoke_result_t> -FullBinaryTree - transform(FullBinaryTree const &t, F f) { - return visit>( - t, - overload{ - [&](FullBinaryTreeParentNode const &parent) { - return FullBinaryTree{ - transform(parent, f), - }; - }, - [&](LeafLabel const &leaf) { - return FullBinaryTree{ - f(leaf), - }; - }}); -} - -} // namespace FlexFlow - -#endif diff --git a/lib/utils/include/utils/full_binary_tree/visit.h b/lib/utils/include/utils/full_binary_tree/visit.h index f9349069a9..87aa115c8c 100644 --- a/lib/utils/include/utils/full_binary_tree/visit.h +++ b/lib/utils/include/utils/full_binary_tree/visit.h @@ -4,7 +4,6 @@ #include "utils/exception.h" #include "utils/full_binary_tree/full_binary_tree_visitor.dtg.h" #include "utils/full_binary_tree/full_binary_tree_implementation.dtg.h" -#include "utils/full_binary_tree/get_node_type.h" namespace FlexFlow { diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_parallel_split.struct.toml b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_parallel_split.struct.toml deleted file mode 100644 index 139074299f..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_parallel_split.struct.toml +++ /dev/null @@ -1,35 +0,0 @@ -namespace = "FlexFlow" -name = "GenericBinaryParallelSplit" -features = [ - "eq", - "hash", - "fmt", -] - -fwd_decls = [ - "template struct GenericBinarySPDecompositionTree", -] - -post_includes = [ - "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree.dtg.h" -] - -template_params = [ - "SeriesLabel", - "ParallelLabel", - "LeafLabel", -] - -[[fields]] -name = "label" -type = "ParallelLabel" - -[[fields]] -name = "left_child" -type = "::FlexFlow::GenericBinarySPDecompositionTree" -indirect = true - -[[fields]] -name = "right_child" -type = "::FlexFlow::GenericBinarySPDecompositionTree" -indirect = true diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_series_split.struct.toml b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_series_split.struct.toml deleted file mode 100644 index 054532e2e0..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_series_split.struct.toml +++ /dev/null @@ -1,35 +0,0 @@ -namespace = "FlexFlow" -name = "GenericBinarySeriesSplit" -features = [ - "eq", - "hash", - "fmt", -] - -fwd_decls = [ - "template struct GenericBinarySPDecompositionTree", -] - -post_includes = [ - "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree.dtg.h" -] - -template_params = [ - "SeriesLabel", - "ParallelLabel", - "LeafLabel", -] - -[[fields]] -name = "label" -type = "SeriesLabel" - -[[fields]] -name = "left_child" -type = "::FlexFlow::GenericBinarySPDecompositionTree" -indirect = true - -[[fields]] -name = "right_child" -type = "::FlexFlow::GenericBinarySPDecompositionTree" -indirect = true diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree.variant.toml b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree.variant.toml deleted file mode 100644 index 5edaa80a09..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree.variant.toml +++ /dev/null @@ -1,31 +0,0 @@ -namespace = "FlexFlow" -name = "GenericBinarySPDecompositionTree" -features = [ - "eq", - "hash", - "fmt", - "json", -] - -template_params = [ - "SeriesLabel", - "ParallelLabel", - "LeafLabel", -] - -includes = [ - "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_series_split.dtg.h", - "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_parallel_split.dtg.h", -] - -[[values]] -type = "::FlexFlow::GenericBinarySeriesSplit" -key = "series" - -[[values]] -type = "::FlexFlow::GenericBinaryParallelSplit" -key = "parallel" - -[[values]] -type = "LeafLabel" -key = "leaf" diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree_transform_visitor.struct.toml b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree_transform_visitor.struct.toml deleted file mode 100644 index df0b0f2ea7..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree_transform_visitor.struct.toml +++ /dev/null @@ -1,28 +0,0 @@ -namespace = "FlexFlow" -name = "GenericBinarySPDecompositionTreeTransformVisitor" -features = [] - -template_params = [ - "SeriesSplitLabel", - "ParallelSplitLabel", - "LeafLabel", - "SeriesSplitLabel2", - "ParallelSplitLabel2", - "LeafLabel2", -] - -includes = [ - "", -] - -[[fields]] -name = "series_split_func" -type = "std::function" - -[[fields]] -name = "parallel_split_func" -type = "std::function" - -[[fields]] -name = "leaf_func" -type = "std::function" diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/get_node_type.h b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/get_node_type.h deleted file mode 100644 index c4e86a252d..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/get_node_type.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_GENERIC_BINARY_SP_DECOMPOSITION_TREE_GET_NODE_TYPE_H -#define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_GENERIC_BINARY_SP_DECOMPOSITION_TREE_GET_NODE_TYPE_H - -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree.dtg.h" -#include "utils/graph/series_parallel/sp_decomposition_tree_node_type.dtg.h" -#include "utils/overload.h" - -namespace FlexFlow { - -template -SPDecompositionTreeNodeType - get_node_type(GenericBinarySPDecompositionTree const &tree) { - return tree.template visit(overload { - [](GenericBinarySeriesSplit const &) { - return SPDecompositionTreeNodeType::SERIES; - }, - [](GenericBinaryParallelSplit const &) { - return SPDecompositionTreeNodeType::PARALLEL; - }, - [](LeafLabel const &) { - return SPDecompositionTreeNodeType::NODE; - } - }); -} - -} // namespace FlexFlow - -#endif diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/is.h b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/is.h deleted file mode 100644 index a7046bedbe..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/is.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_GENERIC_BINARY_SP_DECOMPOSITION_TREE_IS_H -#define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_GENERIC_BINARY_SP_DECOMPOSITION_TREE_IS_H - -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/get_node_type.h" - -namespace FlexFlow { - -template -bool is_series_split(GenericBinarySPDecompositionTree const &t) { - return get_node_type(t) == SPDecompositionTreeNodeType::SERIES; -} - -template -bool is_parallel_split(GenericBinarySPDecompositionTree const &t) { - return get_node_type(t) == SPDecompositionTreeNodeType::PARALLEL; -} - -template -bool is_leaf(GenericBinarySPDecompositionTree const &t) { - return get_node_type(t) == SPDecompositionTreeNodeType::NODE; -} - -} // namespace FlexFlow - -#endif diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/require.h b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/require.h deleted file mode 100644 index 315fca844d..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/require.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_GENERIC_BINARY_SP_DECOMPOSITION_TREE_REQUIRE_H -#define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_GENERIC_BINARY_SP_DECOMPOSITION_TREE_REQUIRE_H - -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_parallel_split.dtg.h" -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_series_split.dtg.h" - -namespace FlexFlow { - -template -GenericBinarySeriesSplit - require_generic_binary_series_split( - GenericBinarySPDecompositionTree const &tree) { - return tree.template get>(); -} - -template -GenericBinaryParallelSplit - require_generic_binary_parallel_split( - GenericBinarySPDecompositionTree const &tree) { - return tree.template get>(); -} - -template -LeafLabel require_generic_binary_leaf( - GenericBinarySPDecompositionTree const &tree) { - return tree.template get(); -} - -} // namespace FlexFlow - -#endif diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/transform.h b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/transform.h deleted file mode 100644 index 00419ace55..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/transform.h +++ /dev/null @@ -1,124 +0,0 @@ -#ifndef _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_GENERIC_BINARY_SP_DECOMPOSITION_TREE_TRANSFORM_H -#define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_GENERIC_BINARY_SP_DECOMPOSITION_TREE_TRANSFORM_H - -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree.dtg.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree_visitor.dtg.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree_transform_visitor.dtg.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/get_left_child.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/get_right_child.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/make.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/visit.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/wrap.h" -// #include "utils/overload.h" -// -// namespace FlexFlow { -// -// template -// GenericBinarySPDecompositionTree -// transform( -// GenericBinarySPDecompositionTree const &tt, -// GenericBinarySPDecompositionTreeTransformVisitor const &visitor); -// -// template -// GenericBinarySeriesSplit transform( -// GenericBinarySeriesSplit const &s, -// GenericBinarySPDecompositionTreeTransformVisitor const &visitor) { -// return GenericBinarySeriesSplit{ -// visitor.series_split_func(s.label), -// transform(get_left_child(s), visitor), -// transform(get_right_child(s), visitor), -// }; -// }; -// -// template -// GenericBinaryParallelSplit transform( -// GenericBinaryParallelSplit const &s, -// GenericBinarySPDecompositionTreeTransformVisitor const &visitor) { -// return GenericBinaryParallelSplit{ -// visitor.parallel_split_func(s.label), -// transform(get_left_child(s), visitor), -// transform(get_right_child(s), visitor), -// }; -// }; -// -// template -// GenericBinarySPDecompositionTree -// transform( -// GenericBinarySPDecompositionTree const &tree, -// GenericBinarySPDecompositionTreeTransformVisitor const &transform_visitor) { -// -// using ResultType = -// GenericBinarySPDecompositionTree; -// -// auto visitor = GenericBinarySPDecompositionTreeVisitor< -// ResultType, -// SeriesLabel, -// ParallelLabel, -// LeafLabel> -// { -// [&](GenericBinarySeriesSplit const &s) -> ResultType { -// return generic_binary_sp_tree_wrap_series_split(transform(s, transform_visitor)); -// }, -// [&](GenericBinaryParallelSplit const &s) -> ResultType { -// return generic_binary_sp_tree_wrap_parallel_split(transform(s, transform_visitor)); -// }, -// [&](LeafLabel const &t) -> ResultType { -// return generic_binary_sp_tree_wrap_leaf( -// transform_visitor.leaf_func(t)); -// }, -// }; -// -// return visit(tree, visitor); -// } -// -// } // namespace FlexFlow - -#endif diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/find_paths_to_leaf.h b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/find_paths_to_leaf.h deleted file mode 100644 index 1d7f9ae88c..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/find_paths_to_leaf.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_FIND_PATHS_TO_LEAF_H -#define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_FIND_PATHS_TO_LEAF_H - -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/find_paths_to_leaf.h" -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree.dtg.h" - -namespace FlexFlow { - -template -std::unordered_set - find_paths_to_leaf(LeafOnlyBinarySPDecompositionTree const &tree, - LeafLabel const &leaf) { - return find_paths_to_leaf(tree.raw_tree, leaf); -} - -} // namespace FlexFlow - -#endif diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/get_leaves.h b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/get_leaves.h deleted file mode 100644 index 738b4c013d..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/get_leaves.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_GET_LEAVES_H -#define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_GET_LEAVES_H - -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/get_leaves.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree.dtg.h" -// -// namespace FlexFlow { -// -// template -// std::unordered_multiset -// get_leaves(LeafOnlyBinarySPDecompositionTree const &t) { -// return get_leaves(t.raw_tree); -// } -// -// } // namespace FlexFlow - -#endif diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/get_node_type.h b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/get_node_type.h deleted file mode 100644 index 78dd8990c7..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/get_node_type.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_GET_NODE_TYPE_H -#define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_GET_NODE_TYPE_H - -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/get_node_type.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree.dtg.h" -// -// namespace FlexFlow { -// -// template -// SPDecompositionTreeNodeType -// get_node_type(LeafOnlyBinarySPDecompositionTree const &tree) { -// return get_node_type(tree.raw_tree); -// } -// -// } // namespace FlexFlow - -#endif diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/is_binary_sp_tree_left_associative.h b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/is_binary_sp_tree_left_associative.h deleted file mode 100644 index df365360ca..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/is_binary_sp_tree_left_associative.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_IS_BINARY_SP_TREE_LEFT_ASSOCIATIVE_H -#define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_IS_BINARY_SP_TREE_LEFT_ASSOCIATIVE_H - -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/is_binary_sp_tree_left_associative.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree.dtg.h" -// -// namespace FlexFlow { -// -// template -// bool is_binary_sp_tree_left_associative( -// LeafOnlyBinarySPDecompositionTree const &t) { -// return is_binary_sp_tree_left_associative(t.raw_tree); -// } -// -// } // namespace FlexFlow - -#endif diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/is_binary_sp_tree_right_associative.h b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/is_binary_sp_tree_right_associative.h deleted file mode 100644 index 8eb09f3654..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/is_binary_sp_tree_right_associative.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_IS_BINARY_SP_TREE_RIGHT_ASSOCIATIVE_H -#define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_IS_BINARY_SP_TREE_RIGHT_ASSOCIATIVE_H - -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/is_binary_sp_tree_right_associative.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree.dtg.h" -// -// namespace FlexFlow { -// -// template -// bool is_binary_sp_tree_right_associative( -// LeafOnlyBinarySPDecompositionTree const &t) { -// return is_binary_sp_tree_right_associative(t.raw_tree); -// } -// -// } // namespace FlexFlow - -#endif diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/json.h b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/json.h deleted file mode 100644 index b5c1ed3f95..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/json.h +++ /dev/null @@ -1,78 +0,0 @@ -#ifndef _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_JSON_H -#define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_JSON_H - -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree.dtg.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree_visitor.dtg.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/wrap.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/visit.h" -// #include "utils/json/check_is_json_deserializable.h" -// #include "utils/json/check_is_json_serializable.h" -// #include "utils/fmt/json.h" -// #include - -namespace nlohmann { - -// template -// struct adl_serializer<::FlexFlow::LeafOnlyBinarySPDecompositionTree> { -// static ::FlexFlow::LeafOnlyBinarySPDecompositionTree from_json(json const &j) { -// CHECK_IS_JSON_SERIALIZABLE(LeafLabel); -// -// using namespace ::FlexFlow; -// -// using Tree = LeafOnlyBinarySPDecompositionTree; -// -// std::string type = j.at("type").get(); -// -// if (type == "series") { -// return leaf_only_binary_sp_tree_wrap_series_split( -// LeafOnlyBinarySeriesSplit{ -// /*lhs=*/j.at("left_child").get(), -// /*rhs=*/j.at("right_child").get(), -// }); -// } else if (type == "parallel") { -// return leaf_only_binary_sp_tree_wrap_parallel_split( -// LeafOnlyBinaryParallelSplit{ -// /*lhs=*/j.at("left_child").get(), -// /*rhs=*/j.at("right_child").get(), -// }); -// } else if (type == "leaf") { -// return leaf_only_binary_sp_tree_wrap_leaf(j.at("label").get()); -// } else { -// throw mk_runtime_error(fmt::format("Unknown json type value for LeafOnlyBinarySPDecompositionTree \"{}\" in json object: {}", type, j)); -// } -// } -// -// static void to_json(json &j, ::FlexFlow::LeafOnlyBinarySPDecompositionTree const &tree) { -// CHECK_IS_JSON_DESERIALIZABLE(LeafLabel); -// -// using namespace FlexFlow; -// -// using Tree = LeafOnlyBinarySPDecompositionTree; -// -// auto visitor = LeafOnlyBinarySPDecompositionTreeVisitor{ -// /*series_func=*/[&](LeafOnlyBinarySeriesSplit const &split) { -// j["type"] = "series"; -// j["left_child"] = split.lhs; -// j["right_child"] = split.rhs; -// return std::monostate{}; -// }, -// /*parallel_func=*/[&](LeafOnlyBinaryParallelSplit const &split) { -// j["type"] = "parallel"; -// j["left_child"] = split.lhs; -// j["right_child"] = split.rhs; -// return std::monostate{}; -// }, -// /*leaf_func=*/[&](LeafLabel const &leaf_label) { -// j["type"] = "leaf"; -// j["label"] = leaf_label; -// return std::monostate{}; -// }, -// }; -// -// visit(tree, visitor); -// } -// }; - -} // namespace nlohmann - -#endif diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_parallel_split.struct.toml b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_parallel_split.struct.toml deleted file mode 100644 index 802ee854ab..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_parallel_split.struct.toml +++ /dev/null @@ -1,30 +0,0 @@ -namespace = "FlexFlow" -name = "LeafOnlyBinaryParallelSplit" -features = [ - "eq", - "hash", - "fmt", -] - -fwd_decls = [ - "template struct LeafOnlyBinarySPDecompositionTree", -] - -post_includes = [ - "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree.dtg.h", -] - - -template_params = [ - "LeafLabel", -] - -[[fields]] -name = "left_child" -type = "::FlexFlow::LeafOnlyBinarySPDecompositionTree" -indirect = true - -[[fields]] -name = "right_child" -type = "::FlexFlow::LeafOnlyBinarySPDecompositionTree" -indirect = true diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_series_split.struct.toml b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_series_split.struct.toml deleted file mode 100644 index 95a647aea3..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_series_split.struct.toml +++ /dev/null @@ -1,29 +0,0 @@ -namespace = "FlexFlow" -name = "LeafOnlyBinarySeriesSplit" -features = [ - "eq", - "hash", - "fmt", -] - -fwd_decls = [ - "template struct LeafOnlyBinarySPDecompositionTree", -] - -post_includes = [ - "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree.dtg.h", -] - -template_params = [ - "LeafLabel", -] - -[[fields]] -name = "left_child" -type = "::FlexFlow::LeafOnlyBinarySPDecompositionTree" -indirect = true - -[[fields]] -name = "right_child" -type = "::FlexFlow::LeafOnlyBinarySPDecompositionTree" -indirect = true diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree.variant.toml b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree.variant.toml deleted file mode 100644 index fdab932039..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree.variant.toml +++ /dev/null @@ -1,29 +0,0 @@ -namespace = "FlexFlow" -name = "LeafOnlyBinarySPDecompositionTree" -features = [ - "eq", - "hash", - "fmt" -] - -template_params = [ - "LeafLabel", -] - -includes = [ - "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_series_split.dtg.h", - "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_parallel_split.dtg.h", - "", -] - -[[values]] -type = "::FlexFlow::LeafOnlyBinarySeriesSplit" -key = "series" - -[[values]] -type = "::FlexFlow::LeafOnlyBinaryParallelSplit" -key = "parallel" - -[[values]] -type = "LeafLabel" -key = "leaf" diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree_transform_visitor.struct.toml b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree_transform_visitor.struct.toml deleted file mode 100644 index b94972c323..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree_transform_visitor.struct.toml +++ /dev/null @@ -1,16 +0,0 @@ -namespace = "FlexFlow" -name = "LeafOnlyBinarySPDecompositionTreeTransformVisitor" -features = [] - -template_params = [ - "LeafLabel", - "LeafLabel2", -] - -includes = [ - "", -] - -[[fields]] -name = "leaf_func" -type = "std::function" diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree_visitor.h b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree_visitor.h deleted file mode 100644 index f1dbcb97af..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree_visitor.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_VISITOR_H -#define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_VISITOR_H - -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree_visitor.dtg.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree_visitor.dtg.h" - -namespace FlexFlow { - -// template -// GenericBinarySPDecompositionTreeVisitor -// generic_visitor_from_leaf_only_visitor(LeafOnlyBinarySPDecompositionTreeVisitor const &leaf_only) { -// return GenericBinarySPDecompositionTreeVisitor{ -// [leaf_only](GenericBinarySeriesSplit const &split) { -// return leaf_only.series_func( -// LeafOnlyBinarySeriesSplit{ -// LeafOnlyBinarySPDecompositionTree{split.lhs}, -// LeafOnlyBinarySPDecompositionTree{split.rhs}, -// }); -// }, -// [leaf_only](GenericBinaryParallelSplit const &split) { -// return leaf_only.parallel_func( -// LeafOnlyBinaryParallelSplit{ -// LeafOnlyBinarySPDecompositionTree{split.lhs}, -// LeafOnlyBinarySPDecompositionTree{split.rhs}, -// }); -// }, -// [leaf_only](LeafLabel const &leaf_label) { -// return leaf_only.leaf_func(leaf_label); -// }, -// }; -// } - -} // namespace FlexFlow - -#endif diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree_visitor.struct.toml b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree_visitor.struct.toml deleted file mode 100644 index 7174afcaa7..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree_visitor.struct.toml +++ /dev/null @@ -1,26 +0,0 @@ -namespace = "FlexFlow" -name = "LeafOnlyBinarySPDecompositionTreeVisitor" -features = [] - -template_params = [ - "ReturnType", - "LeafLabel", -] - -includes = [ - "", - "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_series_split.dtg.h", - "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_parallel_split.dtg.h", -] - -[[fields]] -name = "series_func" -type = "std::function const &)>" - -[[fields]] -name = "parallel_func" -type = "std::function const &)>" - -[[fields]] -name = "leaf_func" -type = "std::function" diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/require.h b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/require.h deleted file mode 100644 index e83120a0f9..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/require.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_REQUIRE_H -#define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_REQUIRE_H - -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_parallel_split.dtg.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/generic_binary_series_split.dtg.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/require.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_parallel_split.dtg.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_series_split.dtg.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree.dtg.h" - -namespace FlexFlow { - -// template -// LeafOnlyBinarySeriesSplit require_leaf_only_binary_series_split( -// LeafOnlyBinarySPDecompositionTree const &t) { -// GenericBinarySeriesSplit raw = -// require_generic_binary_series_split(t.raw_tree); -// -// return LeafOnlyBinarySeriesSplit{ -// LeafOnlyBinarySPDecompositionTree{raw.lhs}, -// LeafOnlyBinarySPDecompositionTree{raw.rhs}, -// }; -// } -// -// template -// LeafOnlyBinaryParallelSplit require_leaf_only_binary_parallel_split( -// LeafOnlyBinarySPDecompositionTree const &t) { -// GenericBinaryParallelSplit raw = -// require_generic_binary_parallel_split(t.raw_tree); -// -// return LeafOnlyBinaryParallelSplit{ -// LeafOnlyBinarySPDecompositionTree{raw.lhs}, -// LeafOnlyBinarySPDecompositionTree{raw.rhs}, -// }; -// } -// -// template -// LeafLabel require_leaf_only_binary_leaf( -// LeafOnlyBinarySPDecompositionTree const &t) { -// return require_generic_binary_leaf(t.raw_tree); -// } -// -} // namespace FlexFlow - -#endif diff --git a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/transform.h b/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/transform.h deleted file mode 100644 index 58a60c91ba..0000000000 --- a/lib/utils/include/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/transform.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_TRANSFORM_H -#define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_GRAPH_SERIES_PARALLEL_BINARY_SP_DECOMPOSITION_TREE_LEAF_ONLY_BINARY_SP_DECOMPOSITION_TREE_TRANSFORM_H - -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/transform.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/wrap.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_parallel_split.dtg.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_series_split.dtg.h" -// #include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree_visitor.dtg.h" - -namespace FlexFlow { - -// template -// LeafOnlyBinarySeriesSplit transform( -// LeafOnlyBinarySeriesSplit const &t, -// LeafOnlyBinarySPDecompositionTreeVisitor const -// &visitor) { -// return transform(leaf_only_binary_sp_tree_wrap_series_split(t), visitor); -// } -// -// template -// LeafOnlyBinaryParallelSplit transform( -// LeafOnlyBinaryParallelSplit const &t, -// LeafOnlyBinarySPDecompositionTreeVisitor const -// &visitor) { -// return transform(leaf_only_binary_sp_tree_wrap_parallel_split(t), visitor); -// } -// -// template -// LeafOnlyBinarySPDecompositionTree transform( -// LeafOnlyBinarySPDecompositionTree const &t, -// LeafOnlyBinarySPDecompositionTreeVisitor const -// &visitor) { -// using GenericVisitor = GenericBinarySPDecompositionTreeTransformVisitor; -// -// GenericVisitor generic_visitor = GenericVisitor{ -// [&](std::monostate const &x) { return x; }, -// [&](std::monostate const &x) { return x; }, -// [&](LeafLabel const &t) { return visitor.leaf_func(t); }, -// }; -// -// return LeafOnlyBinarySPDecompositionTree{ -// transform(t.raw_tree, generic_visitor), -// }; -// } - -} // namespace FlexFlow - -#endif diff --git a/lib/utils/src/utils/full_binary_tree/get_node_type.cc b/lib/utils/src/utils/full_binary_tree/get_node_type.cc deleted file mode 100644 index a4c88a03f3..0000000000 --- a/lib/utils/src/utils/full_binary_tree/get_node_type.cc +++ /dev/null @@ -1,7 +0,0 @@ -#include "utils/full_binary_tree/get_node_type.h" - -namespace FlexFlow { - -template FullBinaryTreeNodeType get_node_type(FullBinaryTree const &); - -} // namespace FlexFlow diff --git a/lib/utils/src/utils/full_binary_tree/require.cc b/lib/utils/src/utils/full_binary_tree/require.cc deleted file mode 100644 index e4454927a4..0000000000 --- a/lib/utils/src/utils/full_binary_tree/require.cc +++ /dev/null @@ -1,10 +0,0 @@ -#include "utils/full_binary_tree/require.h" - -namespace FlexFlow { - -template FullBinaryTreeParentNode const & - require_full_binary_tree_parent_node(FullBinaryTree const &); -template int const & - require_full_binary_tree_leaf(FullBinaryTree const &); - -} // namespace FlexFlow diff --git a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/get_node_type.cc b/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/get_node_type.cc deleted file mode 100644 index e66b996721..0000000000 --- a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/get_node_type.cc +++ /dev/null @@ -1,8 +0,0 @@ -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/get_node_type.h" - -namespace FlexFlow { - -template SPDecompositionTreeNodeType - get_node_type(GenericBinarySPDecompositionTree const &); - -} // namespace FlexFlow diff --git a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/is.cc b/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/is.cc deleted file mode 100644 index 056435531f..0000000000 --- a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/is.cc +++ /dev/null @@ -1,11 +0,0 @@ -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/is.h" - -namespace FlexFlow { - -template bool - is_series_split(GenericBinarySPDecompositionTree const &); -template bool - is_parallel_split(GenericBinarySPDecompositionTree const &); -template bool is_leaf(GenericBinarySPDecompositionTree const &); - -} // namespace FlexFlow diff --git a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/require.cc b/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/require.cc deleted file mode 100644 index 9a3fa879d4..0000000000 --- a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/require.cc +++ /dev/null @@ -1,27 +0,0 @@ -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/require.h" -#include "utils/archetypes/value_type.h" - -namespace FlexFlow { - -using SeriesLabel = value_type<0>; -using ParallelLabel = value_type<1>; -using LeafLabel = value_type<2>; - -template - GenericBinarySeriesSplit - require_generic_binary_series_split( - GenericBinarySPDecompositionTree const &); -template - GenericBinaryParallelSplit - require_generic_binary_parallel_split( - GenericBinarySPDecompositionTree const &); -template - LeafLabel require_generic_binary_leaf( - GenericBinarySPDecompositionTree const &); -} // namespace FlexFlow diff --git a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/transform.cc b/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/transform.cc deleted file mode 100644 index bdb59887a1..0000000000 --- a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/transform.cc +++ /dev/null @@ -1,14 +0,0 @@ -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/transform.h" - -namespace FlexFlow { - -// template GenericBinarySeriesSplit -// transform(GenericBinarySeriesSplit const &, -// GenericBinarySPDecompositionTreeTransformVisitor const &); - -} // namespace FlexFlow diff --git a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/get_leaves.cc b/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/get_leaves.cc deleted file mode 100644 index 79aac82e12..0000000000 --- a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/get_leaves.cc +++ /dev/null @@ -1,8 +0,0 @@ -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/get_leaves.h" - -namespace FlexFlow { - -// template std::unordered_multiset -// get_leaves(LeafOnlyBinarySPDecompositionTree const &); - -} // namespace FlexFlow diff --git a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/get_node_type.cc b/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/get_node_type.cc deleted file mode 100644 index 9f5516fbb3..0000000000 --- a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/get_node_type.cc +++ /dev/null @@ -1,8 +0,0 @@ -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/get_node_type.h" - -namespace FlexFlow { - -// template SPDecompositionTreeNodeType -// get_node_type(LeafOnlyBinarySPDecompositionTree const &); - -} // namespace FlexFlow diff --git a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/is_binary_sp_tree_left_associative.cc b/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/is_binary_sp_tree_left_associative.cc deleted file mode 100644 index 393189f092..0000000000 --- a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/is_binary_sp_tree_left_associative.cc +++ /dev/null @@ -1,8 +0,0 @@ -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/is_binary_sp_tree_left_associative.h" - -namespace FlexFlow { - -// template bool is_binary_sp_tree_left_associative( -// LeafOnlyBinarySPDecompositionTree const &); - -} // namespace FlexFlow diff --git a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/is_binary_sp_tree_right_associative.cc b/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/is_binary_sp_tree_right_associative.cc deleted file mode 100644 index 0a7724b13a..0000000000 --- a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/is_binary_sp_tree_right_associative.cc +++ /dev/null @@ -1,8 +0,0 @@ -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/is_binary_sp_tree_right_associative.h" - -namespace FlexFlow { - -// template bool is_binary_sp_tree_right_associative( -// LeafOnlyBinarySPDecompositionTree const &); - -} // namespace FlexFlow diff --git a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/json.cc b/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/json.cc deleted file mode 100644 index 6d8ead4165..0000000000 --- a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/json.cc +++ /dev/null @@ -1,8 +0,0 @@ -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/json.h" - -namespace nlohmann { - -// template -// struct adl_serializer<::FlexFlow::LeafOnlyBinarySPDecompositionTree>; - -} // namespace nlohmann diff --git a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree_visitor.cc b/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree_visitor.cc deleted file mode 100644 index fe671a8e8f..0000000000 --- a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree_visitor.cc +++ /dev/null @@ -1,9 +0,0 @@ -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree_visitor.h" - -namespace FlexFlow { - -// template -// GenericBinarySPDecompositionTreeVisitor -// generic_visitor_from_leaf_only_visitor(LeafOnlyBinarySPDecompositionTreeVisitor const &); - -} // namespace FlexFlow diff --git a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/require.cc b/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/require.cc deleted file mode 100644 index cefb44d0c4..0000000000 --- a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/require.cc +++ /dev/null @@ -1,13 +0,0 @@ -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/require.h" - -namespace FlexFlow { - -// template LeafOnlyBinarySeriesSplit require_leaf_only_binary_series_split( -// LeafOnlyBinarySPDecompositionTree const &); -// template LeafOnlyBinaryParallelSplit -// require_leaf_only_binary_parallel_split( -// LeafOnlyBinarySPDecompositionTree const &); -// template int require_leaf_only_binary_leaf( -// LeafOnlyBinarySPDecompositionTree const &); - -} // namespace FlexFlow diff --git a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/transform.cc b/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/transform.cc deleted file mode 100644 index 2421ffdc43..0000000000 --- a/lib/utils/src/utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/transform.cc +++ /dev/null @@ -1,15 +0,0 @@ -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/transform.h" - -namespace FlexFlow { - -// template LeafOnlyBinarySeriesSplit transform( LeafOnlyBinarySeriesSplit const &, -// LeafOnlyBinarySPDecompositionTreeVisitor const &); -// template LeafOnlyBinaryParallelSplit transform( -// LeafOnlyBinaryParallelSplit const &, -// LeafOnlyBinarySPDecompositionTreeVisitor const &); -// -// template LeafOnlyBinarySPDecompositionTree transform( -// LeafOnlyBinarySPDecompositionTree const &, -// LeafOnlyBinarySPDecompositionTreeVisitor const &); -// -} // namespace FlexFlow diff --git a/lib/utils/test/src/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/is_binary_sp_tree_right_associative.cc b/lib/utils/test/src/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/is_binary_sp_tree_right_associative.cc index 4e889ceab0..324008fdca 100644 --- a/lib/utils/test/src/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/is_binary_sp_tree_right_associative.cc +++ b/lib/utils/test/src/utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/is_binary_sp_tree_right_associative.cc @@ -1,4 +1,4 @@ -#include "utils/graph/series_parallel/binary_sp_decomposition_tree/leaf_only_binary_sp_decomposition_tree/is_binary_sp_tree_right_associative.h" +#include "utils/graph/series_parallel/binary_sp_decomposition_tree/generic_binary_sp_decomposition_tree/is_binary_sp_tree_right_associative.h" #include "utils/graph/series_parallel/binary_sp_decomposition_tree/binary_sp_decomposition_tree.dtg.h" #include "utils/graph/series_parallel/binary_sp_decomposition_tree/binary_sp_decomposition_tree.h" #include