change: use generated RL version fixtures and update Ray version#1769

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
laurenyu merged 2 commits into from
Jul 29, 2020
Merged

change: use generated RL version fixtures and update Ray version #1769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c968c8d
use generated fixtures for RL versions
laurenyu Jul 29, 2020
fbbfb30
port other changes from aws/sagemaker-python-sdk#1618
laurenyu Jul 29, 2020
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
3 changes: 2 additions & 1 deletion src/sagemaker/rl/estimator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@
"0.11.0": {"tensorflow": "1.11", "mxnet": "1.3"},
"0.11.1": {"tensorflow": "1.12"},
"0.11": {"tensorflow": "1.12", "mxnet": "1.3"},
"1.0.0": {"tensorflow": "1.12"},
},
"ray": {
"0.5.3": {"tensorflow": "1.11"},
Expand DownExpand Up@@ -68,7 +69,7 @@ class RLEstimator(Framework):

COACH_LATEST_VERSION_TF = "0.11.1"
COACH_LATEST_VERSION_MXNET = "0.11.0"
RAY_LATEST_VERSION = "0.6.5"
RAY_LATEST_VERSION = "0.8.5"

def __init__(
self,
Expand Down
46 changes: 5 additions & 41 deletions tests/conftest.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@

from sagemaker import Session, image_uris, utils
from sagemaker.local import LocalSession
from sagemaker.rl import RLEstimator
import tests.integ

DEFAULT_REGION = "us-west-2"
Expand All@@ -41,15 +40,20 @@

FRAMEWORKS_FOR_GENERATED_VERSION_FIXTURES = (
"chainer",
"coach_mxnet",
"coach_tensorflow",
"inferentia_mxnet",
"inferentia_tensorflow",
"mxnet",
"neo_mxnet",
"neo_pytorch",
"neo_tensorflow",
"pytorch",
"ray_pytorch",
"ray_tensorflow",
"sklearn",
"tensorflow",
"vw",
"xgboost",
)

Expand DownExpand Up@@ -181,46 +185,6 @@ def _tf_py_version(tf_version, request):
return "py37"


@pytest.fixture(scope="module", params=["0.10.1", "0.10.1", "0.11", "0.11.0", "0.11.1"])
def rl_coach_tf_version(request):
return request.param


@pytest.fixture(scope="module", params=["0.11", "0.11.0"])
def rl_coach_mxnet_version(request):
return request.param


@pytest.fixture(scope="module", params=["0.5", "0.5.3", "0.6", "0.6.5", "0.8.2", "0.8.5"])
def rl_ray_tf_version(request):
return request.param


@pytest.fixture(scope="module", params=["0.8.5"])
def rl_ray_pytorch_version(request):
return request.param


@pytest.fixture(scope="module", params=["8.7.0"])
def rl_vw_version(request):
return request.param


@pytest.fixture(scope="module")
def rl_coach_mxnet_full_version():
return RLEstimator.COACH_LATEST_VERSION_MXNET


@pytest.fixture(scope="module")
def rl_coach_tf_full_version():
return RLEstimator.COACH_LATEST_VERSION_TF


@pytest.fixture(scope="module")
def rl_ray_full_version():
return RLEstimator.RAY_LATEST_VERSION


@pytest.fixture(scope="module")
def tf_full_version(tensorflow_training_latest_version, tensorflow_inference_latest_version):
"""Fixture for TF tests that test both training and inference.
Expand Down
4 changes: 2 additions & 2 deletions tests/data/ray_cartpole/train_ray.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,12 @@
from ray.tune.logger import pretty_print

# Based on https://github.com/ray-project/ray/blob/master/doc/source/rllib-training.rst#python-api
ray.init(log_to_driver=False)
ray.init(log_to_driver=False, webui_host="127.0.0.1")
config = ppo.DEFAULT_CONFIG.copy()
config["num_gpus"] = int(os.environ.get("SM_NUM_GPUS", 0))
checkpoint_dir = os.environ.get("SM_MODEL_DIR", "/Users/nadzeya/gym")
config["num_workers"] = 1
agent = ppo.PPOAgent(config=config, env="CartPole-v0")
agent = ppo.PPOTrainer(config=config, env="CartPole-v0")

# Can optionally call agent.restore(path) to load a checkpoint.

Expand Down
15 changes: 9 additions & 6 deletions tests/integ/test_rl.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,9 +24,9 @@


@pytest.mark.canary_quick
def test_coach_mxnet(sagemaker_session, rl_coach_mxnet_full_version, cpu_instance_type):
def test_coach_mxnet(sagemaker_session, coach_mxnet_latest_version, cpu_instance_type):
estimator = _test_coach(
sagemaker_session, RLFramework.MXNET, rl_coach_mxnet_full_version, cpu_instance_type
sagemaker_session, RLFramework.MXNET, coach_mxnet_latest_version, cpu_instance_type
)
job_name = unique_name_from_base("test-coach-mxnet")

Expand All@@ -51,9 +51,12 @@ def test_coach_mxnet(sagemaker_session, rl_coach_mxnet_full_version, cpu_instanc
assert 0 < action[0][1] < 1


def test_coach_tf(sagemaker_session, rl_coach_tf_full_version, cpu_instance_type):
def test_coach_tf(sagemaker_session, coach_tensorflow_latest_version, cpu_instance_type):
estimator = _test_coach(
sagemaker_session, RLFramework.TENSORFLOW, rl_coach_tf_full_version, cpu_instance_type
sagemaker_session,
RLFramework.TENSORFLOW,
coach_tensorflow_latest_version,
cpu_instance_type,
)
job_name = unique_name_from_base("test-coach-tf")

Expand DownExpand Up@@ -96,7 +99,7 @@ def _test_coach(sagemaker_session, rl_framework, rl_coach_version, cpu_instance_


@pytest.mark.canary_quick
def test_ray_tf(sagemaker_session, rl_ray_full_version, cpu_instance_type):
def test_ray_tf(sagemaker_session, ray_tensorflow_latest_version, cpu_instance_type):
source_dir = os.path.join(DATA_DIR, "ray_cartpole")
cartpole = "train_ray.py"

Expand All@@ -105,7 +108,7 @@ def test_ray_tf(sagemaker_session, rl_ray_full_version, cpu_instance_type):
source_dir=source_dir,
toolkit=RLToolkit.RAY,
framework=RLFramework.TENSORFLOW,
toolkit_version=rl_ray_full_version,
toolkit_version=ray_tensorflow_latest_version,
sagemaker_session=sagemaker_session,
role="SageMakerRole",
instance_type=cpu_instance_type,
Expand Down
31 changes: 17 additions & 14 deletions tests/unit/sagemaker/image_uris/test_rl.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,12 +31,15 @@ def _version_for_tag(toolkit, toolkit_version, framework, framework_in_tag=False
return "{}{}".format(toolkit, toolkit_version)


def test_coach_tf(rl_coach_tf_version):
def test_coach_tf(coach_tensorflow_version):
for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
uri = image_uris.retrieve(
"coach-tensorflow", REGION, version=rl_coach_tf_version, instance_type=instance_type
"coach-tensorflow",
REGION,
version=coach_tensorflow_version,
instance_type=instance_type,
)
assert _expected_coach_tf_uri(rl_coach_tf_version, processor) == uri
assert _expected_coach_tf_uri(coach_tensorflow_version, processor) == uri


def _expected_coach_tf_uri(coach_tf_version, processor):
Expand All@@ -58,28 +61,28 @@ def _expected_coach_tf_uri(coach_tf_version, processor):
)


def test_coach_mxnet(rl_coach_mxnet_version):
def test_coach_mxnet(coach_mxnet_version):
for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
uri = image_uris.retrieve(
"coach-mxnet", REGION, version=rl_coach_mxnet_version, instance_type=instance_type
"coach-mxnet", REGION, version=coach_mxnet_version, instance_type=instance_type
)

expected = expected_uris.framework_uri(
"sagemaker-rl-mxnet",
"coach{}".format(rl_coach_mxnet_version),
"coach{}".format(coach_mxnet_version),
SAGEMAKER_ACCOUNT,
py_version="py3",
processor=processor,
)
assert expected == uri


def test_ray_tf(rl_ray_tf_version):
def test_ray_tf(ray_tensorflow_version):
for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
uri = image_uris.retrieve(
"ray-tensorflow", REGION, version=rl_ray_tf_version, instance_type=instance_type
"ray-tensorflow", REGION, version=ray_tensorflow_version, instance_type=instance_type
)
assert _expected_ray_tf_uri(rl_ray_tf_version, processor) == uri
assert _expected_ray_tf_uri(ray_tensorflow_version, processor) == uri


def _expected_ray_tf_uri(ray_tf_version, processor):
Expand All@@ -101,15 +104,15 @@ def _expected_ray_tf_uri(ray_tf_version, processor):
)


def test_ray_pytorch(rl_ray_pytorch_version):
def test_ray_pytorch(ray_pytorch_version):
for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
uri = image_uris.retrieve(
"ray-pytorch", REGION, version=rl_ray_pytorch_version, instance_type=instance_type
"ray-pytorch", REGION, version=ray_pytorch_version, instance_type=instance_type
)

expected = expected_uris.framework_uri(
"sagemaker-rl-ray-container",
"ray-{}-torch".format(rl_ray_pytorch_version),
"ray-{}-torch".format(ray_pytorch_version),
RL_ACCOUNT,
py_version="py36",
processor=processor,
Expand All@@ -118,8 +121,8 @@ def test_ray_pytorch(rl_ray_pytorch_version):
assert expected == uri


def test_vw(rl_vw_version):
version = "vw-{}".format(rl_vw_version)
def test_vw(vw_version):
version = "vw-{}".format(vw_version)
uri = image_uris.retrieve("vw", REGION, version=version, instance_type="ml.c4.xlarge")

expected = expected_uris.framework_uri("sagemaker-rl-vw-container", version, RL_ACCOUNT)
Expand Down
Loading
, '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
change: use generated RL version fixtures and update Ray version#1769

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

laurenyu
merged 2 commits into

from

Jul 29, 2020
 Merged


change: use generated RL version fixtures and update Ray version
#1769
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c968c8d

use generated fixtures for RL versions


laurenyu Jul 29, 2020
fbbfb30

port other changes from aws/sagemaker-python-sdk#1618


laurenyu Jul 29, 2020

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


3 changes: 2 additions & 1 deletion
src/sagemaker/rl/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@
 "0.11.0": {"tensorflow": "1.11", "mxnet": "1.3"},
 "0.11.1": {"tensorflow": "1.12"},
 "0.11": {"tensorflow": "1.12", "mxnet": "1.3"},
 "1.0.0": {"tensorflow": "1.12"},
 },
 "ray": {
 "0.5.3": {"tensorflow": "1.11"},
Expand DownExpand Up@@ -68,7 +69,7 @@ class RLEstimator(Framework):

 COACH_LATEST_VERSION_TF = "0.11.1"
 COACH_LATEST_VERSION_MXNET = "0.11.0"
 RAY_LATEST_VERSION = "0.6.5"
 RAY_LATEST_VERSION = "0.8.5"

 def __init__(
 self,
Expand Down

46 changes: 5 additions & 41 deletions
tests/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@

from sagemaker import Session, image_uris, utils
from sagemaker.local import LocalSession
from sagemaker.rl import RLEstimator
import tests.integ

DEFAULT_REGION = "us-west-2"
Expand All@@ -41,15 +40,20 @@

FRAMEWORKS_FOR_GENERATED_VERSION_FIXTURES = (
 "chainer",
 "coach_mxnet",
 "coach_tensorflow",
 "inferentia_mxnet",
 "inferentia_tensorflow",
 "mxnet",
 "neo_mxnet",
 "neo_pytorch",
 "neo_tensorflow",
 "pytorch",
 "ray_pytorch",
 "ray_tensorflow",
 "sklearn",
 "tensorflow",
 "vw",
 "xgboost",
)

Expand DownExpand Up@@ -181,46 +185,6 @@ def _tf_py_version(tf_version, request):
 return "py37"


@pytest.fixture(scope="module", params=["0.10.1", "0.10.1", "0.11", "0.11.0", "0.11.1"])
def rl_coach_tf_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.11", "0.11.0"])
def rl_coach_mxnet_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.5", "0.5.3", "0.6", "0.6.5", "0.8.2", "0.8.5"])
def rl_ray_tf_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.8.5"])
def rl_ray_pytorch_version(request):
 return request.param


@pytest.fixture(scope="module", params=["8.7.0"])
def rl_vw_version(request):
 return request.param


@pytest.fixture(scope="module")
def rl_coach_mxnet_full_version():
 return RLEstimator.COACH_LATEST_VERSION_MXNET


@pytest.fixture(scope="module")
def rl_coach_tf_full_version():
 return RLEstimator.COACH_LATEST_VERSION_TF


@pytest.fixture(scope="module")
def rl_ray_full_version():
 return RLEstimator.RAY_LATEST_VERSION


@pytest.fixture(scope="module")
def tf_full_version(tensorflow_training_latest_version, tensorflow_inference_latest_version):
 """Fixture for TF tests that test both training and inference.
Expand Down

4 changes: 2 additions & 2 deletions
tests/data/ray_cartpole/train_ray.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,12 @@
from ray.tune.logger import pretty_print

# Based on https://github.com/ray-project/ray/blob/master/doc/source/rllib-training.rst#python-api
ray.init(log_to_driver=False)
ray.init(log_to_driver=False, webui_host="127.0.0.1")
config = ppo.DEFAULT_CONFIG.copy()
config["num_gpus"] = int(os.environ.get("SM_NUM_GPUS", 0))
checkpoint_dir = os.environ.get("SM_MODEL_DIR", "/Users/nadzeya/gym")
config["num_workers"] = 1
agent = ppo.PPOAgent(config=config, env="CartPole-v0")
agent = ppo.PPOTrainer(config=config, env="CartPole-v0")

# Can optionally call agent.restore(path) to load a checkpoint.

Expand Down

15 changes: 9 additions & 6 deletions
tests/integ/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,9 +24,9 @@


@pytest.mark.canary_quick
def test_coach_mxnet(sagemaker_session, rl_coach_mxnet_full_version, cpu_instance_type):
def test_coach_mxnet(sagemaker_session, coach_mxnet_latest_version, cpu_instance_type):
 estimator = _test_coach(
 sagemaker_session, RLFramework.MXNET, rl_coach_mxnet_full_version, cpu_instance_type
 sagemaker_session, RLFramework.MXNET, coach_mxnet_latest_version, cpu_instance_type
 )
 job_name = unique_name_from_base("test-coach-mxnet")

Expand All@@ -51,9 +51,12 @@ def test_coach_mxnet(sagemaker_session, rl_coach_mxnet_full_version, cpu_instanc
 assert 0 < action[0][1] < 1


def test_coach_tf(sagemaker_session, rl_coach_tf_full_version, cpu_instance_type):
def test_coach_tf(sagemaker_session, coach_tensorflow_latest_version, cpu_instance_type):
 estimator = _test_coach(
 sagemaker_session, RLFramework.TENSORFLOW, rl_coach_tf_full_version, cpu_instance_type
 sagemaker_session,
 RLFramework.TENSORFLOW,
 coach_tensorflow_latest_version,
 cpu_instance_type,
 )
 job_name = unique_name_from_base("test-coach-tf")

Expand DownExpand Up@@ -96,7 +99,7 @@ def _test_coach(sagemaker_session, rl_framework, rl_coach_version, cpu_instance_


@pytest.mark.canary_quick
def test_ray_tf(sagemaker_session, rl_ray_full_version, cpu_instance_type):
def test_ray_tf(sagemaker_session, ray_tensorflow_latest_version, cpu_instance_type):
 source_dir = os.path.join(DATA_DIR, "ray_cartpole")
 cartpole = "train_ray.py"

Expand All@@ -105,7 +108,7 @@ def test_ray_tf(sagemaker_session, rl_ray_full_version, cpu_instance_type):
 source_dir=source_dir,
 toolkit=RLToolkit.RAY,
 framework=RLFramework.TENSORFLOW,
 toolkit_version=rl_ray_full_version,
 toolkit_version=ray_tensorflow_latest_version,
 sagemaker_session=sagemaker_session,
 role="SageMakerRole",
 instance_type=cpu_instance_type,
Expand Down

31 changes: 17 additions & 14 deletions
tests/unit/sagemaker/image_uris/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,12 +31,15 @@ def _version_for_tag(toolkit, toolkit_version, framework, framework_in_tag=False
 return "{}{}".format(toolkit, toolkit_version)


def test_coach_tf(rl_coach_tf_version):
def test_coach_tf(coach_tensorflow_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "coach-tensorflow", REGION, version=rl_coach_tf_version, instance_type=instance_type
 "coach-tensorflow",
 REGION,
 version=coach_tensorflow_version,
 instance_type=instance_type,
 )
 assert _expected_coach_tf_uri(rl_coach_tf_version, processor) == uri
 assert _expected_coach_tf_uri(coach_tensorflow_version, processor) == uri


def _expected_coach_tf_uri(coach_tf_version, processor):
Expand All@@ -58,28 +61,28 @@ def _expected_coach_tf_uri(coach_tf_version, processor):
 )


def test_coach_mxnet(rl_coach_mxnet_version):
def test_coach_mxnet(coach_mxnet_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "coach-mxnet", REGION, version=rl_coach_mxnet_version, instance_type=instance_type
 "coach-mxnet", REGION, version=coach_mxnet_version, instance_type=instance_type
 )

 expected = expected_uris.framework_uri(
 "sagemaker-rl-mxnet",
 "coach{}".format(rl_coach_mxnet_version),
 "coach{}".format(coach_mxnet_version),
 SAGEMAKER_ACCOUNT,
 py_version="py3",
 processor=processor,
 )
 assert expected == uri


def test_ray_tf(rl_ray_tf_version):
def test_ray_tf(ray_tensorflow_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "ray-tensorflow", REGION, version=rl_ray_tf_version, instance_type=instance_type
 "ray-tensorflow", REGION, version=ray_tensorflow_version, instance_type=instance_type
 )
 assert _expected_ray_tf_uri(rl_ray_tf_version, processor) == uri
 assert _expected_ray_tf_uri(ray_tensorflow_version, processor) == uri


def _expected_ray_tf_uri(ray_tf_version, processor):
Expand All@@ -101,15 +104,15 @@ def _expected_ray_tf_uri(ray_tf_version, processor):
 )


def test_ray_pytorch(rl_ray_pytorch_version):
def test_ray_pytorch(ray_pytorch_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "ray-pytorch", REGION, version=rl_ray_pytorch_version, instance_type=instance_type
 "ray-pytorch", REGION, version=ray_pytorch_version, instance_type=instance_type
 )

 expected = expected_uris.framework_uri(
 "sagemaker-rl-ray-container",
 "ray-{}-torch".format(rl_ray_pytorch_version),
 "ray-{}-torch".format(ray_pytorch_version),
 RL_ACCOUNT,
 py_version="py36",
 processor=processor,
Expand All@@ -118,8 +121,8 @@ def test_ray_pytorch(rl_ray_pytorch_version):
 assert expected == uri


def test_vw(rl_vw_version):
 version = "vw-{}".format(rl_vw_version)
def test_vw(vw_version):
 version = "vw-{}".format(vw_version)
 uri = image_uris.retrieve("vw", REGION, version=version, instance_type="ml.c4.xlarge")

 expected = expected_uris.framework_uri("sagemaker-rl-vw-container", version, RL_ACCOUNT)
Expand Down
Loading

, '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
change: use generated RL version fixtures and update Ray version#1769

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

laurenyu
merged 2 commits into

from

Jul 29, 2020
 Merged


change: use generated RL version fixtures and update Ray version
#1769
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c968c8d

use generated fixtures for RL versions


laurenyu Jul 29, 2020
fbbfb30

port other changes from aws/sagemaker-python-sdk#1618


laurenyu Jul 29, 2020

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


3 changes: 2 additions & 1 deletion
src/sagemaker/rl/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@
 "0.11.0": {"tensorflow": "1.11", "mxnet": "1.3"},
 "0.11.1": {"tensorflow": "1.12"},
 "0.11": {"tensorflow": "1.12", "mxnet": "1.3"},
 "1.0.0": {"tensorflow": "1.12"},
 },
 "ray": {
 "0.5.3": {"tensorflow": "1.11"},
Expand DownExpand Up@@ -68,7 +69,7 @@ class RLEstimator(Framework):

 COACH_LATEST_VERSION_TF = "0.11.1"
 COACH_LATEST_VERSION_MXNET = "0.11.0"
 RAY_LATEST_VERSION = "0.6.5"
 RAY_LATEST_VERSION = "0.8.5"

 def __init__(
 self,
Expand Down

46 changes: 5 additions & 41 deletions
tests/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@

from sagemaker import Session, image_uris, utils
from sagemaker.local import LocalSession
from sagemaker.rl import RLEstimator
import tests.integ

DEFAULT_REGION = "us-west-2"
Expand All@@ -41,15 +40,20 @@

FRAMEWORKS_FOR_GENERATED_VERSION_FIXTURES = (
 "chainer",
 "coach_mxnet",
 "coach_tensorflow",
 "inferentia_mxnet",
 "inferentia_tensorflow",
 "mxnet",
 "neo_mxnet",
 "neo_pytorch",
 "neo_tensorflow",
 "pytorch",
 "ray_pytorch",
 "ray_tensorflow",
 "sklearn",
 "tensorflow",
 "vw",
 "xgboost",
)

Expand DownExpand Up@@ -181,46 +185,6 @@ def _tf_py_version(tf_version, request):
 return "py37"


@pytest.fixture(scope="module", params=["0.10.1", "0.10.1", "0.11", "0.11.0", "0.11.1"])
def rl_coach_tf_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.11", "0.11.0"])
def rl_coach_mxnet_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.5", "0.5.3", "0.6", "0.6.5", "0.8.2", "0.8.5"])
def rl_ray_tf_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.8.5"])
def rl_ray_pytorch_version(request):
 return request.param


@pytest.fixture(scope="module", params=["8.7.0"])
def rl_vw_version(request):
 return request.param


@pytest.fixture(scope="module")
def rl_coach_mxnet_full_version():
 return RLEstimator.COACH_LATEST_VERSION_MXNET


@pytest.fixture(scope="module")
def rl_coach_tf_full_version():
 return RLEstimator.COACH_LATEST_VERSION_TF


@pytest.fixture(scope="module")
def rl_ray_full_version():
 return RLEstimator.RAY_LATEST_VERSION


@pytest.fixture(scope="module")
def tf_full_version(tensorflow_training_latest_version, tensorflow_inference_latest_version):
 """Fixture for TF tests that test both training and inference.
Expand Down

4 changes: 2 additions & 2 deletions
tests/data/ray_cartpole/train_ray.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,12 @@
from ray.tune.logger import pretty_print

# Based on https://github.com/ray-project/ray/blob/master/doc/source/rllib-training.rst#python-api
ray.init(log_to_driver=False)
ray.init(log_to_driver=False, webui_host="127.0.0.1")
config = ppo.DEFAULT_CONFIG.copy()
config["num_gpus"] = int(os.environ.get("SM_NUM_GPUS", 0))
checkpoint_dir = os.environ.get("SM_MODEL_DIR", "/Users/nadzeya/gym")
config["num_workers"] = 1
agent = ppo.PPOAgent(config=config, env="CartPole-v0")
agent = ppo.PPOTrainer(config=config, env="CartPole-v0")

# Can optionally call agent.restore(path) to load a checkpoint.

Expand Down

15 changes: 9 additions & 6 deletions
tests/integ/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,9 +24,9 @@


@pytest.mark.canary_quick
def test_coach_mxnet(sagemaker_session, rl_coach_mxnet_full_version, cpu_instance_type):
def test_coach_mxnet(sagemaker_session, coach_mxnet_latest_version, cpu_instance_type):
 estimator = _test_coach(
 sagemaker_session, RLFramework.MXNET, rl_coach_mxnet_full_version, cpu_instance_type
 sagemaker_session, RLFramework.MXNET, coach_mxnet_latest_version, cpu_instance_type
 )
 job_name = unique_name_from_base("test-coach-mxnet")

Expand All@@ -51,9 +51,12 @@ def test_coach_mxnet(sagemaker_session, rl_coach_mxnet_full_version, cpu_instanc
 assert 0 < action[0][1] < 1


def test_coach_tf(sagemaker_session, rl_coach_tf_full_version, cpu_instance_type):
def test_coach_tf(sagemaker_session, coach_tensorflow_latest_version, cpu_instance_type):
 estimator = _test_coach(
 sagemaker_session, RLFramework.TENSORFLOW, rl_coach_tf_full_version, cpu_instance_type
 sagemaker_session,
 RLFramework.TENSORFLOW,
 coach_tensorflow_latest_version,
 cpu_instance_type,
 )
 job_name = unique_name_from_base("test-coach-tf")

Expand DownExpand Up@@ -96,7 +99,7 @@ def _test_coach(sagemaker_session, rl_framework, rl_coach_version, cpu_instance_


@pytest.mark.canary_quick
def test_ray_tf(sagemaker_session, rl_ray_full_version, cpu_instance_type):
def test_ray_tf(sagemaker_session, ray_tensorflow_latest_version, cpu_instance_type):
 source_dir = os.path.join(DATA_DIR, "ray_cartpole")
 cartpole = "train_ray.py"

Expand All@@ -105,7 +108,7 @@ def test_ray_tf(sagemaker_session, rl_ray_full_version, cpu_instance_type):
 source_dir=source_dir,
 toolkit=RLToolkit.RAY,
 framework=RLFramework.TENSORFLOW,
 toolkit_version=rl_ray_full_version,
 toolkit_version=ray_tensorflow_latest_version,
 sagemaker_session=sagemaker_session,
 role="SageMakerRole",
 instance_type=cpu_instance_type,
Expand Down

31 changes: 17 additions & 14 deletions
tests/unit/sagemaker/image_uris/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,12 +31,15 @@ def _version_for_tag(toolkit, toolkit_version, framework, framework_in_tag=False
 return "{}{}".format(toolkit, toolkit_version)


def test_coach_tf(rl_coach_tf_version):
def test_coach_tf(coach_tensorflow_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "coach-tensorflow", REGION, version=rl_coach_tf_version, instance_type=instance_type
 "coach-tensorflow",
 REGION,
 version=coach_tensorflow_version,
 instance_type=instance_type,
 )
 assert _expected_coach_tf_uri(rl_coach_tf_version, processor) == uri
 assert _expected_coach_tf_uri(coach_tensorflow_version, processor) == uri


def _expected_coach_tf_uri(coach_tf_version, processor):
Expand All@@ -58,28 +61,28 @@ def _expected_coach_tf_uri(coach_tf_version, processor):
 )


def test_coach_mxnet(rl_coach_mxnet_version):
def test_coach_mxnet(coach_mxnet_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "coach-mxnet", REGION, version=rl_coach_mxnet_version, instance_type=instance_type
 "coach-mxnet", REGION, version=coach_mxnet_version, instance_type=instance_type
 )

 expected = expected_uris.framework_uri(
 "sagemaker-rl-mxnet",
 "coach{}".format(rl_coach_mxnet_version),
 "coach{}".format(coach_mxnet_version),
 SAGEMAKER_ACCOUNT,
 py_version="py3",
 processor=processor,
 )
 assert expected == uri


def test_ray_tf(rl_ray_tf_version):
def test_ray_tf(ray_tensorflow_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "ray-tensorflow", REGION, version=rl_ray_tf_version, instance_type=instance_type
 "ray-tensorflow", REGION, version=ray_tensorflow_version, instance_type=instance_type
 )
 assert _expected_ray_tf_uri(rl_ray_tf_version, processor) == uri
 assert _expected_ray_tf_uri(ray_tensorflow_version, processor) == uri


def _expected_ray_tf_uri(ray_tf_version, processor):
Expand All@@ -101,15 +104,15 @@ def _expected_ray_tf_uri(ray_tf_version, processor):
 )


def test_ray_pytorch(rl_ray_pytorch_version):
def test_ray_pytorch(ray_pytorch_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "ray-pytorch", REGION, version=rl_ray_pytorch_version, instance_type=instance_type
 "ray-pytorch", REGION, version=ray_pytorch_version, instance_type=instance_type
 )

 expected = expected_uris.framework_uri(
 "sagemaker-rl-ray-container",
 "ray-{}-torch".format(rl_ray_pytorch_version),
 "ray-{}-torch".format(ray_pytorch_version),
 RL_ACCOUNT,
 py_version="py36",
 processor=processor,
Expand All@@ -118,8 +121,8 @@ def test_ray_pytorch(rl_ray_pytorch_version):
 assert expected == uri


def test_vw(rl_vw_version):
 version = "vw-{}".format(rl_vw_version)
def test_vw(vw_version):
 version = "vw-{}".format(vw_version)
 uri = image_uris.retrieve("vw", REGION, version=version, instance_type="ml.c4.xlarge")

 expected = expected_uris.framework_uri("sagemaker-rl-vw-container", version, RL_ACCOUNT)
Expand Down
Loading

, '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
change: use generated RL version fixtures and update Ray version#1769

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

laurenyu
merged 2 commits into

from

Jul 29, 2020
 Merged


change: use generated RL version fixtures and update Ray version
#1769
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c968c8d

use generated fixtures for RL versions


laurenyu Jul 29, 2020
fbbfb30

port other changes from aws/sagemaker-python-sdk#1618


laurenyu Jul 29, 2020

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


3 changes: 2 additions & 1 deletion
src/sagemaker/rl/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@
 "0.11.0": {"tensorflow": "1.11", "mxnet": "1.3"},
 "0.11.1": {"tensorflow": "1.12"},
 "0.11": {"tensorflow": "1.12", "mxnet": "1.3"},
 "1.0.0": {"tensorflow": "1.12"},
 },
 "ray": {
 "0.5.3": {"tensorflow": "1.11"},
Expand DownExpand Up@@ -68,7 +69,7 @@ class RLEstimator(Framework):

 COACH_LATEST_VERSION_TF = "0.11.1"
 COACH_LATEST_VERSION_MXNET = "0.11.0"
 RAY_LATEST_VERSION = "0.6.5"
 RAY_LATEST_VERSION = "0.8.5"

 def __init__(
 self,
Expand Down

46 changes: 5 additions & 41 deletions
tests/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@

from sagemaker import Session, image_uris, utils
from sagemaker.local import LocalSession
from sagemaker.rl import RLEstimator
import tests.integ

DEFAULT_REGION = "us-west-2"
Expand All@@ -41,15 +40,20 @@

FRAMEWORKS_FOR_GENERATED_VERSION_FIXTURES = (
 "chainer",
 "coach_mxnet",
 "coach_tensorflow",
 "inferentia_mxnet",
 "inferentia_tensorflow",
 "mxnet",
 "neo_mxnet",
 "neo_pytorch",
 "neo_tensorflow",
 "pytorch",
 "ray_pytorch",
 "ray_tensorflow",
 "sklearn",
 "tensorflow",
 "vw",
 "xgboost",
)

Expand DownExpand Up@@ -181,46 +185,6 @@ def _tf_py_version(tf_version, request):
 return "py37"


@pytest.fixture(scope="module", params=["0.10.1", "0.10.1", "0.11", "0.11.0", "0.11.1"])
def rl_coach_tf_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.11", "0.11.0"])
def rl_coach_mxnet_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.5", "0.5.3", "0.6", "0.6.5", "0.8.2", "0.8.5"])
def rl_ray_tf_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.8.5"])
def rl_ray_pytorch_version(request):
 return request.param


@pytest.fixture(scope="module", params=["8.7.0"])
def rl_vw_version(request):
 return request.param


@pytest.fixture(scope="module")
def rl_coach_mxnet_full_version():
 return RLEstimator.COACH_LATEST_VERSION_MXNET


@pytest.fixture(scope="module")
def rl_coach_tf_full_version():
 return RLEstimator.COACH_LATEST_VERSION_TF


@pytest.fixture(scope="module")
def rl_ray_full_version():
 return RLEstimator.RAY_LATEST_VERSION


@pytest.fixture(scope="module")
def tf_full_version(tensorflow_training_latest_version, tensorflow_inference_latest_version):
 """Fixture for TF tests that test both training and inference.
Expand Down

4 changes: 2 additions & 2 deletions
tests/data/ray_cartpole/train_ray.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,12 @@
from ray.tune.logger import pretty_print

# Based on https://github.com/ray-project/ray/blob/master/doc/source/rllib-training.rst#python-api
ray.init(log_to_driver=False)
ray.init(log_to_driver=False, webui_host="127.0.0.1")
config = ppo.DEFAULT_CONFIG.copy()
config["num_gpus"] = int(os.environ.get("SM_NUM_GPUS", 0))
checkpoint_dir = os.environ.get("SM_MODEL_DIR", "/Users/nadzeya/gym")
config["num_workers"] = 1
agent = ppo.PPOAgent(config=config, env="CartPole-v0")
agent = ppo.PPOTrainer(config=config, env="CartPole-v0")

# Can optionally call agent.restore(path) to load a checkpoint.

Expand Down

15 changes: 9 additions & 6 deletions
tests/integ/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,9 +24,9 @@


@pytest.mark.canary_quick
def test_coach_mxnet(sagemaker_session, rl_coach_mxnet_full_version, cpu_instance_type):
def test_coach_mxnet(sagemaker_session, coach_mxnet_latest_version, cpu_instance_type):
 estimator = _test_coach(
 sagemaker_session, RLFramework.MXNET, rl_coach_mxnet_full_version, cpu_instance_type
 sagemaker_session, RLFramework.MXNET, coach_mxnet_latest_version, cpu_instance_type
 )
 job_name = unique_name_from_base("test-coach-mxnet")

Expand All@@ -51,9 +51,12 @@ def test_coach_mxnet(sagemaker_session, rl_coach_mxnet_full_version, cpu_instanc
 assert 0 < action[0][1] < 1


def test_coach_tf(sagemaker_session, rl_coach_tf_full_version, cpu_instance_type):
def test_coach_tf(sagemaker_session, coach_tensorflow_latest_version, cpu_instance_type):
 estimator = _test_coach(
 sagemaker_session, RLFramework.TENSORFLOW, rl_coach_tf_full_version, cpu_instance_type
 sagemaker_session,
 RLFramework.TENSORFLOW,
 coach_tensorflow_latest_version,
 cpu_instance_type,
 )
 job_name = unique_name_from_base("test-coach-tf")

Expand DownExpand Up@@ -96,7 +99,7 @@ def _test_coach(sagemaker_session, rl_framework, rl_coach_version, cpu_instance_


@pytest.mark.canary_quick
def test_ray_tf(sagemaker_session, rl_ray_full_version, cpu_instance_type):
def test_ray_tf(sagemaker_session, ray_tensorflow_latest_version, cpu_instance_type):
 source_dir = os.path.join(DATA_DIR, "ray_cartpole")
 cartpole = "train_ray.py"

Expand All@@ -105,7 +108,7 @@ def test_ray_tf(sagemaker_session, rl_ray_full_version, cpu_instance_type):
 source_dir=source_dir,
 toolkit=RLToolkit.RAY,
 framework=RLFramework.TENSORFLOW,
 toolkit_version=rl_ray_full_version,
 toolkit_version=ray_tensorflow_latest_version,
 sagemaker_session=sagemaker_session,
 role="SageMakerRole",
 instance_type=cpu_instance_type,
Expand Down

31 changes: 17 additions & 14 deletions
tests/unit/sagemaker/image_uris/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,12 +31,15 @@ def _version_for_tag(toolkit, toolkit_version, framework, framework_in_tag=False
 return "{}{}".format(toolkit, toolkit_version)


def test_coach_tf(rl_coach_tf_version):
def test_coach_tf(coach_tensorflow_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "coach-tensorflow", REGION, version=rl_coach_tf_version, instance_type=instance_type
 "coach-tensorflow",
 REGION,
 version=coach_tensorflow_version,
 instance_type=instance_type,
 )
 assert _expected_coach_tf_uri(rl_coach_tf_version, processor) == uri
 assert _expected_coach_tf_uri(coach_tensorflow_version, processor) == uri


def _expected_coach_tf_uri(coach_tf_version, processor):
Expand All@@ -58,28 +61,28 @@ def _expected_coach_tf_uri(coach_tf_version, processor):
 )


def test_coach_mxnet(rl_coach_mxnet_version):
def test_coach_mxnet(coach_mxnet_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "coach-mxnet", REGION, version=rl_coach_mxnet_version, instance_type=instance_type
 "coach-mxnet", REGION, version=coach_mxnet_version, instance_type=instance_type
 )

 expected = expected_uris.framework_uri(
 "sagemaker-rl-mxnet",
 "coach{}".format(rl_coach_mxnet_version),
 "coach{}".format(coach_mxnet_version),
 SAGEMAKER_ACCOUNT,
 py_version="py3",
 processor=processor,
 )
 assert expected == uri


def test_ray_tf(rl_ray_tf_version):
def test_ray_tf(ray_tensorflow_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "ray-tensorflow", REGION, version=rl_ray_tf_version, instance_type=instance_type
 "ray-tensorflow", REGION, version=ray_tensorflow_version, instance_type=instance_type
 )
 assert _expected_ray_tf_uri(rl_ray_tf_version, processor) == uri
 assert _expected_ray_tf_uri(ray_tensorflow_version, processor) == uri


def _expected_ray_tf_uri(ray_tf_version, processor):
Expand All@@ -101,15 +104,15 @@ def _expected_ray_tf_uri(ray_tf_version, processor):
 )


def test_ray_pytorch(rl_ray_pytorch_version):
def test_ray_pytorch(ray_pytorch_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "ray-pytorch", REGION, version=rl_ray_pytorch_version, instance_type=instance_type
 "ray-pytorch", REGION, version=ray_pytorch_version, instance_type=instance_type
 )

 expected = expected_uris.framework_uri(
 "sagemaker-rl-ray-container",
 "ray-{}-torch".format(rl_ray_pytorch_version),
 "ray-{}-torch".format(ray_pytorch_version),
 RL_ACCOUNT,
 py_version="py36",
 processor=processor,
Expand All@@ -118,8 +121,8 @@ def test_ray_pytorch(rl_ray_pytorch_version):
 assert expected == uri


def test_vw(rl_vw_version):
 version = "vw-{}".format(rl_vw_version)
def test_vw(vw_version):
 version = "vw-{}".format(vw_version)
 uri = image_uris.retrieve("vw", REGION, version=version, instance_type="ml.c4.xlarge")

 expected = expected_uris.framework_uri("sagemaker-rl-vw-container", version, RL_ACCOUNT)
Expand Down
Loading

, '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
change: use generated RL version fixtures and update Ray version#1769

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

laurenyu
merged 2 commits into

from

Jul 29, 2020
 Merged


change: use generated RL version fixtures and update Ray version
#1769
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c968c8d

use generated fixtures for RL versions


laurenyu Jul 29, 2020
fbbfb30

port other changes from aws/sagemaker-python-sdk#1618


laurenyu Jul 29, 2020

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


3 changes: 2 additions & 1 deletion
src/sagemaker/rl/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@
 "0.11.0": {"tensorflow": "1.11", "mxnet": "1.3"},
 "0.11.1": {"tensorflow": "1.12"},
 "0.11": {"tensorflow": "1.12", "mxnet": "1.3"},
 "1.0.0": {"tensorflow": "1.12"},
 },
 "ray": {
 "0.5.3": {"tensorflow": "1.11"},
Expand DownExpand Up@@ -68,7 +69,7 @@ class RLEstimator(Framework):

 COACH_LATEST_VERSION_TF = "0.11.1"
 COACH_LATEST_VERSION_MXNET = "0.11.0"
 RAY_LATEST_VERSION = "0.6.5"
 RAY_LATEST_VERSION = "0.8.5"

 def __init__(
 self,
Expand Down

46 changes: 5 additions & 41 deletions
tests/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@

from sagemaker import Session, image_uris, utils
from sagemaker.local import LocalSession
from sagemaker.rl import RLEstimator
import tests.integ

DEFAULT_REGION = "us-west-2"
Expand All@@ -41,15 +40,20 @@

FRAMEWORKS_FOR_GENERATED_VERSION_FIXTURES = (
 "chainer",
 "coach_mxnet",
 "coach_tensorflow",
 "inferentia_mxnet",
 "inferentia_tensorflow",
 "mxnet",
 "neo_mxnet",
 "neo_pytorch",
 "neo_tensorflow",
 "pytorch",
 "ray_pytorch",
 "ray_tensorflow",
 "sklearn",
 "tensorflow",
 "vw",
 "xgboost",
)

Expand DownExpand Up@@ -181,46 +185,6 @@ def _tf_py_version(tf_version, request):
 return "py37"


@pytest.fixture(scope="module", params=["0.10.1", "0.10.1", "0.11", "0.11.0", "0.11.1"])
def rl_coach_tf_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.11", "0.11.0"])
def rl_coach_mxnet_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.5", "0.5.3", "0.6", "0.6.5", "0.8.2", "0.8.5"])
def rl_ray_tf_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.8.5"])
def rl_ray_pytorch_version(request):
 return request.param


@pytest.fixture(scope="module", params=["8.7.0"])
def rl_vw_version(request):
 return request.param


@pytest.fixture(scope="module")
def rl_coach_mxnet_full_version():
 return RLEstimator.COACH_LATEST_VERSION_MXNET


@pytest.fixture(scope="module")
def rl_coach_tf_full_version():
 return RLEstimator.COACH_LATEST_VERSION_TF


@pytest.fixture(scope="module")
def rl_ray_full_version():
 return RLEstimator.RAY_LATEST_VERSION


@pytest.fixture(scope="module")
def tf_full_version(tensorflow_training_latest_version, tensorflow_inference_latest_version):
 """Fixture for TF tests that test both training and inference.
Expand Down

4 changes: 2 additions & 2 deletions
tests/data/ray_cartpole/train_ray.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,12 @@
from ray.tune.logger import pretty_print

# Based on https://github.com/ray-project/ray/blob/master/doc/source/rllib-training.rst#python-api
ray.init(log_to_driver=False)
ray.init(log_to_driver=False, webui_host="127.0.0.1")
config = ppo.DEFAULT_CONFIG.copy()
config["num_gpus"] = int(os.environ.get("SM_NUM_GPUS", 0))
checkpoint_dir = os.environ.get("SM_MODEL_DIR", "/Users/nadzeya/gym")
config["num_workers"] = 1
agent = ppo.PPOAgent(config=config, env="CartPole-v0")
agent = ppo.PPOTrainer(config=config, env="CartPole-v0")

# Can optionally call agent.restore(path) to load a checkpoint.

Expand Down

15 changes: 9 additions & 6 deletions
tests/integ/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,9 +24,9 @@


@pytest.mark.canary_quick
def test_coach_mxnet(sagemaker_session, rl_coach_mxnet_full_version, cpu_instance_type):
def test_coach_mxnet(sagemaker_session, coach_mxnet_latest_version, cpu_instance_type):
 estimator = _test_coach(
 sagemaker_session, RLFramework.MXNET, rl_coach_mxnet_full_version, cpu_instance_type
 sagemaker_session, RLFramework.MXNET, coach_mxnet_latest_version, cpu_instance_type
 )
 job_name = unique_name_from_base("test-coach-mxnet")

Expand All@@ -51,9 +51,12 @@ def test_coach_mxnet(sagemaker_session, rl_coach_mxnet_full_version, cpu_instanc
 assert 0 < action[0][1] < 1


def test_coach_tf(sagemaker_session, rl_coach_tf_full_version, cpu_instance_type):
def test_coach_tf(sagemaker_session, coach_tensorflow_latest_version, cpu_instance_type):
 estimator = _test_coach(
 sagemaker_session, RLFramework.TENSORFLOW, rl_coach_tf_full_version, cpu_instance_type
 sagemaker_session,
 RLFramework.TENSORFLOW,
 coach_tensorflow_latest_version,
 cpu_instance_type,
 )
 job_name = unique_name_from_base("test-coach-tf")

Expand DownExpand Up@@ -96,7 +99,7 @@ def _test_coach(sagemaker_session, rl_framework, rl_coach_version, cpu_instance_


@pytest.mark.canary_quick
def test_ray_tf(sagemaker_session, rl_ray_full_version, cpu_instance_type):
def test_ray_tf(sagemaker_session, ray_tensorflow_latest_version, cpu_instance_type):
 source_dir = os.path.join(DATA_DIR, "ray_cartpole")
 cartpole = "train_ray.py"

Expand All@@ -105,7 +108,7 @@ def test_ray_tf(sagemaker_session, rl_ray_full_version, cpu_instance_type):
 source_dir=source_dir,
 toolkit=RLToolkit.RAY,
 framework=RLFramework.TENSORFLOW,
 toolkit_version=rl_ray_full_version,
 toolkit_version=ray_tensorflow_latest_version,
 sagemaker_session=sagemaker_session,
 role="SageMakerRole",
 instance_type=cpu_instance_type,
Expand Down

31 changes: 17 additions & 14 deletions
tests/unit/sagemaker/image_uris/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,12 +31,15 @@ def _version_for_tag(toolkit, toolkit_version, framework, framework_in_tag=False
 return "{}{}".format(toolkit, toolkit_version)


def test_coach_tf(rl_coach_tf_version):
def test_coach_tf(coach_tensorflow_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "coach-tensorflow", REGION, version=rl_coach_tf_version, instance_type=instance_type
 "coach-tensorflow",
 REGION,
 version=coach_tensorflow_version,
 instance_type=instance_type,
 )
 assert _expected_coach_tf_uri(rl_coach_tf_version, processor) == uri
 assert _expected_coach_tf_uri(coach_tensorflow_version, processor) == uri


def _expected_coach_tf_uri(coach_tf_version, processor):
Expand All@@ -58,28 +61,28 @@ def _expected_coach_tf_uri(coach_tf_version, processor):
 )


def test_coach_mxnet(rl_coach_mxnet_version):
def test_coach_mxnet(coach_mxnet_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "coach-mxnet", REGION, version=rl_coach_mxnet_version, instance_type=instance_type
 "coach-mxnet", REGION, version=coach_mxnet_version, instance_type=instance_type
 )

 expected = expected_uris.framework_uri(
 "sagemaker-rl-mxnet",
 "coach{}".format(rl_coach_mxnet_version),
 "coach{}".format(coach_mxnet_version),
 SAGEMAKER_ACCOUNT,
 py_version="py3",
 processor=processor,
 )
 assert expected == uri


def test_ray_tf(rl_ray_tf_version):
def test_ray_tf(ray_tensorflow_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "ray-tensorflow", REGION, version=rl_ray_tf_version, instance_type=instance_type
 "ray-tensorflow", REGION, version=ray_tensorflow_version, instance_type=instance_type
 )
 assert _expected_ray_tf_uri(rl_ray_tf_version, processor) == uri
 assert _expected_ray_tf_uri(ray_tensorflow_version, processor) == uri


def _expected_ray_tf_uri(ray_tf_version, processor):
Expand All@@ -101,15 +104,15 @@ def _expected_ray_tf_uri(ray_tf_version, processor):
 )


def test_ray_pytorch(rl_ray_pytorch_version):
def test_ray_pytorch(ray_pytorch_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "ray-pytorch", REGION, version=rl_ray_pytorch_version, instance_type=instance_type
 "ray-pytorch", REGION, version=ray_pytorch_version, instance_type=instance_type
 )

 expected = expected_uris.framework_uri(
 "sagemaker-rl-ray-container",
 "ray-{}-torch".format(rl_ray_pytorch_version),
 "ray-{}-torch".format(ray_pytorch_version),
 RL_ACCOUNT,
 py_version="py36",
 processor=processor,
Expand All@@ -118,8 +121,8 @@ def test_ray_pytorch(rl_ray_pytorch_version):
 assert expected == uri


def test_vw(rl_vw_version):
 version = "vw-{}".format(rl_vw_version)
def test_vw(vw_version):
 version = "vw-{}".format(vw_version)
 uri = image_uris.retrieve("vw", REGION, version=version, instance_type="ml.c4.xlarge")

 expected = expected_uris.framework_uri("sagemaker-rl-vw-container", version, RL_ACCOUNT)
Expand Down
Loading

, '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
change: use generated RL version fixtures and update Ray version#1769

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

laurenyu
merged 2 commits into

from

Jul 29, 2020
 Merged


change: use generated RL version fixtures and update Ray version
#1769
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c968c8d

use generated fixtures for RL versions


laurenyu Jul 29, 2020
fbbfb30

port other changes from aws/sagemaker-python-sdk#1618


laurenyu Jul 29, 2020

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


3 changes: 2 additions & 1 deletion
src/sagemaker/rl/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@
 "0.11.0": {"tensorflow": "1.11", "mxnet": "1.3"},
 "0.11.1": {"tensorflow": "1.12"},
 "0.11": {"tensorflow": "1.12", "mxnet": "1.3"},
 "1.0.0": {"tensorflow": "1.12"},
 },
 "ray": {
 "0.5.3": {"tensorflow": "1.11"},
Expand DownExpand Up@@ -68,7 +69,7 @@ class RLEstimator(Framework):

 COACH_LATEST_VERSION_TF = "0.11.1"
 COACH_LATEST_VERSION_MXNET = "0.11.0"
 RAY_LATEST_VERSION = "0.6.5"
 RAY_LATEST_VERSION = "0.8.5"

 def __init__(
 self,
Expand Down

46 changes: 5 additions & 41 deletions
tests/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@

from sagemaker import Session, image_uris, utils
from sagemaker.local import LocalSession
from sagemaker.rl import RLEstimator
import tests.integ

DEFAULT_REGION = "us-west-2"
Expand All@@ -41,15 +40,20 @@

FRAMEWORKS_FOR_GENERATED_VERSION_FIXTURES = (
 "chainer",
 "coach_mxnet",
 "coach_tensorflow",
 "inferentia_mxnet",
 "inferentia_tensorflow",
 "mxnet",
 "neo_mxnet",
 "neo_pytorch",
 "neo_tensorflow",
 "pytorch",
 "ray_pytorch",
 "ray_tensorflow",
 "sklearn",
 "tensorflow",
 "vw",
 "xgboost",
)

Expand DownExpand Up@@ -181,46 +185,6 @@ def _tf_py_version(tf_version, request):
 return "py37"


@pytest.fixture(scope="module", params=["0.10.1", "0.10.1", "0.11", "0.11.0", "0.11.1"])
def rl_coach_tf_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.11", "0.11.0"])
def rl_coach_mxnet_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.5", "0.5.3", "0.6", "0.6.5", "0.8.2", "0.8.5"])
def rl_ray_tf_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.8.5"])
def rl_ray_pytorch_version(request):
 return request.param


@pytest.fixture(scope="module", params=["8.7.0"])
def rl_vw_version(request):
 return request.param


@pytest.fixture(scope="module")
def rl_coach_mxnet_full_version():
 return RLEstimator.COACH_LATEST_VERSION_MXNET


@pytest.fixture(scope="module")
def rl_coach_tf_full_version():
 return RLEstimator.COACH_LATEST_VERSION_TF


@pytest.fixture(scope="module")
def rl_ray_full_version():
 return RLEstimator.RAY_LATEST_VERSION


@pytest.fixture(scope="module")
def tf_full_version(tensorflow_training_latest_version, tensorflow_inference_latest_version):
 """Fixture for TF tests that test both training and inference.
Expand Down

4 changes: 2 additions & 2 deletions
tests/data/ray_cartpole/train_ray.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,12 @@
from ray.tune.logger import pretty_print

# Based on https://github.com/ray-project/ray/blob/master/doc/source/rllib-training.rst#python-api
ray.init(log_to_driver=False)
ray.init(log_to_driver=False, webui_host="127.0.0.1")
config = ppo.DEFAULT_CONFIG.copy()
config["num_gpus"] = int(os.environ.get("SM_NUM_GPUS", 0))
checkpoint_dir = os.environ.get("SM_MODEL_DIR", "/Users/nadzeya/gym")
config["num_workers"] = 1
agent = ppo.PPOAgent(config=config, env="CartPole-v0")
agent = ppo.PPOTrainer(config=config, env="CartPole-v0")

# Can optionally call agent.restore(path) to load a checkpoint.

Expand Down

15 changes: 9 additions & 6 deletions
tests/integ/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,9 +24,9 @@


@pytest.mark.canary_quick
def test_coach_mxnet(sagemaker_session, rl_coach_mxnet_full_version, cpu_instance_type):
def test_coach_mxnet(sagemaker_session, coach_mxnet_latest_version, cpu_instance_type):
 estimator = _test_coach(
 sagemaker_session, RLFramework.MXNET, rl_coach_mxnet_full_version, cpu_instance_type
 sagemaker_session, RLFramework.MXNET, coach_mxnet_latest_version, cpu_instance_type
 )
 job_name = unique_name_from_base("test-coach-mxnet")

Expand All@@ -51,9 +51,12 @@ def test_coach_mxnet(sagemaker_session, rl_coach_mxnet_full_version, cpu_instanc
 assert 0 < action[0][1] < 1


def test_coach_tf(sagemaker_session, rl_coach_tf_full_version, cpu_instance_type):
def test_coach_tf(sagemaker_session, coach_tensorflow_latest_version, cpu_instance_type):
 estimator = _test_coach(
 sagemaker_session, RLFramework.TENSORFLOW, rl_coach_tf_full_version, cpu_instance_type
 sagemaker_session,
 RLFramework.TENSORFLOW,
 coach_tensorflow_latest_version,
 cpu_instance_type,
 )
 job_name = unique_name_from_base("test-coach-tf")

Expand DownExpand Up@@ -96,7 +99,7 @@ def _test_coach(sagemaker_session, rl_framework, rl_coach_version, cpu_instance_


@pytest.mark.canary_quick
def test_ray_tf(sagemaker_session, rl_ray_full_version, cpu_instance_type):
def test_ray_tf(sagemaker_session, ray_tensorflow_latest_version, cpu_instance_type):
 source_dir = os.path.join(DATA_DIR, "ray_cartpole")
 cartpole = "train_ray.py"

Expand All@@ -105,7 +108,7 @@ def test_ray_tf(sagemaker_session, rl_ray_full_version, cpu_instance_type):
 source_dir=source_dir,
 toolkit=RLToolkit.RAY,
 framework=RLFramework.TENSORFLOW,
 toolkit_version=rl_ray_full_version,
 toolkit_version=ray_tensorflow_latest_version,
 sagemaker_session=sagemaker_session,
 role="SageMakerRole",
 instance_type=cpu_instance_type,
Expand Down

31 changes: 17 additions & 14 deletions
tests/unit/sagemaker/image_uris/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,12 +31,15 @@ def _version_for_tag(toolkit, toolkit_version, framework, framework_in_tag=False
 return "{}{}".format(toolkit, toolkit_version)


def test_coach_tf(rl_coach_tf_version):
def test_coach_tf(coach_tensorflow_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "coach-tensorflow", REGION, version=rl_coach_tf_version, instance_type=instance_type
 "coach-tensorflow",
 REGION,
 version=coach_tensorflow_version,
 instance_type=instance_type,
 )
 assert _expected_coach_tf_uri(rl_coach_tf_version, processor) == uri
 assert _expected_coach_tf_uri(coach_tensorflow_version, processor) == uri


def _expected_coach_tf_uri(coach_tf_version, processor):
Expand All@@ -58,28 +61,28 @@ def _expected_coach_tf_uri(coach_tf_version, processor):
 )


def test_coach_mxnet(rl_coach_mxnet_version):
def test_coach_mxnet(coach_mxnet_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "coach-mxnet", REGION, version=rl_coach_mxnet_version, instance_type=instance_type
 "coach-mxnet", REGION, version=coach_mxnet_version, instance_type=instance_type
 )

 expected = expected_uris.framework_uri(
 "sagemaker-rl-mxnet",
 "coach{}".format(rl_coach_mxnet_version),
 "coach{}".format(coach_mxnet_version),
 SAGEMAKER_ACCOUNT,
 py_version="py3",
 processor=processor,
 )
 assert expected == uri


def test_ray_tf(rl_ray_tf_version):
def test_ray_tf(ray_tensorflow_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "ray-tensorflow", REGION, version=rl_ray_tf_version, instance_type=instance_type
 "ray-tensorflow", REGION, version=ray_tensorflow_version, instance_type=instance_type
 )
 assert _expected_ray_tf_uri(rl_ray_tf_version, processor) == uri
 assert _expected_ray_tf_uri(ray_tensorflow_version, processor) == uri


def _expected_ray_tf_uri(ray_tf_version, processor):
Expand All@@ -101,15 +104,15 @@ def _expected_ray_tf_uri(ray_tf_version, processor):
 )


def test_ray_pytorch(rl_ray_pytorch_version):
def test_ray_pytorch(ray_pytorch_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "ray-pytorch", REGION, version=rl_ray_pytorch_version, instance_type=instance_type
 "ray-pytorch", REGION, version=ray_pytorch_version, instance_type=instance_type
 )

 expected = expected_uris.framework_uri(
 "sagemaker-rl-ray-container",
 "ray-{}-torch".format(rl_ray_pytorch_version),
 "ray-{}-torch".format(ray_pytorch_version),
 RL_ACCOUNT,
 py_version="py36",
 processor=processor,
Expand All@@ -118,8 +121,8 @@ def test_ray_pytorch(rl_ray_pytorch_version):
 assert expected == uri


def test_vw(rl_vw_version):
 version = "vw-{}".format(rl_vw_version)
def test_vw(vw_version):
 version = "vw-{}".format(vw_version)
 uri = image_uris.retrieve("vw", REGION, version=version, instance_type="ml.c4.xlarge")

 expected = expected_uris.framework_uri("sagemaker-rl-vw-container", version, RL_ACCOUNT)
Expand Down
Loading

, '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
change: use generated RL version fixtures and update Ray version#1769

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

laurenyu
merged 2 commits into

from

Jul 29, 2020
 Merged


change: use generated RL version fixtures and update Ray version
#1769
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c968c8d

use generated fixtures for RL versions


laurenyu Jul 29, 2020
fbbfb30

port other changes from aws/sagemaker-python-sdk#1618


laurenyu Jul 29, 2020

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


3 changes: 2 additions & 1 deletion
src/sagemaker/rl/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@
 "0.11.0": {"tensorflow": "1.11", "mxnet": "1.3"},
 "0.11.1": {"tensorflow": "1.12"},
 "0.11": {"tensorflow": "1.12", "mxnet": "1.3"},
 "1.0.0": {"tensorflow": "1.12"},
 },
 "ray": {
 "0.5.3": {"tensorflow": "1.11"},
Expand DownExpand Up@@ -68,7 +69,7 @@ class RLEstimator(Framework):

 COACH_LATEST_VERSION_TF = "0.11.1"
 COACH_LATEST_VERSION_MXNET = "0.11.0"
 RAY_LATEST_VERSION = "0.6.5"
 RAY_LATEST_VERSION = "0.8.5"

 def __init__(
 self,
Expand Down

46 changes: 5 additions & 41 deletions
tests/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@

from sagemaker import Session, image_uris, utils
from sagemaker.local import LocalSession
from sagemaker.rl import RLEstimator
import tests.integ

DEFAULT_REGION = "us-west-2"
Expand All@@ -41,15 +40,20 @@

FRAMEWORKS_FOR_GENERATED_VERSION_FIXTURES = (
 "chainer",
 "coach_mxnet",
 "coach_tensorflow",
 "inferentia_mxnet",
 "inferentia_tensorflow",
 "mxnet",
 "neo_mxnet",
 "neo_pytorch",
 "neo_tensorflow",
 "pytorch",
 "ray_pytorch",
 "ray_tensorflow",
 "sklearn",
 "tensorflow",
 "vw",
 "xgboost",
)

Expand DownExpand Up@@ -181,46 +185,6 @@ def _tf_py_version(tf_version, request):
 return "py37"


@pytest.fixture(scope="module", params=["0.10.1", "0.10.1", "0.11", "0.11.0", "0.11.1"])
def rl_coach_tf_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.11", "0.11.0"])
def rl_coach_mxnet_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.5", "0.5.3", "0.6", "0.6.5", "0.8.2", "0.8.5"])
def rl_ray_tf_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.8.5"])
def rl_ray_pytorch_version(request):
 return request.param


@pytest.fixture(scope="module", params=["8.7.0"])
def rl_vw_version(request):
 return request.param


@pytest.fixture(scope="module")
def rl_coach_mxnet_full_version():
 return RLEstimator.COACH_LATEST_VERSION_MXNET


@pytest.fixture(scope="module")
def rl_coach_tf_full_version():
 return RLEstimator.COACH_LATEST_VERSION_TF


@pytest.fixture(scope="module")
def rl_ray_full_version():
 return RLEstimator.RAY_LATEST_VERSION


@pytest.fixture(scope="module")
def tf_full_version(tensorflow_training_latest_version, tensorflow_inference_latest_version):
 """Fixture for TF tests that test both training and inference.
Expand Down

4 changes: 2 additions & 2 deletions
tests/data/ray_cartpole/train_ray.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,12 @@
from ray.tune.logger import pretty_print

# Based on https://github.com/ray-project/ray/blob/master/doc/source/rllib-training.rst#python-api
ray.init(log_to_driver=False)
ray.init(log_to_driver=False, webui_host="127.0.0.1")
config = ppo.DEFAULT_CONFIG.copy()
config["num_gpus"] = int(os.environ.get("SM_NUM_GPUS", 0))
checkpoint_dir = os.environ.get("SM_MODEL_DIR", "/Users/nadzeya/gym")
config["num_workers"] = 1
agent = ppo.PPOAgent(config=config, env="CartPole-v0")
agent = ppo.PPOTrainer(config=config, env="CartPole-v0")

# Can optionally call agent.restore(path) to load a checkpoint.

Expand Down

15 changes: 9 additions & 6 deletions
tests/integ/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,9 +24,9 @@


@pytest.mark.canary_quick
def test_coach_mxnet(sagemaker_session, rl_coach_mxnet_full_version, cpu_instance_type):
def test_coach_mxnet(sagemaker_session, coach_mxnet_latest_version, cpu_instance_type):
 estimator = _test_coach(
 sagemaker_session, RLFramework.MXNET, rl_coach_mxnet_full_version, cpu_instance_type
 sagemaker_session, RLFramework.MXNET, coach_mxnet_latest_version, cpu_instance_type
 )
 job_name = unique_name_from_base("test-coach-mxnet")

Expand All@@ -51,9 +51,12 @@ def test_coach_mxnet(sagemaker_session, rl_coach_mxnet_full_version, cpu_instanc
 assert 0 < action[0][1] < 1


def test_coach_tf(sagemaker_session, rl_coach_tf_full_version, cpu_instance_type):
def test_coach_tf(sagemaker_session, coach_tensorflow_latest_version, cpu_instance_type):
 estimator = _test_coach(
 sagemaker_session, RLFramework.TENSORFLOW, rl_coach_tf_full_version, cpu_instance_type
 sagemaker_session,
 RLFramework.TENSORFLOW,
 coach_tensorflow_latest_version,
 cpu_instance_type,
 )
 job_name = unique_name_from_base("test-coach-tf")

Expand DownExpand Up@@ -96,7 +99,7 @@ def _test_coach(sagemaker_session, rl_framework, rl_coach_version, cpu_instance_


@pytest.mark.canary_quick
def test_ray_tf(sagemaker_session, rl_ray_full_version, cpu_instance_type):
def test_ray_tf(sagemaker_session, ray_tensorflow_latest_version, cpu_instance_type):
 source_dir = os.path.join(DATA_DIR, "ray_cartpole")
 cartpole = "train_ray.py"

Expand All@@ -105,7 +108,7 @@ def test_ray_tf(sagemaker_session, rl_ray_full_version, cpu_instance_type):
 source_dir=source_dir,
 toolkit=RLToolkit.RAY,
 framework=RLFramework.TENSORFLOW,
 toolkit_version=rl_ray_full_version,
 toolkit_version=ray_tensorflow_latest_version,
 sagemaker_session=sagemaker_session,
 role="SageMakerRole",
 instance_type=cpu_instance_type,
Expand Down

31 changes: 17 additions & 14 deletions
tests/unit/sagemaker/image_uris/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,12 +31,15 @@ def _version_for_tag(toolkit, toolkit_version, framework, framework_in_tag=False
 return "{}{}".format(toolkit, toolkit_version)


def test_coach_tf(rl_coach_tf_version):
def test_coach_tf(coach_tensorflow_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "coach-tensorflow", REGION, version=rl_coach_tf_version, instance_type=instance_type
 "coach-tensorflow",
 REGION,
 version=coach_tensorflow_version,
 instance_type=instance_type,
 )
 assert _expected_coach_tf_uri(rl_coach_tf_version, processor) == uri
 assert _expected_coach_tf_uri(coach_tensorflow_version, processor) == uri


def _expected_coach_tf_uri(coach_tf_version, processor):
Expand All@@ -58,28 +61,28 @@ def _expected_coach_tf_uri(coach_tf_version, processor):
 )


def test_coach_mxnet(rl_coach_mxnet_version):
def test_coach_mxnet(coach_mxnet_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "coach-mxnet", REGION, version=rl_coach_mxnet_version, instance_type=instance_type
 "coach-mxnet", REGION, version=coach_mxnet_version, instance_type=instance_type
 )

 expected = expected_uris.framework_uri(
 "sagemaker-rl-mxnet",
 "coach{}".format(rl_coach_mxnet_version),
 "coach{}".format(coach_mxnet_version),
 SAGEMAKER_ACCOUNT,
 py_version="py3",
 processor=processor,
 )
 assert expected == uri


def test_ray_tf(rl_ray_tf_version):
def test_ray_tf(ray_tensorflow_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "ray-tensorflow", REGION, version=rl_ray_tf_version, instance_type=instance_type
 "ray-tensorflow", REGION, version=ray_tensorflow_version, instance_type=instance_type
 )
 assert _expected_ray_tf_uri(rl_ray_tf_version, processor) == uri
 assert _expected_ray_tf_uri(ray_tensorflow_version, processor) == uri


def _expected_ray_tf_uri(ray_tf_version, processor):
Expand All@@ -101,15 +104,15 @@ def _expected_ray_tf_uri(ray_tf_version, processor):
 )


def test_ray_pytorch(rl_ray_pytorch_version):
def test_ray_pytorch(ray_pytorch_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "ray-pytorch", REGION, version=rl_ray_pytorch_version, instance_type=instance_type
 "ray-pytorch", REGION, version=ray_pytorch_version, instance_type=instance_type
 )

 expected = expected_uris.framework_uri(
 "sagemaker-rl-ray-container",
 "ray-{}-torch".format(rl_ray_pytorch_version),
 "ray-{}-torch".format(ray_pytorch_version),
 RL_ACCOUNT,
 py_version="py36",
 processor=processor,
Expand All@@ -118,8 +121,8 @@ def test_ray_pytorch(rl_ray_pytorch_version):
 assert expected == uri


def test_vw(rl_vw_version):
 version = "vw-{}".format(rl_vw_version)
def test_vw(vw_version):
 version = "vw-{}".format(vw_version)
 uri = image_uris.retrieve("vw", REGION, version=version, instance_type="ml.c4.xlarge")

 expected = expected_uris.framework_uri("sagemaker-rl-vw-container", version, RL_ACCOUNT)
Expand Down
Loading

, '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
change: use generated RL version fixtures and update Ray version#1769

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

laurenyu
merged 2 commits into

from

Jul 29, 2020
 Merged


change: use generated RL version fixtures and update Ray version
#1769
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
c968c8d

use generated fixtures for RL versions


laurenyu Jul 29, 2020
fbbfb30

port other changes from aws/sagemaker-python-sdk#1618


laurenyu Jul 29, 2020

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


3 changes: 2 additions & 1 deletion
src/sagemaker/rl/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@
 "0.11.0": {"tensorflow": "1.11", "mxnet": "1.3"},
 "0.11.1": {"tensorflow": "1.12"},
 "0.11": {"tensorflow": "1.12", "mxnet": "1.3"},
 "1.0.0": {"tensorflow": "1.12"},
 },
 "ray": {
 "0.5.3": {"tensorflow": "1.11"},
Expand DownExpand Up@@ -68,7 +69,7 @@ class RLEstimator(Framework):

 COACH_LATEST_VERSION_TF = "0.11.1"
 COACH_LATEST_VERSION_MXNET = "0.11.0"
 RAY_LATEST_VERSION = "0.6.5"
 RAY_LATEST_VERSION = "0.8.5"

 def __init__(
 self,
Expand Down

46 changes: 5 additions & 41 deletions
tests/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@

from sagemaker import Session, image_uris, utils
from sagemaker.local import LocalSession
from sagemaker.rl import RLEstimator
import tests.integ

DEFAULT_REGION = "us-west-2"
Expand All@@ -41,15 +40,20 @@

FRAMEWORKS_FOR_GENERATED_VERSION_FIXTURES = (
 "chainer",
 "coach_mxnet",
 "coach_tensorflow",
 "inferentia_mxnet",
 "inferentia_tensorflow",
 "mxnet",
 "neo_mxnet",
 "neo_pytorch",
 "neo_tensorflow",
 "pytorch",
 "ray_pytorch",
 "ray_tensorflow",
 "sklearn",
 "tensorflow",
 "vw",
 "xgboost",
)

Expand DownExpand Up@@ -181,46 +185,6 @@ def _tf_py_version(tf_version, request):
 return "py37"


@pytest.fixture(scope="module", params=["0.10.1", "0.10.1", "0.11", "0.11.0", "0.11.1"])
def rl_coach_tf_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.11", "0.11.0"])
def rl_coach_mxnet_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.5", "0.5.3", "0.6", "0.6.5", "0.8.2", "0.8.5"])
def rl_ray_tf_version(request):
 return request.param


@pytest.fixture(scope="module", params=["0.8.5"])
def rl_ray_pytorch_version(request):
 return request.param


@pytest.fixture(scope="module", params=["8.7.0"])
def rl_vw_version(request):
 return request.param


@pytest.fixture(scope="module")
def rl_coach_mxnet_full_version():
 return RLEstimator.COACH_LATEST_VERSION_MXNET


@pytest.fixture(scope="module")
def rl_coach_tf_full_version():
 return RLEstimator.COACH_LATEST_VERSION_TF


@pytest.fixture(scope="module")
def rl_ray_full_version():
 return RLEstimator.RAY_LATEST_VERSION


@pytest.fixture(scope="module")
def tf_full_version(tensorflow_training_latest_version, tensorflow_inference_latest_version):
 """Fixture for TF tests that test both training and inference.
Expand Down

4 changes: 2 additions & 2 deletions
tests/data/ray_cartpole/train_ray.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,12 @@
from ray.tune.logger import pretty_print

# Based on https://github.com/ray-project/ray/blob/master/doc/source/rllib-training.rst#python-api
ray.init(log_to_driver=False)
ray.init(log_to_driver=False, webui_host="127.0.0.1")
config = ppo.DEFAULT_CONFIG.copy()
config["num_gpus"] = int(os.environ.get("SM_NUM_GPUS", 0))
checkpoint_dir = os.environ.get("SM_MODEL_DIR", "/Users/nadzeya/gym")
config["num_workers"] = 1
agent = ppo.PPOAgent(config=config, env="CartPole-v0")
agent = ppo.PPOTrainer(config=config, env="CartPole-v0")

# Can optionally call agent.restore(path) to load a checkpoint.

Expand Down

15 changes: 9 additions & 6 deletions
tests/integ/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,9 +24,9 @@


@pytest.mark.canary_quick
def test_coach_mxnet(sagemaker_session, rl_coach_mxnet_full_version, cpu_instance_type):
def test_coach_mxnet(sagemaker_session, coach_mxnet_latest_version, cpu_instance_type):
 estimator = _test_coach(
 sagemaker_session, RLFramework.MXNET, rl_coach_mxnet_full_version, cpu_instance_type
 sagemaker_session, RLFramework.MXNET, coach_mxnet_latest_version, cpu_instance_type
 )
 job_name = unique_name_from_base("test-coach-mxnet")

Expand All@@ -51,9 +51,12 @@ def test_coach_mxnet(sagemaker_session, rl_coach_mxnet_full_version, cpu_instanc
 assert 0 < action[0][1] < 1


def test_coach_tf(sagemaker_session, rl_coach_tf_full_version, cpu_instance_type):
def test_coach_tf(sagemaker_session, coach_tensorflow_latest_version, cpu_instance_type):
 estimator = _test_coach(
 sagemaker_session, RLFramework.TENSORFLOW, rl_coach_tf_full_version, cpu_instance_type
 sagemaker_session,
 RLFramework.TENSORFLOW,
 coach_tensorflow_latest_version,
 cpu_instance_type,
 )
 job_name = unique_name_from_base("test-coach-tf")

Expand DownExpand Up@@ -96,7 +99,7 @@ def _test_coach(sagemaker_session, rl_framework, rl_coach_version, cpu_instance_


@pytest.mark.canary_quick
def test_ray_tf(sagemaker_session, rl_ray_full_version, cpu_instance_type):
def test_ray_tf(sagemaker_session, ray_tensorflow_latest_version, cpu_instance_type):
 source_dir = os.path.join(DATA_DIR, "ray_cartpole")
 cartpole = "train_ray.py"

Expand All@@ -105,7 +108,7 @@ def test_ray_tf(sagemaker_session, rl_ray_full_version, cpu_instance_type):
 source_dir=source_dir,
 toolkit=RLToolkit.RAY,
 framework=RLFramework.TENSORFLOW,
 toolkit_version=rl_ray_full_version,
 toolkit_version=ray_tensorflow_latest_version,
 sagemaker_session=sagemaker_session,
 role="SageMakerRole",
 instance_type=cpu_instance_type,
Expand Down

31 changes: 17 additions & 14 deletions
tests/unit/sagemaker/image_uris/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,12 +31,15 @@ def _version_for_tag(toolkit, toolkit_version, framework, framework_in_tag=False
 return "{}{}".format(toolkit, toolkit_version)


def test_coach_tf(rl_coach_tf_version):
def test_coach_tf(coach_tensorflow_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "coach-tensorflow", REGION, version=rl_coach_tf_version, instance_type=instance_type
 "coach-tensorflow",
 REGION,
 version=coach_tensorflow_version,
 instance_type=instance_type,
 )
 assert _expected_coach_tf_uri(rl_coach_tf_version, processor) == uri
 assert _expected_coach_tf_uri(coach_tensorflow_version, processor) == uri


def _expected_coach_tf_uri(coach_tf_version, processor):
Expand All@@ -58,28 +61,28 @@ def _expected_coach_tf_uri(coach_tf_version, processor):
 )


def test_coach_mxnet(rl_coach_mxnet_version):
def test_coach_mxnet(coach_mxnet_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "coach-mxnet", REGION, version=rl_coach_mxnet_version, instance_type=instance_type
 "coach-mxnet", REGION, version=coach_mxnet_version, instance_type=instance_type
 )

 expected = expected_uris.framework_uri(
 "sagemaker-rl-mxnet",
 "coach{}".format(rl_coach_mxnet_version),
 "coach{}".format(coach_mxnet_version),
 SAGEMAKER_ACCOUNT,
 py_version="py3",
 processor=processor,
 )
 assert expected == uri


def test_ray_tf(rl_ray_tf_version):
def test_ray_tf(ray_tensorflow_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "ray-tensorflow", REGION, version=rl_ray_tf_version, instance_type=instance_type
 "ray-tensorflow", REGION, version=ray_tensorflow_version, instance_type=instance_type
 )
 assert _expected_ray_tf_uri(rl_ray_tf_version, processor) == uri
 assert _expected_ray_tf_uri(ray_tensorflow_version, processor) == uri


def _expected_ray_tf_uri(ray_tf_version, processor):
Expand All@@ -101,15 +104,15 @@ def _expected_ray_tf_uri(ray_tf_version, processor):
 )


def test_ray_pytorch(rl_ray_pytorch_version):
def test_ray_pytorch(ray_pytorch_version):
 for instance_type, processor in INSTANCE_TYPES_AND_PROCESSORS:
 uri = image_uris.retrieve(
 "ray-pytorch", REGION, version=rl_ray_pytorch_version, instance_type=instance_type
 "ray-pytorch", REGION, version=ray_pytorch_version, instance_type=instance_type
 )

 expected = expected_uris.framework_uri(
 "sagemaker-rl-ray-container",
 "ray-{}-torch".format(rl_ray_pytorch_version),
 "ray-{}-torch".format(ray_pytorch_version),
 RL_ACCOUNT,
 py_version="py36",
 processor=processor,
Expand All@@ -118,8 +121,8 @@ def test_ray_pytorch(rl_ray_pytorch_version):
 assert expected == uri


def test_vw(rl_vw_version):
 version = "vw-{}".format(rl_vw_version)
def test_vw(vw_version):
 version = "vw-{}".format(vw_version)
 uri = image_uris.retrieve("vw", REGION, version=version, instance_type="ml.c4.xlarge")

 expected = expected_uris.framework_uri("sagemaker-rl-vw-container", version, RL_ACCOUNT)
Expand Down
Loading