Skip to content

Commit 8301bed

Browse files
author
Victor Li
committed
Added back test after bugfixing
1 parent 04a3b06 commit 8301bed

File tree

1 file changed

+41
-45
lines changed

1 file changed

+41
-45
lines changed

lib/substitutions/test/src/substitutions/unity_substitution_set.cc

Lines changed: 41 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ TEST_SUITE(FF_TEST_SUITE) {
251251
parallel_tensor_guid_t t_projection_weight =
252252
get_only(projection_weight_added.outputs);
253253

254-
ParallelLayerAddedResult bias_added =
254+
ParallelLayerAddedResult bias_added =
255255
add_parallel_layer(pcg, make_layer_attrs(bias_attrs), {}, {});
256256
parallel_tensor_guid_t t_bias = get_only(bias_added.outputs);
257257

@@ -265,39 +265,39 @@ TEST_SUITE(FF_TEST_SUITE) {
265265
}();
266266

267267
PCGPatternMatch match = [&] {
268-
parallel_layer_guid_t match_layer =
269-
get_parallel_layer_by_name(original_pcg, linear_match);
270-
open_parallel_tensor_guid_t match_layer_input_activations =
271-
get_layer_inputs(original_pcg, match_layer).at(0);
272-
open_parallel_tensor_guid_t match_layer_input_weights =
273-
get_layer_inputs(original_pcg, match_layer).at(1);
274-
open_parallel_tensor_guid_t match_layer_input_bias =
275-
get_layer_inputs(original_pcg, match_layer).at(2);
276-
277-
return PCGPatternMatch{
278-
bidict<PatternNode, parallel_layer_guid_t>{
279-
{PatternNode{Node{0}}, match_layer},
280-
},
281-
std::unordered_map<PatternInput, open_parallel_tensor_guid_t>{
282-
{
283-
PatternInput{DataflowGraphInput{0}},
284-
match_layer_input_activations,
285-
},
286-
{
287-
PatternInput{DataflowGraphInput{2}},
288-
match_layer_input_weights,
289-
},
290-
{
268+
parallel_layer_guid_t match_layer =
269+
get_parallel_layer_by_name(original_pcg, linear_match);
270+
open_parallel_tensor_guid_t match_layer_input_activations =
271+
get_layer_inputs(original_pcg, match_layer).at(0);
272+
open_parallel_tensor_guid_t match_layer_input_weights =
273+
get_layer_inputs(original_pcg, match_layer).at(1);
274+
open_parallel_tensor_guid_t match_layer_input_bias =
275+
get_layer_inputs(original_pcg, match_layer).at(2);
276+
277+
return PCGPatternMatch{
278+
bidict<PatternNode, parallel_layer_guid_t>{
279+
{PatternNode{Node{0}}, match_layer},
280+
},
281+
std::unordered_map<PatternInput, open_parallel_tensor_guid_t>{
282+
{
283+
PatternInput{DataflowGraphInput{0}},
284+
match_layer_input_activations,
285+
},
286+
{
287+
PatternInput{DataflowGraphInput{2}},
288+
match_layer_input_weights,
289+
},
290+
{
291291
PatternInput{DataflowGraphInput{4}},
292292
match_layer_input_bias,
293293
}},
294-
};
295-
}();
294+
};
295+
}();
296296

297297
SubParallelComputationGraph result =
298298
apply_substitution(original_pcg, sub, match);
299299

300-
/*SubParallelComputationGraph correct = [&] {
300+
SubParallelComputationGraph correct = [&] {
301301
ParallelComputationGraph pcg = empty_parallel_computation_graph();
302302

303303
ParallelLayerAddedResult input_added =
@@ -323,24 +323,20 @@ TEST_SUITE(FF_TEST_SUITE) {
323323
parallel_tensor_guid_t t_partitioned_projection_weight =
324324
get_only(partition_projection_added.outputs);
325325

326-
ParallelLayerAddedResult bias_added = add_parallel_layer(
327-
pcg, make_layer_attrs(bias_attrs), {}, {});
328-
parallel_tensor_guid_t t_bias =
329-
get_only(bias_added.outputs);
330-
331-
ParallelLayerAddedResult partition_bias_added =
332-
add_parallel_layer(pcg,
333-
make_layer_attrs(partition_projection_attrs),
334-
{t_bias},
335-
{});
336-
parallel_tensor_guid_t t_partitioned_bias =
337-
get_only(partition_bias_added.outputs);
326+
ParallelLayerAddedResult bias_added =
327+
add_parallel_layer(pcg, make_layer_attrs(bias_attrs), {}, {});
328+
parallel_tensor_guid_t t_bias = get_only(bias_added.outputs);
338329

339-
ParallelLayerAddedResult replicate_linear_added =
340-
add_parallel_layer(pcg,
341-
make_layer_attrs(linear_attrs),
342-
{t_replicated_input},
343-
{t_partitioned_projection_weight, t_partitioned_bias});
330+
ParallelLayerAddedResult partition_bias_added = add_parallel_layer(
331+
pcg, make_layer_attrs(partition_projection_attrs), {t_bias}, {});
332+
parallel_tensor_guid_t t_partitioned_bias =
333+
get_only(partition_bias_added.outputs);
334+
335+
ParallelLayerAddedResult replicate_linear_added = add_parallel_layer(
336+
pcg,
337+
make_layer_attrs(linear_attrs),
338+
{t_replicated_input},
339+
{t_partitioned_projection_weight, t_partitioned_bias});
344340
parallel_tensor_guid_t t_replicated_linear =
345341
get_only(replicate_linear_added.outputs);
346342

@@ -351,7 +347,7 @@ TEST_SUITE(FF_TEST_SUITE) {
351347
return sub_pcg_from_full_pcg(pcg);
352348
}();
353349

354-
CHECK(sub_pcgs_are_isomorphic(result, correct));*/
350+
CHECK(sub_pcgs_are_isomorphic(result, correct));
355351
}
356352

357353
TEST_CASE("create_partition_linear_combine, use_bias = false") {

0 commit comments

Comments
 (0)