Skip to content

Commit 2dbf80f

Browse files
authored
Merge branch 'master' into master
2 parents 9cac6be + 3d5366c commit 2dbf80f

File tree

9 files changed

+86
-21
lines changed

9 files changed

+86
-21
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
name: Bug report
3+
about: File a report to help us reproduce and fix the problem
4+
title: ''
5+
labels: 'bug'
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To reproduce**
14+
A clear, step-by-step set of instructions to reproduce the bug.
15+
16+
**Expected behavior**
17+
A clear and concise description of what you expected to happen.
18+
19+
**Screenshots or logs**
20+
If applicable, add screenshots or logs to help explain your problem.
21+
22+
**System information**
23+
A description of your system. Please provide:
24+
- **SageMaker Python SDK version**:
25+
- **Framework name (eg. PyTorch) or algorithm (eg. KMeans)**:
26+
- **Framework version**:
27+
- **Python version**:
28+
- **CPU or GPU**:
29+
- **Custom Docker image (Y/N)**:
30+
31+
**Additional context**
32+
Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Ask a question
4+
url: https://stackoverflow.com/questions/tagged/amazon-sagemaker
5+
about: Use Stack Overflow to ask and answer questions
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: Documentation request
3+
about: Request improved documentation
4+
title: ''
5+
labels: 'doc update'
6+
assignees: ''
7+
8+
---
9+
10+
**What did you find confusing? Please describe.**
11+
A clear and concise description of what you found confusing. Ex. I tried to [...] but I didn't understand how to [...]
12+
13+
**Describe how documentation can be improved**
14+
A clear and concise description of where documentation was lacking and how it can be improved.
15+
16+
**Additional context**
17+
Add any other context or screenshots about the documentation request here.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an improvement for this library
4+
title: ''
5+
labels: 'feature request'
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

.github/issue_template.md

Lines changed: 0 additions & 17 deletions
This file was deleted.

doc/using_mxnet.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,15 @@ For more information on the runtime environment, including specific package vers
312312
If there are other packages you want to use with your script, you can include a ``requirements.txt`` file in the same directory as your training script to install other dependencies at runtime.
313313
Both ``requirements.txt`` and your training script should be put in the same folder.
314314
You must specify this folder in ``source_dir`` argument when creating an MXNet estimator.
315+
316+
The function of installing packages using ``requirements.txt`` is supported for all MXNet versions during training.
317+
When serving an MXNet model, support for this function varies with MXNet versions.
318+
For MXNet 1.6.0 or newer, ``requirements.txt`` must be under folder ``code``.
319+
The SageMaker MXNet Estimator will automatically save ``code`` in ``model.tar.gz`` after training (assuming you set up your script and ``requirements.txt`` correctly as stipulated in the previous paragraph).
320+
In the case of bringing your own trained model for deployment, you must save ``requirements.txt`` under folder ``code`` in ``model.tar.gz`` yourself or specify it through ``dependencies``.
321+
For MXNet 1.4.1, ``requirements.txt`` is not supported for inference.
322+
For MXNet 0.12.1-1.3.0, ``requirements.txt`` must be in ``source_dir``.
323+
315324
A ``requirements.txt`` file is a text file that contains a list of items that are installed by using ``pip install``.
316325
You can also specify the version of an item to install.
317326
For information about the format of a ``requirements.txt`` file, see `Requirements Files <https://pip.pypa.io/en/stable/user_guide/#requirements-files>`__ in the pip documentation.

doc/using_pytorch.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ For more information on the runtime environment, including specific package vers
127127

128128
If there are other packages you want to use with your script, you can include a ``requirements.txt`` file in the same directory as your training script to install other dependencies at runtime. Both ``requirements.txt`` and your training script should be put in the same folder. You must specify this folder in ``source_dir`` argument when creating PyTorch estimator.
129129

130-
The function of installing packages using ``requirements.txt`` is supported for all PyTorch versions during training. When serving a PyTorch model, support for this function varies with PyTorch Versions. For PyTorch 1.3.1 or newer, ``requirements.txt`` must be under folder ``code``. SageMaker PyTorch Estimator will automatically save ``code`` in ``model.tar.gz`` after training (assuming you set up your script and ``requirements.txt`` correctly as stipulated in the previous paragraph). In the case of bringing your own trained model for deployment, you must save ``requirements.txt`` under folder ``code`` in ``model.tar.gz`` yourself. For PyTorch 1.2.0, ``requirements.txt`` is not supported for inference. For PyTorch 0.4.0 to 1.1.0, ``requirements.txt`` must be in ``source_dir``.
130+
The function of installing packages using ``requirements.txt`` is supported for all PyTorch versions during training. When serving a PyTorch model, support for this function varies with PyTorch versions. For PyTorch 1.3.1 or newer, ``requirements.txt`` must be under folder ``code``. The SageMaker PyTorch Estimator will automatically save ``code`` in ``model.tar.gz`` after training (assuming you set up your script and ``requirements.txt`` correctly as stipulated in the previous paragraph). In the case of bringing your own trained model for deployment, you must save ``requirements.txt`` under folder ``code`` in ``model.tar.gz`` yourself or specify it through ``dependencies``. For PyTorch 1.2.0, ``requirements.txt`` is not supported for inference. For PyTorch 0.4.0 to 1.1.0, ``requirements.txt`` must be in ``source_dir``.
131131

132132
A ``requirements.txt`` file is a text file that contains a list of items that are installed by using ``pip install``. You can also specify the version of an item to install. For information about the format of a ``requirements.txt`` file, see `Requirements Files <https://pip.pypa.io/en/stable/user_guide/#requirements-files>`__ in the pip documentation.
133133

src/sagemaker/estimator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ def delete_endpoint(self):
796796
"""Delete an Amazon SageMaker ``Endpoint``.
797797
798798
Raises:
799-
ValueError: If the endpoint does not exist.
799+
botocore.exceptions.ClientError: If the endpoint does not exist.
800800
"""
801801
self._ensure_latest_training_job(error_message="Endpoint was not created yet")
802802
self.sagemaker_session.delete_endpoint(self.latest_training_job.name)

src/sagemaker/pytorch/defaults.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515

1616
PYTORCH_VERSION = "0.4"
1717
"""Default PyTorch version for when the framework version is not specified.
18-
The latest PyTorch version is 1.1.0, but the default version is no longer updated so as to not
19-
break existing workflows.
18+
The default version is no longer updated so as to not break existing workflows.
2019
"""
2120

2221
LATEST_VERSION = "1.3.1"

0 commit comments

Comments
 (0)