Skip to content

Commit b14b3f4

Browse files
author
chronos_secgrp_pytorch_oss_ci_oncall
committed
2021-03-17 nightly release (b936abd)
1 parent 3f71714 commit b14b3f4

File tree

245 files changed

+3389
-1990
lines changed

Some content is hidden

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

245 files changed

+3389
-1990
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1326,7 +1326,7 @@ jobs:
13261326
command: |
13271327
set -e
13281328
export IN_CI=1
1329-
export CROSS_COMPILE_ARM=1
1329+
export CROSS_COMPILE_ARM64=1
13301330
13311331
# Install sccache
13321332
sudo curl --retry 3 https://s3.amazonaws.com/ossci-macos/sccache_v2.15 --output /usr/local/bin/sccache

.circleci/scripts/python_doc_push_script.sh

-8
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,6 @@ popd
111111
git rm -rf "$install_path" || true
112112
mv "$pt_checkout/docs/build/html" "$install_path"
113113

114-
# Add the version handler by search and replace.
115-
# XXX: Consider moving this to the docs Makefile or site build
116-
if [ "$is_master_doc" = true ]; then
117-
find "$install_path" -name "*.html" -print0 | xargs -0 perl -pi -w -e "s@master\s+\((\d\.\d\.[A-Fa-f0-9]+\+[A-Fa-f0-9]+)\s+\)@<a href='http://pytorch.org/docs/versions.html'>\1 \&#x25BC</a>@g"
118-
else
119-
find "$install_path" -name "*.html" -print0 | xargs -0 perl -pi -w -e "s@master\s+\((\d\.\d\.[A-Fa-f0-9]+\+[A-Fa-f0-9]+)\s+\)@<a href='http://pytorch.org/docs/versions.html'>$version \&#x25BC</a>@g"
120-
fi
121-
122114
# Prevent Google from indexing $install_path/_modules. This folder contains
123115
# generated source files.
124116
# NB: the following only works on gnu sed. The sed shipped with mac os is different.

.circleci/verbatim-sources/job-specs/job-specs-custom.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
command: |
126126
set -e
127127
export IN_CI=1
128-
export CROSS_COMPILE_ARM=1
128+
export CROSS_COMPILE_ARM64=1
129129
130130
# Install sccache
131131
sudo curl --retry 3 https://s3.amazonaws.com/ossci-macos/sccache_v2.15 --output /usr/local/bin/sccache

.jenkins/caffe2/bench.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22

3+
# shellcheck source=./common.sh
34
source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
45

56
# Anywhere except $ROOT_DIR should work. This is so the python import doesn't

.jenkins/caffe2/build.sh

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
set -ex
44

5+
# shellcheck source=./common.sh
56
source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
67

78
# CMAKE_ARGS are only passed to 'cmake' and the -Dfoo=bar does not work with

.jenkins/caffe2/test.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22

3+
# shellcheck source=./common.sh
34
source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
45

56
# Skip tests in environments where they are not built/applicable

.jenkins/pytorch/.shellcheckrc

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
disable=SC2086
2-
disable=SC1091
32
disable=SC2155
4-
disable=SC1090
53
disable=SC2164
64
disable=SC1003

.jenkins/pytorch/build-asan.sh

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# shellcheck disable=SC2034
88
COMPACT_JOB_NAME="${BUILD_ENVIRONMENT}"
99

10+
# shellcheck source=./common.sh
1011
source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
1112

1213
echo "Clang version:"

.jenkins/pytorch/build-mobile-code-analysis.sh

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ set -eu -o pipefail
88
# shellcheck disable=SC2034
99
COMPACT_JOB_NAME="${BUILD_ENVIRONMENT}"
1010

11+
# shellcheck source=./common.sh
1112
source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
1213

1314
echo "Clang version:"

.jenkins/pytorch/build-mobile.sh

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ set -eu -o pipefail
99
# shellcheck disable=SC2034
1010
COMPACT_JOB_NAME="${BUILD_ENVIRONMENT}"
1111

12+
# shellcheck source=./common.sh
1213
source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
1314

1415
# Install torch & torchvision - used to download & trace test model.

.jenkins/pytorch/build.sh

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ set -ex
99
# shellcheck disable=SC2034
1010
COMPACT_JOB_NAME="${BUILD_ENVIRONMENT}"
1111

12+
# shellcheck source=./common.sh
1213
source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
1314

1415
if [[ "$BUILD_ENVIRONMENT" == *-linux-xenial-py3-clang5-asan* ]]; then
@@ -123,6 +124,7 @@ fi
123124

124125
if [[ "$BUILD_ENVIRONMENT" != *android* && "$BUILD_ENVIRONMENT" == *vulkan-linux* ]]; then
125126
export USE_VULKAN=1
127+
# shellcheck disable=SC1091
126128
source /var/lib/jenkins/vulkansdk/setup-env.sh
127129
fi
128130

