Skip to content

Commit 4812fd7

Browse files
stephanie-wangstephanie-wang
committed
Merge branch 'master' into stresstesting
2 parents 4477936 + 0f0099f commit 4812fd7

36 files changed

+839
-1128
lines changed

‎CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,10 @@ if ("${CMAKE_RAY_LANG_PYTHON}" STREQUAL "YES")
111111
list(APPEND ray_file_list "src/credis/redis/src/redis-server")
112112
endif()
113113

114-
if (DEFINED ENV{INCLUDE_UI} AND "$ENV{INCLUDE_UI}" STREQUAL "1")
114+
# The goal of the if statement below is to require the catapult files to be
115+
# present INCLUDE_UI=1 is set and to include the UI files if they are present.
116+
# This should match the logic in build_ui.sh.
117+
if (EXISTS "${CMAKE_BINARY_DIR}/src/catapult_files/index.html" OR "$ENV{INCLUDE_UI}" STREQUAL "1")
115118
list(APPEND ray_file_list "src/catapult_files/index.html")
116119
list(APPEND ray_file_list "src/catapult_files/trace_viewer_full.html")
117120
endif()

‎doc/source/rllib-algorithms.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ SpaceInvaders 692 ~600
119119
:start-after: __sphinx_doc_begin__
120120
:end-before: __sphinx_doc_end__
121121

122-
Deep Deterministic Policy Gradients (DDPG)
123-
------------------------------------------
122+
Deep Deterministic Policy Gradients (DDPG, TD3)
123+
-----------------------------------------------
124124
`[paper] <https://arxiv.org/abs/1509.02971>`__ `[implementation] <https://github.com/ray-project/ray/blob/master/python/ray/rllib/agents/ddpg/ddpg.py>`__
125-
DDPG is implemented similarly to DQN (below). The algorithm can be scaled by increasing the number of workers, switching to AsyncGradientsOptimizer, or using Ape-X.
125+
DDPG is implemented similarly to DQN (below). The algorithm can be scaled by increasing the number of workers, switching to AsyncGradientsOptimizer, or using Ape-X. The improvements from `TD3 <https://spinningup.openai.com/en/latest/algorithms/td3.html>`__ are available though not enabled by default.
126126

127-
Tuned examples: `Pendulum-v0 <https://github.com/ray-project/ray/blob/master/python/ray/rllib/tuned_examples/pendulum-ddpg.yaml>`__, `MountainCarContinuous-v0 <https://github.com/ray-project/ray/blob/master/python/ray/rllib/tuned_examples/mountaincarcontinuous-ddpg.yaml>`__, `HalfCheetah-v2 <https://github.com/ray-project/ray/blob/master/python/ray/rllib/tuned_examples/halfcheetah-ddpg.yaml>`__
127+
Tuned examples: `Pendulum-v0 <https://github.com/ray-project/ray/blob/master/python/ray/rllib/tuned_examples/pendulum-ddpg.yaml>`__, `TD3 configuration <https://github.com/ray-project/ray/blob/master/python/ray/rllib/tuned_examples/pendulum-td3.yaml>`__, `MountainCarContinuous-v0 <https://github.com/ray-project/ray/blob/master/python/ray/rllib/tuned_examples/mountaincarcontinuous-ddpg.yaml>`__, `HalfCheetah-v2 <https://github.com/ray-project/ray/blob/master/python/ray/rllib/tuned_examples/halfcheetah-ddpg.yaml>`__
128128

129129
**DDPG-specific configs** (see also `common configs <rllib-training.html#common-parameters>`__):
130130

‎doc/source/rllib-env.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ PPO **Yes** **Yes** **Yes** **Yes**
1515
PG **Yes** **Yes** **Yes** **Yes**
1616
IMPALA **Yes** No **Yes** **Yes**
1717
DQN, Rainbow **Yes** No **Yes** No
18-
DDPG No **Yes** **Yes** No
18+
DDPG, TD3 No **Yes** **Yes** No
1919
APEX-DQN **Yes** No **Yes** No
2020
APEX-DDPG No **Yes** **Yes** No
2121
ES **Yes** **Yes** No No

