@@ -169,21 +169,18 @@ def test_byo_training_config_all_args(sagemaker_session):
169
169
@patch (
170
170
"sagemaker.fw_utils.parse_s3_url" ,
171
171
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 )]
176
173
),
177
174
)
178
175
@patch (
179
176
"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" ,
181
178
)
182
179
def test_framework_training_config_required_args (ecr_prefix , sagemaker_session ):
183
180
tf = tensorflow .TensorFlow (
184
181
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" ,
187
184
role = "{{ role }}" ,
188
185
train_instance_count = "{{ instance_count }}" ,
189
186
train_instance_type = "ml.c4.2xlarge" ,
@@ -195,11 +192,11 @@ def test_framework_training_config_required_args(ecr_prefix, sagemaker_session):
195
192
config = airflow .training_config (tf , data )
196
193
expected_config = {
197
194
"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 " ,
199
196
"TrainingInputMode" : "File" ,
200
197
},
201
198
"OutputDataConfig" : {"S3OutputPath" : "s3://output/" },
202
- "TrainingJobName" : "sagemaker- tensorflow-%s" % TIME_STAMP ,
199
+ "TrainingJobName" : "tensorflow-training -%s" % TIME_STAMP ,
203
200
"StoppingCondition" : {"MaxRuntimeInSeconds" : 86400 },
204
201
"ResourceConfig" : {
205
202
"InstanceCount" : "{{ instance_count }}" ,
@@ -220,22 +217,21 @@ def test_framework_training_config_required_args(ecr_prefix, sagemaker_session):
220
217
}
221
218
],
222
219
"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"'
224
221
% TIME_STAMP ,
225
222
"sagemaker_program" : '"script.py"' ,
226
223
"sagemaker_enable_cloudwatch_metrics" : "false" ,
227
224
"sagemaker_container_log_level" : "20" ,
228
- "sagemaker_job_name" : '"sagemaker- tensorflow-%s"' % TIME_STAMP ,
225
+ "sagemaker_job_name" : '"tensorflow-training -%s"' % TIME_STAMP ,
229
226
"sagemaker_region" : '"us-west-2"' ,
230
- "training_steps" : "1000" ,
231
- "evaluation_steps" : "100" ,
227
+ "model_dir" : '"s3://output/tensorflow-training-%s/model"' % TIME_STAMP ,
232
228
},
233
229
"S3Operations" : {
234
230
"S3Upload" : [
235
231
{
236
232
"Path" : "/some/script.py" ,
237
233
"Bucket" : "output" ,
238
- "Key" : "sagemaker- tensorflow-%s/source/sourcedir.tar.gz" % TIME_STAMP ,
234
+ "Key" : "tensorflow-training -%s/source/sourcedir.tar.gz" % TIME_STAMP ,
239
235
"Tar" : True ,
240
236
}
241
237
]
@@ -253,7 +249,7 @@ def test_framework_training_config_required_args(ecr_prefix, sagemaker_session):
253
249
)
254
250
@patch (
255
251
"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" ,
257
253
)
258
254
def test_framework_training_config_all_args (ecr_prefix , sagemaker_session ):
259
255
tf = tensorflow .TensorFlow (
@@ -262,14 +258,9 @@ def test_framework_training_config_all_args(ecr_prefix, sagemaker_session):
262
258
enable_cloudwatch_metrics = False ,
263
259
container_log_level = "{{ log_level }}" ,
264
260
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" ,
273
264
role = "{{ role }}" ,
274
265
train_instance_count = "{{ instance_count }}" ,
275
266
train_instance_type = "ml.c4.2xlarge" ,
@@ -292,7 +283,7 @@ def test_framework_training_config_all_args(ecr_prefix, sagemaker_session):
292
283
config = airflow .training_config (tf , data )
293
284
expected_config = {
294
285
"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 " ,
296
287
"TrainingInputMode" : "Pipe" ,
297
288
"MetricDefinitions" : [{"Name" : "{{ name }}" , "Regex" : "{{ regex }}" }],
298
289
},
@@ -333,10 +324,8 @@ def test_framework_training_config_all_args(ecr_prefix, sagemaker_session):
333
324
"sagemaker_container_log_level" : '"{{ log_level }}"' ,
334
325
"sagemaker_job_name" : '"{{ base_job_name }}-%s"' % TIME_STAMP ,
335
326
"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" ,
340
329
},
341
330
"Tags" : [{"{{ key }}" : "{{ value }}" }],
342
331
"S3Operations" : {
0 commit comments