.jenkins/pytorch/codegen-test.sh

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ set -eu -o pipefail
1414
if [ "$#" -eq 0 ]; then
1515
# shellcheck disable=SC2034
1616
COMPACT_JOB_NAME="${BUILD_ENVIRONMENT}"
17+
# shellcheck source=./common.sh
1718
source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
1819
OUT="$(dirname "${BASH_SOURCE[0]}")/../../codegen_result"
1920
else

.jenkins/pytorch/common.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22

33
# Common setup for all Jenkins scripts
4+
# shellcheck source=./common_utils.sh
45
source "$(dirname "${BASH_SOURCE[0]}")/common_utils.sh"
56
set -ex
67

.jenkins/pytorch/docker-build-test.sh

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# shellcheck disable=SC2034
44
COMPACT_JOB_NAME="docker-build-test"
55

6+
# shellcheck source=./common.sh
67
source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
78

89
docker build -t pytorch .

.jenkins/pytorch/docs-test.sh

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# shellcheck disable=SC2034
44
COMPACT_JOB_NAME="${BUILD_ENVIRONMENT}"
55

6+
# shellcheck source=./common.sh
67
source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
78

89
echo "Testing pytorch docs"

.jenkins/pytorch/macos-build-test.sh

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
#!/bin/bash
22

33
if [ -z "${BUILD_ENVIRONMENT}" ] || [[ "${BUILD_ENVIRONMENT}" == *-build* ]]; then
4+
# shellcheck source=./macos-build.sh
45
source "$(dirname "${BASH_SOURCE[0]}")/macos-build.sh"
56
fi
67

78
if [ -z "${BUILD_ENVIRONMENT}" ] || [[ "${BUILD_ENVIRONMENT}" == *-test* ]]; then
9+
# shellcheck source=./macos-test.sh
810
source "$(dirname "${BASH_SOURCE[0]}")/macos-test.sh"
911
fi

.jenkins/pytorch/macos-build.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22

33
# shellcheck disable=SC2034
4+
# shellcheck source=./macos-common.sh
45
source "$(dirname "${BASH_SOURCE[0]}")/macos-common.sh"
56

67
export CMAKE_PREFIX_PATH=${WORKSPACE_DIR}/miniconda3/
@@ -26,7 +27,7 @@ if which sccache > /dev/null; then
2627
export PATH="${WORKSPACE_DIR}:$PATH"
2728
fi
2829

29-
if [ -z "${CROSS_COMPILE_ARM}" ]; then
30+
if [ -z "${CROSS_COMPILE_ARM64}" ]; then
3031
USE_DISTRIBUTED=1 python setup.py install
3132
else
3233
export MACOSX_DEPLOYMENT_TARGET=11.0

.jenkins/pytorch/macos-common.sh

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ sysctl -a | grep machdep.cpu
77
# shellcheck disable=SC2034
88
COMPACT_JOB_NAME="${BUILD_ENVIRONMENT}"
99

10+
# shellcheck source=./common.sh
1011
source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
1112
export PATH="/usr/local/bin:$PATH"
1213
export WORKSPACE_DIR="${HOME}/workspace"
@@ -25,6 +26,7 @@ if [ ! -d "${WORKSPACE_DIR}/miniconda3" ]; then
2526
retry bash ${WORKSPACE_DIR}/miniconda3.sh -b -p ${WORKSPACE_DIR}/miniconda3
2627
fi
2728
export PATH="${WORKSPACE_DIR}/miniconda3/bin:$PATH"
29+
# shellcheck disable=SC1090
2830
source ${WORKSPACE_DIR}/miniconda3/bin/activate
2931
retry conda install -y mkl mkl-include numpy=1.18.5 pyyaml=5.3 setuptools=46.0.0 cmake cffi ninja typing_extensions dataclasses pip
3032
# The torch.hub tests make requests to GitHub.

.jenkins/pytorch/macos-lite-interpreter-build-test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# shellcheck disable=SC1090
3+
# shellcheck source=./macos-common.sh
44
source "$(dirname "${BASH_SOURCE[0]}")/macos-common.sh"
55

66
git submodule sync --recursive

.jenkins/pytorch/macos-test.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22

33
# shellcheck disable=SC2034
4+
# shellcheck source=./macos-common.sh
45
source "$(dirname "${BASH_SOURCE[0]}")/macos-common.sh"
56

67
conda install -y six

.jenkins/pytorch/multigpu-test.sh

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# shellcheck disable=SC2034
88
COMPACT_JOB_NAME="${BUILD_ENVIRONMENT}"
99

10+
# shellcheck source=./common.sh
1011
source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
1112

