Skip to content

Commit 053bb71

Browse files
authored
Merge branch 'master' into patch-1
2 parents 9f646ed + af754cb commit 053bb71

Some content is hidden

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

52 files changed

+4051
-585
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ pytorch_tutorial_build_defaults: &pytorch_tutorial_build_defaults
106106
sudo pip -q install awscli==1.16.35
107107
108108
if [ -n "${CUDA_VERSION}" ]; then
109-
DRIVER_FN="NVIDIA-Linux-x86_64-440.59.run"
109+
DRIVER_FN="NVIDIA-Linux-x86_64-460.39.run"
110110
wget "https://s3.amazonaws.com/ossci-linux/nvidia_driver/$DRIVER_FN"
111111
sudo /bin/bash "$DRIVER_FN" -s --no-drm || (sudo cat /var/log/nvidia-installer.log && false)
112112
nvidia-smi
@@ -122,7 +122,7 @@ pytorch_tutorial_build_defaults: &pytorch_tutorial_build_defaults
122122
command: |
123123
set -e
124124
125-
export pyTorchDockerImageTag=291
125+
export pyTorchDockerImageTag=9de29bef4a5dc0dd1dd19428d83e5a66a44a1ed2
126126
echo "PyTorchDockerImageTag: "${pyTorchDockerImageTag}
127127
128128
cat >/home/circleci/project/ci_build_script.sh \<<EOL
@@ -171,14 +171,14 @@ pytorch_tutorial_build_defaults: &pytorch_tutorial_build_defaults
171171
172172
pytorch_tutorial_build_worker_defaults: &pytorch_tutorial_build_worker_defaults
173173
environment:
174-
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py3"
174+
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7"
175175
CUDA_VERSION: "9"
176176
resource_class: gpu.medium
177177
<<: *pytorch_tutorial_build_defaults
178178

179179
pytorch_tutorial_build_manager_defaults: &pytorch_tutorial_build_manager_defaults
180180
environment:
181-
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda9-cudnn7-py3"
181+
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7"
182182
resource_class: medium
183183
<<: *pytorch_tutorial_build_defaults
184184

.circleci/scripts/build_for_windows.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ REQUIREMENTS="$(grep -v '^ *#\|^torch\|^torchaudio\|^torchvision|^torchtext' $PR
3535
echo $REQUIREMENTS > requirements.txt
3636
pip install -r requirements.txt
3737
pip install pySoundFile
38+
# Force uninstall torch & related packages, we'll install them using conda later.
39+
pip uninstall -y torch torchvision torchtext
3840
conda install -yq -c pytorch "cudatoolkit=10.1" pytorch torchvision torchtext
3941
conda install torchaudio -c pytorch-test
4042
python -m spacy download de
@@ -47,6 +49,9 @@ if [[ "${CIRCLE_JOB}" == *worker_* ]]; then
4749
python $DIR/remove_runnable_code.py intermediate_source/model_parallel_tutorial.py intermediate_source/model_parallel_tutorial.py || true
4850
python $DIR/remove_runnable_code.py advanced_source/static_quantization_tutorial.py advanced_source/static_quantization_tutorial.py || true
4951
python $DIR/remove_runnable_code.py beginner_source/hyperparameter_tuning_tutorial.py beginner_source/hyperparameter_tuning_tutorial.py || true
52+
python $DIR/remove_runnable_code.py beginner_source/audio_preprocessing_tutorial.py beginner_source/audio_preprocessing_tutorial.py || true
53+
# Temp remove for mnist download issue.
54+
python $DIR/remove_runnable_code.py beginner_source/fgsm_tutorial.py beginner_source/fgsm_tutorial.py || true
5055

5156
export WORKER_ID=$(echo "${CIRCLE_JOB}" | tr -dc '0-9')
5257
count=0

.devcontainer/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
FROM python:3.6-slim
1+
FROM mcr.microsoft.com/vscode/devcontainers/python:3.8
22

3-
COPY requirements.txt requirements.txt
3+
COPY requirements.txt /tmp/pip-tmp/
44

55
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
66
&& apt-get install git gcc unzip make -y \
7-
&& pip install --no-cache-dir -r requirements.txt
7+
&& pip3 install --disable-pip-version-check --no-cache-dir -r /tmp/pip-tmp/requirements.txt \
8+
&& rm -rf /tmp/pip-tmp

