Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
c189395
change test-ecr-scan image data storage
Feb 4, 2025
e24f648
Merge remote-tracking branch 'upstream/master'
Feb 5, 2025
9c81afd
initial commit add files
Feb 5, 2025
30bad9a
revert test ecr change
Feb 5, 2025
318edac
disable autopatch
Feb 5, 2025
841c8a2
build cpu without conda
Feb 6, 2025
a61e711
remove miniforge
Feb 6, 2025
cb750ce
install python before pip install
Feb 6, 2025
b53263a
link pip
Feb 6, 2025
0384160
remove invalid options
Feb 6, 2025
1859d3a
install pip
Feb 6, 2025
9d1898f
change path
Feb 6, 2025
9af27b7
check python and pip path
Feb 6, 2025
6f911f5
fix install and add systemlink
Feb 6, 2025
33b899b
fix systemlink error
Feb 7, 2025
24af7f7
add system link to python3
Feb 7, 2025
813e631
remove conda in gpu file
Feb 7, 2025
429a00d
change image baseline
Feb 7, 2025
4bd3cf2
fix typo
Feb 7, 2025
9170917
increse image baseline
Feb 7, 2025
f972c73
increase cpu baseline
Feb 7, 2025
b91825b
increase cpu baseline to 10000
Feb 7, 2025
ef92f92
add doc string and comment out sitecustomize.py
Feb 8, 2025
82f28ef
remove .python_history file
Feb 8, 2025
4619134
fix cpu link
Feb 9, 2025
6a14fec
run all ec2 tests
Feb 10, 2025
b326efa
add back sitecustomize.py
Feb 10, 2025
3cc35bd
build sm images
Feb 10, 2025
b2000a2
run all tests
Feb 10, 2025
02b3466
revert toml
Feb 10, 2025
bd6e4bb
fix torch_data url and add back torch data tests
Feb 10, 2025
66afa0c
fix typo
Feb 10, 2025
a460fd0
fix torch data link
Feb 11, 2025
8abc5fe
change torchdata tests
Feb 11, 2025
b869f08
update version check
Feb 11, 2025
35d23b9
revert toml
Feb 11, 2025
5f97292
Merge branch 'master' into pt2.6-inf
Yadan-Wei Feb 11, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 67 additions & 0 deletions pytorch/inference/buildspec-2-6-ec2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
account_id: &ACCOUNT_ID <set-$ACCOUNT_ID-in-environment>
prod_account_id: &PROD_ACCOUNT_ID 763104351884
region: &REGION <set-$REGION-in-environment>
framework: &FRAMEWORK pytorch
version: &VERSION 2.6.0
short_version: &SHORT_VERSION "2.6"
arch_type: x86
# autopatch_build: "True"

repository_info:
inference_repository: &INFERENCE_REPOSITORY
image_type: &INFERENCE_IMAGE_TYPE inference
root: !join [ *FRAMEWORK, "/", *INFERENCE_IMAGE_TYPE ]
repository_name: &REPOSITORY_NAME !join [ pr, "-", *FRAMEWORK, "-", *INFERENCE_IMAGE_TYPE ]
repository: &REPOSITORY !join [ *ACCOUNT_ID, .dkr.ecr., *REGION, .amazonaws.com/, *REPOSITORY_NAME ]
release_repository_name: &RELEASE_REPOSITORY_NAME !join [ *FRAMEWORK, "-", *INFERENCE_IMAGE_TYPE ]
release_repository: &RELEASE_REPOSITORY !join [ *PROD_ACCOUNT_ID, .dkr.ecr., *REGION, .amazonaws.com/, *RELEASE_REPOSITORY_NAME ]

context:
inference_context: &INFERENCE_CONTEXT
torchserve-ec2-entrypoint:
source: docker/build_artifacts/torchserve-ec2-entrypoint.py
target: torchserve-ec2-entrypoint.py
torchserve-entrypoint:
source: docker/build_artifacts/torchserve-entrypoint.py
target: torchserve-entrypoint.py
config:
source: docker/build_artifacts/config.properties
target: config.properties
deep_learning_container:
source: ../../src/deep_learning_container.py
target: deep_learning_container.py