‎doc/source/rllib.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Algorithms
5454

5555
- `Advantage Actor-Critic (A2C, A3C) <rllib-algorithms.html#advantage-actor-critic-a2c-a3c>`__
5656

57-
- `Deep Deterministic Policy Gradients (DDPG) <rllib-algorithms.html#deep-deterministic-policy-gradients-ddpg>`__
57+
- `Deep Deterministic Policy Gradients (DDPG, TD3) <rllib-algorithms.html#deep-deterministic-policy-gradients-ddpg-td3>`__
5858

5959
- `Deep Q Networks (DQN, Rainbow) <rllib-algorithms.html#deep-q-networks-dqn-rainbow>`__
6060

‎python/ray/WebUI.ipynb‎

Lines changed: 95 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -1,150 +1,97 @@
11
{
2-
"cells": [
3-
{
4-
"cell_type": "markdown",
5-
"metadata": {},
6-
"source": [
7-
"# Ray UI\n",
8-
"\n",
9-
"Start the UI with **Kernel -> Restart and Run All**."
10-
]
11-
},
12-
{
13-
"cell_type": "code",
14-
"execution_count": null,
15-
"metadata": {},
16-
"outputs": [],
17-
"source": [
18-
"import os\n",
19-
"import ray\n",
20-
"import ray.experimental.ui as ui\n",
21-
"\n",
22-
"ray.init(redis_address=os.environ[\"REDIS_ADDRESS\"])"
23-
]
24-
},
25-
{
26-
"cell_type": "markdown",
27-
"metadata": {},
28-
"source": [
29-
"#### Object search."
30-
]
31-
},
32-
{
33-
"cell_type": "code",
34-
"execution_count": null,
35-
"metadata": {},
36-
"outputs": [],
37-
"source": [
38-
"ui.object_search_bar()"
39-
]
40-
},
41-
{
42-
"cell_type": "markdown",
43-
"metadata": {},
44-
"source": [
45-
"#### Task search."
46-
]
47-
},
48-
{
49-
"cell_type": "code",
50-
"execution_count": null,
51-
"metadata": {},
52-
"outputs": [],
53-
"source": [
54-
"ui.task_search_bar()"
55-
]
56-
},
57-
{
58-
"cell_type": "markdown",
59-
"metadata": {},
60-
"source": [
61-
"#### Task trace timeline."
62-
]
63-
},
64-
{
65-
"cell_type": "markdown",
66-
"metadata": {},
67-
"source": [
68-
"To view arrows, go to View Options and select Flow Events."
69-
]
70-
},
71-
{
72-
"cell_type": "code",
73-
"execution_count": null,
74-
"metadata": {},
75-
"outputs": [],
76-
"source": [
77-
"ui.task_timeline()"
78-
]
79-
},
80-
{
81-
"cell_type": "markdown",
82-
"metadata": {},
83-
"source": [
84-
"#### Task durations."
85-
]
86-
},
87-
{
88-
"cell_type": "code",
89-
"execution_count": null,
90-
"metadata": {},
91-
"outputs": [],
92-
"source": [
93-
"ui.task_completion_time_distribution()"
94-
]
95-
},
96-
{
97-
"cell_type": "markdown",
98-
"metadata": {},
99-
"source": [
100-
"#### CPU usage."
101-
]
102-
},
103-
{
104-
"cell_type": "code",
105-
"execution_count": null,
106-
"metadata": {},
107-
"outputs": [],
108-
"source": [
109-
"ui.cpu_usage()"
110-
]
111-
},
112-
{
113-
"cell_type": "markdown",
114-
"metadata": {},
115-
"source": [
116-
"#### Cluster usage."
117-
]
118-
},
119-
{
120-
"cell_type": "code",
121-
"execution_count": null,
122-
"metadata": {},
123-
"outputs": [],
124-
"source": [
125-
"ui.cluster_usage()"
126-
]
127-
}
128-
],
129-
"metadata": {
130-
"kernelspec": {
131-
"display_name": "Python 3",
132-
"language": "python",
133-
"name": "python3"
134-
},
135-
"language_info": {
136-
"codemirror_mode": {
137-
"name": "ipython",
138-
"version": 3
139-
},
140-
"file_extension": ".py",
141-
"mimetype": "text/x-python",
142-
"name": "python",
143-
"nbconvert_exporter": "python",
144-
"pygments_lexer": "ipython3",
145-
"version": "3.6.1"
146-
}
147-
},
148-
"nbformat": 4,
149-
"nbformat_minor": 2
2+
"cells": [{
3+
"cell_type": "markdown",
4+
"metadata": {},
5+
"source": [
6+
"# Ray UI\n", "\n",
7+
"Start the UI with **Kernel -> Restart and Run All**."
8+
]
9+
}, {
10+
"cell_type": "code",
11+
"execution_count": null,
12+
"metadata": {},
13+
"outputs": [],
14+
"source": [
15+
"import os\n", "import ray\n",
16+
"import ray.experimental.ui as ui\n", "\n",
17+
"ray.init(redis_address=os.environ[\"REDIS_ADDRESS\"])"
18+
]
19+
}, {
20+
"cell_type": "markdown",
21+
"metadata": {},
22+
"source": ["#### Task trace timeline."]
23+
}, {
24+
"cell_type": "markdown",
25+
"metadata": {},
26+
"source": [
27+
"To view arrows, go to View Options and select Flow Events."
28+
]
29+
}, {
30+
"cell_type": "code",
31+
"execution_count": null,
32+
"metadata": {},
33+
"outputs": [],
34+
"source": ["ui.task_timeline()"]
35+
}, {
36+
"cell_type": "markdown",
37+
"metadata": {},
38+
"source": ["#### Object transfer timeline."]
39+
}, {
40+
"cell_type": "code",
41+
"execution_count": null,
42+
"metadata": {},
43+
"outputs": [],
44+
"source": ["ui.object_transfer_timeline()"]
45+
}, {
46+
"cell_type": "markdown",
47+
"metadata": {},
48+
"source": ["#### Task durations."]
49+
}, {
50+
"cell_type": "code",
51+
"execution_count": null,
52+
"metadata": {},
53+
"outputs": [],
54+
"source": ["ui.task_completion_time_distribution()"]
55+
}, {
56+
"cell_type": "markdown",
57+
"metadata": {},
58+
"source": ["#### CPU usage."]
59+
}, {
60+
"cell_type": "code",
61+
"execution_count": null,
62+
"metadata": {},
63+
"outputs": [],
64+
"source": ["ui.cpu_usage()"]
65+
}, {
66+
"cell_type": "markdown",
67+
"metadata": {},
68+
"source": ["#### Cluster usage."]
69+
}, {
70+
"cell_type": "code",
71+
"execution_count": null,
72+
"metadata": {},
73+
"outputs": [],
74+
"source": ["ui.cluster_usage()"]
75+
}],
76+
"metadata": {
77+
"kernelspec": {
78+
"display_name": "Python 3",
79+
"language": "python",
80+
"name": "python3"
81+
},
82+
"language_info": {
83+
"codemirror_mode": {
84+
"name": "ipython",
85+
"version": 3
86+
},
87+
"file_extension": ".py",
88+
"mimetype": "text/x-python",
89+
"name": "python",
90+
"nbconvert_exporter": "python",
91+
"pygments_lexer": "ipython3",
92+
"version": "3.6.1"
93+
}
94+
},
95+
"nbformat": 4,
96+
"nbformat_minor": 2
15097
}

‎python/ray/autoscaler/aws/config.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import boto3
1212
from botocore.config import Config
13+
import botocore
1314

1415
from ray.ray_constants import BOTO_MAX_RETRIES
1516

@@ -272,7 +273,7 @@ def _get_role(role_name, config):
272273
try:
273274
role.load()
274275
return role
275-
except Exception:
276+
except botocore.errorfactory.NoSuchEntityException:
276277
return None
277278

278279

@@ -282,7 +283,7 @@ def _get_instance_profile(profile_name, config):
282283
try:
283284
profile.load()
284285
return profile
285-
except Exception:
286+
except botocore.errorfactory.NoSuchEntityException:
286287
return None
287288

288289

0 commit comments

Comments
 (0)