1213
echo "Testing pytorch (distributed only)"

.jenkins/pytorch/short-perf-test-cpu.sh

+4
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,13 @@ if [[ "$COMMIT_SOURCE" == master ]]; then
4242
fi
4343

4444
# Include tests
45+
# shellcheck source=./perf_test/test_cpu_speed_mini_sequence_labeler.sh
4546
. ./test_cpu_speed_mini_sequence_labeler.sh
47+
# shellcheck source=./perf_test/test_cpu_speed_mnist.sh
4648
. ./test_cpu_speed_mnist.sh
49+
# shellcheck source=./perf_test/test_cpu_speed_torch.sh
4750
. ./test_cpu_speed_torch.sh
51+
# shellcheck source=./perf_test/test_cpu_speed_torch_tensor.sh
4852
. ./test_cpu_speed_torch_tensor.sh
4953

5054
# Run tests

.jenkins/pytorch/short-perf-test-gpu.sh

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# shellcheck disable=SC2034
44
COMPACT_JOB_NAME="short-perf-test-gpu"
55

6+
# shellcheck source=./common.sh
67
source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
78

89
pushd .jenkins/pytorch/perf_test
@@ -41,10 +42,15 @@ if [[ "$COMMIT_SOURCE" == master ]]; then
4142
fi
4243

4344
# Include tests
45+
# shellcheck source=./perf_test/test_gpu_speed_mnist.sh
4446
. ./test_gpu_speed_mnist.sh
47+
# shellcheck source=./perf_test/test_gpu_speed_word_language_model.sh
4548
. ./test_gpu_speed_word_language_model.sh
49+
# shellcheck source=./perf_test/test_gpu_speed_cudnn_lstm.sh
4650
. ./test_gpu_speed_cudnn_lstm.sh
51+
# shellcheck source=./perf_test/test_gpu_speed_lstm.sh
4752
. ./test_gpu_speed_lstm.sh
53+
# shellcheck source=./perf_test/test_gpu_speed_mlstm.sh
4854
. ./test_gpu_speed_mlstm.sh
4955

5056
# Run tests

.jenkins/pytorch/test.sh

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# shellcheck disable=SC2034
88
COMPACT_JOB_NAME="${BUILD_ENVIRONMENT}"
99

10+
# shellcheck source=./common.sh
1011
source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
1112

1213
echo "Testing pytorch"
@@ -333,6 +334,7 @@ test_backward_compatibility() {
333334
set -x
334335
pushd test/backward_compatibility
335336
python -m venv venv
337+
# shellcheck disable=SC1091
336338
. venv/bin/activate
337339
pip_install --pre torch -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
338340
pip show torch

.jenkins/pytorch/win-build.sh

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ fi
1313
COMPACT_JOB_NAME=pytorch-win-ws2019-cuda10-cudnn7-py3-build
1414

1515
SCRIPT_PARENT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
16+
# shellcheck source=./common.sh
1617
source "$SCRIPT_PARENT_DIR/common.sh"
1718

1819
export IMAGE_COMMIT_ID=$(git rev-parse HEAD)

.jenkins/pytorch/win-test.sh

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ set -ex
44
COMPACT_JOB_NAME=pytorch-win-ws2019-cuda10-cudnn7-py3-test
55

66
SCRIPT_PARENT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
7+
# shellcheck source=./common.sh
78
source "$SCRIPT_PARENT_DIR/common.sh"
89

910
export IMAGE_COMMIT_ID=$(git rev-parse HEAD)

.jenkins/run-shellcheck.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# .jenkins/run-shellcheck.sh --color=always | less -R
66

77

8-
find .jenkins/pytorch -name *.sh | xargs shellcheck --external-sources "$@"
8+
find .jenkins/pytorch -name *.sh | xargs shellcheck --external-sources -P SCRIPTDIR "$@"

BUILD.bazel

-2
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,6 @@ filegroup(
332332
"aten/src/TH/THTensorLapack.cpp",
333333
"aten/src/TH/THTensorMath.cpp",
334334
"aten/src/TH/THTensorMoreMath.cpp",
335-
"aten/src/TH/THTensorRandom.cpp",
336335
],
337336
)
338337

@@ -389,7 +388,6 @@ filegroup(
389388
"aten/src/THC/THCTensorMathReduce.cu.cc",
390389
"aten/src/THC/THCTensorMathScan.cu.cc",
391390
"aten/src/THC/THCTensorMode.cu.cc",
392-
"aten/src/THC/THCTensorRandom.cu.cc",
393391
"aten/src/THC/THCTensorScatterGather.cu.cc",
394392
"aten/src/THC/THCTensorSort.cu.cc",
395393
"aten/src/THC/THCTensorTopK.cu.cc",

0 commit comments

Comments
 (0)