.devcontainer/devcontainer.json

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
{
2-
"name": "PyTorch",
3-
"build": {
4-
"context": "..",
5-
"dockerfile": "Dockerfile",
6-
"args": { }
7-
},
8-
"settings": {
9-
"terminal.integrated.shell.linux": "/bin/bash",
10-
"workbench.startupEditor": "none",
11-
"files.autoSave": "afterDelay",
12-
"python.dataScience.enabled": true,
13-
"python.dataScience.alwaysTrustNotebooks": true,
14-
"python.insidersChannel": "weekly",
15-
"python.showStartPage": false
16-
},
17-
"extensions": [
18-
"ms-python.python",
19-
"lextudio.restructuredtext"
20-
]
21-
}
2+
"name": "PyTorch Tutorials",
3+
"build": {
4+
"context": "..",
5+
"dockerfile": "Dockerfile",
6+
"args": {}
7+
},
8+
"settings": {
9+
"terminal.integrated.shell.linux": "/bin/bash",
10+
"workbench.startupEditor": "none",
11+
"files.autoSave": "afterDelay",
12+
"python.dataScience.enabled": true,
13+
"python.dataScience.alwaysTrustNotebooks": true,
14+
"python.insidersChannel": "weekly",
15+
"python.showStartPage": false
16+
},
17+
"extensions": ["ms-python.python", "lextudio.restructuredtext"]
18+
}

.devcontainer/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ipython
2424
# to run examples
2525
pandas
2626
scikit-image
27-
pillow==8.1.0
27+
pillow==8.1.1
2828
wget
2929

3030
# for codespaces env

.jenkins/build.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ pip install -r $DIR/../requirements.txt
2222
# export PATH=/opt/conda/bin:$PATH
2323
# pip install sphinx==1.8.2 pandas
2424

25+
#Install PyTorch Nightly for test.
26+
# Nightly - pip install --pre torch torchvision torchaudio -f https://download.pytorch.org/whl/nightly/cu102/torch_nightly.html
27+
# RC Link
28+
# pip uninstall -y torch torchvision torchaudio torchtext
29+
# pip install -f https://download.pytorch.org/whl/test/cu102/torch_test.html torch torchvision torchaudio torchtext
30+
2531
# For Tensorboard. Until 1.14 moves to the release channel.
2632
pip install tb-nightly
2733

@@ -41,6 +47,11 @@ export NUM_WORKERS=20
4147
if [[ "${JOB_BASE_NAME}" == *worker_* ]]; then
4248
# Step 1: Remove runnable code from tutorials that are not supposed to be run
4349
python $DIR/remove_runnable_code.py beginner_source/aws_distributed_training_tutorial.py beginner_source/aws_distributed_training_tutorial.py || true
50+
# python $DIR/remove_runnable_code.py advanced_source/ddp_pipeline_tutorial.py advanced_source/ddp_pipeline_tutorial.py || true
51+
# Temp remove for mnist download issue.
52+
python $DIR/remove_runnable_code.py beginner_source/fgsm_tutorial.py beginner_source/fgsm_tutorial.py || true
53+
python $DIR/remove_runnable_code.py intermediate_source/spatial_transformer_tutorial.py intermediate_source/spatial_transformer_tutorial.py || true
54+
4455
# TODO: Fix bugs in these tutorials to make them runnable again
4556
# python $DIR/remove_runnable_code.py beginner_source/audio_classifier_tutorial.py beginner_source/audio_classifier_tutorial.py || true
4657

_static/img/quickstart/comp-graph.png

-14 KB
Binary file not shown.
-32.6 KB
Binary file not shown.
-59.2 KB
Binary file not shown.

_static/img/quickstart/typesdata.png

-14.4 KB
Binary file not shown.
Loading
Loading
Loading

_templates/layout.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,10 @@
7373
src="https://www.facebook.com/tr?id=243028289693773&ev=PageView
7474
&noscript=1"/>
7575
</noscript>
76+
77+
<script type="text/javascript">
78+
var collapsedSections = ['PyTorch Recipes', 'Image and Video', 'Audio', 'Text', 'Reinforcement Learning', 'Deploying PyTorch Models in Production', 'Code Transforms with FX', 'Frontend APIs', 'Extending PyTorch', 'Model Optimization', 'Parallel and Distributed Training', 'Mobile'];
79+
</script>
80+
7681
<img height="1" width="1" style="border-style:none;" alt="" src="https://www.googleadservices.com/pagead/conversion/795629140/?label=txkmCPmdtosBENSssfsC&amp;guid=ON&amp;script=0"/>
7782
{% endblock %}

advanced_source/cpp_extension.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ Once you have your operation written in C++ and ATen, you can use pybind11 to
313313
bind your C++ functions or classes into Python in a very simple manner.
314314
Questions or issues you have about this part of PyTorch C++ extensions will
315315
largely be addressed by `pybind11 documentation
316-
<https://pybind11.readthedocs.io/en/master/>`_.
316+
<https://pybind11.readthedocs.io/en/stable/>`_.
317317

318318
For our extensions, the necessary binding code spans only four lines:
319319

0 commit comments

Comments
 (0)