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
22 changes: 21 additions & 1 deletion src/sagemaker/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,6 +181,7 @@ def __init__(
container_arguments: Optional[List[str]] = None,
disable_output_compression: bool = False,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
**kwargs,
):
"""Initialize an ``EstimatorBase`` instance.
Expand DownExpand Up@@ -544,7 +545,9 @@ def __init__(
enable_infra_check (bool or PipelineVariable): Optional.
Specifies whether it is running Sagemaker built-in infra check jobs.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
Specifies whether RemoteDebug is enabled for the training job.
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job.
"""
instance_count = renamed_kwargs(
"train_instance_count", "instance_count", instance_count, kwargs
Expand DownExpand Up@@ -785,6 +788,8 @@ def __init__(

self._enable_remote_debug = enable_remote_debug

self._enable_session_tag_chaining = enable_session_tag_chaining

@abstractmethod
def training_image_uri(self):
"""Return the Docker image to use for training.
Expand DownExpand Up@@ -2318,6 +2323,14 @@ def get_remote_debug_config(self):
else {"EnableRemoteDebug": self._enable_remote_debug}
)

def get_session_chaining_config(self):
"""dict: Return the configuration of SessionChaining"""
return (
None
if self._enable_session_tag_chaining is None
else {"EnableSessionTagChaining": self._enable_session_tag_chaining}
)

def enable_remote_debug(self):
"""Enable remote debug for a training job."""
self._update_remote_debug(True)
Expand DownExpand Up@@ -2574,6 +2587,9 @@ def _get_train_args(cls, estimator, inputs, experiment_config):
if estimator.get_remote_debug_config() is not None:
train_args["remote_debug_config"] = estimator.get_remote_debug_config()

if estimator.get_session_chaining_config() is not None:
train_args["session_chaining_config"] = estimator.get_session_chaining_config()

return train_args

@classmethod
Expand DownExpand Up@@ -2766,6 +2782,7 @@ def __init__(
disable_output_compression: bool = False,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
**kwargs,
):
"""Initialize an ``Estimator`` instance.
Expand DownExpand Up@@ -3129,6 +3146,8 @@ def __init__(
Specifies whether it is running Sagemaker built-in infra check jobs.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job
"""
self.image_uri = image_uri
self._hyperparameters = hyperparameters.copy() if hyperparameters else {}
Expand DownExpand Up@@ -3181,6 +3200,7 @@ def __init__(
container_arguments=container_arguments,
disable_output_compression=disable_output_compression,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
**kwargs,
)

Expand Down
4 changes: 4 additions & 0 deletions src/sagemaker/jumpstart/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ def __init__(
container_arguments: Optional[List[str]] = None,
disable_output_compression: Optional[bool] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
):
"""Initializes a ``JumpStartEstimator``.

Expand DownExpand Up@@ -500,6 +501,8 @@ def __init__(
to Amazon S3 without compression after training finishes.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job

Raises:
ValueError: If the model ID is not recognized by JumpStart.
Expand DownExpand Up@@ -578,6 +581,7 @@ def _validate_model_id_and_get_type_hook():
disable_output_compression=disable_output_compression,
enable_infra_check=enable_infra_check,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
)

self.model_id = estimator_init_kwargs.model_id
Expand Down
2 changes: 2 additions & 0 deletions src/sagemaker/jumpstart/factory/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,7 @@ def get_init_kwargs(
disable_output_compression: Optional[bool] = None,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
) -> JumpStartEstimatorInitKwargs:
"""Returns kwargs required to instantiate `sagemaker.estimator.Estimator` object."""

Expand DownExpand Up@@ -188,6 +189,7 @@ def get_init_kwargs(
disable_output_compression=disable_output_compression,
enable_infra_check=enable_infra_check,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
)

estimator_init_kwargs = _add_model_version_to_kwargs(estimator_init_kwargs)
Expand Down
3 changes: 3 additions & 0 deletions src/sagemaker/jumpstart/types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,6 +1723,7 @@ class JumpStartEstimatorInitKwargs(JumpStartKwargs):
"disable_output_compression",
"enable_infra_check",
"enable_remote_debug",
"enable_session_tag_chaining",
]

SERIALIZATION_EXCLUSION_SET = {
Expand DownExpand Up@@ -1790,6 +1791,7 @@ def __init__(
disable_output_compression: Optional[bool] = None,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
) -> None:
"""Instantiates JumpStartEstimatorInitKwargs object."""

Expand DownExpand Up@@ -1849,6 +1851,7 @@ def __init__(
self.disable_output_compression = disable_output_compression
self.enable_infra_check = enable_infra_check
self.enable_remote_debug = enable_remote_debug
self.enable_session_tag_chaining = enable_session_tag_chaining


class JumpStartEstimatorFitKwargs(JumpStartKwargs):
Expand Down
24 changes: 24 additions & 0 deletions src/sagemaker/session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -758,6 +758,7 @@ def train( # noqa: C901
environment: Optional[Dict[str, str]] = None,
retry_strategy=None,
remote_debug_config=None,
session_chaining_config=None,
):
"""Create an Amazon SageMaker training job.

Expand DownExpand Up@@ -877,6 +878,15 @@ def train( # noqa: C901
remote_debug_config = {
"EnableRemoteDebug": True,
}
session_chaining_config(dict): Configuration for SessionChaining. (default: ``None``)
The dict can contain 'EnableSessionTagChaining'(bool).
For example,

.. code:: python

session_chaining_config = {
"EnableSessionTagChaining": True,
}
environment (dict[str, str]) : Environment variables to be set for
use during training job (default: ``None``)
retry_strategy(dict): Defines RetryStrategy for InternalServerFailures.
Expand DownExpand Up@@ -970,6 +980,7 @@ def train( # noqa: C901
profiler_rule_configs=profiler_rule_configs,
profiler_config=inferred_profiler_config,
remote_debug_config=remote_debug_config,
session_chaining_config=session_chaining_config,
environment=environment,
retry_strategy=retry_strategy,
)
Expand DownExpand Up@@ -1013,6 +1024,7 @@ def _get_train_request( # noqa: C901
profiler_rule_configs=None,
profiler_config=None,
remote_debug_config=None,
session_chaining_config=None,
environment=None,
retry_strategy=None,
):
Expand DownExpand Up@@ -1133,6 +1145,15 @@ def _get_train_request( # noqa: C901
remote_debug_config = {
"EnableRemoteDebug": True,
}
session_chaining_config(dict): Configuration for SessionChaining. (default: ``None``)
The dict can contain 'EnableSessionTagChaining'(bool).
For example,

.. code:: python

session_chaining_config = {
"EnableSessionTagChaining": True,
}
environment (dict[str, str]) : Environment variables to be set for
use during training job (default: ``None``)
retry_strategy(dict): Defines RetryStrategy for InternalServerFailures.
Expand DownExpand Up@@ -1239,6 +1260,9 @@ def _get_train_request( # noqa: C901
if remote_debug_config is not None:
train_request["RemoteDebugConfig"] = remote_debug_config

if session_chaining_config is not None:
train_request["SessionChainingConfig"] = session_chaining_config

if retry_strategy is not None:
train_request["RetryStrategy"] = retry_strategy

Expand Down
35 changes: 35 additions & 0 deletions tests/unit/test_estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2089,6 +2089,41 @@ def test_framework_disable_remote_debug(sagemaker_session):
assert len(args) == 2


def test_framework_with_session_chaining_config(sagemaker_session):
f = DummyFramework(
entry_point=SCRIPT_PATH,
role=ROLE,
sagemaker_session=sagemaker_session,
instance_groups=[
InstanceGroup("group1", "ml.c4.xlarge", 1),
InstanceGroup("group2", "ml.m4.xlarge", 2),
],
enable_session_tag_chaining=True,
)
f.fit("s3://mydata")
sagemaker_session.train.assert_called_once()
_, args = sagemaker_session.train.call_args
assert args["session_chaining_config"]["EnableSessionTagChaining"]
assert f.get_session_chaining_config()["EnableSessionTagChaining"]


def test_framework_without_session_chaining_config(sagemaker_session):
f = DummyFramework(
entry_point=SCRIPT_PATH,
role=ROLE,
sagemaker_session=sagemaker_session,
instance_groups=[
InstanceGroup("group1", "ml.c4.xlarge", 1),
InstanceGroup("group2", "ml.m4.xlarge", 2),
],
)
f.fit("s3://mydata")
sagemaker_session.train.assert_called_once()
_, args = sagemaker_session.train.call_args
assert args.get("SessionTagChaining") is None
assert f.get_remote_debug_config() is None


@patch("time.strftime", return_value=TIMESTAMP)
def test_custom_code_bucket(time, sagemaker_session):
code_bucket = "codebucket"
Expand Down
3 changes: 3 additions & 0 deletions tests/unit/test_session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2197,6 +2197,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
CONTAINER_ENTRY_POINT = ["bin/bash", "test.sh"]
CONTAINER_ARGUMENTS = ["--arg1", "value1", "--arg2", "value2"]
remote_debug_config = {"EnableRemoteDebug": True}
session_chaining_config = {"EnableSessionTagChaining": True}

sagemaker_session.train(
image_uri=IMAGE,
Expand All@@ -2222,6 +2223,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
container_entry_point=CONTAINER_ENTRY_POINT,
container_arguments=CONTAINER_ARGUMENTS,
remote_debug_config=remote_debug_config,
session_chaining_config=session_chaining_config,
)

_, _, actual_train_args = sagemaker_session.sagemaker_client.method_calls[0]
Expand All@@ -2245,6 +2247,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
)
assert actual_train_args["AlgorithmSpecification"]["ContainerArguments"] == CONTAINER_ARGUMENTS
assert actual_train_args["RemoteDebugConfig"]["EnableRemoteDebug"]
assert actual_train_args["SessionChainingConfig"]["EnableSessionTagChaining"]


def test_create_transform_job_with_sagemaker_config_injection(sagemaker_session):
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
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
22 changes: 21 additions & 1 deletion src/sagemaker/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,6 +181,7 @@ def __init__(
container_arguments: Optional[List[str]] = None,
disable_output_compression: bool = False,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
**kwargs,
):
"""Initialize an ``EstimatorBase`` instance.
Expand DownExpand Up@@ -544,7 +545,9 @@ def __init__(
enable_infra_check (bool or PipelineVariable): Optional.
Specifies whether it is running Sagemaker built-in infra check jobs.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
Specifies whether RemoteDebug is enabled for the training job.
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job.
"""
instance_count = renamed_kwargs(
"train_instance_count", "instance_count", instance_count, kwargs
Expand DownExpand Up@@ -785,6 +788,8 @@ def __init__(

self._enable_remote_debug = enable_remote_debug

self._enable_session_tag_chaining = enable_session_tag_chaining

@abstractmethod
def training_image_uri(self):
"""Return the Docker image to use for training.
Expand DownExpand Up@@ -2318,6 +2323,14 @@ def get_remote_debug_config(self):
else {"EnableRemoteDebug": self._enable_remote_debug}
)

def get_session_chaining_config(self):
"""dict: Return the configuration of SessionChaining"""
return (
None
if self._enable_session_tag_chaining is None
else {"EnableSessionTagChaining": self._enable_session_tag_chaining}
)

def enable_remote_debug(self):
"""Enable remote debug for a training job."""
self._update_remote_debug(True)
Expand DownExpand Up@@ -2574,6 +2587,9 @@ def _get_train_args(cls, estimator, inputs, experiment_config):
if estimator.get_remote_debug_config() is not None:
train_args["remote_debug_config"] = estimator.get_remote_debug_config()

if estimator.get_session_chaining_config() is not None:
train_args["session_chaining_config"] = estimator.get_session_chaining_config()

return train_args

@classmethod
Expand DownExpand Up@@ -2766,6 +2782,7 @@ def __init__(
disable_output_compression: bool = False,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
**kwargs,
):
"""Initialize an ``Estimator`` instance.
Expand DownExpand Up@@ -3129,6 +3146,8 @@ def __init__(
Specifies whether it is running Sagemaker built-in infra check jobs.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job
"""
self.image_uri = image_uri
self._hyperparameters = hyperparameters.copy() if hyperparameters else {}
Expand DownExpand Up@@ -3181,6 +3200,7 @@ def __init__(
container_arguments=container_arguments,
disable_output_compression=disable_output_compression,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
**kwargs,
)

Expand Down
4 changes: 4 additions & 0 deletions src/sagemaker/jumpstart/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ def __init__(
container_arguments: Optional[List[str]] = None,
disable_output_compression: Optional[bool] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
):
"""Initializes a ``JumpStartEstimator``.

Expand DownExpand Up@@ -500,6 +501,8 @@ def __init__(
to Amazon S3 without compression after training finishes.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job

Raises:
ValueError: If the model ID is not recognized by JumpStart.
Expand DownExpand Up@@ -578,6 +581,7 @@ def _validate_model_id_and_get_type_hook():
disable_output_compression=disable_output_compression,
enable_infra_check=enable_infra_check,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
)

self.model_id = estimator_init_kwargs.model_id
Expand Down
2 changes: 2 additions & 0 deletions src/sagemaker/jumpstart/factory/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,7 @@ def get_init_kwargs(
disable_output_compression: Optional[bool] = None,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
) -> JumpStartEstimatorInitKwargs:
"""Returns kwargs required to instantiate `sagemaker.estimator.Estimator` object."""

Expand DownExpand Up@@ -188,6 +189,7 @@ def get_init_kwargs(
disable_output_compression=disable_output_compression,
enable_infra_check=enable_infra_check,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
)

estimator_init_kwargs = _add_model_version_to_kwargs(estimator_init_kwargs)
Expand Down
3 changes: 3 additions & 0 deletions src/sagemaker/jumpstart/types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,6 +1723,7 @@ class JumpStartEstimatorInitKwargs(JumpStartKwargs):
"disable_output_compression",
"enable_infra_check",
"enable_remote_debug",
"enable_session_tag_chaining",
]

SERIALIZATION_EXCLUSION_SET = {
Expand DownExpand Up@@ -1790,6 +1791,7 @@ def __init__(
disable_output_compression: Optional[bool] = None,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
) -> None:
"""Instantiates JumpStartEstimatorInitKwargs object."""

Expand DownExpand Up@@ -1849,6 +1851,7 @@ def __init__(
self.disable_output_compression = disable_output_compression
self.enable_infra_check = enable_infra_check
self.enable_remote_debug = enable_remote_debug
self.enable_session_tag_chaining = enable_session_tag_chaining


class JumpStartEstimatorFitKwargs(JumpStartKwargs):
Expand Down
24 changes: 24 additions & 0 deletions src/sagemaker/session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -758,6 +758,7 @@ def train( # noqa: C901
environment: Optional[Dict[str, str]] = None,
retry_strategy=None,
remote_debug_config=None,
session_chaining_config=None,
):
"""Create an Amazon SageMaker training job.

Expand DownExpand Up@@ -877,6 +878,15 @@ def train( # noqa: C901
remote_debug_config = {
"EnableRemoteDebug": True,
}
session_chaining_config(dict): Configuration for SessionChaining. (default: ``None``)
The dict can contain 'EnableSessionTagChaining'(bool).
For example,

.. code:: python

session_chaining_config = {
"EnableSessionTagChaining": True,
}
environment (dict[str, str]) : Environment variables to be set for
use during training job (default: ``None``)
retry_strategy(dict): Defines RetryStrategy for InternalServerFailures.
Expand DownExpand Up@@ -970,6 +980,7 @@ def train( # noqa: C901
profiler_rule_configs=profiler_rule_configs,
profiler_config=inferred_profiler_config,
remote_debug_config=remote_debug_config,
session_chaining_config=session_chaining_config,
environment=environment,
retry_strategy=retry_strategy,
)
Expand DownExpand Up@@ -1013,6 +1024,7 @@ def _get_train_request( # noqa: C901
profiler_rule_configs=None,
profiler_config=None,
remote_debug_config=None,
session_chaining_config=None,
environment=None,
retry_strategy=None,
):
Expand DownExpand Up@@ -1133,6 +1145,15 @@ def _get_train_request( # noqa: C901
remote_debug_config = {
"EnableRemoteDebug": True,
}
session_chaining_config(dict): Configuration for SessionChaining. (default: ``None``)
The dict can contain 'EnableSessionTagChaining'(bool).
For example,

.. code:: python

session_chaining_config = {
"EnableSessionTagChaining": True,
}
environment (dict[str, str]) : Environment variables to be set for
use during training job (default: ``None``)
retry_strategy(dict): Defines RetryStrategy for InternalServerFailures.
Expand DownExpand Up@@ -1239,6 +1260,9 @@ def _get_train_request( # noqa: C901
if remote_debug_config is not None:
train_request["RemoteDebugConfig"] = remote_debug_config

if session_chaining_config is not None:
train_request["SessionChainingConfig"] = session_chaining_config

if retry_strategy is not None:
train_request["RetryStrategy"] = retry_strategy

Expand Down
35 changes: 35 additions & 0 deletions tests/unit/test_estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2089,6 +2089,41 @@ def test_framework_disable_remote_debug(sagemaker_session):
assert len(args) == 2


def test_framework_with_session_chaining_config(sagemaker_session):
f = DummyFramework(
entry_point=SCRIPT_PATH,
role=ROLE,
sagemaker_session=sagemaker_session,
instance_groups=[
InstanceGroup("group1", "ml.c4.xlarge", 1),
InstanceGroup("group2", "ml.m4.xlarge", 2),
],
enable_session_tag_chaining=True,
)
f.fit("s3://mydata")
sagemaker_session.train.assert_called_once()
_, args = sagemaker_session.train.call_args
assert args["session_chaining_config"]["EnableSessionTagChaining"]
assert f.get_session_chaining_config()["EnableSessionTagChaining"]


def test_framework_without_session_chaining_config(sagemaker_session):
f = DummyFramework(
entry_point=SCRIPT_PATH,
role=ROLE,
sagemaker_session=sagemaker_session,
instance_groups=[
InstanceGroup("group1", "ml.c4.xlarge", 1),
InstanceGroup("group2", "ml.m4.xlarge", 2),
],
)
f.fit("s3://mydata")
sagemaker_session.train.assert_called_once()
_, args = sagemaker_session.train.call_args
assert args.get("SessionTagChaining") is None
assert f.get_remote_debug_config() is None


@patch("time.strftime", return_value=TIMESTAMP)
def test_custom_code_bucket(time, sagemaker_session):
code_bucket = "codebucket"
Expand Down
3 changes: 3 additions & 0 deletions tests/unit/test_session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2197,6 +2197,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
CONTAINER_ENTRY_POINT = ["bin/bash", "test.sh"]
CONTAINER_ARGUMENTS = ["--arg1", "value1", "--arg2", "value2"]
remote_debug_config = {"EnableRemoteDebug": True}
session_chaining_config = {"EnableSessionTagChaining": True}

sagemaker_session.train(
image_uri=IMAGE,
Expand All@@ -2222,6 +2223,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
container_entry_point=CONTAINER_ENTRY_POINT,
container_arguments=CONTAINER_ARGUMENTS,
remote_debug_config=remote_debug_config,
session_chaining_config=session_chaining_config,
)

_, _, actual_train_args = sagemaker_session.sagemaker_client.method_calls[0]
Expand All@@ -2245,6 +2247,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
)
assert actual_train_args["AlgorithmSpecification"]["ContainerArguments"] == CONTAINER_ARGUMENTS
assert actual_train_args["RemoteDebugConfig"]["EnableRemoteDebug"]
assert actual_train_args["SessionChainingConfig"]["EnableSessionTagChaining"]


def test_create_transform_job_with_sagemaker_config_injection(sagemaker_session):
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
22 changes: 21 additions & 1 deletion src/sagemaker/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,6 +181,7 @@ def __init__(
container_arguments: Optional[List[str]] = None,
disable_output_compression: bool = False,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
**kwargs,
):
"""Initialize an ``EstimatorBase`` instance.
Expand DownExpand Up@@ -544,7 +545,9 @@ def __init__(
enable_infra_check (bool or PipelineVariable): Optional.
Specifies whether it is running Sagemaker built-in infra check jobs.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
Specifies whether RemoteDebug is enabled for the training job.
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job.
"""
instance_count = renamed_kwargs(
"train_instance_count", "instance_count", instance_count, kwargs
Expand DownExpand Up@@ -785,6 +788,8 @@ def __init__(

self._enable_remote_debug = enable_remote_debug

self._enable_session_tag_chaining = enable_session_tag_chaining

@abstractmethod
def training_image_uri(self):
"""Return the Docker image to use for training.
Expand DownExpand Up@@ -2318,6 +2323,14 @@ def get_remote_debug_config(self):
else {"EnableRemoteDebug": self._enable_remote_debug}
)

def get_session_chaining_config(self):
"""dict: Return the configuration of SessionChaining"""
return (
None
if self._enable_session_tag_chaining is None
else {"EnableSessionTagChaining": self._enable_session_tag_chaining}
)

def enable_remote_debug(self):
"""Enable remote debug for a training job."""
self._update_remote_debug(True)
Expand DownExpand Up@@ -2574,6 +2587,9 @@ def _get_train_args(cls, estimator, inputs, experiment_config):
if estimator.get_remote_debug_config() is not None:
train_args["remote_debug_config"] = estimator.get_remote_debug_config()

if estimator.get_session_chaining_config() is not None:
train_args["session_chaining_config"] = estimator.get_session_chaining_config()

return train_args

@classmethod
Expand DownExpand Up@@ -2766,6 +2782,7 @@ def __init__(
disable_output_compression: bool = False,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
**kwargs,
):
"""Initialize an ``Estimator`` instance.
Expand DownExpand Up@@ -3129,6 +3146,8 @@ def __init__(
Specifies whether it is running Sagemaker built-in infra check jobs.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job
"""
self.image_uri = image_uri
self._hyperparameters = hyperparameters.copy() if hyperparameters else {}
Expand DownExpand Up@@ -3181,6 +3200,7 @@ def __init__(
container_arguments=container_arguments,
disable_output_compression=disable_output_compression,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
**kwargs,
)

Expand Down
4 changes: 4 additions & 0 deletions src/sagemaker/jumpstart/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ def __init__(
container_arguments: Optional[List[str]] = None,
disable_output_compression: Optional[bool] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
):
"""Initializes a ``JumpStartEstimator``.

Expand DownExpand Up@@ -500,6 +501,8 @@ def __init__(
to Amazon S3 without compression after training finishes.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job

Raises:
ValueError: If the model ID is not recognized by JumpStart.
Expand DownExpand Up@@ -578,6 +581,7 @@ def _validate_model_id_and_get_type_hook():
disable_output_compression=disable_output_compression,
enable_infra_check=enable_infra_check,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
)

self.model_id = estimator_init_kwargs.model_id
Expand Down
2 changes: 2 additions & 0 deletions src/sagemaker/jumpstart/factory/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,7 @@ def get_init_kwargs(
disable_output_compression: Optional[bool] = None,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
) -> JumpStartEstimatorInitKwargs:
"""Returns kwargs required to instantiate `sagemaker.estimator.Estimator` object."""

Expand DownExpand Up@@ -188,6 +189,7 @@ def get_init_kwargs(
disable_output_compression=disable_output_compression,
enable_infra_check=enable_infra_check,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
)

estimator_init_kwargs = _add_model_version_to_kwargs(estimator_init_kwargs)
Expand Down
3 changes: 3 additions & 0 deletions src/sagemaker/jumpstart/types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,6 +1723,7 @@ class JumpStartEstimatorInitKwargs(JumpStartKwargs):
"disable_output_compression",
"enable_infra_check",
"enable_remote_debug",
"enable_session_tag_chaining",
]

SERIALIZATION_EXCLUSION_SET = {
Expand DownExpand Up@@ -1790,6 +1791,7 @@ def __init__(
disable_output_compression: Optional[bool] = None,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
) -> None:
"""Instantiates JumpStartEstimatorInitKwargs object."""

Expand DownExpand Up@@ -1849,6 +1851,7 @@ def __init__(
self.disable_output_compression = disable_output_compression
self.enable_infra_check = enable_infra_check
self.enable_remote_debug = enable_remote_debug
self.enable_session_tag_chaining = enable_session_tag_chaining


class JumpStartEstimatorFitKwargs(JumpStartKwargs):
Expand Down
24 changes: 24 additions & 0 deletions src/sagemaker/session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -758,6 +758,7 @@ def train( # noqa: C901
environment: Optional[Dict[str, str]] = None,
retry_strategy=None,
remote_debug_config=None,
session_chaining_config=None,
):
"""Create an Amazon SageMaker training job.

Expand DownExpand Up@@ -877,6 +878,15 @@ def train( # noqa: C901
remote_debug_config = {
"EnableRemoteDebug": True,
}
session_chaining_config(dict): Configuration for SessionChaining. (default: ``None``)
The dict can contain 'EnableSessionTagChaining'(bool).
For example,

.. code:: python

session_chaining_config = {
"EnableSessionTagChaining": True,
}
environment (dict[str, str]) : Environment variables to be set for
use during training job (default: ``None``)
retry_strategy(dict): Defines RetryStrategy for InternalServerFailures.
Expand DownExpand Up@@ -970,6 +980,7 @@ def train( # noqa: C901
profiler_rule_configs=profiler_rule_configs,
profiler_config=inferred_profiler_config,
remote_debug_config=remote_debug_config,
session_chaining_config=session_chaining_config,
environment=environment,
retry_strategy=retry_strategy,
)
Expand DownExpand Up@@ -1013,6 +1024,7 @@ def _get_train_request( # noqa: C901
profiler_rule_configs=None,
profiler_config=None,
remote_debug_config=None,
session_chaining_config=None,
environment=None,
retry_strategy=None,
):
Expand DownExpand Up@@ -1133,6 +1145,15 @@ def _get_train_request( # noqa: C901
remote_debug_config = {
"EnableRemoteDebug": True,
}
session_chaining_config(dict): Configuration for SessionChaining. (default: ``None``)
The dict can contain 'EnableSessionTagChaining'(bool).
For example,

.. code:: python

session_chaining_config = {
"EnableSessionTagChaining": True,
}
environment (dict[str, str]) : Environment variables to be set for
use during training job (default: ``None``)
retry_strategy(dict): Defines RetryStrategy for InternalServerFailures.
Expand DownExpand Up@@ -1239,6 +1260,9 @@ def _get_train_request( # noqa: C901
if remote_debug_config is not None:
train_request["RemoteDebugConfig"] = remote_debug_config

if session_chaining_config is not None:
train_request["SessionChainingConfig"] = session_chaining_config

if retry_strategy is not None:
train_request["RetryStrategy"] = retry_strategy

Expand Down
35 changes: 35 additions & 0 deletions tests/unit/test_estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2089,6 +2089,41 @@ def test_framework_disable_remote_debug(sagemaker_session):
assert len(args) == 2


def test_framework_with_session_chaining_config(sagemaker_session):
f = DummyFramework(
entry_point=SCRIPT_PATH,
role=ROLE,
sagemaker_session=sagemaker_session,
instance_groups=[
InstanceGroup("group1", "ml.c4.xlarge", 1),
InstanceGroup("group2", "ml.m4.xlarge", 2),
],
enable_session_tag_chaining=True,
)
f.fit("s3://mydata")
sagemaker_session.train.assert_called_once()
_, args = sagemaker_session.train.call_args
assert args["session_chaining_config"]["EnableSessionTagChaining"]
assert f.get_session_chaining_config()["EnableSessionTagChaining"]


def test_framework_without_session_chaining_config(sagemaker_session):
f = DummyFramework(
entry_point=SCRIPT_PATH,
role=ROLE,
sagemaker_session=sagemaker_session,
instance_groups=[
InstanceGroup("group1", "ml.c4.xlarge", 1),
InstanceGroup("group2", "ml.m4.xlarge", 2),
],
)
f.fit("s3://mydata")
sagemaker_session.train.assert_called_once()
_, args = sagemaker_session.train.call_args
assert args.get("SessionTagChaining") is None
assert f.get_remote_debug_config() is None


@patch("time.strftime", return_value=TIMESTAMP)
def test_custom_code_bucket(time, sagemaker_session):
code_bucket = "codebucket"
Expand Down
3 changes: 3 additions & 0 deletions tests/unit/test_session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2197,6 +2197,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
CONTAINER_ENTRY_POINT = ["bin/bash", "test.sh"]
CONTAINER_ARGUMENTS = ["--arg1", "value1", "--arg2", "value2"]
remote_debug_config = {"EnableRemoteDebug": True}
session_chaining_config = {"EnableSessionTagChaining": True}

sagemaker_session.train(
image_uri=IMAGE,
Expand All@@ -2222,6 +2223,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
container_entry_point=CONTAINER_ENTRY_POINT,
container_arguments=CONTAINER_ARGUMENTS,
remote_debug_config=remote_debug_config,
session_chaining_config=session_chaining_config,
)

_, _, actual_train_args = sagemaker_session.sagemaker_client.method_calls[0]
Expand All@@ -2245,6 +2247,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
)
assert actual_train_args["AlgorithmSpecification"]["ContainerArguments"] == CONTAINER_ARGUMENTS
assert actual_train_args["RemoteDebugConfig"]["EnableRemoteDebug"]
assert actual_train_args["SessionChainingConfig"]["EnableSessionTagChaining"]


def test_create_transform_job_with_sagemaker_config_injection(sagemaker_session):
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
22 changes: 21 additions & 1 deletion src/sagemaker/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,6 +181,7 @@ def __init__(
container_arguments: Optional[List[str]] = None,
disable_output_compression: bool = False,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
**kwargs,
):
"""Initialize an ``EstimatorBase`` instance.
Expand DownExpand Up@@ -544,7 +545,9 @@ def __init__(
enable_infra_check (bool or PipelineVariable): Optional.
Specifies whether it is running Sagemaker built-in infra check jobs.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
Specifies whether RemoteDebug is enabled for the training job.
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job.
"""
instance_count = renamed_kwargs(
"train_instance_count", "instance_count", instance_count, kwargs
Expand DownExpand Up@@ -785,6 +788,8 @@ def __init__(

self._enable_remote_debug = enable_remote_debug

self._enable_session_tag_chaining = enable_session_tag_chaining

@abstractmethod
def training_image_uri(self):
"""Return the Docker image to use for training.
Expand DownExpand Up@@ -2318,6 +2323,14 @@ def get_remote_debug_config(self):
else {"EnableRemoteDebug": self._enable_remote_debug}
)

def get_session_chaining_config(self):
"""dict: Return the configuration of SessionChaining"""
return (
None
if self._enable_session_tag_chaining is None
else {"EnableSessionTagChaining": self._enable_session_tag_chaining}
)

def enable_remote_debug(self):
"""Enable remote debug for a training job."""
self._update_remote_debug(True)
Expand DownExpand Up@@ -2574,6 +2587,9 @@ def _get_train_args(cls, estimator, inputs, experiment_config):
if estimator.get_remote_debug_config() is not None:
train_args["remote_debug_config"] = estimator.get_remote_debug_config()

if estimator.get_session_chaining_config() is not None:
train_args["session_chaining_config"] = estimator.get_session_chaining_config()

return train_args

@classmethod
Expand DownExpand Up@@ -2766,6 +2782,7 @@ def __init__(
disable_output_compression: bool = False,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
**kwargs,
):
"""Initialize an ``Estimator`` instance.
Expand DownExpand Up@@ -3129,6 +3146,8 @@ def __init__(
Specifies whether it is running Sagemaker built-in infra check jobs.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job
"""
self.image_uri = image_uri
self._hyperparameters = hyperparameters.copy() if hyperparameters else {}
Expand DownExpand Up@@ -3181,6 +3200,7 @@ def __init__(
container_arguments=container_arguments,
disable_output_compression=disable_output_compression,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
**kwargs,
)

Expand Down
4 changes: 4 additions & 0 deletions src/sagemaker/jumpstart/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ def __init__(
container_arguments: Optional[List[str]] = None,
disable_output_compression: Optional[bool] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
):
"""Initializes a ``JumpStartEstimator``.

Expand DownExpand Up@@ -500,6 +501,8 @@ def __init__(
to Amazon S3 without compression after training finishes.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job

Raises:
ValueError: If the model ID is not recognized by JumpStart.
Expand DownExpand Up@@ -578,6 +581,7 @@ def _validate_model_id_and_get_type_hook():
disable_output_compression=disable_output_compression,
enable_infra_check=enable_infra_check,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
)

self.model_id = estimator_init_kwargs.model_id
Expand Down
2 changes: 2 additions & 0 deletions src/sagemaker/jumpstart/factory/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,7 @@ def get_init_kwargs(
disable_output_compression: Optional[bool] = None,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
) -> JumpStartEstimatorInitKwargs:
"""Returns kwargs required to instantiate `sagemaker.estimator.Estimator` object."""

Expand DownExpand Up@@ -188,6 +189,7 @@ def get_init_kwargs(
disable_output_compression=disable_output_compression,
enable_infra_check=enable_infra_check,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
)

estimator_init_kwargs = _add_model_version_to_kwargs(estimator_init_kwargs)
Expand Down
3 changes: 3 additions & 0 deletions src/sagemaker/jumpstart/types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,6 +1723,7 @@ class JumpStartEstimatorInitKwargs(JumpStartKwargs):
"disable_output_compression",
"enable_infra_check",
"enable_remote_debug",
"enable_session_tag_chaining",
]

SERIALIZATION_EXCLUSION_SET = {
Expand DownExpand Up@@ -1790,6 +1791,7 @@ def __init__(
disable_output_compression: Optional[bool] = None,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
) -> None:
"""Instantiates JumpStartEstimatorInitKwargs object."""

Expand DownExpand Up@@ -1849,6 +1851,7 @@ def __init__(
self.disable_output_compression = disable_output_compression
self.enable_infra_check = enable_infra_check
self.enable_remote_debug = enable_remote_debug
self.enable_session_tag_chaining = enable_session_tag_chaining


class JumpStartEstimatorFitKwargs(JumpStartKwargs):
Expand Down
24 changes: 24 additions & 0 deletions src/sagemaker/session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -758,6 +758,7 @@ def train( # noqa: C901
environment: Optional[Dict[str, str]] = None,
retry_strategy=None,
remote_debug_config=None,
session_chaining_config=None,
):
"""Create an Amazon SageMaker training job.

Expand DownExpand Up@@ -877,6 +878,15 @@ def train( # noqa: C901
remote_debug_config = {
"EnableRemoteDebug": True,
}
session_chaining_config(dict): Configuration for SessionChaining. (default: ``None``)
The dict can contain 'EnableSessionTagChaining'(bool).
For example,

.. code:: python

session_chaining_config = {
"EnableSessionTagChaining": True,
}
environment (dict[str, str]) : Environment variables to be set for
use during training job (default: ``None``)
retry_strategy(dict): Defines RetryStrategy for InternalServerFailures.
Expand DownExpand Up@@ -970,6 +980,7 @@ def train( # noqa: C901
profiler_rule_configs=profiler_rule_configs,
profiler_config=inferred_profiler_config,
remote_debug_config=remote_debug_config,
session_chaining_config=session_chaining_config,
environment=environment,
retry_strategy=retry_strategy,
)
Expand DownExpand Up@@ -1013,6 +1024,7 @@ def _get_train_request( # noqa: C901
profiler_rule_configs=None,
profiler_config=None,
remote_debug_config=None,
session_chaining_config=None,
environment=None,
retry_strategy=None,
):
Expand DownExpand Up@@ -1133,6 +1145,15 @@ def _get_train_request( # noqa: C901
remote_debug_config = {
"EnableRemoteDebug": True,
}
session_chaining_config(dict): Configuration for SessionChaining. (default: ``None``)
The dict can contain 'EnableSessionTagChaining'(bool).
For example,

.. code:: python

session_chaining_config = {
"EnableSessionTagChaining": True,
}
environment (dict[str, str]) : Environment variables to be set for
use during training job (default: ``None``)
retry_strategy(dict): Defines RetryStrategy for InternalServerFailures.
Expand DownExpand Up@@ -1239,6 +1260,9 @@ def _get_train_request( # noqa: C901
if remote_debug_config is not None:
train_request["RemoteDebugConfig"] = remote_debug_config

if session_chaining_config is not None:
train_request["SessionChainingConfig"] = session_chaining_config

if retry_strategy is not None:
train_request["RetryStrategy"] = retry_strategy

Expand Down
35 changes: 35 additions & 0 deletions tests/unit/test_estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2089,6 +2089,41 @@ def test_framework_disable_remote_debug(sagemaker_session):
assert len(args) == 2


def test_framework_with_session_chaining_config(sagemaker_session):
f = DummyFramework(
entry_point=SCRIPT_PATH,
role=ROLE,
sagemaker_session=sagemaker_session,
instance_groups=[
InstanceGroup("group1", "ml.c4.xlarge", 1),
InstanceGroup("group2", "ml.m4.xlarge", 2),
],
enable_session_tag_chaining=True,
)
f.fit("s3://mydata")
sagemaker_session.train.assert_called_once()
_, args = sagemaker_session.train.call_args
assert args["session_chaining_config"]["EnableSessionTagChaining"]
assert f.get_session_chaining_config()["EnableSessionTagChaining"]


def test_framework_without_session_chaining_config(sagemaker_session):
f = DummyFramework(
entry_point=SCRIPT_PATH,
role=ROLE,
sagemaker_session=sagemaker_session,
instance_groups=[
InstanceGroup("group1", "ml.c4.xlarge", 1),
InstanceGroup("group2", "ml.m4.xlarge", 2),
],
)
f.fit("s3://mydata")
sagemaker_session.train.assert_called_once()
_, args = sagemaker_session.train.call_args
assert args.get("SessionTagChaining") is None
assert f.get_remote_debug_config() is None


@patch("time.strftime", return_value=TIMESTAMP)
def test_custom_code_bucket(time, sagemaker_session):
code_bucket = "codebucket"
Expand Down
3 changes: 3 additions & 0 deletions tests/unit/test_session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2197,6 +2197,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
CONTAINER_ENTRY_POINT = ["bin/bash", "test.sh"]
CONTAINER_ARGUMENTS = ["--arg1", "value1", "--arg2", "value2"]
remote_debug_config = {"EnableRemoteDebug": True}
session_chaining_config = {"EnableSessionTagChaining": True}

sagemaker_session.train(
image_uri=IMAGE,
Expand All@@ -2222,6 +2223,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
container_entry_point=CONTAINER_ENTRY_POINT,
container_arguments=CONTAINER_ARGUMENTS,
remote_debug_config=remote_debug_config,
session_chaining_config=session_chaining_config,
)

_, _, actual_train_args = sagemaker_session.sagemaker_client.method_calls[0]
Expand All@@ -2245,6 +2247,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
)
assert actual_train_args["AlgorithmSpecification"]["ContainerArguments"] == CONTAINER_ARGUMENTS
assert actual_train_args["RemoteDebugConfig"]["EnableRemoteDebug"]
assert actual_train_args["SessionChainingConfig"]["EnableSessionTagChaining"]


def test_create_transform_job_with_sagemaker_config_injection(sagemaker_session):
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
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
22 changes: 21 additions & 1 deletion src/sagemaker/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,6 +181,7 @@ def __init__(
container_arguments: Optional[List[str]] = None,
disable_output_compression: bool = False,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
**kwargs,
):
"""Initialize an ``EstimatorBase`` instance.
Expand DownExpand Up@@ -544,7 +545,9 @@ def __init__(
enable_infra_check (bool or PipelineVariable): Optional.
Specifies whether it is running Sagemaker built-in infra check jobs.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
Specifies whether RemoteDebug is enabled for the training job.
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job.
"""
instance_count = renamed_kwargs(
"train_instance_count", "instance_count", instance_count, kwargs
Expand DownExpand Up@@ -785,6 +788,8 @@ def __init__(

self._enable_remote_debug = enable_remote_debug

self._enable_session_tag_chaining = enable_session_tag_chaining

@abstractmethod
def training_image_uri(self):
"""Return the Docker image to use for training.
Expand DownExpand Up@@ -2318,6 +2323,14 @@ def get_remote_debug_config(self):
else {"EnableRemoteDebug": self._enable_remote_debug}
)

def get_session_chaining_config(self):
"""dict: Return the configuration of SessionChaining"""
return (
None
if self._enable_session_tag_chaining is None
else {"EnableSessionTagChaining": self._enable_session_tag_chaining}
)

def enable_remote_debug(self):
"""Enable remote debug for a training job."""
self._update_remote_debug(True)
Expand DownExpand Up@@ -2574,6 +2587,9 @@ def _get_train_args(cls, estimator, inputs, experiment_config):
if estimator.get_remote_debug_config() is not None:
train_args["remote_debug_config"] = estimator.get_remote_debug_config()

if estimator.get_session_chaining_config() is not None:
train_args["session_chaining_config"] = estimator.get_session_chaining_config()

return train_args

@classmethod
Expand DownExpand Up@@ -2766,6 +2782,7 @@ def __init__(
disable_output_compression: bool = False,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
**kwargs,
):
"""Initialize an ``Estimator`` instance.
Expand DownExpand Up@@ -3129,6 +3146,8 @@ def __init__(
Specifies whether it is running Sagemaker built-in infra check jobs.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job
"""
self.image_uri = image_uri
self._hyperparameters = hyperparameters.copy() if hyperparameters else {}
Expand DownExpand Up@@ -3181,6 +3200,7 @@ def __init__(
container_arguments=container_arguments,
disable_output_compression=disable_output_compression,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
**kwargs,
)

Expand Down
4 changes: 4 additions & 0 deletions src/sagemaker/jumpstart/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ def __init__(
container_arguments: Optional[List[str]] = None,
disable_output_compression: Optional[bool] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
):
"""Initializes a ``JumpStartEstimator``.

Expand DownExpand Up@@ -500,6 +501,8 @@ def __init__(
to Amazon S3 without compression after training finishes.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job

Raises:
ValueError: If the model ID is not recognized by JumpStart.
Expand DownExpand Up@@ -578,6 +581,7 @@ def _validate_model_id_and_get_type_hook():
disable_output_compression=disable_output_compression,
enable_infra_check=enable_infra_check,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
)

self.model_id = estimator_init_kwargs.model_id
Expand Down
2 changes: 2 additions & 0 deletions src/sagemaker/jumpstart/factory/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,7 @@ def get_init_kwargs(
disable_output_compression: Optional[bool] = None,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
) -> JumpStartEstimatorInitKwargs:
"""Returns kwargs required to instantiate `sagemaker.estimator.Estimator` object."""

Expand DownExpand Up@@ -188,6 +189,7 @@ def get_init_kwargs(
disable_output_compression=disable_output_compression,
enable_infra_check=enable_infra_check,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
)

estimator_init_kwargs = _add_model_version_to_kwargs(estimator_init_kwargs)
Expand Down
3 changes: 3 additions & 0 deletions src/sagemaker/jumpstart/types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,6 +1723,7 @@ class JumpStartEstimatorInitKwargs(JumpStartKwargs):
"disable_output_compression",
"enable_infra_check",
"enable_remote_debug",
"enable_session_tag_chaining",
]

SERIALIZATION_EXCLUSION_SET = {
Expand DownExpand Up@@ -1790,6 +1791,7 @@ def __init__(
disable_output_compression: Optional[bool] = None,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
) -> None:
"""Instantiates JumpStartEstimatorInitKwargs object."""

Expand DownExpand Up@@ -1849,6 +1851,7 @@ def __init__(
self.disable_output_compression = disable_output_compression
self.enable_infra_check = enable_infra_check
self.enable_remote_debug = enable_remote_debug
self.enable_session_tag_chaining = enable_session_tag_chaining


class JumpStartEstimatorFitKwargs(JumpStartKwargs):
Expand Down
24 changes: 24 additions & 0 deletions src/sagemaker/session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -758,6 +758,7 @@ def train( # noqa: C901
environment: Optional[Dict[str, str]] = None,
retry_strategy=None,
remote_debug_config=None,
session_chaining_config=None,
):
"""Create an Amazon SageMaker training job.

Expand DownExpand Up@@ -877,6 +878,15 @@ def train( # noqa: C901
remote_debug_config = {
"EnableRemoteDebug": True,
}
session_chaining_config(dict): Configuration for SessionChaining. (default: ``None``)
The dict can contain 'EnableSessionTagChaining'(bool).
For example,

.. code:: python

session_chaining_config = {
"EnableSessionTagChaining": True,
}
environment (dict[str, str]) : Environment variables to be set for
use during training job (default: ``None``)
retry_strategy(dict): Defines RetryStrategy for InternalServerFailures.
Expand DownExpand Up@@ -970,6 +980,7 @@ def train( # noqa: C901
profiler_rule_configs=profiler_rule_configs,
profiler_config=inferred_profiler_config,
remote_debug_config=remote_debug_config,
session_chaining_config=session_chaining_config,
environment=environment,
retry_strategy=retry_strategy,
)
Expand DownExpand Up@@ -1013,6 +1024,7 @@ def _get_train_request( # noqa: C901
profiler_rule_configs=None,
profiler_config=None,
remote_debug_config=None,
session_chaining_config=None,
environment=None,
retry_strategy=None,
):
Expand DownExpand Up@@ -1133,6 +1145,15 @@ def _get_train_request( # noqa: C901
remote_debug_config = {
"EnableRemoteDebug": True,
}
session_chaining_config(dict): Configuration for SessionChaining. (default: ``None``)
The dict can contain 'EnableSessionTagChaining'(bool).
For example,

.. code:: python

session_chaining_config = {
"EnableSessionTagChaining": True,
}
environment (dict[str, str]) : Environment variables to be set for
use during training job (default: ``None``)
retry_strategy(dict): Defines RetryStrategy for InternalServerFailures.
Expand DownExpand Up@@ -1239,6 +1260,9 @@ def _get_train_request( # noqa: C901
if remote_debug_config is not None:
train_request["RemoteDebugConfig"] = remote_debug_config

if session_chaining_config is not None:
train_request["SessionChainingConfig"] = session_chaining_config

if retry_strategy is not None:
train_request["RetryStrategy"] = retry_strategy

Expand Down
35 changes: 35 additions & 0 deletions tests/unit/test_estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2089,6 +2089,41 @@ def test_framework_disable_remote_debug(sagemaker_session):
assert len(args) == 2


def test_framework_with_session_chaining_config(sagemaker_session):
f = DummyFramework(
entry_point=SCRIPT_PATH,
role=ROLE,
sagemaker_session=sagemaker_session,
instance_groups=[
InstanceGroup("group1", "ml.c4.xlarge", 1),
InstanceGroup("group2", "ml.m4.xlarge", 2),
],
enable_session_tag_chaining=True,
)
f.fit("s3://mydata")
sagemaker_session.train.assert_called_once()
_, args = sagemaker_session.train.call_args
assert args["session_chaining_config"]["EnableSessionTagChaining"]
assert f.get_session_chaining_config()["EnableSessionTagChaining"]


def test_framework_without_session_chaining_config(sagemaker_session):
f = DummyFramework(
entry_point=SCRIPT_PATH,
role=ROLE,
sagemaker_session=sagemaker_session,
instance_groups=[
InstanceGroup("group1", "ml.c4.xlarge", 1),
InstanceGroup("group2", "ml.m4.xlarge", 2),
],
)
f.fit("s3://mydata")
sagemaker_session.train.assert_called_once()
_, args = sagemaker_session.train.call_args
assert args.get("SessionTagChaining") is None
assert f.get_remote_debug_config() is None


@patch("time.strftime", return_value=TIMESTAMP)
def test_custom_code_bucket(time, sagemaker_session):
code_bucket = "codebucket"
Expand Down
3 changes: 3 additions & 0 deletions tests/unit/test_session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2197,6 +2197,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
CONTAINER_ENTRY_POINT = ["bin/bash", "test.sh"]
CONTAINER_ARGUMENTS = ["--arg1", "value1", "--arg2", "value2"]
remote_debug_config = {"EnableRemoteDebug": True}
session_chaining_config = {"EnableSessionTagChaining": True}

sagemaker_session.train(
image_uri=IMAGE,
Expand All@@ -2222,6 +2223,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
container_entry_point=CONTAINER_ENTRY_POINT,
container_arguments=CONTAINER_ARGUMENTS,
remote_debug_config=remote_debug_config,
session_chaining_config=session_chaining_config,
)

_, _, actual_train_args = sagemaker_session.sagemaker_client.method_calls[0]
Expand All@@ -2245,6 +2247,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
)
assert actual_train_args["AlgorithmSpecification"]["ContainerArguments"] == CONTAINER_ARGUMENTS
assert actual_train_args["RemoteDebugConfig"]["EnableRemoteDebug"]
assert actual_train_args["SessionChainingConfig"]["EnableSessionTagChaining"]


def test_create_transform_job_with_sagemaker_config_injection(sagemaker_session):
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
22 changes: 21 additions & 1 deletion src/sagemaker/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,6 +181,7 @@ def __init__(
container_arguments: Optional[List[str]] = None,
disable_output_compression: bool = False,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
**kwargs,
):
"""Initialize an ``EstimatorBase`` instance.
Expand DownExpand Up@@ -544,7 +545,9 @@ def __init__(
enable_infra_check (bool or PipelineVariable): Optional.
Specifies whether it is running Sagemaker built-in infra check jobs.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
Specifies whether RemoteDebug is enabled for the training job.
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job.
"""
instance_count = renamed_kwargs(
"train_instance_count", "instance_count", instance_count, kwargs
Expand DownExpand Up@@ -785,6 +788,8 @@ def __init__(

self._enable_remote_debug = enable_remote_debug

self._enable_session_tag_chaining = enable_session_tag_chaining

@abstractmethod
def training_image_uri(self):
"""Return the Docker image to use for training.
Expand DownExpand Up@@ -2318,6 +2323,14 @@ def get_remote_debug_config(self):
else {"EnableRemoteDebug": self._enable_remote_debug}
)

def get_session_chaining_config(self):
"""dict: Return the configuration of SessionChaining"""
return (
None
if self._enable_session_tag_chaining is None
else {"EnableSessionTagChaining": self._enable_session_tag_chaining}
)

def enable_remote_debug(self):
"""Enable remote debug for a training job."""
self._update_remote_debug(True)
Expand DownExpand Up@@ -2574,6 +2587,9 @@ def _get_train_args(cls, estimator, inputs, experiment_config):
if estimator.get_remote_debug_config() is not None:
train_args["remote_debug_config"] = estimator.get_remote_debug_config()

if estimator.get_session_chaining_config() is not None:
train_args["session_chaining_config"] = estimator.get_session_chaining_config()

return train_args

@classmethod
Expand DownExpand Up@@ -2766,6 +2782,7 @@ def __init__(
disable_output_compression: bool = False,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
**kwargs,
):
"""Initialize an ``Estimator`` instance.
Expand DownExpand Up@@ -3129,6 +3146,8 @@ def __init__(
Specifies whether it is running Sagemaker built-in infra check jobs.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job
"""
self.image_uri = image_uri
self._hyperparameters = hyperparameters.copy() if hyperparameters else {}
Expand DownExpand Up@@ -3181,6 +3200,7 @@ def __init__(
container_arguments=container_arguments,
disable_output_compression=disable_output_compression,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
**kwargs,
)

Expand Down
4 changes: 4 additions & 0 deletions src/sagemaker/jumpstart/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ def __init__(
container_arguments: Optional[List[str]] = None,
disable_output_compression: Optional[bool] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
):
"""Initializes a ``JumpStartEstimator``.

Expand DownExpand Up@@ -500,6 +501,8 @@ def __init__(
to Amazon S3 without compression after training finishes.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job

Raises:
ValueError: If the model ID is not recognized by JumpStart.
Expand DownExpand Up@@ -578,6 +581,7 @@ def _validate_model_id_and_get_type_hook():
disable_output_compression=disable_output_compression,
enable_infra_check=enable_infra_check,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
)

self.model_id = estimator_init_kwargs.model_id
Expand Down
2 changes: 2 additions & 0 deletions src/sagemaker/jumpstart/factory/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,7 @@ def get_init_kwargs(
disable_output_compression: Optional[bool] = None,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
) -> JumpStartEstimatorInitKwargs:
"""Returns kwargs required to instantiate `sagemaker.estimator.Estimator` object."""

Expand DownExpand Up@@ -188,6 +189,7 @@ def get_init_kwargs(
disable_output_compression=disable_output_compression,
enable_infra_check=enable_infra_check,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
)

estimator_init_kwargs = _add_model_version_to_kwargs(estimator_init_kwargs)
Expand Down
3 changes: 3 additions & 0 deletions src/sagemaker/jumpstart/types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,6 +1723,7 @@ class JumpStartEstimatorInitKwargs(JumpStartKwargs):
"disable_output_compression",
"enable_infra_check",
"enable_remote_debug",
"enable_session_tag_chaining",
]

SERIALIZATION_EXCLUSION_SET = {
Expand DownExpand Up@@ -1790,6 +1791,7 @@ def __init__(
disable_output_compression: Optional[bool] = None,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
) -> None:
"""Instantiates JumpStartEstimatorInitKwargs object."""

Expand DownExpand Up@@ -1849,6 +1851,7 @@ def __init__(
self.disable_output_compression = disable_output_compression
self.enable_infra_check = enable_infra_check
self.enable_remote_debug = enable_remote_debug
self.enable_session_tag_chaining = enable_session_tag_chaining


class JumpStartEstimatorFitKwargs(JumpStartKwargs):
Expand Down
24 changes: 24 additions & 0 deletions src/sagemaker/session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -758,6 +758,7 @@ def train( # noqa: C901
environment: Optional[Dict[str, str]] = None,
retry_strategy=None,
remote_debug_config=None,
session_chaining_config=None,
):
"""Create an Amazon SageMaker training job.

Expand DownExpand Up@@ -877,6 +878,15 @@ def train( # noqa: C901
remote_debug_config = {
"EnableRemoteDebug": True,
}
session_chaining_config(dict): Configuration for SessionChaining. (default: ``None``)
The dict can contain 'EnableSessionTagChaining'(bool).
For example,

.. code:: python

session_chaining_config = {
"EnableSessionTagChaining": True,
}
environment (dict[str, str]) : Environment variables to be set for
use during training job (default: ``None``)
retry_strategy(dict): Defines RetryStrategy for InternalServerFailures.
Expand DownExpand Up@@ -970,6 +980,7 @@ def train( # noqa: C901
profiler_rule_configs=profiler_rule_configs,
profiler_config=inferred_profiler_config,
remote_debug_config=remote_debug_config,
session_chaining_config=session_chaining_config,
environment=environment,
retry_strategy=retry_strategy,
)
Expand DownExpand Up@@ -1013,6 +1024,7 @@ def _get_train_request( # noqa: C901
profiler_rule_configs=None,
profiler_config=None,
remote_debug_config=None,
session_chaining_config=None,
environment=None,
retry_strategy=None,
):
Expand DownExpand Up@@ -1133,6 +1145,15 @@ def _get_train_request( # noqa: C901
remote_debug_config = {
"EnableRemoteDebug": True,
}
session_chaining_config(dict): Configuration for SessionChaining. (default: ``None``)
The dict can contain 'EnableSessionTagChaining'(bool).
For example,

.. code:: python

session_chaining_config = {
"EnableSessionTagChaining": True,
}
environment (dict[str, str]) : Environment variables to be set for
use during training job (default: ``None``)
retry_strategy(dict): Defines RetryStrategy for InternalServerFailures.
Expand DownExpand Up@@ -1239,6 +1260,9 @@ def _get_train_request( # noqa: C901
if remote_debug_config is not None:
train_request["RemoteDebugConfig"] = remote_debug_config

if session_chaining_config is not None:
train_request["SessionChainingConfig"] = session_chaining_config

if retry_strategy is not None:
train_request["RetryStrategy"] = retry_strategy

Expand Down
35 changes: 35 additions & 0 deletions tests/unit/test_estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2089,6 +2089,41 @@ def test_framework_disable_remote_debug(sagemaker_session):
assert len(args) == 2


def test_framework_with_session_chaining_config(sagemaker_session):
f = DummyFramework(
entry_point=SCRIPT_PATH,
role=ROLE,
sagemaker_session=sagemaker_session,
instance_groups=[
InstanceGroup("group1", "ml.c4.xlarge", 1),
InstanceGroup("group2", "ml.m4.xlarge", 2),
],
enable_session_tag_chaining=True,
)
f.fit("s3://mydata")
sagemaker_session.train.assert_called_once()
_, args = sagemaker_session.train.call_args
assert args["session_chaining_config"]["EnableSessionTagChaining"]
assert f.get_session_chaining_config()["EnableSessionTagChaining"]


def test_framework_without_session_chaining_config(sagemaker_session):
f = DummyFramework(
entry_point=SCRIPT_PATH,
role=ROLE,
sagemaker_session=sagemaker_session,
instance_groups=[
InstanceGroup("group1", "ml.c4.xlarge", 1),
InstanceGroup("group2", "ml.m4.xlarge", 2),
],
)
f.fit("s3://mydata")
sagemaker_session.train.assert_called_once()
_, args = sagemaker_session.train.call_args
assert args.get("SessionTagChaining") is None
assert f.get_remote_debug_config() is None


@patch("time.strftime", return_value=TIMESTAMP)
def test_custom_code_bucket(time, sagemaker_session):
code_bucket = "codebucket"
Expand Down
3 changes: 3 additions & 0 deletions tests/unit/test_session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2197,6 +2197,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
CONTAINER_ENTRY_POINT = ["bin/bash", "test.sh"]
CONTAINER_ARGUMENTS = ["--arg1", "value1", "--arg2", "value2"]
remote_debug_config = {"EnableRemoteDebug": True}
session_chaining_config = {"EnableSessionTagChaining": True}

sagemaker_session.train(
image_uri=IMAGE,
Expand All@@ -2222,6 +2223,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
container_entry_point=CONTAINER_ENTRY_POINT,
container_arguments=CONTAINER_ARGUMENTS,
remote_debug_config=remote_debug_config,
session_chaining_config=session_chaining_config,
)

_, _, actual_train_args = sagemaker_session.sagemaker_client.method_calls[0]
Expand All@@ -2245,6 +2247,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
)
assert actual_train_args["AlgorithmSpecification"]["ContainerArguments"] == CONTAINER_ARGUMENTS
assert actual_train_args["RemoteDebugConfig"]["EnableRemoteDebug"]
assert actual_train_args["SessionChainingConfig"]["EnableSessionTagChaining"]


def test_create_transform_job_with_sagemaker_config_injection(sagemaker_session):
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
22 changes: 21 additions & 1 deletion src/sagemaker/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,6 +181,7 @@ def __init__(
container_arguments: Optional[List[str]] = None,
disable_output_compression: bool = False,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
**kwargs,
):
"""Initialize an ``EstimatorBase`` instance.
Expand DownExpand Up@@ -544,7 +545,9 @@ def __init__(
enable_infra_check (bool or PipelineVariable): Optional.
Specifies whether it is running Sagemaker built-in infra check jobs.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
Specifies whether RemoteDebug is enabled for the training job.
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job.
"""
instance_count = renamed_kwargs(
"train_instance_count", "instance_count", instance_count, kwargs
Expand DownExpand Up@@ -785,6 +788,8 @@ def __init__(

self._enable_remote_debug = enable_remote_debug

self._enable_session_tag_chaining = enable_session_tag_chaining

@abstractmethod
def training_image_uri(self):
"""Return the Docker image to use for training.
Expand DownExpand Up@@ -2318,6 +2323,14 @@ def get_remote_debug_config(self):
else {"EnableRemoteDebug": self._enable_remote_debug}
)

def get_session_chaining_config(self):
"""dict: Return the configuration of SessionChaining"""
return (
None
if self._enable_session_tag_chaining is None
else {"EnableSessionTagChaining": self._enable_session_tag_chaining}
)

def enable_remote_debug(self):
"""Enable remote debug for a training job."""
self._update_remote_debug(True)
Expand DownExpand Up@@ -2574,6 +2587,9 @@ def _get_train_args(cls, estimator, inputs, experiment_config):
if estimator.get_remote_debug_config() is not None:
train_args["remote_debug_config"] = estimator.get_remote_debug_config()

if estimator.get_session_chaining_config() is not None:
train_args["session_chaining_config"] = estimator.get_session_chaining_config()

return train_args

@classmethod
Expand DownExpand Up@@ -2766,6 +2782,7 @@ def __init__(
disable_output_compression: bool = False,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
**kwargs,
):
"""Initialize an ``Estimator`` instance.
Expand DownExpand Up@@ -3129,6 +3146,8 @@ def __init__(
Specifies whether it is running Sagemaker built-in infra check jobs.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job
"""
self.image_uri = image_uri
self._hyperparameters = hyperparameters.copy() if hyperparameters else {}
Expand DownExpand Up@@ -3181,6 +3200,7 @@ def __init__(
container_arguments=container_arguments,
disable_output_compression=disable_output_compression,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
**kwargs,
)

Expand Down
4 changes: 4 additions & 0 deletions src/sagemaker/jumpstart/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ def __init__(
container_arguments: Optional[List[str]] = None,
disable_output_compression: Optional[bool] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
):
"""Initializes a ``JumpStartEstimator``.

Expand DownExpand Up@@ -500,6 +501,8 @@ def __init__(
to Amazon S3 without compression after training finishes.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job

Raises:
ValueError: If the model ID is not recognized by JumpStart.
Expand DownExpand Up@@ -578,6 +581,7 @@ def _validate_model_id_and_get_type_hook():
disable_output_compression=disable_output_compression,
enable_infra_check=enable_infra_check,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
)

self.model_id = estimator_init_kwargs.model_id
Expand Down
2 changes: 2 additions & 0 deletions src/sagemaker/jumpstart/factory/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,7 @@ def get_init_kwargs(
disable_output_compression: Optional[bool] = None,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
) -> JumpStartEstimatorInitKwargs:
"""Returns kwargs required to instantiate `sagemaker.estimator.Estimator` object."""

Expand DownExpand Up@@ -188,6 +189,7 @@ def get_init_kwargs(
disable_output_compression=disable_output_compression,
enable_infra_check=enable_infra_check,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
)

estimator_init_kwargs = _add_model_version_to_kwargs(estimator_init_kwargs)
Expand Down
3 changes: 3 additions & 0 deletions src/sagemaker/jumpstart/types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,6 +1723,7 @@ class JumpStartEstimatorInitKwargs(JumpStartKwargs):
"disable_output_compression",
"enable_infra_check",
"enable_remote_debug",
"enable_session_tag_chaining",
]

SERIALIZATION_EXCLUSION_SET = {
Expand DownExpand Up@@ -1790,6 +1791,7 @@ def __init__(
disable_output_compression: Optional[bool] = None,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
) -> None:
"""Instantiates JumpStartEstimatorInitKwargs object."""

Expand DownExpand Up@@ -1849,6 +1851,7 @@ def __init__(
self.disable_output_compression = disable_output_compression
self.enable_infra_check = enable_infra_check
self.enable_remote_debug = enable_remote_debug
self.enable_session_tag_chaining = enable_session_tag_chaining


class JumpStartEstimatorFitKwargs(JumpStartKwargs):
Expand Down
24 changes: 24 additions & 0 deletions src/sagemaker/session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -758,6 +758,7 @@ def train( # noqa: C901
environment: Optional[Dict[str, str]] = None,
retry_strategy=None,
remote_debug_config=None,
session_chaining_config=None,
):
"""Create an Amazon SageMaker training job.

Expand DownExpand Up@@ -877,6 +878,15 @@ def train( # noqa: C901
remote_debug_config = {
"EnableRemoteDebug": True,
}
session_chaining_config(dict): Configuration for SessionChaining. (default: ``None``)
The dict can contain 'EnableSessionTagChaining'(bool).
For example,

.. code:: python

session_chaining_config = {
"EnableSessionTagChaining": True,
}
environment (dict[str, str]) : Environment variables to be set for
use during training job (default: ``None``)
retry_strategy(dict): Defines RetryStrategy for InternalServerFailures.
Expand DownExpand Up@@ -970,6 +980,7 @@ def train( # noqa: C901
profiler_rule_configs=profiler_rule_configs,
profiler_config=inferred_profiler_config,
remote_debug_config=remote_debug_config,
session_chaining_config=session_chaining_config,
environment=environment,
retry_strategy=retry_strategy,
)
Expand DownExpand Up@@ -1013,6 +1024,7 @@ def _get_train_request( # noqa: C901
profiler_rule_configs=None,
profiler_config=None,
remote_debug_config=None,
session_chaining_config=None,
environment=None,
retry_strategy=None,
):
Expand DownExpand Up@@ -1133,6 +1145,15 @@ def _get_train_request( # noqa: C901
remote_debug_config = {
"EnableRemoteDebug": True,
}
session_chaining_config(dict): Configuration for SessionChaining. (default: ``None``)
The dict can contain 'EnableSessionTagChaining'(bool).
For example,

.. code:: python

session_chaining_config = {
"EnableSessionTagChaining": True,
}
environment (dict[str, str]) : Environment variables to be set for
use during training job (default: ``None``)
retry_strategy(dict): Defines RetryStrategy for InternalServerFailures.
Expand DownExpand Up@@ -1239,6 +1260,9 @@ def _get_train_request( # noqa: C901
if remote_debug_config is not None:
train_request["RemoteDebugConfig"] = remote_debug_config

if session_chaining_config is not None:
train_request["SessionChainingConfig"] = session_chaining_config

if retry_strategy is not None:
train_request["RetryStrategy"] = retry_strategy

Expand Down
35 changes: 35 additions & 0 deletions tests/unit/test_estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2089,6 +2089,41 @@ def test_framework_disable_remote_debug(sagemaker_session):
assert len(args) == 2


def test_framework_with_session_chaining_config(sagemaker_session):
f = DummyFramework(
entry_point=SCRIPT_PATH,
role=ROLE,
sagemaker_session=sagemaker_session,
instance_groups=[
InstanceGroup("group1", "ml.c4.xlarge", 1),
InstanceGroup("group2", "ml.m4.xlarge", 2),
],
enable_session_tag_chaining=True,
)
f.fit("s3://mydata")
sagemaker_session.train.assert_called_once()
_, args = sagemaker_session.train.call_args
assert args["session_chaining_config"]["EnableSessionTagChaining"]
assert f.get_session_chaining_config()["EnableSessionTagChaining"]


def test_framework_without_session_chaining_config(sagemaker_session):
f = DummyFramework(
entry_point=SCRIPT_PATH,
role=ROLE,
sagemaker_session=sagemaker_session,
instance_groups=[
InstanceGroup("group1", "ml.c4.xlarge", 1),
InstanceGroup("group2", "ml.m4.xlarge", 2),
],
)
f.fit("s3://mydata")
sagemaker_session.train.assert_called_once()
_, args = sagemaker_session.train.call_args
assert args.get("SessionTagChaining") is None
assert f.get_remote_debug_config() is None


@patch("time.strftime", return_value=TIMESTAMP)
def test_custom_code_bucket(time, sagemaker_session):
code_bucket = "codebucket"
Expand Down
3 changes: 3 additions & 0 deletions tests/unit/test_session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2197,6 +2197,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
CONTAINER_ENTRY_POINT = ["bin/bash", "test.sh"]
CONTAINER_ARGUMENTS = ["--arg1", "value1", "--arg2", "value2"]
remote_debug_config = {"EnableRemoteDebug": True}
session_chaining_config = {"EnableSessionTagChaining": True}

sagemaker_session.train(
image_uri=IMAGE,
Expand All@@ -2222,6 +2223,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
container_entry_point=CONTAINER_ENTRY_POINT,
container_arguments=CONTAINER_ARGUMENTS,
remote_debug_config=remote_debug_config,
session_chaining_config=session_chaining_config,
)

_, _, actual_train_args = sagemaker_session.sagemaker_client.method_calls[0]
Expand All@@ -2245,6 +2247,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
)
assert actual_train_args["AlgorithmSpecification"]["ContainerArguments"] == CONTAINER_ARGUMENTS
assert actual_train_args["RemoteDebugConfig"]["EnableRemoteDebug"]
assert actual_train_args["SessionChainingConfig"]["EnableSessionTagChaining"]


def test_create_transform_job_with_sagemaker_config_injection(sagemaker_session):
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
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
22 changes: 21 additions & 1 deletion src/sagemaker/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,6 +181,7 @@ def __init__(
container_arguments: Optional[List[str]] = None,
disable_output_compression: bool = False,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
**kwargs,
):
"""Initialize an ``EstimatorBase`` instance.
Expand DownExpand Up@@ -544,7 +545,9 @@ def __init__(
enable_infra_check (bool or PipelineVariable): Optional.
Specifies whether it is running Sagemaker built-in infra check jobs.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
Specifies whether RemoteDebug is enabled for the training job.
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job.
"""
instance_count = renamed_kwargs(
"train_instance_count", "instance_count", instance_count, kwargs
Expand DownExpand Up@@ -785,6 +788,8 @@ def __init__(

self._enable_remote_debug = enable_remote_debug

self._enable_session_tag_chaining = enable_session_tag_chaining

@abstractmethod
def training_image_uri(self):
"""Return the Docker image to use for training.
Expand DownExpand Up@@ -2318,6 +2323,14 @@ def get_remote_debug_config(self):
else {"EnableRemoteDebug": self._enable_remote_debug}
)

def get_session_chaining_config(self):
"""dict: Return the configuration of SessionChaining"""
return (
None
if self._enable_session_tag_chaining is None
else {"EnableSessionTagChaining": self._enable_session_tag_chaining}
)

def enable_remote_debug(self):
"""Enable remote debug for a training job."""
self._update_remote_debug(True)
Expand DownExpand Up@@ -2574,6 +2587,9 @@ def _get_train_args(cls, estimator, inputs, experiment_config):
if estimator.get_remote_debug_config() is not None:
train_args["remote_debug_config"] = estimator.get_remote_debug_config()

if estimator.get_session_chaining_config() is not None:
train_args["session_chaining_config"] = estimator.get_session_chaining_config()

return train_args

@classmethod
Expand DownExpand Up@@ -2766,6 +2782,7 @@ def __init__(
disable_output_compression: bool = False,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
**kwargs,
):
"""Initialize an ``Estimator`` instance.
Expand DownExpand Up@@ -3129,6 +3146,8 @@ def __init__(
Specifies whether it is running Sagemaker built-in infra check jobs.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job
"""
self.image_uri = image_uri
self._hyperparameters = hyperparameters.copy() if hyperparameters else {}
Expand DownExpand Up@@ -3181,6 +3200,7 @@ def __init__(
container_arguments=container_arguments,
disable_output_compression=disable_output_compression,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
**kwargs,
)

Expand Down
4 changes: 4 additions & 0 deletions src/sagemaker/jumpstart/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,7 @@ def __init__(
container_arguments: Optional[List[str]] = None,
disable_output_compression: Optional[bool] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
):
"""Initializes a ``JumpStartEstimator``.

Expand DownExpand Up@@ -500,6 +501,8 @@ def __init__(
to Amazon S3 without compression after training finishes.
enable_remote_debug (bool or PipelineVariable): Optional.
Specifies whether RemoteDebug is enabled for the training job
enable_session_tag_chaining (bool or PipelineVariable): Optional.
Specifies whether SessionTagChaining is enabled for the training job

Raises:
ValueError: If the model ID is not recognized by JumpStart.
Expand DownExpand Up@@ -578,6 +581,7 @@ def _validate_model_id_and_get_type_hook():
disable_output_compression=disable_output_compression,
enable_infra_check=enable_infra_check,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
)

self.model_id = estimator_init_kwargs.model_id
Expand Down
2 changes: 2 additions & 0 deletions src/sagemaker/jumpstart/factory/estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,7 @@ def get_init_kwargs(
disable_output_compression: Optional[bool] = None,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
) -> JumpStartEstimatorInitKwargs:
"""Returns kwargs required to instantiate `sagemaker.estimator.Estimator` object."""

Expand DownExpand Up@@ -188,6 +189,7 @@ def get_init_kwargs(
disable_output_compression=disable_output_compression,
enable_infra_check=enable_infra_check,
enable_remote_debug=enable_remote_debug,
enable_session_tag_chaining=enable_session_tag_chaining,
)

estimator_init_kwargs = _add_model_version_to_kwargs(estimator_init_kwargs)
Expand Down
3 changes: 3 additions & 0 deletions src/sagemaker/jumpstart/types.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -1723,6 +1723,7 @@ class JumpStartEstimatorInitKwargs(JumpStartKwargs):
"disable_output_compression",
"enable_infra_check",
"enable_remote_debug",
"enable_session_tag_chaining",
]

SERIALIZATION_EXCLUSION_SET = {
Expand DownExpand Up@@ -1790,6 +1791,7 @@ def __init__(
disable_output_compression: Optional[bool] = None,
enable_infra_check: Optional[Union[bool, PipelineVariable]] = None,
enable_remote_debug: Optional[Union[bool, PipelineVariable]] = None,
enable_session_tag_chaining: Optional[Union[bool, PipelineVariable]] = None,
) -> None:
"""Instantiates JumpStartEstimatorInitKwargs object."""

Expand DownExpand Up@@ -1849,6 +1851,7 @@ def __init__(
self.disable_output_compression = disable_output_compression
self.enable_infra_check = enable_infra_check
self.enable_remote_debug = enable_remote_debug
self.enable_session_tag_chaining = enable_session_tag_chaining


class JumpStartEstimatorFitKwargs(JumpStartKwargs):
Expand Down
24 changes: 24 additions & 0 deletions src/sagemaker/session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -758,6 +758,7 @@ def train( # noqa: C901
environment: Optional[Dict[str, str]] = None,
retry_strategy=None,
remote_debug_config=None,
session_chaining_config=None,
):
"""Create an Amazon SageMaker training job.

Expand DownExpand Up@@ -877,6 +878,15 @@ def train( # noqa: C901
remote_debug_config = {
"EnableRemoteDebug": True,
}
session_chaining_config(dict): Configuration for SessionChaining. (default: ``None``)
The dict can contain 'EnableSessionTagChaining'(bool).
For example,

.. code:: python

session_chaining_config = {
"EnableSessionTagChaining": True,
}
environment (dict[str, str]) : Environment variables to be set for
use during training job (default: ``None``)
retry_strategy(dict): Defines RetryStrategy for InternalServerFailures.
Expand DownExpand Up@@ -970,6 +980,7 @@ def train( # noqa: C901
profiler_rule_configs=profiler_rule_configs,
profiler_config=inferred_profiler_config,
remote_debug_config=remote_debug_config,
session_chaining_config=session_chaining_config,
environment=environment,
retry_strategy=retry_strategy,
)
Expand DownExpand Up@@ -1013,6 +1024,7 @@ def _get_train_request( # noqa: C901
profiler_rule_configs=None,
profiler_config=None,
remote_debug_config=None,
session_chaining_config=None,
environment=None,
retry_strategy=None,
):
Expand DownExpand Up@@ -1133,6 +1145,15 @@ def _get_train_request( # noqa: C901
remote_debug_config = {
"EnableRemoteDebug": True,
}
session_chaining_config(dict): Configuration for SessionChaining. (default: ``None``)
The dict can contain 'EnableSessionTagChaining'(bool).
For example,

.. code:: python

session_chaining_config = {
"EnableSessionTagChaining": True,
}
environment (dict[str, str]) : Environment variables to be set for
use during training job (default: ``None``)
retry_strategy(dict): Defines RetryStrategy for InternalServerFailures.
Expand DownExpand Up@@ -1239,6 +1260,9 @@ def _get_train_request( # noqa: C901
if remote_debug_config is not None:
train_request["RemoteDebugConfig"] = remote_debug_config

if session_chaining_config is not None:
train_request["SessionChainingConfig"] = session_chaining_config

if retry_strategy is not None:
train_request["RetryStrategy"] = retry_strategy

Expand Down
35 changes: 35 additions & 0 deletions tests/unit/test_estimator.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2089,6 +2089,41 @@ def test_framework_disable_remote_debug(sagemaker_session):
assert len(args) == 2


def test_framework_with_session_chaining_config(sagemaker_session):
f = DummyFramework(
entry_point=SCRIPT_PATH,
role=ROLE,
sagemaker_session=sagemaker_session,
instance_groups=[
InstanceGroup("group1", "ml.c4.xlarge", 1),
InstanceGroup("group2", "ml.m4.xlarge", 2),
],
enable_session_tag_chaining=True,
)
f.fit("s3://mydata")
sagemaker_session.train.assert_called_once()
_, args = sagemaker_session.train.call_args
assert args["session_chaining_config"]["EnableSessionTagChaining"]
assert f.get_session_chaining_config()["EnableSessionTagChaining"]


def test_framework_without_session_chaining_config(sagemaker_session):
f = DummyFramework(
entry_point=SCRIPT_PATH,
role=ROLE,
sagemaker_session=sagemaker_session,
instance_groups=[
InstanceGroup("group1", "ml.c4.xlarge", 1),
InstanceGroup("group2", "ml.m4.xlarge", 2),
],
)
f.fit("s3://mydata")
sagemaker_session.train.assert_called_once()
_, args = sagemaker_session.train.call_args
assert args.get("SessionTagChaining") is None
assert f.get_remote_debug_config() is None


@patch("time.strftime", return_value=TIMESTAMP)
def test_custom_code_bucket(time, sagemaker_session):
code_bucket = "codebucket"
Expand Down
3 changes: 3 additions & 0 deletions tests/unit/test_session.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2197,6 +2197,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
CONTAINER_ENTRY_POINT = ["bin/bash", "test.sh"]
CONTAINER_ARGUMENTS = ["--arg1", "value1", "--arg2", "value2"]
remote_debug_config = {"EnableRemoteDebug": True}
session_chaining_config = {"EnableSessionTagChaining": True}

sagemaker_session.train(
image_uri=IMAGE,
Expand All@@ -2222,6 +2223,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
container_entry_point=CONTAINER_ENTRY_POINT,
container_arguments=CONTAINER_ARGUMENTS,
remote_debug_config=remote_debug_config,
session_chaining_config=session_chaining_config,
)

_, _, actual_train_args = sagemaker_session.sagemaker_client.method_calls[0]
Expand All@@ -2245,6 +2247,7 @@ def test_train_pack_to_request_with_optional_params(sagemaker_session):
)
assert actual_train_args["AlgorithmSpecification"]["ContainerArguments"] == CONTAINER_ARGUMENTS
assert actual_train_args["RemoteDebugConfig"]["EnableRemoteDebug"]
assert actual_train_args["SessionChainingConfig"]["EnableSessionTagChaining"]


def test_create_transform_job_with_sagemaker_config_injection(sagemaker_session):
Expand Down