images:
BuildEC2CPUPTInferencePy3DockerImage:
<<: *INFERENCE_REPOSITORY
build: &PYTORCH_CPU_INFERENCE_PY3 false
image_size_baseline: 5000
device_type: &DEVICE_TYPE cpu
python_version: &DOCKER_PYTHON_VERSION py3
tag_python_version: &TAG_PYTHON_VERSION py312
os_version: &OS_VERSION ubuntu22.04
torch_serve_version: &TORCHSERVE_VERSION 0.12.0
tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *OS_VERSION, "-ec2" ]
latest_release_tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *OS_VERSION, "-ec2" ]
# build_tag_override: "beta:2.5.0-cpu-py311-ubuntu22.04-ec2"
docker_file: !join [ docker/, *SHORT_VERSION, /, *DOCKER_PYTHON_VERSION, /Dockerfile., *DEVICE_TYPE ]
target: ec2
context:
<<: *INFERENCE_CONTEXT
BuildEC2GPUPTInferencePy3DockerImage:
<<: *INFERENCE_REPOSITORY
build: &PYTORCH_GPU_INFERENCE_PY3 false
image_size_baseline: 14000
device_type: &DEVICE_TYPE gpu
python_version: &DOCKER_PYTHON_VERSION py3
tag_python_version: &TAG_PYTHON_VERSION py312
cuda_version: &CUDA_VERSION cu124
os_version: &OS_VERSION ubuntu22.04
torch_serve_version: &TORCHSERVE_VERSION 0.12.0
tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *CUDA_VERSION, "-", *OS_VERSION, "-ec2" ]
latest_release_tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *CUDA_VERSION, "-", *OS_VERSION, "-ec2" ]
# build_tag_override: "beta:2.5.0-gpu-py311-cu124-ubuntu22.04-ec2"
docker_file: !join [ docker/, *SHORT_VERSION, /, *DOCKER_PYTHON_VERSION, /, *CUDA_VERSION, /Dockerfile., *DEVICE_TYPE ]
target: ec2
context:
<<: *INFERENCE_CONTEXT
70 changes: 70 additions & 0 deletions pytorch/inference/buildspec-2-6-sm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
account_id: &ACCOUNT_ID <set-$ACCOUNT_ID-in-environment>
prod_account_id: &PROD_ACCOUNT_ID 763104351884
region: &REGION <set-$REGION-in-environment>
framework: &FRAMEWORK pytorch
version: &VERSION 2.6.0
short_version: &SHORT_VERSION "2.6"
arch_type: x86
# autopatch_build: "True"

repository_info:
inference_repository: &INFERENCE_REPOSITORY
image_type: &INFERENCE_IMAGE_TYPE inference
root: !join [ *FRAMEWORK, "/", *INFERENCE_IMAGE_TYPE ]
repository_name: &REPOSITORY_NAME !join [ pr, "-", *FRAMEWORK, "-", *INFERENCE_IMAGE_TYPE ]
repository: &REPOSITORY !join [ *ACCOUNT_ID, .dkr.ecr., *REGION, .amazonaws.com/, *REPOSITORY_NAME ]
release_repository_name: &RELEASE_REPOSITORY_NAME !join [ *FRAMEWORK, "-", *INFERENCE_IMAGE_TYPE ]
release_repository: &RELEASE_REPOSITORY !join [ *PROD_ACCOUNT_ID, .dkr.ecr., *REGION, .amazonaws.com/, *RELEASE_REPOSITORY_NAME ]

context:
inference_context: &INFERENCE_CONTEXT
torchserve-ec2-entrypoint:
source: docker/build_artifacts/torchserve-ec2-entrypoint.py
target: torchserve-ec2-entrypoint.py
torchserve-entrypoint:
source: docker/build_artifacts/torchserve-entrypoint.py
target: torchserve-entrypoint.py
config:
source: docker/build_artifacts/config.properties
target: config.properties
deep_learning_container:
source: ../../src/deep_learning_container.py
target: deep_learning_container.py

images:
BuildSageMakerCPUPTInferencePy3DockerImage:
<<: *INFERENCE_REPOSITORY
build: &PYTORCH_CPU_INFERENCE_PY3 false
image_size_baseline: 4900
device_type: &DEVICE_TYPE cpu
python_version: &DOCKER_PYTHON_VERSION py3
tag_python_version: &TAG_PYTHON_VERSION py312
os_version: &OS_VERSION ubuntu22.04
torch_serve_version: &TORCHSERVE_VERSION 0.12.0
tool_kit_version: &SM_TOOLKIT_VERSION 2.0.25
tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *OS_VERSION, "-sagemaker" ]
latest_release_tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *OS_VERSION, "-sagemaker" ]
# build_tag_override: "beta:2.5.0-cpu-py311-ubuntu22.04-sagemaker"
docker_file: !join [ docker/, *SHORT_VERSION, /, *DOCKER_PYTHON_VERSION, /Dockerfile., *DEVICE_TYPE ]
target: sagemaker
context:
<<: *INFERENCE_CONTEXT
BuildSageMakerGPUPTInferencePy3DockerImage:
<<: *INFERENCE_REPOSITORY
build: &PYTORCH_GPU_INFERENCE_PY3 false
image_size_baseline: 14000
device_type: &DEVICE_TYPE gpu
python_version: &DOCKER_PYTHON_VERSION py3
tag_python_version: &TAG_PYTHON_VERSION py312
cuda_version: &CUDA_VERSION cu124
os_version: &OS_VERSION ubuntu22.04
torch_serve_version: &TORCHSERVE_VERSION 0.12.0
tool_kit_version: &SM_TOOLKIT_VERSION 2.0.25
tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *CUDA_VERSION, "-", *OS_VERSION, "-sagemaker" ]
latest_release_tag: !join [ *VERSION, "-", *DEVICE_TYPE, "-", *TAG_PYTHON_VERSION, "-", *CUDA_VERSION, "-", *OS_VERSION, "-sagemaker" ]
# build_tag_override: "beta:2.5.0-gpu-py311-cu124-ubuntu22.04-sagemaker"
docker_file: !join [ docker/, *SHORT_VERSION, /, *DOCKER_PYTHON_VERSION, /, *CUDA_VERSION, /Dockerfile.,
*DEVICE_TYPE ]
target: sagemaker
context:
<<: *INFERENCE_CONTEXT
2 changes: 1 addition & 1 deletion pytorch/inference/buildspec.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
buildspec_pointer: buildspec-2-5-sm.yml
buildspec_pointer: buildspec-2-6-sm.yml
Loading