Small bugfix and remove some unnecessary includes

flexflow · Oct 10, 2024 · 27a0cfe · 27a0cfe
1 parent 3579ee4
commit 27a0cfe
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 36 deletions.
diff --git a/lib/kernels/include/kernels/accessor.h b/lib/kernels/include/kernels/accessor.h
@@ -7,7 +7,6 @@
 #include "op-attrs/datatype.h"
 #include "utils/exception.h"
 #include "utils/required.h"
-#include "utils/variant.h"
 
 namespace FlexFlow {
 

diff --git a/lib/kernels/include/kernels/initializer_kernels.h b/lib/kernels/include/kernels/initializer_kernels.h
@@ -4,7 +4,6 @@
 #include "accessor.h"
 #include "kernels/cpu.h"
 #include "op-attrs/datatype_value.dtg.h"
-#include "utils/variant.h"
 
 namespace FlexFlow {
 

diff --git a/lib/pcg/include/pcg/optimizer_attrs.h b/lib/pcg/include/pcg/optimizer_attrs.h
@@ -3,7 +3,7 @@
 
 #include "pcg/optimizers/adam_optimizer_attrs.h"
 #include "pcg/optimizers/sgd_optimizer_attrs.h"
-#include "utils/variant.h"
+#include <variant>
 
 namespace FlexFlow {
 

diff --git a/lib/utils/include/utils/graph/cow_ptr_t.h b/lib/utils/include/utils/graph/cow_ptr_t.h
@@ -2,8 +2,6 @@
 #define _FLEXFLOW_UTILS_INCLUDE_UTILS_GRAPH_COW_PTR_T_H
 
 #include "utils/type_traits.h"
-#include "utils/unique.h"
-#include "utils/variant.h"
 #include <memory>
 #include <type_traits>
 

diff --git a/lib/utils/include/utils/rapidcheck/variant.h b/lib/utils/include/utils/rapidcheck/variant.h
@@ -0,0 +1,18 @@
+#ifndef _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_RAPIDCHECK_VARIANT_H
+#define _FLEXFLOW_LIB_UTILS_INCLUDE_UTILS_RAPIDCHECK_VARIANT_H
+
+#include <variant>
+#include <rapidcheck.h>
+
+namespace rc {
+
+template <typename... Ts>
+struct Arbitrary<std::variant<Ts...>> {
+  static Gen<std::variant<Ts...>> arbitrary() {
+    return gen::oneOf(gen::construct<std::variant<Ts...>>(gen::arbitrary<Ts>())...);
+  }
+};
+
+} // namespace rc
+
+#endif
diff --git a/lib/utils/include/utils/unique.h b/lib/utils/include/utils/unique.h
diff --git a/lib/utils/include/utils/variant.h b/lib/utils/include/utils/variant.h
@@ -213,15 +213,4 @@ std::optional<VariantOut> cast(VariantIn const &v) {
 
 } // namespace FlexFlow
 
-namespace rc {
-
-template <typename... Ts>
-struct Arbitrary<std::variant<Ts...>> {
-  static Gen<std::variant<Ts...>> arbitrary() {
-    return gen::oneOf(gen::cast<std::variant<Ts...>>(gen::arbitrary<Ts>())...);
-  }
-};
-
-} // namespace rc
-
 #endif
diff --git a/lib/utils/src/utils/rapidcheck/variant.cc b/lib/utils/src/utils/rapidcheck/variant.cc
@@ -0,0 +1,11 @@
+#include "utils/rapidcheck/variant.h"
+
+namespace rc {
+
+using T0 = int;
+using T1 = std::string;
+
+template
+  struct Arbitrary<std::variant<T0, T1>>;
+
+} // namespace rc
diff --git a/lib/utils/test/src/utils/rapidcheck/variant.cc b/lib/utils/test/src/utils/rapidcheck/variant.cc
@@ -0,0 +1,13 @@
+#include "utils/rapidcheck/variant.h"
+#include <doctest/doctest.h>
+#include "test/utils/rapidcheck.h"
+
+using namespace ::FlexFlow;
+
+TEST_SUITE(FF_TEST_SUITE) {
+  TEST_CASE("Arbitrary<std::variant>") {
+    RC_SUBCASE("valid type", [](std::variant<int, float> v) {
+      return std::holds_alternative<int>(v) || std::holds_alternative<float>(v);
+    });
+  }
+}
diff --git a/lib/utils/test/src/utils/variant.cc b/lib/utils/test/src/utils/variant.cc
@@ -1,7 +1,6 @@
 #include "utils/variant.h"
 #include "test/utils/doctest/fmt/optional.h"
 #include "test/utils/doctest/fmt/variant.h"
-#include "test/utils/rapidcheck.h"
 #include <doctest/doctest.h>
 
 using namespace ::FlexFlow;
@@ -74,10 +73,4 @@ TEST_SUITE(FF_TEST_SUITE) {
     // Check the result
     CHECK(get<int>(wider_variant) == 42);
   }
-
-  TEST_CASE("Arbitrary<std::variant>") {
-    RC_SUBCASE("valid type", [](std::variant<int, float> v) {
-      return std::holds_alternative<int>(v) || std::holds_alternative<float>(v);
-    });
-  }
 }