Skip to content

Commit d7807d3

Browse files
committed
doc: refactor sphinx overview topic
2 parents 90c4b46 + a659683 commit d7807d3

File tree

216 files changed

+24279
-16285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

216 files changed

+24279
-16285
lines changed

CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
# Changelog
22

3+
## v1.29.0 (2019-06-24)
4+
5+
### Features
6+
7+
* network isolation mode in training
8+
9+
### Bug fixes and other changes
10+
11+
* Integrate black into development process
12+
* moving not canary TFS tests to local mode
13+
14+
## v1.28.3 (2019-06-20)
15+
16+
### Bug fixes and other changes
17+
18+
* update Sagemaker Neo regions and instance families
19+
20+
### Documentation changes
21+
22+
* fix punctuation in MXNet version list
23+
* clean up MXNet and TF documentation
24+
325
## v1.28.2 (2019-06-19)
426

527
### Bug fixes and other changes

README.rst

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ As a managed service, Amazon SageMaker performs operations on your behalf on the
8484
Amazon SageMaker can perform only operations that the user permits.
8585
You can read more about which permissions are necessary in the `AWS Documentation <https://docs.aws.amazon.com/sagemaker/latest/dg/sagemaker-roles.html>`__.
8686

87-
The SageMaker Python SDK should not require any additional permissions.
87+
The SageMaker Python SDK should not require any additional permissions aside from what is required for using SageMaker.
8888
However, if you are using an IAM role with a path in it, you should grant permission for ``iam:GetRole``.
8989

9090
Licensing
@@ -117,27 +117,28 @@ To run the unit tests with tox, run:
117117
To run the integration tests, the following prerequisites must be met
118118

119119
1. AWS account credentials are available in the environment for the boto3 client to use.
120-
2. The AWS account has an IAM role named :code:`SageMakerRole` with the AmazonSageMakerFullAccess policy attached.
120+
2. The AWS account has an IAM role named :code:`SageMakerRole`.
121+
It should have the AmazonSageMakerFullAccess policy attached as well as a policy with `the necessary permissions to use Elastic Inference <https://docs.aws.amazon.com/sagemaker/latest/dg/ei-setup.html>`__.
121122

122123
We recommend selectively running just those integration tests you'd like to run. You can filter by individual test function names with:
123124

124125
::
125126

126-
pytest -k 'test_i_care_about'
127+
tox -- -k 'test_i_care_about'
127128

128129

129130
You can also run all of the integration tests by running the following command, which runs them in sequence, which may take a while:
130131

131132
::
132133

133-
pytest tests/integ
134+
tox -- tests/integ
134135

135136

136137
You can also run them in parallel:
137138

138139
::
139140

140-
pytest -n auto tests/integ
141+
tox -- -n auto tests/integ
141142

142143

143144
Building Sphinx docs
@@ -149,16 +150,16 @@ Building Sphinx docs
149150

150151
make html
151152

152-
You can edit the templates for any of the pages in the docs by editing the .rst files in the "doc" directory and then running "``make html``" again.
153+
You can edit the templates for any of the pages in the docs by editing the .rst files in the ``doc`` directory and then running ``make html`` again.
153154

154155
MXNet SageMaker Estimators
155156
--------------------------
156157

157-
By using MXNet SageMaker ``Estimators``, you can train and host MXNet models on Amazon SageMaker.
158+
By using MXNet SageMaker Estimators, you can train and host MXNet models on Amazon SageMaker.
158159

159-
Supported versions of MXNet: ``1.3.0``, ``1.2.1``, ``1.1.0``, ``1.0.0``, ``0.12.1``.
160+
Supported versions of MXNet: ``0.12.1``, ``1.0.0``, ``1.1.0``, ``1.2.1``, ``1.3.0``, ``1.4.0``.
160161

161-
Supported versions of MXNet for Elastic Inference: ``1.3.0``
162+
Supported versions of MXNet for Elastic Inference: ``1.3.0``, ``1.4.0``.
162163

163164
We recommend that you use the latest supported version, because that's where we focus most of our development efforts.
164165

@@ -170,7 +171,7 @@ For more information, see `Using MXNet with the SageMaker Python SDK`_.
170171
TensorFlow SageMaker Estimators
171172
-------------------------------
172173

173-
By using TensorFlow SageMaker ``Estimators``, you can train and host TensorFlow models on Amazon SageMaker.
174+
By using TensorFlow SageMaker Estimators, you can train and host TensorFlow models on Amazon SageMaker.
174175

