Skip to content

Add compute type argument #8

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.

Sign up for GitHub

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 2 commits into from
Mar 18, 2021
Merged

Add compute type argument #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f6573c
Add compute type argument
Mar 5, 2021
f8601bb
Remove image arg. Move CodeBuild compute type choices to arg parse
brightsparc Mar 18, 2021
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
4 changes: 2 additions & 2 deletions sagemaker_studio_image_build/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ def delete_zip_file(bucket, key):
s3.delete_object(Bucket=bucket, Key=key)


def build_image(repository, role, bucket, extra_args, log=True):
def build_image(repository, role, bucket, compute_type, extra_args, log=True):
bucket, key = upload_zip_file(repository, bucket, " ".join(extra_args))
try:
from sagemaker_studio_image_build.codebuild import TempCodeBuildProject

with TempCodeBuildProject(f"{bucket}/{key}", role, repository=repository) as p:
with TempCodeBuildProject(f"{bucket}/{key}", role, repository=repository, compute_type=compute_type) as p:
p.build(log)
finally:
delete_zip_file(bucket, key)
9 changes: 8 additions & 1 deletion sagemaker_studio_image_build/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def build_image(args, extra_args):
validate_args(args, extra_args)

builder.build_image(
args.repository, get_role(args), args.bucket, extra_args, log=not args.no_logs
args.repository, get_role(args), args.bucket, args.compute_type, extra_args, log=not args.no_logs
)


Expand All @@ -70,6 +70,13 @@ def main():
"--repository",
help="The ECR repository:tag for the image (default: sagemaker-studio-${domain_id}:latest)",
)
build_parser.add_argument(
"--compute-type",
help="The CodeBuild compute type (default: BUILD_GENERAL1_SMALL)",
choices=["BUILD_GENERAL1_SMALL", "BUILD_GENERAL1_MEDIUM",
"BUILD_GENERAL1_LARGE", "BUILD_GENERAL1_2XLARGE"]
default="BUILD_GENERAL1_SMALL"
)
build_parser.add_argument(
"--role",
help=f"The IAM role name for CodeBuild to use (default: the Studio execution role).",
Expand Down
5 changes: 3 additions & 2 deletions sagemaker_studio_image_build/codebuild.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@


class TempCodeBuildProject:
def __init__(self, s3_location, role, repository=None):
def __init__(self, s3_location, role, repository=None, compute_type=None):
self.s3_location = s3_location
self.role = role

self.session = boto3.session.Session()
self.domain_id, self.user_profile_name = self._get_studio_metadata()
self.repo_name = None
self.compute_type = compute_type or "BUILD_GENERAL1_SMALL"

if repository:
self.repo_name, self.tag = repository.split(":", maxsplit=1)
Expand Down Expand Up @@ -62,7 +63,7 @@ def __enter__(self):
"environment": {
"type": "LINUX_CONTAINER",
"image": "aws/codebuild/standard:4.0",
"computeType": "BUILD_GENERAL1_SMALL",
"computeType": self.compute_type,
"environmentVariables": [
{"name": "AWS_DEFAULT_REGION", "value": region},
{"name": "AWS_ACCOUNT_ID", "value": account},
Expand Down