Skip to content
This repository was archived by the owner on Jan 15, 2024. It is now read-only.

Commit e76530f

Browse files
committed
[CI] Remove skip_master feature
1 parent 5e11334 commit e76530f

File tree

5 files changed

+10
-15
lines changed

5 files changed

+10
-15
lines changed

ci/jenkins/Jenkinsfile_py3-master_cpu_unittest

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,27 @@ core_logic: {
4040
utils.parallel_stage('Tests', [
4141
build_steps.test_unittest('gluon-nlp-cpu-py3', 'cpu/py3-master',
4242
'tests/unittest', 'src/gluonnlp',
43-
'not (gpu or serial or skip_master)',
43+
'not (gpu or serial)',
4444
4, false, false),
4545
build_steps.test_unittest('gluon-nlp-cpu-py3', 'cpu/py3-master',
4646
'tests/unittest', 'src/gluonnlp',
47-
'(not (gpu or skip_master)) and serial',
47+
'(not gpu) and serial',
4848
0, false, false),
4949
build_steps.test_unittest('gluon-nlp-cpu-py3', 'cpu/py3-master',
5050
'scripts/tests', 'src/gluonnlp',
51-
'not (gpu or serial or skip_master or integration)',
51+
'not (gpu or serial or integration)',
5252
4, false, false),
5353
build_steps.test_unittest('gluon-nlp-cpu-py3', 'cpu/py3-master',
5454
'scripts/tests', 'src/gluonnlp',
55-
'(not (gpu or skip_master or integration)) and serial',
55+
'(not (gpu or integration)) and serial',
5656
0, false, false),
5757
build_steps.test_unittest('gluon-nlp-cpu-py3', 'cpu/py3-master',
5858
'scripts/tests', 'src/gluonnlp',
59-
'not (gpu or serial or skip_master) and integration',
59+
'not (gpu or serial) and integration',
6060
4, false, false),
6161
build_steps.test_unittest('gluon-nlp-cpu-py3', 'cpu/py3-master',
6262
'scripts/tests', 'src/gluonnlp',
63-
'(not (gpu or skip_master)) and serial and integration',
63+
'(not gpu) and serial and integration',
6464
0, false, false)
6565
])
6666
}

ci/jenkins/Jenkinsfile_py3-master_gpu_unittest

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@ core_logic: {
4040
utils.parallel_stage('Tests', [
4141
build_steps.test_unittest('gluon-nlp-gpu-py3-master', 'gpu/py3-master',
4242
'tests/unittest', 'src/gluonnlp',
43-
'gpu and (not (serial or skip_master))',
43+
'gpu and (not serial)',
4444
4, true, false),
4545
build_steps.test_unittest('gluon-nlp-gpu-py3-master', 'gpu/py3-master',
4646
'tests/unittest', 'src/gluonnlp',
47-
'gpu and serial and not skip_master',
47+
'gpu and serial',
4848
0, true, false),
4949
build_steps.test_unittest('gluon-nlp-gpu-py3-master', 'gpu/py3-master',
5050
'scripts/tests', 'src/gluonnlp',
51-
'gpu and (not (serial or skip_master or integration))',
51+
'gpu and (not (serial or integration))',
5252
4, true, false),
5353
build_steps.test_unittest('gluon-nlp-gpu-py3-master', 'gpu/py3-master',
5454
'scripts/tests', 'src/gluonnlp',
55-
'gpu and serial and not (skip_master or integration)',
55+
'gpu and serial and not integration',
5656
0, true, false)
5757
])
5858
}

pytest.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ markers =
55
remote_required: mark a test that requires internet access.
66
gpu: mark a test that requires GPU.
77
integration: mark an integration test
8-
skip_master: mark a test that is temporarily skipped for mxnet master validation.
98
py3_only: mark a test that is intended for a python3-only feature.
109

1110
env =

scripts/tests/test_scripts.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ def test_glove():
6161
time.sleep(5)
6262

6363

64-
@pytest.mark.skip_master
6564
@pytest.mark.serial
6665
@pytest.mark.remote_required
6766
@pytest.mark.gpu
@@ -135,7 +134,6 @@ def test_sentiment_analysis_textcnn():
135134
'--dropout', '0.5', '--model_mode', 'rand', '--data_name', 'MR'])
136135
time.sleep(5)
137136

138-
@pytest.mark.skip_master
139137
@pytest.mark.remote_required
140138
@pytest.mark.gpu
141139
@pytest.mark.serial
@@ -154,7 +152,6 @@ def test_sampling(method):
154152
time.sleep(5)
155153

156154

157-
@pytest.mark.skip_master
158155
@pytest.mark.serial
159156
@pytest.mark.remote_required
160157
@pytest.mark.gpu

tests/unittest/test_sequence_sampler.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ def test_beam_search_score(length, alpha, K):
2727
lp = (K + length) ** alpha / (K + 1) ** alpha
2828
assert_allclose(scores.asnumpy(), sum_log_probs.asnumpy() / lp, 1E-5, 1E-5)
2929

30-
@pytest.mark.skip_master
3130
@pytest.mark.serial
3231
@pytest.mark.parametrize('top_k', [None, 5])
3332
def test_sequence_sampler(top_k):

0 commit comments

Comments
 (0)