Skip to content

Commit d9f474a

Browse files
jinyan-li1jinyan-li1
authored
Merge branch 'master' into pt-2.8-arm64
2 parents 45731e2 + 00da18a commit d9f474a

File tree

4 files changed

+13
-34
lines changed

4 files changed

+13
-34
lines changed

‎available_images.md‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ EC2 Framework Containers (EC2, ECS, and EKS support only)
123123

124124
| Framework |Job Type |Horovod Options|CPU/GPU |Python Version Options | Example URL |
125125
|-------------------|-----------|---------------|-----------|-----------------------|-----------------------------------------------------------------------------------------------------------|
126-
| PyTorch 2.7.1 |training |No |CPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-training:2.7.1-cpu-py312-ubuntu22.04-ec2 |
127-
| PyTorch 2.7.1 |training |No |GPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-training:2.7.1-gpu-py312-cu128-ubuntu22.04-ec2 |
126+
| PyTorch 2.8.0 |training |No |CPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-training:2.8.0-cpu-py312-ubuntu22.04-ec2 |
127+
| PyTorch 2.8.0 |training |No |GPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-training:2.8.0-gpu-py312-cu129-ubuntu22.04-ec2 |
128128
| PyTorch 2.6.0 |inference |No |CPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-inference:2.6.0-cpu-py312-ubuntu22.04-ec2 |
129129
| PyTorch 2.6.0 |inference |No |GPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-inference:2.6.0-gpu-py312-cu124-ubuntu22.04-ec2 |
130130
| TensorFlow 2.18.0 |training |No |CPU | 3.10 (py310) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/tensorflow-training:2.18.0-cpu-py310-ubuntu22.04-ec2 |
@@ -138,8 +138,8 @@ SageMaker Framework Containers (SM support only)
138138

139139
| Framework | Job Type | Horovod Options | CPU/GPU | Python Version Options | Example URL |
140140
|-------------------|-----------|-----------------|-----------|------------------------|----------------------------------------------------------------------------------------------------------------|
141-
| PyTorch 2.7.1 | training | No | CPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-training:2.7.1-cpu-py312-ubuntu22.04-sagemaker |
142-
| PyTorch 2.7.1 | training | No | GPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-training:2.7.1-gpu-py312-cu128-ubuntu22.04-sagemaker |
141+
| PyTorch 2.8.0 | training | No | CPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-training:2.8.0-cpu-py312-ubuntu22.04-sagemaker |
142+
| PyTorch 2.8.0 | training | No | GPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-training:2.8.0-gpu-py312-cu129-ubuntu22.04-sagemaker |
143143
| PyTorch 2.6.0 | inference | No | CPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-inference:2.6.0-cpu-py312-ubuntu22.04-sagemaker |
144144
| PyTorch 2.6.0 | inference | No | GPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-inference:2.6.0-gpu-py312-cu124-ubuntu22.04-sagemaker |
145145
| TensorFlow 2.19.0 | training | No | CPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/tensorflow-training:2.19.0-cpu-py312-ubuntu22.04-sagemaker |
@@ -392,6 +392,8 @@ Prior EC2 Framework Container Versions
392392
==============
393393
| Framework |Job Type |Horovod Options |CPU/GPU |Python Version Options |Example URL |
394394
|---------------------------------------------|------------------------|---------------------------------|------------|---------------------------------------|----------------------------------------------------------------------------------------------------|
395+
| PyTorch 2.7.1 |training |No |CPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-training:2.7.1-cpu-py312-ubuntu22.04-ec2 |
396+
| PyTorch 2.7.1 |training |No |GPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-training:2.7.1-gpu-py312-cu128-ubuntu22.04-ec2 |
395397
| PyTorch 2.6.0 |training |No |CPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-training:2.6.0-cpu-py312-ubuntu22.04-ec2 |
396398
| PyTorch 2.6.0 |training |No |GPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-training:2.6.0-gpu-py312-cu126-ubuntu22.04-ec2 |
397399
| PyTorch 2.5.1 |training |No |CPU | 3.11 (py311) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-training:2.5.1-cpu-py311-ubuntu22.04-ec2 |
@@ -403,6 +405,8 @@ Prior SageMaker Framework Container Versions
403405
==============
404406
| Framework |Job Type |Horovod Options |CPU/GPU |Python Version Options |Example URL |
405407
|---------------------------------------------|------------------------|---------------------------------|------------|---------------------------------------|----------------------------------------------------------------------------------------------------|
408+
| PyTorch 2.7.1 | training | No | CPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-training:2.7.1-cpu-py312-ubuntu22.04-sagemaker |
409+
| PyTorch 2.7.1 | training | No | GPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-training:2.7.1-gpu-py312-cu128-ubuntu22.04-sagemaker |
406410
| PyTorch 2.6.0 | training | No | CPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-training:2.6.0-cpu-py312-ubuntu22.04-sagemaker |
407411
| PyTorch 2.6.0 | training | No | GPU | 3.12 (py312) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-training:2.6.0-gpu-py312-cu126-ubuntu22.04-sagemaker |
408412
| PyTorch 2.5.1 | training | No | CPU | 3.11 (py311) | 763104351884.dkr.ecr.us-east-1.amazonaws.com/pytorch-training:2.5.1-cpu-py311-ubuntu22.04-sagemaker |

