Merge remote-tracking branch 'origin/repo-refactor' into feat/repo-re…

…factor-cpp17
flexflow · Sep 1, 2023 · 868091c · 868091c
2 parents f377089 + cee33f3
commit 868091c
Show file tree

Hide file tree

Showing 33 changed files with 262 additions and 139 deletions.
diff --git a/cmake/flexflow-utils.cmake b/cmake/flexflow-utils.cmake
@@ -38,6 +38,9 @@ function(ff_set_cxx_properties target)
       CXX_STANDARD_REQUIRED YES
       CXX_EXTENSIONS NO
   )
+  target_compile_options(${target}
+    PRIVATE $<$<COMPILE_LANGUAGE:CXX>:> # add C++ compile flags here
+  )
 endfunction()
 
 function(ff_add_library)

diff --git a/cmake/nccl.cmake b/cmake/nccl.cmake
@@ -89,7 +89,7 @@ else()
    BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/deps/nccl/lib/libnccl${LIBEXT}
    INSTALL_COMMAND ""
    CONFIGURE_COMMAND ""
-   BUILD_COMMAND make src.build "${NCCL_BUILD_NVCC_GENCODE} --disable-warnings" "CUDA_HOME=${CUDA_TOOLKIT_ROOT_DIR}" "BUILDDIR=${CMAKE_BINARY_DIR}/deps/nccl" "CXX=${CMAKE_CXX_COMPILER}" CC="${CMAKE_CC_COMPILER}" "CXXFLAGS+=-w"
+   BUILD_COMMAND make src.build "${NCCL_BUILD_NVCC_GENCODE}" "CUDA_HOME=${CUDA_TOOLKIT_ROOT_DIR}" "BUILDDIR=${CMAKE_BINARY_DIR}/deps/nccl" "CXX=${CMAKE_CXX_COMPILER} -w" CC="${CMAKE_CC_COMPILER}"
    BUILD_IN_SOURCE 1
   )
 

diff --git a/deps/fmt b/deps/fmt
diff --git a/lib/pcg/include/pcg/layer.h b/lib/pcg/include/pcg/layer.h
@@ -23,8 +23,10 @@ VISITABLE_STRUCT(::FlexFlow::Layer, attrs, name);
 MAKE_VISIT_HASHABLE(::FlexFlow::Layer);
 
 namespace FlexFlow {
-static_assert(is_well_behaved_value_type<Layer>::value, "");
-static_assert(is_fmtable<Layer>::value, "Layer must be fmtable");
+
+FF_VISIT_FMTABLE(Layer);
+CHECK_FMTABLE(Layer);
+
 } // namespace FlexFlow
 
 #endif
diff --git a/lib/utils/include/utils/containers.decl → lib/utils/include/utils/containers.decl.h b/lib/utils/include/utils/containers.decl → lib/utils/include/utils/containers.decl.h
@@ -1,5 +1,5 @@
-#ifndef _FLEXFLOW_UTILS_INCLUDE_UTILS_CONTAINERS_H
-#define _FLEXFLOW_UTILS_INCLUDE_UTILS_CONTAINERS_H
+#ifndef _FLEXFLOW_UTILS_INCLUDE_UTILS_CONTAINERS_DECL_H
+#define _FLEXFLOW_UTILS_INCLUDE_UTILS_CONTAINERS_DECL_H
 
 #include "utils/bidict.h"
 #include "utils/invoke.h"

diff --git a/lib/utils/include/utils/containers.h b/lib/utils/include/utils/containers.h
@@ -2,7 +2,7 @@
 #define _FLEXFLOW_UTILS_INCLUDE_UTILS_CONTAINERS_INL
 
 #include "bidict.h"
-#include "containers.decl"
+#include "containers.decl.h"
 #include "invoke.h"
 #include "required_core.h"
 #include "type_traits_core.h"

diff --git a/lib/utils/include/utils/exception.decl.h b/lib/utils/include/utils/exception.decl.h
@@ -0,0 +1,25 @@
+#ifndef _FLEXFLOW_UTILS_INCLUDE_EXCEPTION_DECL_H
+#define _FLEXFLOW_UTILS_INCLUDE_EXCEPTION_DECL_H
+
+#include "utils/fmt.decl.h"
+#include <stdexcept>
+
+namespace FlexFlow {
+
+#ifdef FF_REQUIRE_IMPLEMENTED
+#define NOT_IMPLEMENTED() static_assert(false, "Function not yet implemented");
+#else
+#define NOT_IMPLEMENTED() throw not_implemented();
+#endif
+
+class not_implemented : public std::logic_error {
+public:
+  not_implemented();
+};
+
+template <typename... T>
+std::runtime_error mk_runtime_error(fmt::format_string<T...> fmt_str,
+                                    T &&...args);
+} // namespace FlexFlow
+
+#endif
diff --git a/lib/utils/include/utils/exception.h b/lib/utils/include/utils/exception.h
@@ -1,22 +1,12 @@
 #ifndef _FLEXFLOW_UTILS_INCLUDE_EXCEPTION_H
 #define _FLEXFLOW_UTILS_INCLUDE_EXCEPTION_H
 
