Skip to content

Commit 065019a

Browse files
laurenyulaurenyu
committed
Fix Python version fixtures
1 parent b5929c0 commit 065019a

File tree

8 files changed

+100
-54
lines changed

8 files changed

+100
-54
lines changed

‎tests/integ/test_airflow_config.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,10 @@ def test_chainer_airflow_config_uploads_data_source_to_s3(
442442

443443
@pytest.mark.canary_quick
444444
def test_mxnet_airflow_config_uploads_data_source_to_s3(
445-
sagemaker_session, cpu_instance_type, mxnet_training_latest_version, mxnet_latest_py_version
445+
sagemaker_session,
446+
cpu_instance_type,
447+
mxnet_training_latest_version,
448+
mxnet_training_latest_py_version,
446449
):
447450
with timeout(seconds=AIRFLOW_CONFIG_TIMEOUT_IN_SECONDS):
448451
script_path = os.path.join(DATA_DIR, "chainer_mnist", "mnist.py")
@@ -452,7 +455,7 @@ def test_mxnet_airflow_config_uploads_data_source_to_s3(
452455
entry_point=script_path,
453456
role=ROLE,
454457
framework_version=mxnet_training_latest_version,
455-
py_version=mxnet_latest_py_version,
458+
py_version=mxnet_training_latest_py_version,
456459
instance_count=SINGLE_INSTANCE_COUNT,
457460
instance_type=cpu_instance_type,
458461
sagemaker_session=sagemaker_session,

‎tests/integ/test_debugger.py

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@
5757

5858

5959
def test_mxnet_with_rules(
60-
sagemaker_session, mxnet_training_latest_version, mxnet_latest_py_version, cpu_instance_type
60+
sagemaker_session,
61+
mxnet_training_latest_version,
62+
mxnet_training_latest_py_version,
63+
cpu_instance_type,
6164
):
6265
with timeout(minutes=TRAINING_DEFAULT_TIMEOUT_MINUTES):
6366
rules = [
@@ -75,7 +78,7 @@ def test_mxnet_with_rules(
7578
entry_point=script_path,
7679
role="SageMakerRole",
7780
framework_version=mxnet_training_latest_version,
78-
py_version=mxnet_latest_py_version,
81+
py_version=mxnet_training_latest_py_version,
7982
instance_count=1,
8083
instance_type=cpu_instance_type,
8184
sagemaker_session=sagemaker_session,
@@ -118,7 +121,10 @@ def test_mxnet_with_rules(
118121

119122

120123
def test_mxnet_with_custom_rule(
121-
sagemaker_session, mxnet_training_latest_version, mxnet_latest_py_version, cpu_instance_type
124+
sagemaker_session,
125+
mxnet_training_latest_version,
126+
mxnet_training_latest_py_version,
127+
cpu_instance_type,
122128
):
123129
with timeout(minutes=TRAINING_DEFAULT_TIMEOUT_MINUTES):
124130
rules = [_get_custom_rule(sagemaker_session)]
@@ -130,7 +136,7 @@ def test_mxnet_with_custom_rule(
130136
entry_point=script_path,
131137
role="SageMakerRole",
132138
framework_version=mxnet_training_latest_version,
133-
py_version=mxnet_latest_py_version,
139+
py_version=mxnet_training_latest_py_version,
134140
instance_count=1,
135141
instance_type=cpu_instance_type,
136142
sagemaker_session=sagemaker_session,
@@ -167,7 +173,10 @@ def test_mxnet_with_custom_rule(
167173

168174

169175
def test_mxnet_with_debugger_hook_config(
170-
sagemaker_session, mxnet_training_latest_version, mxnet_latest_py_version, cpu_instance_type
176+
sagemaker_session,
177+
mxnet_training_latest_version,
178+
mxnet_training_latest_py_version,
179+
cpu_instance_type,
171180
):
172181
with timeout(minutes=TRAINING_DEFAULT_TIMEOUT_MINUTES):
173182
debugger_hook_config = DebuggerHookConfig(
@@ -183,7 +192,7 @@ def test_mxnet_with_debugger_hook_config(
183192
entry_point=script_path,
184193
role="SageMakerRole",
185194
framework_version=mxnet_training_latest_version,
186-
py_version=mxnet_latest_py_version,
195+
py_version=mxnet_training_latest_py_version,
187196
instance_count=1,
188197
instance_type=cpu_instance_type,
189198
sagemaker_session=sagemaker_session,
@@ -206,7 +215,10 @@ def test_mxnet_with_debugger_hook_config(
206215

207216

208217
def test_mxnet_with_rules_and_debugger_hook_config(
209-
sagemaker_session, mxnet_training_latest_version, mxnet_latest_py_version, cpu_instance_type
218+
sagemaker_session,
219+
mxnet_training_latest_version,
220+
mxnet_training_latest_py_version,
221+
cpu_instance_type,
210222
):
211223
with timeout(minutes=TRAINING_DEFAULT_TIMEOUT_MINUTES):
212224
rules = [
@@ -229,7 +241,7 @@ def test_mxnet_with_rules_and_debugger_hook_config(
229241
entry_point=script_path,
230242
role="SageMakerRole",
231243
framework_version=mxnet_training_latest_version,
232-
py_version=mxnet_latest_py_version,
244+
py_version=mxnet_training_latest_py_version,
233245
instance_count=1,
234246
instance_type=cpu_instance_type,
235247
sagemaker_session=sagemaker_session,
@@ -274,7 +286,10 @@ def test_mxnet_with_rules_and_debugger_hook_config(
274286

275287

276288
def test_mxnet_with_custom_rule_and_debugger_hook_config(
277-
sagemaker_session, mxnet_training_latest_version, mxnet_latest_py_version, cpu_instance_type
289+
sagemaker_session,
290+
mxnet_training_latest_version,
291+
mxnet_training_latest_py_version,
292+
cpu_instance_type,
278293
):
279294
with timeout(minutes=TRAINING_DEFAULT_TIMEOUT_MINUTES):
280295
rules = [_get_custom_rule(sagemaker_session)]
@@ -291,7 +306,7 @@ def test_mxnet_with_custom_rule_and_debugger_hook_config(
291306
entry_point=script_path,
292307
role="SageMakerRole",
293308
framework_version=mxnet_training_latest_version,
294-
py_version=mxnet_latest_py_version,
309+
py_version=mxnet_training_latest_py_version,
295310
instance_count=1,
296311
instance_type=cpu_instance_type,
297312
sagemaker_session=sagemaker_session,
@@ -330,7 +345,10 @@ def test_mxnet_with_custom_rule_and_debugger_hook_config(
330345

331346

332347
def test_mxnet_with_tensorboard_output_config(
333-
sagemaker_session, mxnet_training_latest_version, mxnet_latest_py_version, cpu_instance_type
348+
sagemaker_session,
349+
mxnet_training_latest_version,
350+
mxnet_training_latest_py_version,
351+
cpu_instance_type,
334352
):
335353
with timeout(minutes=TRAINING_DEFAULT_TIMEOUT_MINUTES):
336354
tensorboard_output_config = TensorBoardOutputConfig(
@@ -346,7 +364,7 @@ def test_mxnet_with_tensorboard_output_config(
346364
entry_point=script_path,
347365
role="SageMakerRole",
348366
framework_version=mxnet_training_latest_version,
349-
py_version=mxnet_latest_py_version,
367+
py_version=mxnet_training_latest_py_version,
350368
instance_count=1,
351369
instance_type=cpu_instance_type,
352370
sagemaker_session=sagemaker_session,
@@ -373,7 +391,10 @@ def test_mxnet_with_tensorboard_output_config(
373391

374392
@pytest.mark.canary_quick
375393
def test_mxnet_with_all_rules_and_configs(
376-
sagemaker_session, mxnet_training_latest_version, mxnet_latest_py_version, cpu_instance_type
394+
sagemaker_session,
395+
mxnet_training_latest_version,
396+
mxnet_training_latest_py_version,
397+
cpu_instance_type,
377398
):
378399
with timeout(minutes=TRAINING_DEFAULT_TIMEOUT_MINUTES):
379400
rules = [
@@ -402,7 +423,7 @@ def test_mxnet_with_all_rules_and_configs(
402423
entry_point=script_path,
403424
role="SageMakerRole",
404425
framework_version=mxnet_training_latest_version,
405-
py_version=mxnet_latest_py_version,
426+
py_version=mxnet_training_latest_py_version,
406427
instance_count=1,
407428
instance_type=cpu_instance_type,
408429
sagemaker_session=sagemaker_session,
@@ -445,7 +466,10 @@ def test_mxnet_with_all_rules_and_configs(
445466

446467

447468
def test_mxnet_with_debugger_hook_config_disabled(
448-
sagemaker_session, mxnet_training_latest_version, mxnet_latest_py_version, cpu_instance_type
469+
sagemaker_session,
470+
mxnet_training_latest_version,
471+
mxnet_training_latest_py_version,
472+
cpu_instance_type,
449473
):
450474
with timeout(minutes=TRAINING_DEFAULT_TIMEOUT_MINUTES):
451475
script_path = os.path.join(DATA_DIR, "mxnet_mnist", "mnist_gluon.py")
@@ -455,7 +479,7 @@ def test_mxnet_with_debugger_hook_config_disabled(
455479
entry_point=script_path,
456480
role="SageMakerRole",
457481
framework_version=mxnet_training_latest_version,
458-
py_version=mxnet_latest_py_version,
482+
py_version=mxnet_training_latest_py_version,
459483
instance_count=1,
460484
instance_type=cpu_instance_type,
461485
sagemaker_session=sagemaker_session,

‎tests/integ/test_git.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def test_github(sagemaker_local_session, pytorch_full_version, pytorch_full_py_v
8282
@pytest.mark.local_mode
8383
@pytest.mark.skip("needs a secure authentication approach")
8484
def test_private_github(
85-
sagemaker_local_session, mxnet_training_latest_version, mxnet_latest_py_version
85+
sagemaker_local_session, mxnet_training_latest_version, mxnet_training_latest_py_version
8686
):
8787
script_path = "mnist.py"
8888
data_path = os.path.join(DATA_DIR, "mxnet_mnist")
@@ -102,7 +102,7 @@ def test_private_github(
102102
source_dir=source_dir,
103103
dependencies=dependencies,
104104
framework_version=mxnet_training_latest_version,
105-
py_version=mxnet_latest_py_version,
105+
py_version=mxnet_training_latest_py_version,
106106
instance_count=1,
107107
instance_type="local",
108108
sagemaker_session=sagemaker_local_session,
@@ -226,7 +226,7 @@ def test_github_with_ssh_passphrase_not_configured(
226226
@pytest.mark.local_mode
227227
@pytest.mark.skip("needs a secure authentication approach")
228228
def test_codecommit(
229-
sagemaker_local_session, mxnet_training_latest_version, mxnet_latest_py_version
229+
sagemaker_local_session, mxnet_training_latest_version, mxnet_training_latest_py_version
230230
):
231231
script_path = "mnist.py"
232232
data_path = os.path.join(DATA_DIR, "mxnet_mnist")
@@ -244,7 +244,7 @@ def test_codecommit(
244244
source_dir=source_dir,
245245
dependencies=dependencies,
246246
framework_version=mxnet_training_latest_version,
247-
py_version=mxnet_latest_py_version,
247+
py_version=mxnet_training_latest_py_version,
248248
instance_count=1,
249249
instance_type="local",
250250
sagemaker_session=sagemaker_local_session,

‎tests/integ/test_local_mode.py

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ def _initialize(self, boto_session, sagemaker_client, sagemaker_runtime_client):
5454

5555

5656
@pytest.fixture(scope="module")
57-
def mxnet_model(sagemaker_local_session, mxnet_inference_latest_version, mxnet_latest_py_version):
57+
def mxnet_model(
58+
sagemaker_local_session, mxnet_inference_latest_version, mxnet_inference_latest_py_version
59+
):
5860
def _create_model(output_path):
5961
script_path = os.path.join(DATA_DIR, "mxnet_mnist", "mnist.py")
6062
data_path = os.path.join(DATA_DIR, "mxnet_mnist")
@@ -66,7 +68,7 @@ def _create_model(output_path):
6668
instance_type="local",
6769
output_path=output_path,
6870
framework_version=mxnet_inference_latest_version,
69-
py_version=mxnet_latest_py_version,
71+
py_version=mxnet_inference_latest_py_version,
7072
sagemaker_session=sagemaker_local_session,
7173
)
7274

@@ -86,7 +88,10 @@ def _create_model(output_path):
8688

8789
@pytest.mark.local_mode
8890
def test_local_mode_serving_from_s3_model(
89-
sagemaker_local_session, mxnet_model, mxnet_inference_latest_version, mxnet_latest_py_version
91+
sagemaker_local_session,
92+
mxnet_model,
93+
mxnet_inference_latest_version,
94+
mxnet_inference_latest_py_version,
9095
):
9196
path = "s3://%s" % sagemaker_local_session.default_bucket()
9297
s3_model = mxnet_model(path)
@@ -122,15 +127,15 @@ def test_local_mode_serving_from_local_model(tmpdir, sagemaker_local_session, mx
122127

123128
@pytest.mark.local_mode
124129
def test_mxnet_local_mode(
125-
sagemaker_local_session, mxnet_training_latest_version, mxnet_latest_py_version
130+
sagemaker_local_session, mxnet_training_latest_version, mxnet_training_latest_py_version
126131
):
127132
script_path = os.path.join(DATA_DIR, "mxnet_mnist", "mnist.py")
128133
data_path = os.path.join(DATA_DIR, "mxnet_mnist")
129134

130135
mx = MXNet(
131136
entry_point=script_path,
132137
role="SageMakerRole",
133-
py_version=mxnet_latest_py_version,
138+
py_version=mxnet_training_latest_py_version,
134139
instance_count=1,
135140
instance_type="local",
136141
sagemaker_session=sagemaker_local_session,
@@ -158,15 +163,15 @@ def test_mxnet_local_mode(
158163

159164
@pytest.mark.local_mode
160165
def test_mxnet_distributed_local_mode(
161-
sagemaker_local_session, mxnet_training_latest_version, mxnet_latest_py_version
166+
sagemaker_local_session, mxnet_training_latest_version, mxnet_training_latest_py_version
162167
):
163168
script_path = os.path.join(DATA_DIR, "mxnet_mnist", "mnist.py")
164169
data_path = os.path.join(DATA_DIR, "mxnet_mnist")
165170

166171
mx = MXNet(
167172
entry_point=script_path,
168173
role="SageMakerRole",
169-
py_version=mxnet_latest_py_version,
174+
py_version=mxnet_training_latest_py_version,
170175
instance_count=2,
171176
instance_type="local",
172177
sagemaker_session=sagemaker_local_session,
@@ -185,7 +190,9 @@ def test_mxnet_distributed_local_mode(
185190

186191

187192
@pytest.mark.local_mode
188-
def test_mxnet_local_data_local_script(mxnet_training_latest_version, mxnet_latest_py_version):
193+
def test_mxnet_local_data_local_script(
194+
mxnet_training_latest_version, mxnet_training_latest_py_version
195+
):
189196
data_path = os.path.join(DATA_DIR, "mxnet_mnist")
190197
script_path = os.path.join(data_path, "mnist.py")
191198

@@ -195,7 +202,7 @@ def test_mxnet_local_data_local_script(mxnet_training_latest_version, mxnet_late
195202
instance_count=1,
196203
instance_type="local",
197204
framework_version=mxnet_training_latest_version,
198-
py_version=mxnet_latest_py_version,
205+
py_version=mxnet_training_latest_py_version,
199206
sagemaker_session=LocalNoS3Session(),
200207
)
201208

@@ -216,15 +223,15 @@ def test_mxnet_local_data_local_script(mxnet_training_latest_version, mxnet_late
216223

217224
@pytest.mark.local_mode
218225
def test_mxnet_training_failure(
219-
sagemaker_local_session, mxnet_training_latest_version, mxnet_latest_py_version, tmpdir
226+
sagemaker_local_session, mxnet_training_latest_version, mxnet_training_latest_py_version, tmpdir
220227
):
221228
script_path = os.path.join(DATA_DIR, "mxnet_mnist", "failure_script.py")
222229

223230
mx = MXNet(
224231
entry_point=script_path,
225232
role="SageMakerRole",
226233
framework_version=mxnet_training_latest_version,
227-
py_version=mxnet_latest_py_version,
234+
py_version=mxnet_training_latest_py_version,
228235
instance_count=1,
229236
instance_type="local",
230237
sagemaker_session=sagemaker_local_session,
@@ -244,7 +251,7 @@ def test_local_transform_mxnet(
244251
sagemaker_local_session,
245252
tmpdir,
246253
mxnet_inference_latest_version,
247-
mxnet_latest_py_version,
254+
mxnet_inference_latest_py_version,
248255
cpu_instance_type,
249256
):
250257
data_path = os.path.join(DATA_DIR, "mxnet_mnist")
@@ -256,7 +263,7 @@ def test_local_transform_mxnet(
256263
instance_count=1,
257264
instance_type="local",
258265
framework_version=mxnet_inference_latest_version,
259-
py_version=mxnet_latest_py_version,
266+
py_version=mxnet_inference_latest_py_version,
260267
sagemaker_session=sagemaker_local_session,
261268
)
262269

‎tests/integ/test_multidatamodel.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ def test_multi_data_model_deploy_trained_model_from_framework_estimator(
246246
sagemaker_session,
247247
cpu_instance_type,
248248
mxnet_inference_latest_version,
249-
mxnet_latest_py_version,
249+
mxnet_inference_latest_py_version,
250250
):
251251
timestamp = sagemaker_timestamp()
252252
endpoint_name = "test-multimodel-endpoint-{}".format(timestamp)
@@ -257,7 +257,7 @@ def test_multi_data_model_deploy_trained_model_from_framework_estimator(
257257
sagemaker_session,
258258
container_image,
259259
mxnet_inference_latest_version,
260-
mxnet_latest_py_version,
260+
mxnet_inference_latest_py_version,
261261
cpu_instance_type,
262262
0.1,
263263
)
@@ -281,7 +281,7 @@ def test_multi_data_model_deploy_trained_model_from_framework_estimator(
281281
sagemaker_session,
282282
container_image,
283283
mxnet_inference_latest_version,
284-
mxnet_latest_py_version,
284+
mxnet_inference_latest_py_version,
285285
cpu_instance_type,
286286
0.01,
287287
)

0 commit comments

Comments
 (0)