Skip to content

Cleanup to remove EIA integration tests and other unused files/code #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .flake8
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[flake8]
application_import_names = image_utils, integration, local_mode_utils, sagemaker_pytorch_container, test, timeout, utils
application_import_names = image_utils, integration, local_mode_utils, sagemaker_inference, sagemaker_pytorch_serving_container, test, timeout, utils
import-order-style = google
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
recursive-include src/sagemaker_pytorch_serving_container *
recursive-include src/sagemaker_inference *

include VERSION
include LICENSE
Expand Down
3 changes: 1 addition & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ SageMaker PyTorch Inference Toolkit

SageMaker PyTorch Inference Toolkit is an open-source library for serving PyTorch models on Amazon SageMaker.
This library provides default pre-processing, predict and postprocessing for certain PyTorch model types and
utilizes the `SageMaker Inference Toolkit <https://github.com/aws/sagemaker-inference-toolkit>`__
for starting up the model server, which is responsible for handling inference requests.
is responsible for starting up the TorchServe model server on SageMaker, which is responsible for handling inference requests.

For training, see `SageMaker PyTorch Training Toolkit <https://github.com/aws/sagemaker-pytorch-training-toolkit>`__.

Expand Down
18 changes: 0 additions & 18 deletions artifacts/changehostname.c

This file was deleted.

26 changes: 0 additions & 26 deletions artifacts/config.properties

This file was deleted.

15 changes: 0 additions & 15 deletions artifacts/start_with_right_hostname.sh

This file was deleted.

27 changes: 0 additions & 27 deletions artifacts/ts-entrypoint.py

This file was deleted.

13 changes: 0 additions & 13 deletions buildspec-container-pr.yml

This file was deleted.

17 changes: 3 additions & 14 deletions buildspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ version: 0.2
env:
variables:
FRAMEWORK_VERSIONS: '2.0.0 2.0.1'
# EIA_FRAMEWORK_VERSION: '1.3.1'
CPU_INSTANCE_TYPE: 'ml.c4.xlarge'
GPU_INSTANCE_TYPE: 'ml.g4dn.12xlarge'
# EIA_ACCELERATOR_TYPE: 'ml.eia2.medium'
ECR_REPO: 'sagemaker-test'
GITHUB_REPO: 'sagemaker-pytorch-serving-container'
DLC_ACCOUNT: '763104351884'
Expand Down Expand Up @@ -35,9 +33,6 @@ phases:
# run unit tests
- tox -e py38,py39,py310 test/unit

# define EIA tag
# - DLC_EIA_TAG="$EIA_FRAMEWORK_VERSION-dlc-eia-$BUILD_ID"

# run local CPU integration tests (build and push the image to ECR repo)
- |
for FRAMEWORK_VERSION in $FRAMEWORK_VERSIONS;
Expand All @@ -48,14 +43,14 @@ phases:
docker system prune --all --force;
done

# launch remote GPU instance with Deep Learning AMI GPU PyTorch 1.9 (Ubuntu 20.04)
- prefix='ml.'
- instance_type=${GPU_INSTANCE_TYPE#"$prefix"}

# build DLC GPU image because the base DLC image is too big and takes too long to build as part of the test
- python3 setup.py sdist
- $(aws ecr get-login --registry-ids $DLC_ACCOUNT --no-include-email --region $AWS_DEFAULT_REGION)
- create-key-pair

# launch remote GPU instance with Deep Learning AMI GPU PyTorch 1.9 (Ubuntu 20.04)
# build DLC GPU image because the base DLC image is too big and takes too long to build as part of the test
- |
for FRAMEWORK_VERSION in $FRAMEWORK_VERSIONS;
do
Expand Down Expand Up @@ -96,10 +91,6 @@ phases:
docker system prune --all --force;
done

# run EIA sagemaker integration tests
# - test_cmd="IGNORE_COVERAGE=- tox -e py38 -- test/integration/sagemaker --build-image --push-image --dockerfile-type dlc.eia --region $AWS_DEFAULT_REGION --docker-base-name $ECR_REPO --aws-id $ACCOUNT --framework-version $EIA_FRAMEWORK_VERSION --processor cpu --instance-type $CPU_INSTANCE_TYPE --accelerator-type $EIA_ACCELERATOR_TYPE --tag $DLC_EIA_TAG"
# - execute-command-if-has-matching-changes "$test_cmd" "test/" "src/*.py" "setup.py" "setup.cfg"

finally:

# remove ECR image
Expand All @@ -111,5 +102,3 @@ phases:
aws ecr batch-delete-image --repository-name $ECR_REPO --region $AWS_DEFAULT_REGION --image-ids imageTag=$DLC_CPU_TAG;
aws ecr batch-delete-image --repository-name $ECR_REPO --region $AWS_DEFAULT_REGION --image-ids imageTag=$DLC_GPU_TAG;
done

# - aws ecr batch-delete-image --repository-name $ECR_REPO --region $AWS_DEFAULT_REGION --image-ids imageTag=$DLC_EIA_TAG
40 changes: 0 additions & 40 deletions docker/1.1.0/base/Dockerfile.cpu

This file was deleted.

35 changes: 0 additions & 35 deletions docker/1.1.0/base/Dockerfile.gpu

This file was deleted.

18 changes: 0 additions & 18 deletions docker/1.1.0/final/Dockerfile.cpu

This file was deleted.

18 changes: 0 additions & 18 deletions docker/1.1.0/final/Dockerfile.gpu

This file was deleted.

77 changes: 0 additions & 77 deletions docker/1.2.0/py2/Dockerfile.cpu

This file was deleted.

Loading