+#include "utils/exception.decl.h"
 #include "utils/fmt.h"
 #include <stdexcept>
 
 namespace FlexFlow {
 
-#ifdef FF_REQUIRE_IMPLEMENTED
-#define NOT_IMPLEMENTED() static_assert(false, "Function not yet implemented");
-#else
-#define NOT_IMPLEMENTED() throw not_implemented();
-#endif
-
-class not_implemented : public std::logic_error {
-public:
-  not_implemented() : std::logic_error("Function not yet implemented"){};
-};
-
 template <typename... T>
 std::runtime_error mk_runtime_error(fmt::format_string<T...> fmt_str,
                                     T &&...args) {

diff --git a/lib/utils/include/utils/fmt.decl.h b/lib/utils/include/utils/fmt.decl.h
@@ -0,0 +1,41 @@
+#ifndef _FLEXFLOW_UTILS_INCLUDE_UTILS_FMT_DECL_H
+#define _FLEXFLOW_UTILS_INCLUDE_UTILS_FMT_DECL_H
+
+#include "fmt/format.h"
+#include <unordered_set>
+#include <vector>
+
+namespace FlexFlow {
+
+template <typename T>
+using is_fmtable = ::fmt::is_formattable<T>;
+
+template <typename T, typename Enable = void>
+struct already_has_ostream_operator;
+
+template <typename T>
+typename std::enable_if<!already_has_ostream_operator<T>::value,
+                        std::ostream &>::type
+    operator<<(std::ostream &s, T const &t);
+
+} // namespace FlexFlow
+
+namespace fmt {
+
+template <typename T>
+struct formatter<::std::unordered_set<T>> : formatter<::std::string> {
+  template <typename FormatContext>
+  auto format(::std::unordered_set<T> const &m, FormatContext &ctx)
+      -> decltype(ctx.out());
+};
+
+template <typename T>
+struct formatter<::std::vector<T>> : formatter<::std::string> {
+  template <typename FormatContext>
+  auto format(::std::vector<T> const &m, FormatContext &ctx)
+      -> decltype(ctx.out());
+};
+
+} // namespace fmt
+
+#endif
diff --git a/lib/utils/include/utils/fmt.h b/lib/utils/include/utils/fmt.h
@@ -1,22 +1,14 @@
 #ifndef _FLEXFLOW_UTILS_INCLUDE_FMT_H
 #define _FLEXFLOW_UTILS_INCLUDE_FMT_H
 
-#include "fmt/core.h"
-#include "fmt/format.h"
-#include "utils/containers.decl"
+#include "utils/containers.decl.h"
+#include "utils/fmt.decl.h"
+#include "utils/test_types.h"
 #include "utils/type_traits_core.h"
-#include <unordered_set>
 
 namespace FlexFlow {
 
-template <typename T, typename Enable = void>
-struct is_fmtable : std::false_type {};
-
-template <typename T>
-struct is_fmtable<T, void_t<decltype(fmt::format("{}", std::declval<T>()))>>
-    : std::true_type {};
-
-template <typename T, typename = void>
+template <typename T, typename Enable>
 struct already_has_ostream_operator : std::false_type {};
 
 template <>
@@ -43,12 +35,18 @@ operator<<(std::ostream &s, T const &t) {
 }
 */
 
+#define CHECK_FMTABLE(...)                                                     \
+  static_assert(::FlexFlow::is_fmtable<__VA_ARGS__>::value,                    \
+                #__VA_ARGS__ " must be fmtable");
+
 // This will not
 template <typename T>
 typename std::enable_if<!already_has_ostream_operator<T>::value,
                         std::ostream &>::type
     operator<<(std::ostream &s, T const &t) {
-  std::string result = fmt::format("{}", t);
+  CHECK_FMTABLE(T);
+
+  std::string result = fmt::to_string(t);
   return s << result;
 }
 
@@ -63,17 +61,30 @@ typename std::enable_if<!already_has_ostream_operator<T>::value,
 namespace fmt {
 
 template <typename T>
-struct formatter<::std::unordered_set<T>> : formatter<::std::string> {
-  template <typename FormatContext>
-  auto format(::std::unordered_set<T> const &m, FormatContext &ctx)
-      -> decltype(ctx.out()) {
-    std::string result =
-        join_strings(m.cbegin(), m.cend(), ", ", [](T const &t) {
-          return fmt::to_string(t);
-        });
-    return formatter<std::string>::format(result, ctx);
-  }
-};
+template <typename FormatContext>
+auto formatter<::std::unordered_set<T>>::format(
+    ::std::unordered_set<T> const &m, FormatContext &ctx)
+    -> decltype(ctx.out()) {
+  CHECK_FMTABLE(T);
+
+  std::string result = join_strings(
+      m.cbegin(), m.cend(), ", ", [](T const &t) { return fmt::to_string(t); });
+  return formatter<std::string>::format(result, ctx);
+}
+
+template <typename T>
+template <typename FormatContext>
+auto formatter<::std::vector<T>>::format(::std::vector<T> const &m,
+                                         FormatContext &ctx)
+    -> decltype(ctx.out()) {
+  CHECK_FMTABLE(T);
+  std::string result = join_strings(
+      m.cbegin(), m.cend(), ", ", [](T const &t) { return fmt::to_string(t); });
+  return formatter<std::string>::format(result, ctx);
+}
+
+CHECK_FMTABLE(std::vector<int>);
+CHECK_FMTABLE(std::unordered_set<int>);
 
 } // namespace fmt
 

diff --git a/lib/utils/include/utils/graph/cow_ptr_t.h b/lib/utils/include/utils/graph/cow_ptr_t.h
@@ -11,10 +11,8 @@ namespace FlexFlow {
 
 template <typename T>
 struct cow_ptr_t {
-  // static_assert(is_clonable<T>::value,
-  //               "cow_ptr_t requires the type to have a clone() method"); //
-  //               TODO:
-  //               https://github.com/flexflow/FlexFlow/issues/909#issue-1833470024
+  static_assert(is_clonable<T>::value,
+                "cow_ptr_t requires the type to have a clone() method");
 
   cow_ptr_t(std::shared_ptr<T> const &ptr) : ptr(ptr) {}
   cow_ptr_t(std::shared_ptr<T> &&ptr) : ptr(std::move(ptr)) {}

diff --git a/lib/utils/include/utils/graph/digraph.h b/lib/utils/include/utils/graph/digraph.h
@@ -37,7 +37,7 @@ struct DiGraphView {
       unsafe_create_without_ownership(IDiGraphView const &graphView);
 
 private:
-  DiGraphView(std::shared_ptr<IDiGraphView const> ptr) : ptr(ptr) {}
+  DiGraphView(std::shared_ptr<IDiGraphView const> ptr);
 
   friend struct GraphInternal;
 

diff --git a/lib/utils/include/utils/graph/internal.h b/lib/utils/include/utils/graph/internal.h
@@ -3,7 +3,7 @@
 
 #include "utils/graph/digraph.h"
 #include "utils/graph/digraph_interfaces.h"
-#include "utils/graph/labelled/labelled_open.decl"
+#include "utils/graph/labelled/labelled_open.decl.h"
 #include "utils/graph/labelled/labelled_open_interfaces.h"
 #include "utils/graph/multidigraph.h"
 #include "utils/graph/multidigraph_interfaces.h"

diff --git a/...e/utils/graph/labelled/labelled_open.decl → ...utils/graph/labelled/labelled_open.decl.h b/...e/utils/graph/labelled/labelled_open.decl → ...utils/graph/labelled/labelled_open.decl.h
@@ -1,5 +1,5 @@
-#ifndef _FLEXFLOW_UTILS_INCLUDE_UTILS_GRAPH_LABELLED_LABELLED_OPEN_DECL
-#define _FLEXFLOW_UTILS_INCLUDE_UTILS_GRAPH_LABELLED_LABELLED_OPEN_DECL
+#ifndef _FLEXFLOW_UTILS_INCLUDE_UTILS_GRAPH_LABELLED_LABELLED_OPEN_DECL_H
+#define _FLEXFLOW_UTILS_INCLUDE_UTILS_GRAPH_LABELLED_LABELLED_OPEN_DECL_H
 
 #include "labelled_open_interfaces.h"
 #include "node_labelled.h"
@@ -63,7 +63,11 @@ struct LabelledOpenMultiDiGraph {
   operator OpenMultiDiGraphView() const;
 
   friend void swap(LabelledOpenMultiDiGraph &lhs,
-                   LabelledOpenMultiDiGraph &rhs);
+                   LabelledOpenMultiDiGraph &rhs) {
+    using std::swap;
+
+    swap(lhs.ptr, rhs.ptr);
+  }
 
   Node add_node(NodeLabel const &l);
   NodeLabel &at(Node const &n);

diff --git a/lib/utils/include/utils/graph/labelled/labelled_open.h b/lib/utils/include/utils/graph/labelled/labelled_open.h
@@ -1,7 +1,7 @@
 #ifndef _FLEXFLOW_UTILS_INCLUDE_UTILS_GRAPH_LABELLED_LABELLED_OPEN_H
 #define _FLEXFLOW_UTILS_INCLUDE_UTILS_GRAPH_LABELLED_LABELLED_OPEN_H
 
-#include "labelled_open.decl"
+#include "labelled_open.decl.h"
 #include "labelled_open_interfaces.h"
 #include "node_labelled.h"
 #include "utils/graph/internal.h"
@@ -69,14 +69,6 @@ LabelledOpenMultiDiGraph<N, E, I, O>::operator OpenMultiDiGraphView() const {
   return GraphInternal::create_open_multidigraph_view(this->ptr);
 }
 
-template <typename N, typename E, typename I, typename O>
-void swap(LabelledOpenMultiDiGraph<N, E, I, O> &lhs,
-          LabelledOpenMultiDiGraph<N, E, I, O> &rhs) {
-  using std::swap;
-
-  swap(lhs.ptr, rhs.ptr);
-}
-
 template <typename NodeLabel, typename E, typename I, typename O>
 Node LabelledOpenMultiDiGraph<NodeLabel, E, I, O>::add_node(
     NodeLabel const &l) {

diff --git a/lib/utils/include/utils/graph/multidigraph.h b/lib/utils/include/utils/graph/multidigraph.h
@@ -30,7 +30,7 @@ struct MultiDiGraphView {
       unsafe_create_without_ownership(IMultiDiGraphView const &);
 
 private:
-  MultiDiGraphView(std::shared_ptr<IMultiDiGraphView const> ptr) : ptr(ptr) {}
+  MultiDiGraphView(std::shared_ptr<IMultiDiGraphView const> ptr);
 
   friend struct GraphInternal;
 

diff --git a/lib/utils/include/utils/graph/node.h b/lib/utils/include/utils/graph/node.h
@@ -61,7 +61,7 @@ struct GraphView {
   }
 
 private:
-  GraphView(std::shared_ptr<IGraphView const> ptr) : ptr(ptr) {}
+  GraphView(std::shared_ptr<IGraphView const> ptr);
 
   friend struct GraphInternal;
 

diff --git a/lib/utils/include/utils/graph/open_graphs.h b/lib/utils/include/utils/graph/open_graphs.h
@@ -34,8 +34,7 @@ struct OpenMultiDiGraphView {
   }
 
 private:
-  OpenMultiDiGraphView(std::shared_ptr<IOpenMultiDiGraphView const> ptr)
-      : ptr(ptr) {}
+  OpenMultiDiGraphView(std::shared_ptr<IOpenMultiDiGraphView const> ptr);
 
   friend struct GraphInternal;
 

diff --git a/lib/utils/include/utils/graph/query_set.h b/lib/utils/include/utils/graph/query_set.h
@@ -2,7 +2,7 @@
 #define _FLEXFLOW_UTILS_INCLUDE_UTILS_GRAPH_QUERY_SET_H
 
 #include "utils/bidict.h"
-#include "utils/containers.decl"
+#include "utils/containers.decl.h"
 #include "utils/exception.h"
 #include "utils/optional.h"
 #include <unordered_set>
@@ -12,7 +12,7 @@ namespace FlexFlow {
 template <typename T>
 struct query_set {
   query_set() = delete;
-  query_set(T const &query) : query({query}) {}
+  query_set(T const &t) : query(std::unordered_set<T>{t}) {}
 
   query_set(std::unordered_set<T> const &query) : query(query) {}
 

diff --git a/lib/utils/include/utils/graph/undirected.h b/lib/utils/include/utils/graph/undirected.h
@@ -79,8 +79,7 @@ struct UndirectedGraphView {
       unsafe_create_without_ownership(IUndirectedGraphView const &);
 
 private:
-  UndirectedGraphView(std::shared_ptr<IUndirectedGraphView const> ptr)
-      : ptr(ptr) {}
+  UndirectedGraphView(std::shared_ptr<IUndirectedGraphView const> ptr);
 
   friend struct GraphInternal;