Skip to content

Commit 1aa2053

Browse files
okolbaskookolbasko
authored
Disable tests that fail on C600 Hw in CI (#3)
This change disables test that fails on C600 HW on CI. Tests fail because GCL library doesn't support C600 topology and we don't do any change to GCL library atm. This change is required to support poplar_view PR: https://github.com/Software-GCAI/poplar_view/pull/23 JIRA ticket: POPLAR-762
1 parent 42f4441 commit 1aa2053

File tree

10 files changed

+39
-29
lines changed

10 files changed

+39
-29
lines changed

‎tests/CMakeLists.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@ endif()
4848
message(STATUS "Popart default test variants: ${DEFAULT_TEST_VARIANTS}")
4949
message(STATUS "Popart enabled test variants: ${ENABLED_TEST_VARIANTS}")
5050

51+
# C600 isn't supported in GCL library hence need to exclude some tests from
52+
# running on C600 Hw but still run them on M2000 Hw
53+
set(HW_EXCLUDE_C600 "")
54+
if(NOT "$ENV{GCCI_HW_TARGET_SYSTEM}" STREQUAL "C600")
55+
set(HW_EXCLUDE_C600 "Hw")
56+
endif()
57+
5158
# Use of the pytest tmpdir fixture leaves files in /tmp after running the tests.
5259
# By setting --basetemp when running pytest, we can set the temp directory to be
5360
# a subdirectory of the build directory, which will be cleared up with the build.

‎tests/integration/CMakeLists.txt‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ add_unit_test(allocatortest allocator_test.cpp)
66
add_unit_test(boollogictest boollogic_test.cpp)
77
add_unit_test(builderpartialstest builder_partials_test.cpp)
88
add_unit_test(casttest cast_test.cpp)
9-
add_unit_test(collectivestest collectives_test.cpp VARIANTS "Hw")
9+
add_unit_test(collectivestest collectives_test.cpp VARIANTS "${HW_EXCLUDE_C600}")
1010
add_unit_test(copy_named_buffers_to_device_test copy_named_buffers_to_device_test.cpp)
1111
add_unit_test(custompatterntest custom_pattern_test.cpp)
1212
add_unit_test(customtransformtest custom_transform_test.cpp)
1313
add_unit_test(dataflowtest dataflowtest.cpp)
1414
add_unit_test(decomposegradientsummationtest decompose_gradient_summation_test.cpp)
15-
add_unit_test(executable_serialization_test executable_serialization_test.cpp VARIANTS "Hw")
15+
add_unit_test(executable_serialization_test executable_serialization_test.cpp VARIANTS "${HW_EXCLUDE_C600}")
1616
add_unit_test(graphedgemaptest graph_edgemap_test.cpp SUPPORT_LIBS test-graphs-test-util)
1717
add_unit_test(exceptiontest exceptiontest.cpp)
1818
add_unit_test(inputshapeinfotest inputshapeinfotest.cpp)
@@ -29,7 +29,6 @@ add_unit_test(opmanagertest op_manager_test.cpp)
2929
add_unit_test(opxtensoraliasingtest opx_tensor_aliasing_test.cpp)
3030
add_unit_test(outliningirtest outlining_ir_test.cpp)
3131
add_unit_test(poprithmstransitiveclosuretest poprithmstransitiveclosure_test.cpp SUPPORT_LIBS test-graphs-test-util)
32-
add_unit_test(prng_test prng_test.cpp VARIANTS Hw)
3332
add_unit_test(prunetest prune_test.cpp SUPPORT_LIBS test-graphs-test-util)
3433
add_unit_test(simple_addition_test simple_addition_test.cpp)
3534
add_unit_test(subgraph_partitioning_test subgraph_partitioning_test.cpp)
@@ -59,15 +58,13 @@ add_popart_py_unit_test(aliaszerocopy_model_test VARIANTS IpuModel2)
5958
add_popart_py_unit_test(all_constexpr)
6059
add_popart_py_unit_test(anchorreturntype_test VARIANTS IpuModel2)
6160
add_popart_py_unit_test(annotations_test)
62-
add_popart_py_unit_test(auto_loss_scaling_graph_replication_test VARIANTS Hw)
6361
add_popart_py_unit_test(auto_loss_scaling_gradient_accumulation_test)
6462
add_popart_py_unit_test(auto_loss_scaling_identical_weight_updates_0 VARIANTS IpuModel2)
6563
add_popart_py_unit_test(auto_loss_scaling_identical_weight_updates_1 VARIANTS IpuModel2)
6664
add_popart_py_unit_test(auto_virtual_graph_test VARIANTS IpuModel2)
6765
add_popart_py_unit_test(builder_name_test)
6866
add_popart_py_unit_test(builder_test)
6967
add_popart_py_unit_test(clip_by_norm_test)
70-
add_popart_py_unit_test(collectives_test VARIANTS Hw)
7168
add_popart_py_unit_test(replica_sharded_with_optimizer VARIANTS IpuModel2)
7269
add_popart_py_unit_test(convolution_options_test VARIANTS IpuModel2)
7370
add_popart_py_unit_test(context_scope_test)
@@ -87,7 +84,6 @@ add_popart_py_unit_test(distributed_test VARIANTS IpuModel2)
8784
add_popart_py_unit_test(distributed_replicated_graph_test VARIANTS Hw PROPERTIES DISABLED TRUE)
8885
add_popart_py_unit_test(doc_test)
8986
add_popart_py_unit_test(dont_inplace_test)
90-
add_popart_py_unit_test(dropout_replicated_pipeline VARIANTS Hw)
9187
add_popart_py_unit_test(enhanced_debug)
9288
add_popart_py_unit_test(exception_test VARIANTS Hw)
9389
add_popart_py_unit_test(export_test)
@@ -107,7 +103,6 @@ add_popart_py_unit_test(gradient_accumulation_test MATCHEXPR test_adam_gradient_
107103
add_popart_py_unit_test(gradient_accumulation_test MATCHEXPR test_adam_gradient_accumulation_model_proto VARIANTS IpuModel2)
108104
add_popart_py_unit_test(gradient_accumulation_test MATCHEXPR test_adam_loading_saved_gradient_accumulationt_tensors VARIANTS IpuModel2)
109105
add_popart_py_unit_test(graph_caching_test VARIANTS IpuModel2)
110-
add_popart_py_unit_test(graph_replication_test VARIANTS Hw)
111106
add_popart_py_unit_test(import_test)
112107
add_popart_py_unit_test(ipu_copy_test VARIANTS IpuModel2)
113108
add_popart_py_unit_test(loader_test)
@@ -121,7 +116,7 @@ add_popart_py_unit_test(offline_compilation)
121116
add_popart_py_unit_test(optimizer_test)
122117
add_popart_py_unit_test(options_test)
123118
add_popart_py_unit_test(outlining_test)
124-
add_popart_py_unit_test(outlining_execution_context_test VARIANTS "Hw")
119+
add_popart_py_unit_test(outlining_execution_context_test VARIANTS "${HW_EXCLUDE_C600}")
125120
add_popart_py_unit_test(padsumpattern)
126121
add_popart_py_unit_test(partials_tests VARIANTS IpuModel2)
127122
add_popart_py_unit_test(patterns_test)
@@ -152,15 +147,23 @@ add_popart_py_unit_test(external_tensorproto_data_test)
152147
add_popart_py_unit_test(debug_info_test)
153148
add_popart_py_unit_test(logging_test)
154149
add_popart_py_unit_test(model_loading_test)
155-
add_popart_py_unit_test(loss_grad_scaling_with_replication VARIANTS Hw)
156150
add_popart_py_unit_test(int8_host_stream_test VARIANTS IpuModel2)
157-
add_popart_py_unit_test(identical_replica_test VARIANTS Hw)
158151
add_popart_py_unit_test(version_test)
159152
add_popart_py_unit_test(test_all_reduce_op VARIANTS Hw)
160153
add_popart_py_unit_test(min_max_unwinding_test)
161154
add_popart_py_unit_test(deprecated_session_options)
162155
add_popart_py_unit_test(constant_weights_error_test)
163156

157+
add_popart_py_unit_test(auto_loss_scaling_graph_replication_test VARIANTS Hw)
158+
add_popart_py_unit_test(loss_grad_scaling_with_replication VARIANTS Hw)
159+
160+
add_unit_test(prng_test prng_test.cpp VARIANTS "${HW_EXCLUDE_C600}")
161+
add_popart_py_unit_test(collectives_test VARIANTS "${HW_EXCLUDE_C600}")
162+
add_popart_py_unit_test(dropout_replicated_pipeline VARIANTS "${HW_EXCLUDE_C600}")
163+
add_popart_py_unit_test(graph_replication_test VARIANTS "${HW_EXCLUDE_C600}")
164+
add_popart_py_unit_test(identical_replica_test VARIANTS "${HW_EXCLUDE_C600}")
165+
166+
164167
# Test to check for boost in popart headers.
165168
set(POPART_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/willow/include)
166169
add_test(NAME "boost_free_interface_test"

‎tests/integration/anchor_tests/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55

66
add_unit_test(
77
weights_as_anchors_test_0 weights_as_anchors_test_0.cpp VARIANTS "IpuModel2")
8-
add_popart_py_unit_test(anchor_output_test VARIANTS Hw)
8+
add_popart_py_unit_test(anchor_output_test VARIANTS "${HW_EXCLUDE_C600}")
99
add_popart_py_unit_test(anchor_output_test_2 VARIANTS Hw)
1010
add_popart_py_unit_test(anchor_shape_tests VARIANTS Hw)

‎tests/integration/optimizer_tests/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ foreach(optimizer ${optimizers})
4646
foreach(batchserial ${batchserial_options})
4747
foreach(explicit_loops ${explicit_loops_options})
4848
# linter complains if this is indented
49-
add_popart_py_unit_test(global_batch_size_test VARIANTS Hw MATCHEXPR "[${optimizer}-${reduction_type}-${batchserial}-${explicit_loops}]")
49+
add_popart_py_unit_test(global_batch_size_test VARIANTS "${HW_EXCLUDE_C600}" MATCHEXPR "[${optimizer}-${reduction_type}-${batchserial}-${explicit_loops}]")
5050
endforeach()
5151
endforeach()
5252
endforeach()

‎tests/integration/pipelining_tests/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ add_popart_py_unit_test(pipeline_test MATCHEXPR "test_output_matches_train" VARI
3434
add_popart_py_unit_test(pipeline_test MATCHEXPR "test_output_matches_infer" VARIANTS IpuModel2)
3535
add_popart_py_unit_test(pipeline_test MATCHEXPR "not test_output_matches_train and not test_output_matches_infer" VARIANTS IpuModel2)
3636
add_popart_py_unit_test(pipeline_dropout_test VARIANTS Hw)
37-
add_popart_py_unit_test(replicated_pipeline_test VARIANTS Hw)
37+
add_popart_py_unit_test(replicated_pipeline_test VARIANTS "${HW_EXCLUDE_C600}")
3838
add_popart_py_unit_test(pipeline_boundary_test VARIANTS IpuModel2)
3939
add_popart_py_unit_test(pipeline_consecutive_stages_test VARIANTS IpuModel2)
4040
add_popart_py_unit_test(pipeline_multiple_restores_per_stash VARIANTS IpuModel2)

‎tests/integration/popxl/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ foreach(retieval ${retieval_mode_options})
7777
foreach(rts ${rts_options})
7878
foreach(config ${config_options})
7979
# linter complains if this is indented
80-
add_popart_py_unit_test(test_grouped_initialization VARIANTS Hw MATCHEXPR "[${retieval}-${remote}-${rts}-${config}]")
80+
add_popart_py_unit_test(test_grouped_initialization VARIANTS "${HW_EXCLUDE_C600}" MATCHEXPR "[${retieval}-${remote}-${rts}-${config}]")
8181
endforeach()
8282
endforeach()
8383
endforeach()

‎tests/integration/session_api_tests/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ add_unit_test(get_tensor_ids_test get_tensor_ids_test.cpp)
88

99
add_popart_py_unit_test(reset_host_weights_test)
1010

11-
add_popart_py_unit_test(rng_test VARIANTS Hw)
11+
add_popart_py_unit_test(rng_test VARIANTS "${HW_EXCLUDE_C600}")

‎tests/integration/streamingmemory_tests/CMakeLists.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
add_unit_test(overlap_compute_exchange_test overlap_compute_exchange_test.cpp VARIANTS "Hw")
77
add_unit_test(executionphase_gradsumdec_test executionphase_gradsumdec_test.cpp)
8-
add_unit_test(remotebuffer_test remotebuffer_test.cpp VARIANTS "Hw")
8+
add_unit_test(remotebuffer_test remotebuffer_test.cpp VARIANTS "${HW_EXCLUDE_C600}")
99
add_unit_test(executionphase_sharding_test executionphase_sharding_test.cpp VARIANTS "Cpu")
1010
add_unit_test(executionphase_initop_accumulator_test executionphase_initop_accumulator_test.cpp VARIANTS "IpuModel2")
1111
add_unit_test(streamingmemoryopinserter_test streamingmemoryopinserter_test.cpp VARIANTS "Cpu")
@@ -14,16 +14,16 @@ add_unit_test(functionbuffers_test functionbuffers_test.cpp VARIANTS "IpuModel2"
1414
add_unit_test(functionbuffers_test_nested functionbuffers_test_nested.cpp VARIANTS "IpuModel2")
1515

1616
add_popart_py_unit_test(streamingmemory_test_0 MATCHEXPR "test_weight_update or test_onchip_memory" VARIANTS "Hw")
17-
add_popart_py_unit_test(streamingmemory_test_0 MATCHEXPR "test_replicated_sgd0_weight_update" VARIANTS "Hw")
18-
add_popart_py_unit_test(streamingmemory_test_0 MATCHEXPR "test_replicated_sgd1and2_weight_update" VARIANTS "Hw")
19-
add_popart_py_unit_test(streamingmemory_test_0 MATCHEXPR "test_replicated_adam_weight_update" VARIANTS "Hw")
20-
add_popart_py_unit_test(streamingmemory_test_0 MATCHEXPR "test_replicated_lamb_weight_update" VARIANTS "Hw")
21-
add_popart_py_unit_test(streamingmemory_test_0 MATCHEXPR "test_gradient_clipping" VARIANTS "Hw")
17+
add_popart_py_unit_test(streamingmemory_test_0 MATCHEXPR "test_replicated_sgd0_weight_update" VARIANTS "${HW_EXCLUDE_C600}")
18+
add_popart_py_unit_test(streamingmemory_test_0 MATCHEXPR "test_replicated_sgd1and2_weight_update" VARIANTS "${HW_EXCLUDE_C600}")
19+
add_popart_py_unit_test(streamingmemory_test_0 MATCHEXPR "test_replicated_adam_weight_update" VARIANTS "${HW_EXCLUDE_C600}")
20+
add_popart_py_unit_test(streamingmemory_test_0 MATCHEXPR "test_replicated_lamb_weight_update" VARIANTS "${HW_EXCLUDE_C600}")
21+
add_popart_py_unit_test(streamingmemory_test_0 MATCHEXPR "test_gradient_clipping" VARIANTS "${HW_EXCLUDE_C600}")
2222

23-
add_popart_py_unit_test(streamingmemory_test_1 VARIANTS "Hw")
24-
add_popart_py_unit_test(streamingmemory_test_2 VARIANTS "Hw")
23+
add_popart_py_unit_test(streamingmemory_test_1 VARIANTS "${HW_EXCLUDE_C600}")
24+
add_popart_py_unit_test(streamingmemory_test_2 VARIANTS "${HW_EXCLUDE_C600}")
2525
add_popart_py_unit_test(streamingmemory_tensor_location_test VARIANTS "Hw")
26-
add_popart_py_unit_test(streamingmemory_attention_test VARIANTS "Hw")
26+
add_popart_py_unit_test(streamingmemory_attention_test VARIANTS "${HW_EXCLUDE_C600}")
2727

2828
# TODO T26754 && T26968
2929
add_popart_py_unit_test(streamingmemory_overlap_test VARIANTS "Hw" PROPERTIES DISABLED TRUE)

‎tests/integration/streammode_tests/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2021 Graphcore Ltd. All rights reserved.
2-
add_popart_py_unit_test(tensor_replication VARIANTS "Hw")
3-
add_popart_py_unit_test(grouped_initialization_test VARIANTS "Hw" MATCHEXPR "test_onnx_checkpointing")
4-
add_popart_py_unit_test(grouped_initialization_test VARIANTS "Hw" MATCHEXPR "test_locations")
2+
add_popart_py_unit_test(tensor_replication VARIANTS "${HW_EXCLUDE_C600}")
3+
add_popart_py_unit_test(grouped_initialization_test VARIANTS "${HW_EXCLUDE_C600}" MATCHEXPR "test_onnx_checkpointing")
4+
add_popart_py_unit_test(grouped_initialization_test VARIANTS "${HW_EXCLUDE_C600}" MATCHEXPR "test_locations")
55
add_popart_py_unit_test(test_broadcast_replication VARIANTS "Hw")
66

77
# test_grouped_initialization test starts here
@@ -13,7 +13,7 @@ foreach(config ${config_options})
1313
foreach(location ${locations})
1414
foreach(session_type ${session_types})
1515
# linter complains if this is indented
16-
add_popart_py_unit_test(grouped_initialization_test VARIANTS Hw MATCHEXPR "[${session_type}-${location}-${config}]")
16+
add_popart_py_unit_test(grouped_initialization_test VARIANTS "${HW_EXCLUDE_C600}" MATCHEXPR "[${session_type}-${location}-${config}]")
1717
endforeach()
1818
endforeach()
1919
endforeach()

‎tests/integration/tiedgather_tests/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ foreach(splits ${splits_params})
2222
"${transpose_on_gather}"
2323
"${splits}")
2424
set(matchexpr "test_tied_gather_pattern_correctness[${matchexpr}]")
25-
add_popart_py_unit_test(testtiedgather VARIANTS Hw MATCHEXPR
25+
add_popart_py_unit_test(testtiedgather VARIANTS "${HW_EXCLUDE_C600}" MATCHEXPR
2626
"${matchexpr}")
2727
endforeach()
2828
endforeach()

0 commit comments

Comments
 (0)