‎miscellaneous_scripts/dlc_template.py‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/image.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"""
1515

1616
import logging
17+
import os
1718
import subprocess
1819
from datetime import datetime
1920

@@ -25,6 +26,9 @@
2526
LOGGER.setLevel(logging.INFO)
2627

2728

29+
build_context = os.getenv("BUILD_CONTEXT")
30+
31+
2832
class DockerImage:
2933
"""
3034
The DockerImage class has the functions and attributes for building the dockerimage
@@ -275,7 +279,7 @@ def _buildx_build(self, context_path, custom_context=False):
275279
# Use shortest tag from additional_tags as a suitable cache source
276280
latest_tag = min(self.additional_tags, key=len)
277281

278-
if latest_tag:
282+
if latest_tag and build_context == "PR":
279283
latest_image_uri = f"{self.repository}:{latest_tag}"
280284
LOGGER.info(f"Using cache from registry: {latest_image_uri}")
281285
cmd.extend(["--cache-from", f"type=registry,ref={latest_image_uri}"])

‎src/image_builder.py‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -253,26 +253,15 @@ def image_builder(buildspec, image_types=[], device_types=[]):
253253
f"This is required to set job_type label."
254254
)
255255

256-
sitecustomize_template_file = os.path.join(
257-
os.sep, get_cloned_folder_path(), "miscellaneous_scripts", "dlc_template.py"
258-
)
259256
bash_template_file = os.path.join(
260257
os.sep, get_cloned_folder_path(), "miscellaneous_scripts", "bash_telemetry.sh"
261258
)
262-
263259
template_fw_version = (
264260
str(image_config["framework_version"])
265261
if image_config.get("framework_version")
266262
else str(BUILDSPEC["version"])
267263
)
268264
template_fw = str(BUILDSPEC["framework"])
269-
sitecustomize_post_template_file = utils.generate_dlc_cmd(
270-
template_path=sitecustomize_template_file,
271-
output_path=os.path.join(image_config["root"], "out.py"),
272-
framework=template_fw,
273-
framework_version=template_fw_version,
274-
container_type=label_job_type,
275-
)
276265
bash_post_template_file = utils.generate_dlc_cmd(
277266
template_path=bash_template_file,
278267
output_path=os.path.join(image_config["root"], "telemetry.sh"),
@@ -283,10 +272,6 @@ def image_builder(buildspec, image_types=[], device_types=[]):
283272

284273
ARTIFACTS.update(
285274
{
286-
"customize": {
287-
"source": sitecustomize_post_template_file,
288-
"target": "sitecustomize.py",
289-
},
290275
"bash": {"source": bash_post_template_file, "target": "bash_telemetry.sh"},
291276
}
292277
)

0 commit comments

Comments
 (0)