175176
Supported versions of TensorFlow: ``1.4.1``, ``1.5.0``, ``1.6.0``, ``1.7.0``, ``1.8.0``, ``1.9.0``, ``1.10.0``, ``1.11.0``, ``1.12.0``.
176177

@@ -186,47 +187,47 @@ For more information, see `Using TensorFlow with the SageMaker Python SDK`_.
186187
Chainer SageMaker Estimators
187188
----------------------------
188189

189-
By using Chainer SageMaker ``Estimators``, you can train and host Chainer models on Amazon SageMaker.
190+
By using Chainer SageMaker Estimators, you can train and host Chainer models on Amazon SageMaker.
190191

191192
Supported versions of Chainer: ``4.0.0``, ``4.1.0``, ``5.0.0``.
192193

193194
We recommend that you use the latest supported version, because that's where we focus most of our development efforts.
194195

195196
For more information about Chainer, see https://github.com/chainer/chainer.
196197

197-
For more information about Chainer SageMaker ``Estimators``, see `Using Chainer with the SageMaker Python SDK`_.
198+
For more information about Chainer SageMaker Estimators, see `Using Chainer with the SageMaker Python SDK`_.
198199

199200
.. _Using Chainer with the SageMaker Python SDK: https://sagemaker.readthedocs.io/en/stable/using_chainer.html
200201

201202

202203
PyTorch SageMaker Estimators
203204
----------------------------
204205

205-
With PyTorch SageMaker ``Estimators``, you can train and host PyTorch models on Amazon SageMaker.
206+
With PyTorch SageMaker Estimators, you can train and host PyTorch models on Amazon SageMaker.
206207

207208
Supported versions of PyTorch: ``0.4.0``, ``1.0.0``.
208209

209210
We recommend that you use the latest supported version, because that's where we focus most of our development efforts.
210211

211212
For more information about PyTorch, see https://github.com/pytorch/pytorch.
212213

213-
For more information about PyTorch SageMaker ``Estimators``, see `Using PyTorch with the SageMaker Python SDK`_.
214+
For more information about PyTorch SageMaker Estimators, see `Using PyTorch with the SageMaker Python SDK`_.
214215

215216
.. _Using PyTorch with the SageMaker Python SDK: https://sagemaker.readthedocs.io/en/stable/using_pytorch.html
216217

217218

218219
Scikit-learn SageMaker Estimators
219220
---------------------------------
220221

221-
With Scikit-learn SageMaker ``Estimators``, you can train and host Scikit-learn models on Amazon SageMaker.
222+
With Scikit-learn SageMaker Estimators, you can train and host Scikit-learn models on Amazon SageMaker.
222223

223224
Supported versions of Scikit-learn: ``0.20.0``.
224225

225226
We recommend that you use the latest supported version, because that's where we focus most of our development efforts.
226227

227228
For more information about Scikit-learn, see https://scikit-learn.org/stable/
228229

229-
For more information about Scikit-learn SageMaker ``Estimators``, see `Using Scikit-learn with the SageMaker Python SDK`_.
230+
For more information about Scikit-learn SageMaker Estimators, see `Using Scikit-learn with the SageMaker Python SDK`_.
230231

231232
.. _Using Scikit-learn with the SageMaker Python SDK: https://sagemaker.readthedocs.io/en/stable/using_sklearn.html
232233

@@ -236,13 +237,13 @@ SageMaker Reinforcement Learning Estimators
236237

237238
With Reinforcement Learning (RL) Estimators, you can use reinforcement learning to train models on Amazon SageMaker.
238239

239-
Supported versions of Coach: ``0.10.1`` with TensorFlow, ``0.11.0`` with TensorFlow or MXNet.
240+
Supported versions of Coach: ``0.10.1``, ``0.11.1`` with TensorFlow, ``0.11.0`` with TensorFlow or MXNet.
240241
For more information about Coach, see https://github.com/NervanaSystems/coach
241242

242-
Supported versions of Ray: ``0.5.3`` with TensorFlow.
243+
Supported versions of Ray: ``0.5.3``, ``0.6.5`` with TensorFlow.
243244
For more information about Ray, see https://github.com/ray-project/ray
244245

245-
For more information about SageMaker RL ``Estimators``, see `SageMaker Reinforcement Learning Estimators`_.
246+
For more information about SageMaker RL Estimators, see `SageMaker Reinforcement Learning Estimators`_.
246247

