Skip to content

Commit 580112e

Browse files
Yadan-WeiYadan Wei
andauthored
[PyTorch][Inference][EC2][SageMaker] Pytorch 2.6.0 Currency Release (#4535)
* change test-ecr-scan image data storage * initial commit add files * revert test ecr change * disable autopatch * build cpu without conda * remove miniforge * install python before pip install * link pip * remove invalid options * install pip * change path * check python and pip path * fix install and add systemlink * fix systemlink error * add system link to python3 * remove conda in gpu file * change image baseline * fix typo * increse image baseline * increase cpu baseline * increase cpu baseline to 10000 * add doc string and comment out sitecustomize.py * remove .python_history file * fix cpu link * run all ec2 tests * add back sitecustomize.py * build sm images * run all tests * revert toml * fix torch_data url and add back torch data tests * fix typo * fix torch data link * change torchdata tests * update version check * revert toml --------- Co-authored-by: Yadan Wei <yadanwei@amazon.com>
1 parent 1074667 commit 580112e

File tree

7 files changed

+780
-8
lines changed

7 files changed

+780
-8
lines changed
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
account_id: &ACCOUNT_ID <set-$ACCOUNT_ID-in-environment>
2+
prod_account_id: &PROD_ACCOUNT_ID 763104351884
3+
region: &REGION <set-$REGION-in-environment>
4+
framework: &FRAMEWORK pytorch
5+
version: &VERSION 2.6.0
6+
short_version: &SHORT_VERSION "2.6"
7+
arch_type: x86
8+
# autopatch_build: "True"
9+
10+
repository_info:
11+
inference_repository: &INFERENCE_REPOSITORY
12+
image_type: &INFERENCE_IMAGE_TYPE inference
13+
root: !join [ *FRAMEWORK, "/", *INFERENCE_IMAGE_TYPE ]
14+
repository_name: &REPOSITORY_NAME !join [ pr, "-", *FRAMEWORK, "-", *INFERENCE_IMAGE_TYPE ]
15+
repository: &REPOSITORY !join [ *ACCOUNT_ID, .dkr.ecr., *REGION, .amazonaws.com/, *REPOSITORY_NAME ]
16+
release_repository_name: &RELEASE_REPOSITORY_NAME !join [ *FRAMEWORK, "-", *INFERENCE_IMAGE_TYPE ]
17+
release_repository: &RELEASE_REPOSITORY !join [ *PROD_ACCOUNT_ID, .dkr.ecr., *REGION, .amazonaws.com/, *RELEASE_REPOSITORY_NAME ]
18+
19+
context:
20+
inference_context: &INFERENCE_CONTEXT
21+
torchserve-ec2-entrypoint:
22+
source: docker/build_artifacts/torchserve-ec2-entrypoint.py
23+
target: torchserve-ec2-entrypoint.py
24+
torchserve-entrypoint:
25+
source: docker/build_artifacts/torchserve-entrypoint.py
26+
target: torchserve-entrypoint.py
27+
config:
28+
source: docker/build_artifacts/config.properties
29+
target: config.properties
30+
deep_learning_container:
31+
source: ../../src/deep_learning_container.py
32+
target: deep_learning_container.py
33+
34+
images:
35+
BuildEC2CPUPTInferencePy3DockerImage:
36+
<<: *INFERENCE_REPOSITORY
37+
build: &PYTORCH_CPU_INFERENCE_PY3 false
38+
image_size_baseline: 5000
39+
device_type: &DEVICE_TYPE cpu
40+
python_version: &DOCKER_PYTHON_VERSION py3
41+
tag_python_version: &TAG_PYTHON_VERSION py312
42+
os_version: &OS_VERSION ubuntu22.04
43+
torch_serve_version: &TORCHSERVE_VERSION 0.12.0
44+
tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *OS_VERSION, "-ec2" ]
45+
latest_release_tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *OS_VERSION, "-ec2" ]
46+
# build_tag_override: "beta:2.5.0-cpu-py311-ubuntu22.04-ec2"
47+
docker_file: !join [ docker/, *SHORT_VERSION, /, *DOCKER_PYTHON_VERSION, /Dockerfile., *DEVICE_TYPE ]
48+
target: ec2
49+
context:
50+
<<: *INFERENCE_CONTEXT
51+
BuildEC2GPUPTInferencePy3DockerImage:
52+
<<: *INFERENCE_REPOSITORY
53+
build: &PYTORCH_GPU_INFERENCE_PY3 false
54+
image_size_baseline: 14000
55+
device_type: &DEVICE_TYPE gpu
56+
python_version: &DOCKER_PYTHON_VERSION py3
57+
tag_python_version: &TAG_PYTHON_VERSION py312
58+
cuda_version: &CUDA_VERSION cu124
59+
os_version: &OS_VERSION ubuntu22.04
60+
torch_serve_version: &TORCHSERVE_VERSION 0.12.0
61+
tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *CUDA_VERSION, "-", *OS_VERSION, "-ec2" ]
62+
latest_release_tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *CUDA_VERSION, "-", *OS_VERSION, "-ec2" ]
63+
# build_tag_override: "beta:2.5.0-gpu-py311-cu124-ubuntu22.04-ec2"
64+
docker_file: !join [ docker/, *SHORT_VERSION, /, *DOCKER_PYTHON_VERSION, /, *CUDA_VERSION, /Dockerfile., *DEVICE_TYPE ]
65+
target: ec2
66+
context:
67+
<<: *INFERENCE_CONTEXT
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
account_id: &ACCOUNT_ID <set-$ACCOUNT_ID-in-environment>
2+
prod_account_id: &PROD_ACCOUNT_ID 763104351884
3+
region: &REGION <set-$REGION-in-environment>
4+
framework: &FRAMEWORK pytorch
5+
version: &VERSION 2.6.0
6+
short_version: &SHORT_VERSION "2.6"
7+
arch_type: x86
8+
# autopatch_build: "True"
9+
10+
repository_info:
11+
inference_repository: &INFERENCE_REPOSITORY
12+
image_type: &INFERENCE_IMAGE_TYPE inference
13+
root: !join [ *FRAMEWORK, "/", *INFERENCE_IMAGE_TYPE ]
14+
repository_name: &REPOSITORY_NAME !join [ pr, "-", *FRAMEWORK, "-", *INFERENCE_IMAGE_TYPE ]
15+
repository: &REPOSITORY !join [ *ACCOUNT_ID, .dkr.ecr., *REGION, .amazonaws.com/, *REPOSITORY_NAME ]
16+
release_repository_name: &RELEASE_REPOSITORY_NAME !join [ *FRAMEWORK, "-", *INFERENCE_IMAGE_TYPE ]
17+
release_repository: &RELEASE_REPOSITORY !join [ *PROD_ACCOUNT_ID, .dkr.ecr., *REGION, .amazonaws.com/, *RELEASE_REPOSITORY_NAME ]
18+
19+
context:
20+
inference_context: &INFERENCE_CONTEXT
21+
torchserve-ec2-entrypoint:
22+
source: docker/build_artifacts/torchserve-ec2-entrypoint.py
23+
target: torchserve-ec2-entrypoint.py
24+
torchserve-entrypoint:
25+
source: docker/build_artifacts/torchserve-entrypoint.py
26+
target: torchserve-entrypoint.py
27+
config:
28+
source: docker/build_artifacts/config.properties
29+
target: config.properties
30+
deep_learning_container:
31+
source: ../../src/deep_learning_container.py
32+
target: deep_learning_container.py
33+
34+
images:
35+
BuildSageMakerCPUPTInferencePy3DockerImage:
36+
<<: *INFERENCE_REPOSITORY
37+
build: &PYTORCH_CPU_INFERENCE_PY3 false
38+
image_size_baseline: 4900
39+
device_type: &DEVICE_TYPE cpu
40+
python_version: &DOCKER_PYTHON_VERSION py3
41+
tag_python_version: &TAG_PYTHON_VERSION py312
42+
os_version: &OS_VERSION ubuntu22.04
43+
torch_serve_version: &TORCHSERVE_VERSION 0.12.0
44+
tool_kit_version: &SM_TOOLKIT_VERSION 2.0.25
45+
tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *OS_VERSION, "-sagemaker" ]
46+
latest_release_tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *OS_VERSION, "-sagemaker" ]
47+
# build_tag_override: "beta:2.5.0-cpu-py311-ubuntu22.04-sagemaker"
48+
docker_file: !join [ docker/, *SHORT_VERSION, /, *DOCKER_PYTHON_VERSION, /Dockerfile., *DEVICE_TYPE ]
49+
target: sagemaker
50+
context:
51+
<<: *INFERENCE_CONTEXT
52+
BuildSageMakerGPUPTInferencePy3DockerImage:
53+
<<: *INFERENCE_REPOSITORY
54+
build: &PYTORCH_GPU_INFERENCE_PY3 false
55+
image_size_baseline: 14000
56+
device_type: &DEVICE_TYPE gpu
57+
python_version: &DOCKER_PYTHON_VERSION py3
58+
tag_python_version: &TAG_PYTHON_VERSION py312
59+
cuda_version: &CUDA_VERSION cu124
60+
os_version: &OS_VERSION ubuntu22.04
61+
torch_serve_version: &TORCHSERVE_VERSION 0.12.0
62+
tool_kit_version: &SM_TOOLKIT_VERSION 2.0.25
63+
tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *CUDA_VERSION, "-", *OS_VERSION, "-sagemaker" ]
64+
latest_release_tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *CUDA_VERSION, "-", *OS_VERSION, "-sagemaker" ]
65+
# build_tag_override: "beta:2.5.0-gpu-py311-cu124-ubuntu22.04-sagemaker"
66+
docker_file: !join [ docker/, *SHORT_VERSION, /, *DOCKER_PYTHON_VERSION, /, *CUDA_VERSION, /Dockerfile.,
67+
*DEVICE_TYPE ]
68+
target: sagemaker
69+
context:
70+
<<: *INFERENCE_CONTEXT

pytorch/inference/buildspec.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
buildspec_pointer: buildspec-2-5-sm.yml
1+
buildspec_pointer: buildspec-2-6-sm.yml

0 commit comments

Comments
 (0)