Skip to content

Commit d5f80f2

Browse files
committed
fix airflow tests
1 parent f857c33 commit d5f80f2

File tree

1 file changed

+17
-28
lines changed

1 file changed

+17
-28
lines changed

tests/unit/test_airflow.py

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -169,21 +169,18 @@ def test_byo_training_config_all_args(sagemaker_session):
169169
@patch(
170170
"sagemaker.fw_utils.parse_s3_url",
171171
MagicMock(
172-
return_value=[
173-
"output",
174-
"sagemaker-tensorflow-{}/source/sourcedir.tar.gz".format(TIME_STAMP),
175-
]
172+
return_value=["output", "tensorflow-training-{}/source/sourcedir.tar.gz".format(TIME_STAMP)]
176173
),
177174
)
178175
@patch(
179176
"sagemaker.fw_utils.get_ecr_image_uri_prefix",
180-
return_value="520713654638.dkr.ecr.us-west-2.amazonaws.com",
177+
return_value="763104351884.dkr.ecr.us-west-2.amazonaws.com",
181178
)
182179
def test_framework_training_config_required_args(ecr_prefix, sagemaker_session):
183180
tf = tensorflow.TensorFlow(
184181
entry_point="/some/script.py",
185-
framework_version="1.10.0",
186-
hyperparameters={"training_steps": 1000, "evaluation_steps": 100},
182+
framework_version="1.15.2",
183+
py_version="py3",
187184
role="{{ role }}",
188185
train_instance_count="{{ instance_count }}",
189186
train_instance_type="ml.c4.2xlarge",
@@ -195,11 +192,11 @@ def test_framework_training_config_required_args(ecr_prefix, sagemaker_session):
195192
config = airflow.training_config(tf, data)
196193
expected_config = {
197194
"AlgorithmSpecification": {
198-
"TrainingImage": "520713654638.dkr.ecr.us-west-2.amazonaws.com/sagemaker-tensorflow:1.10.0-cpu-py2",
195+
"TrainingImage": "763104351884.dkr.ecr.us-west-2.amazonaws.com/tensorflow-training:1.15.2-cpu-py3",
199196
"TrainingInputMode": "File",
200197
},
201198
"OutputDataConfig": {"S3OutputPath": "s3://output/"},
202-
"TrainingJobName": "sagemaker-tensorflow-%s" % TIME_STAMP,
199+
"TrainingJobName": "tensorflow-training-%s" % TIME_STAMP,
203200
"StoppingCondition": {"MaxRuntimeInSeconds": 86400},
204201
"ResourceConfig": {
205202
"InstanceCount": "{{ instance_count }}",
@@ -220,22 +217,21 @@ def test_framework_training_config_required_args(ecr_prefix, sagemaker_session):
220217
}
221218
],
222219
"HyperParameters": {
223-
"sagemaker_submit_directory": '"s3://output/sagemaker-tensorflow-%s/source/sourcedir.tar.gz"'
220+
"sagemaker_submit_directory": '"s3://output/tensorflow-training-%s/source/sourcedir.tar.gz"'
224221
% TIME_STAMP,
225222
"sagemaker_program": '"script.py"',
226223
"sagemaker_enable_cloudwatch_metrics": "false",
227224
"sagemaker_container_log_level": "20",
228-
"sagemaker_job_name": '"sagemaker-tensorflow-%s"' % TIME_STAMP,
225+
"sagemaker_job_name": '"tensorflow-training-%s"' % TIME_STAMP,
229226
"sagemaker_region": '"us-west-2"',
230-
"training_steps": "1000",
231-
"evaluation_steps": "100",
227+
"model_dir": '"s3://output/tensorflow-training-%s/model"' % TIME_STAMP,
232228
},
233229
"S3Operations": {
234230
"S3Upload": [
235231
{
236232
"Path": "/some/script.py",
237233
"Bucket": "output",
238-
"Key": "sagemaker-tensorflow-%s/source/sourcedir.tar.gz" % TIME_STAMP,
234+
"Key": "tensorflow-training-%s/source/sourcedir.tar.gz" % TIME_STAMP,
239235
"Tar": True,
240236
}
241237
]
@@ -253,7 +249,7 @@ def test_framework_training_config_required_args(ecr_prefix, sagemaker_session):
253249
)
254250
@patch(
255251
"sagemaker.fw_utils.get_ecr_image_uri_prefix",
256-
return_value="520713654638.dkr.ecr.us-west-2.amazonaws.com",
252+
return_value="763104351884.dkr.ecr.us-west-2.amazonaws.com",
257253
)
258254
def test_framework_training_config_all_args(ecr_prefix, sagemaker_session):
259255
tf = tensorflow.TensorFlow(
@@ -262,14 +258,9 @@ def test_framework_training_config_all_args(ecr_prefix, sagemaker_session):
262258
enable_cloudwatch_metrics=False,
263259
container_log_level="{{ log_level }}",
264260
code_location="s3://{{ bucket_name }}/{{ prefix }}",
265-
hyperparameters={
266-
"training_steps": 1000,
267-
"evaluation_steps": 100,
268-
"checkpoint_path": "{{ checkpoint_path }}",
269-
"sagemaker_requirements": "",
270-
},
271-
py_version="py2",
272-
framework_version="1.10.0",
261+
hyperparameters={"epochs": 1},
262+
py_version="py3",
263+
framework_version="1.15.2",
273264
role="{{ role }}",
274265
train_instance_count="{{ instance_count }}",
275266
train_instance_type="ml.c4.2xlarge",
@@ -292,7 +283,7 @@ def test_framework_training_config_all_args(ecr_prefix, sagemaker_session):
292283
config = airflow.training_config(tf, data)
293284
expected_config = {
294285
"AlgorithmSpecification": {
295-
"TrainingImage": "520713654638.dkr.ecr.us-west-2.amazonaws.com/sagemaker-tensorflow:1.10.0-cpu-py2",
286+
"TrainingImage": "763104351884.dkr.ecr.us-west-2.amazonaws.com/tensorflow-training:1.15.2-cpu-py3",
296287
"TrainingInputMode": "Pipe",
297288
"MetricDefinitions": [{"Name": "{{ name }}", "Regex": "{{ regex }}"}],
298289
},
@@ -333,10 +324,8 @@ def test_framework_training_config_all_args(ecr_prefix, sagemaker_session):
333324
"sagemaker_container_log_level": '"{{ log_level }}"',
334325
"sagemaker_job_name": '"{{ base_job_name }}-%s"' % TIME_STAMP,
335326
"sagemaker_region": '"us-west-2"',
336-
"checkpoint_path": '"{{ checkpoint_path }}"',
337-
"training_steps": "1000",
338-
"evaluation_steps": "100",
339-
"sagemaker_requirements": '""',
327+
"model_dir": '"{{ output_path }}/{{ base_job_name }}-%s/model"' % TIME_STAMP,
328+
"epochs": "1",
340329
},
341330
"Tags": [{"{{ key }}": "{{ value }}"}],
342331
"S3Operations": {

0 commit comments

Comments
 (0)