247248
.. _SageMaker Reinforcement Learning Estimators: src/sagemaker/rl/README.rst
248249

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.28.3.dev0
1+
1.29.1.dev0

buildspec-release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ phases:
99
# run linters
1010
- tox -e flake8,pylint
1111

12+
# run format verification
13+
- tox -e black-check
14+
1215
# run package and docbuild checks
1316
- tox -e twine
1417
- tox -e sphinx

buildspec.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ phases:
1414
- tox -e twine
1515
- tox -e sphinx
1616

17+
# run format verification
18+
- tox -e black-check
19+
1720
# run unit tests
1821
- AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= AWS_SESSION_TOKEN=
1922
AWS_CONTAINER_CREDENTIALS_RELATIVE_URI= AWS_DEFAULT_REGION=

doc/conf.py

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,51 +28,65 @@ def __getattr__(cls, name):
2828
return MagicMock()
2929

3030

31-
MOCK_MODULES = ['tensorflow', 'tensorflow.core', 'tensorflow.core.framework', 'tensorflow.python',
32-
'tensorflow.python.framework', 'tensorflow_serving', 'tensorflow_serving.apis',
33-
'numpy', 'scipy', 'scipy.sparse']
31+
MOCK_MODULES = [
32+
"tensorflow",
33+
"tensorflow.core",
34+
"tensorflow.core.framework",
35+
"tensorflow.python",
36+
"tensorflow.python.framework",
37+
"tensorflow_serving",
38+
"tensorflow_serving.apis",
39+
"numpy",
40+
"scipy",
41+
"scipy.sparse",
42+
]
3443
sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
3544

36-
project = u'sagemaker'
45+
project = u"sagemaker"
3746
version = pkg_resources.require(project)[0].version
3847

3948
# Add any Sphinx extension module names here, as strings. They can be extensions
4049
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
41-
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest',
42-
'sphinx.ext.intersphinx', 'sphinx.ext.todo',
43-
'sphinx.ext.coverage', 'sphinx.ext.autosummary',
44-
'sphinx.ext.napoleon']
50+
extensions = [
51+
"sphinx.ext.autodoc",
52+
"sphinx.ext.doctest",
53+
"sphinx.ext.intersphinx",
54+
"sphinx.ext.todo",
55+
"sphinx.ext.coverage",
56+
"sphinx.ext.autosummary",
57+
"sphinx.ext.napoleon",
58+
]
4559

4660
# Add any paths that contain templates here, relative to this directory.
47-
templates_path = ['_templates']
61+
templates_path = ["_templates"]
4862

49-
source_suffix = '.rst' # The suffix of source filenames.
50-
master_doc = 'index' # The master toctree document.
63+
source_suffix = ".rst" # The suffix of source filenames.
64+
master_doc = "index" # The master toctree document.
5165

52-
copyright = u'%s, Amazon' % datetime.now().year
66+
copyright = u"%s, Amazon" % datetime.now().year
5367

5468
# The full version, including alpha/beta/rc tags.
5569
release = version
5670

5771
# List of directories, relative to source directory, that shouldn't be searched
5872
# for source files.
59-
exclude_trees = ['_build']
73+
exclude_trees = ["_build"]
6074

61-
pygments_style = 'default'
75+
pygments_style = "default"
6276

6377
autoclass_content = "both"
64-
autodoc_default_flags = ['show-inheritance', 'members', 'undoc-members']
65-
autodoc_member_order = 'bysource'
78+
autodoc_default_flags = ["show-inheritance", "members", "undoc-members"]
79+
autodoc_member_order = "bysource"
6680

67-
if 'READTHEDOCS' in os.environ:
68-
html_theme = 'default'
81+
if "READTHEDOCS" in os.environ:
82+
html_theme = "default"
6983
else:
70-
html_theme = 'haiku'
84+
html_theme = "haiku"
7185
html_static_path = []
72-
htmlhelp_basename = '%sdoc' % project
86+
htmlhelp_basename = "%sdoc" % project
7387

7488
# Example configuration for intersphinx: refer to the Python standard library.
75-
intersphinx_mapping = {'http://docs.python.org/': None}
89+
intersphinx_mapping = {"http://docs.python.org/": None}
7690

7791
# autosummary
7892
autosummary_generate = True

0 commit comments

Comments
 (0)