Fix failing tests

Author: lockshaw

lib/compiler/src/compiler/allowed_machine_views.cc

@@ -11,7 +11,7 @@
 #include "utils/containers/map_from_keys_and_values.h"
 #include "utils/containers/product.h"
 #include "utils/containers/range.h"
-#include "utils/containers/replicate.h"
+#include "utils/containers/repeat_element.h"
 #include "utils/containers/sorted.h"
 #include "utils/containers/transform.h"
 #include "utils/containers/unordered_multiset_of.h"
@@ -67,8 +67,8 @@ static std::unordered_set<MachineView>
         transform(nonnegative_range(1_n, max_stride_upper_bound + 1_n),
                   [](nonnegative_int stride) { return stride_t{stride}; });
     std::unordered_multiset<std::vector<stride_t>> raw_stride_vectors =
-        cartesian_product(replicate(num_elements(tensor_dims),
-                                    single_stride_range));
+        cartesian_product(repeat_element(/*num_times=*/num_elements(tensor_dims),
+                                         /*element=*/single_stride_range));
     std::unordered_multiset<MultiDimensionalStride> strides =
         transform(raw_stride_vectors, [](auto const &stride_vec) {
           return MultiDimensionalStride{stride_vec};

lib/models/src/models/candle_uno/candle_uno.cc

@@ -1,13 +1,14 @@
 #include "models/candle_uno/candle_uno.h"
 #include "pcg/initializers/glorot_normal_attrs.dtg.h"
+#include "utils/containers/repeat_element.h"
 
 namespace FlexFlow {
 
 CandleUnoConfig get_default_candle_uno_config() {
   return CandleUnoConfig{
       /*batch_size=*/64_n,
-      /*dense_layers=*/std::vector<nonnegative_int>{4_n, 4192_n},
-      /*dense_feature_layers=*/std::vector<nonnegative_int>{8_n, 4192_n},
+      /*dense_layers=*/repeat_element(/*num_times=*/4_n, /*element=*/4192_n),
+      /*dense_feature_layers=*/repeat_element(/*num_times=*/8_n, /*element=*/4192_n),
       /*feature_shapes=*/ {
         {"dose", 1_n},
         {"cell.rnaseq", 942_n},

lib/op-attrs/src/op-attrs/parallel_tensor_dims.cc

@@ -7,7 +7,7 @@
 #include "op-attrs/tensor_dims.h"
 #include "utils/containers/all_of.h"
 #include "utils/containers/product.h"
-#include "utils/containers/replicate.h"
+#include "utils/containers/repeat_element.h"
 #include "utils/containers/transform.h"
 #include "utils/containers/vector_of.h"
 #include "utils/integer_conversions.h"
@@ -42,7 +42,7 @@ ParallelTensorDimDegrees get_parallel_degrees(ParallelTensorDims const &d) {
 }
 
 ParallelTensorDims lift_to_parallel(TensorDims const &dims) {
-  std::vector<nonnegative_int> shard_degrees = replicate(num_dims(dims), 1_n);
+  std::vector<nonnegative_int> shard_degrees = repeat_element(/*num_times=*/num_dims(dims), /*element=*/1_n);
   return lift_to_parallel_with_degrees(
       dims, SumDegree{1_n}, DiscardCopyDegree{1_n}, shard_degrees);
 }

lib/pcg/test/src/pcg/file_format/v1/v1_binary_sp_decomposition/json.cc

@@ -9,11 +9,11 @@ TEST_SUITE(FF_TEST_SUITE) {
         V1BinarySeriesSplit{
             V1BinarySPDecomposition{
                 V1BinaryParallelSplit{
-                    V1BinarySPDecomposition{2},
-                    V1BinarySPDecomposition{2},
+                    V1BinarySPDecomposition{2_n},
+                    V1BinarySPDecomposition{2_n},
                 },
             },
-            V1BinarySPDecomposition{3},
+            V1BinarySPDecomposition{3_n},
         },
     };
 
@@ -68,11 +68,11 @@ TEST_SUITE(FF_TEST_SUITE) {
     V1BinarySeriesSplit example_split = V1BinarySeriesSplit{
         V1BinarySPDecomposition{
             V1BinaryParallelSplit{
-                V1BinarySPDecomposition{2},
-                V1BinarySPDecomposition{2},
+                V1BinarySPDecomposition{2_n},
+                V1BinarySPDecomposition{2_n},
             },
         },
-        V1BinarySPDecomposition{3},
+        V1BinarySPDecomposition{3_n},
     };
 
     nlohmann::json example_json = {
@@ -124,11 +124,11 @@ TEST_SUITE(FF_TEST_SUITE) {
     V1BinaryParallelSplit example_split = V1BinaryParallelSplit{
         V1BinarySPDecomposition{
             V1BinaryParallelSplit{
-                V1BinarySPDecomposition{2},
-                V1BinarySPDecomposition{2},
+                V1BinarySPDecomposition{2_n},
+                V1BinarySPDecomposition{2_n},
             },
         },
-        V1BinarySPDecomposition{3},
+        V1BinarySPDecomposition{3_n},
     };
 
     nlohmann::json example_json = {

lib/substitutions/include/substitutions/operator_pattern/operator_attribute_value.variant.toml

@@ -7,7 +7,6 @@ features = [
   "fmt",
   "json",
 ]
-explicit_constructors = false
 
 includes = [
   "<vector>",
@@ -40,6 +39,9 @@ type = "bool"
 [[values]]
 type = "float"
 
+[[values]]
+type = "std::optional<float>"
+
 [[values]]
 type = "std::vector<::FlexFlow::nonnegative_int>"
 
@@ -56,7 +58,7 @@ type = "std::optional<::FlexFlow::Activation>"
 type = "::FlexFlow::ff_dim_t"
 
 [[values]]
-type = "::FlexFlow::AggregateOp"
+type = "std::optional<::FlexFlow::AggregateOp>"
 
 [[values]]
 type = "std::optional<::FlexFlow::RegularizerAttrs>"

lib/substitutions/include/substitutions/output_graph/output_operator_attrs_assignment.h

@@ -20,6 +20,9 @@ std::pair<OperatorAttributeKey, OutputOperatorAttributeExpr>
     set_attr_to_constant(OperatorAttributeKey key,
                          OperatorAttributeValue const &value);
 
+std::pair<OperatorAttributeKey, OutputOperatorAttributeExpr>
+    set_op_type_attr(OperatorType);
+
 } // namespace FlexFlow
 
 #endif