Skip to content

GitLab

Unverified Commit 7947fc8f authored by Nikita Shulga's avatar Nikita Shulga Committed by GitHub
Browse files

Prep change for changing def branch to main (#4306)

parent ef177c56
Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 56 deletions
.circleci/build_docs/commit_docs.sh
View file @ 7947fc8f
...@@ -6,7 +6,7 @@ set -ex ...@@ -6,7 +6,7 @@ set -ex
if [ "$2" == "" ]; then if [ "$2" == "" ]; then
echo call as "$0" "<src>" "<target branch>" echo call as "$0" "<src>" "<target branch>"
echo where src is the root of the built documentation git checkout and echo where src is the root of the built documentation git checkout and
echo branch should be "master" or "1.7" or so echo branch should be "main" or "1.7" or so
exit 1 exit 1
fi fi
...@@ -20,7 +20,7 @@ git checkout gh-pages ...@@ -20,7 +20,7 @@ git checkout gh-pages
mkdir -p ./"${target}" mkdir -p ./"${target}"
rm -rf ./"${target}"/* rm -rf ./"${target}"/*
cp -r "${src}/docs/build/html/"* ./"$target" cp -r "${src}/docs/build/html/"* ./"$target"
if [ "${target}" == "master" ]; then if [ "${target}" == "main" ]; then
mkdir -p ./_static mkdir -p ./_static
rm -rf ./_static/* rm -rf ./_static/*
cp -r "${src}/docs/build/html/_static/"* ./_static cp -r "${src}/docs/build/html/_static/"* ./_static
......
.circleci/config.yml
View file @ 7947fc8f
...@@ -29,7 +29,7 @@ commands: ...@@ -29,7 +29,7 @@ commands:
# command: | # command: |
# set -ex # set -ex
# BRANCH=$(git rev-parse --abbrev-ref HEAD) # BRANCH=$(git rev-parse --abbrev-ref HEAD)
# if [[ "$BRANCH" != "master" ]]; then # if [[ "$BRANCH" != "main" ]]; then
# git fetch --force origin ${CIRCLE_BRANCH}/merge:merged/${CIRCLE_BRANCH} # git fetch --force origin ${CIRCLE_BRANCH}/merge:merged/${CIRCLE_BRANCH}
# git checkout "merged/$CIRCLE_BRANCH" # git checkout "merged/$CIRCLE_BRANCH"
# fi # fi
...@@ -936,7 +936,7 @@ jobs: ...@@ -936,7 +936,7 @@ jobs:
command: | command: |
set -ex set -ex
tag=${CIRCLE_TAG:1:5} tag=${CIRCLE_TAG:1:5}
VERSION=${tag:-master} VERSION=${tag:-main}
eval "$(./conda/bin/conda shell.bash hook)" eval "$(./conda/bin/conda shell.bash hook)"
conda activate ./env conda activate ./env
pushd docs pushd docs
...@@ -982,7 +982,7 @@ jobs: ...@@ -982,7 +982,7 @@ jobs:
# https://circleci.com/docs/2.0/configuration-reference/#checkout # https://circleci.com/docs/2.0/configuration-reference/#checkout
set -ex set -ex
tag=${CIRCLE_TAG:1:5} tag=${CIRCLE_TAG:1:5}
target=${tag:-master} target=${tag:-main}
~/workspace/.circleci/build_docs/commit_docs.sh ~/workspace $target ~/workspace/.circleci/build_docs/commit_docs.sh ~/workspace $target
...@@ -1159,7 +1159,7 @@ workflows: ...@@ -1159,7 +1159,7 @@ workflows:
cu_version: cpu cu_version: cpu
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.6_cpu name: binary_win_wheel_py3.6_cpu
...@@ -1168,7 +1168,7 @@ workflows: ...@@ -1168,7 +1168,7 @@ workflows:
cu_version: cu102 cu_version: cu102
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.6_cu102 name: binary_win_wheel_py3.6_cu102
...@@ -1177,7 +1177,7 @@ workflows: ...@@ -1177,7 +1177,7 @@ workflows:
cu_version: cu111 cu_version: cu111
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.6_cu111 name: binary_win_wheel_py3.6_cu111
...@@ -1186,7 +1186,7 @@ workflows: ...@@ -1186,7 +1186,7 @@ workflows:
cu_version: cu113 cu_version: cu113
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.6_cu113 name: binary_win_wheel_py3.6_cu113
...@@ -1195,7 +1195,7 @@ workflows: ...@@ -1195,7 +1195,7 @@ workflows:
cu_version: cpu cu_version: cpu
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.7_cpu name: binary_win_wheel_py3.7_cpu
...@@ -1204,7 +1204,7 @@ workflows: ...@@ -1204,7 +1204,7 @@ workflows:
cu_version: cu102 cu_version: cu102
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.7_cu102 name: binary_win_wheel_py3.7_cu102
...@@ -1213,7 +1213,7 @@ workflows: ...@@ -1213,7 +1213,7 @@ workflows:
cu_version: cu111 cu_version: cu111
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.7_cu111 name: binary_win_wheel_py3.7_cu111
...@@ -1222,7 +1222,7 @@ workflows: ...@@ -1222,7 +1222,7 @@ workflows:
cu_version: cu113 cu_version: cu113
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.7_cu113 name: binary_win_wheel_py3.7_cu113
...@@ -1231,7 +1231,7 @@ workflows: ...@@ -1231,7 +1231,7 @@ workflows:
cu_version: cpu cu_version: cpu
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.8_cpu name: binary_win_wheel_py3.8_cpu
...@@ -1240,7 +1240,7 @@ workflows: ...@@ -1240,7 +1240,7 @@ workflows:
cu_version: cu102 cu_version: cu102
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.8_cu102 name: binary_win_wheel_py3.8_cu102
...@@ -1249,7 +1249,7 @@ workflows: ...@@ -1249,7 +1249,7 @@ workflows:
cu_version: cu111 cu_version: cu111
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.8_cu111 name: binary_win_wheel_py3.8_cu111
...@@ -1258,7 +1258,7 @@ workflows: ...@@ -1258,7 +1258,7 @@ workflows:
cu_version: cu113 cu_version: cu113
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.8_cu113 name: binary_win_wheel_py3.8_cu113
...@@ -1271,7 +1271,7 @@ workflows: ...@@ -1271,7 +1271,7 @@ workflows:
cu_version: cu102 cu_version: cu102
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.9_cu102 name: binary_win_wheel_py3.9_cu102
...@@ -1280,7 +1280,7 @@ workflows: ...@@ -1280,7 +1280,7 @@ workflows:
cu_version: cu111 cu_version: cu111
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.9_cu111 name: binary_win_wheel_py3.9_cu111
...@@ -1413,7 +1413,7 @@ workflows: ...@@ -1413,7 +1413,7 @@ workflows:
cu_version: cpu cu_version: cpu
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.6_cpu name: binary_win_conda_py3.6_cpu
...@@ -1422,7 +1422,7 @@ workflows: ...@@ -1422,7 +1422,7 @@ workflows:
cu_version: cu102 cu_version: cu102
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.6_cu102 name: binary_win_conda_py3.6_cu102
...@@ -1431,7 +1431,7 @@ workflows: ...@@ -1431,7 +1431,7 @@ workflows:
cu_version: cu111 cu_version: cu111
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.6_cu111 name: binary_win_conda_py3.6_cu111
...@@ -1440,7 +1440,7 @@ workflows: ...@@ -1440,7 +1440,7 @@ workflows:
cu_version: cu113 cu_version: cu113
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.6_cu113 name: binary_win_conda_py3.6_cu113
...@@ -1449,7 +1449,7 @@ workflows: ...@@ -1449,7 +1449,7 @@ workflows:
cu_version: cpu cu_version: cpu
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.7_cpu name: binary_win_conda_py3.7_cpu
...@@ -1458,7 +1458,7 @@ workflows: ...@@ -1458,7 +1458,7 @@ workflows:
cu_version: cu102 cu_version: cu102
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.7_cu102 name: binary_win_conda_py3.7_cu102
...@@ -1467,7 +1467,7 @@ workflows: ...@@ -1467,7 +1467,7 @@ workflows:
cu_version: cu111 cu_version: cu111
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.7_cu111 name: binary_win_conda_py3.7_cu111
...@@ -1476,7 +1476,7 @@ workflows: ...@@ -1476,7 +1476,7 @@ workflows:
cu_version: cu113 cu_version: cu113
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.7_cu113 name: binary_win_conda_py3.7_cu113
...@@ -1485,7 +1485,7 @@ workflows: ...@@ -1485,7 +1485,7 @@ workflows:
cu_version: cpu cu_version: cpu
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.8_cpu name: binary_win_conda_py3.8_cpu
...@@ -1494,7 +1494,7 @@ workflows: ...@@ -1494,7 +1494,7 @@ workflows:
cu_version: cu102 cu_version: cu102
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.8_cu102 name: binary_win_conda_py3.8_cu102
...@@ -1503,7 +1503,7 @@ workflows: ...@@ -1503,7 +1503,7 @@ workflows:
cu_version: cu111 cu_version: cu111
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.8_cu111 name: binary_win_conda_py3.8_cu111
...@@ -1512,7 +1512,7 @@ workflows: ...@@ -1512,7 +1512,7 @@ workflows:
cu_version: cu113 cu_version: cu113
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.8_cu113 name: binary_win_conda_py3.8_cu113
...@@ -1525,7 +1525,7 @@ workflows: ...@@ -1525,7 +1525,7 @@ workflows:
cu_version: cu102 cu_version: cu102
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.9_cu102 name: binary_win_conda_py3.9_cu102
...@@ -1534,7 +1534,7 @@ workflows: ...@@ -1534,7 +1534,7 @@ workflows:
cu_version: cu111 cu_version: cu111
filters: filters:
branches: branches:
only: master only: main
tags: tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.9_cu111 name: binary_win_conda_py3.9_cu111
...@@ -1609,7 +1609,7 @@ workflows: ...@@ -1609,7 +1609,7 @@ workflows:
filters: filters:
branches: branches:
only: only:
- master - main
- nightly - nightly
name: unittest_linux_gpu_py3.6 name: unittest_linux_gpu_py3.6
python_version: '3.6' python_version: '3.6'
...@@ -1618,7 +1618,7 @@ workflows: ...@@ -1618,7 +1618,7 @@ workflows:
filters: filters:
branches: branches:
only: only:
- master - main
- nightly - nightly
name: unittest_linux_gpu_py3.7 name: unittest_linux_gpu_py3.7
python_version: '3.7' python_version: '3.7'
...@@ -1631,7 +1631,7 @@ workflows: ...@@ -1631,7 +1631,7 @@ workflows:
filters: filters:
branches: branches:
only: only:
- master - main
- nightly - nightly
name: unittest_linux_gpu_py3.9 name: unittest_linux_gpu_py3.9
python_version: '3.9' python_version: '3.9'
...@@ -1656,7 +1656,7 @@ workflows: ...@@ -1656,7 +1656,7 @@ workflows:
filters: filters:
branches: branches:
only: only:
- master - main
- nightly - nightly
name: unittest_windows_gpu_py3.6 name: unittest_windows_gpu_py3.6
python_version: '3.6' python_version: '3.6'
...@@ -1665,7 +1665,7 @@ workflows: ...@@ -1665,7 +1665,7 @@ workflows:
filters: filters:
branches: branches:
only: only:
- master - main
- nightly - nightly
name: unittest_windows_gpu_py3.7 name: unittest_windows_gpu_py3.7
python_version: '3.7' python_version: '3.7'
...@@ -1678,7 +1678,7 @@ workflows: ...@@ -1678,7 +1678,7 @@ workflows:
filters: filters:
branches: branches:
only: only:
- master - main
- nightly - nightly
name: unittest_windows_gpu_py3.9 name: unittest_windows_gpu_py3.9
python_version: '3.9' python_version: '3.9'
...@@ -4075,7 +4075,7 @@ workflows: ...@@ -4075,7 +4075,7 @@ workflows:
filters: filters:
branches: branches:
only: only:
- master - main
jobs: jobs:
- smoke_test_docker_image_build: - smoke_test_docker_image_build:
context: org-member context: org-member
.circleci/config.yml.in
View file @ 7947fc8f
...@@ -29,7 +29,7 @@ commands: ...@@ -29,7 +29,7 @@ commands:
# command: | # command: |
# set -ex # set -ex
# BRANCH=$(git rev-parse --abbrev-ref HEAD) # BRANCH=$(git rev-parse --abbrev-ref HEAD)
# if [[ "$BRANCH" != "master" ]]; then # if [[ "$BRANCH" != "main" ]]; then
# git fetch --force origin ${CIRCLE_BRANCH}/merge:merged/${CIRCLE_BRANCH} # git fetch --force origin ${CIRCLE_BRANCH}/merge:merged/${CIRCLE_BRANCH}
# git checkout "merged/$CIRCLE_BRANCH" # git checkout "merged/$CIRCLE_BRANCH"
# fi # fi
...@@ -936,7 +936,7 @@ jobs: ...@@ -936,7 +936,7 @@ jobs:
command: | command: |
set -ex set -ex
tag=${CIRCLE_TAG:1:5} tag=${CIRCLE_TAG:1:5}
VERSION=${tag:-master} VERSION=${tag:-main}
eval "$(./conda/bin/conda shell.bash hook)" eval "$(./conda/bin/conda shell.bash hook)"
conda activate ./env conda activate ./env
pushd docs pushd docs
...@@ -982,7 +982,7 @@ jobs: ...@@ -982,7 +982,7 @@ jobs:
# https://circleci.com/docs/2.0/configuration-reference/#checkout # https://circleci.com/docs/2.0/configuration-reference/#checkout
set -ex set -ex
tag=${CIRCLE_TAG:1:5} tag=${CIRCLE_TAG:1:5}
target=${tag:-master} target=${tag:-main}
~/workspace/.circleci/build_docs/commit_docs.sh ~/workspace $target ~/workspace/.circleci/build_docs/commit_docs.sh ~/workspace $target
...@@ -1029,7 +1029,7 @@ workflows: ...@@ -1029,7 +1029,7 @@ workflows:
filters: filters:
branches: branches:
only: only:
- master - main
jobs: jobs:
- smoke_test_docker_image_build: - smoke_test_docker_image_build:
context: org-member context: org-member
.circleci/regenerate.py
View file @ 7947fc8f
...@@ -44,7 +44,7 @@ def build_workflows(prefix='', filter_branch=None, upload=False, indentation=6, ...@@ -44,7 +44,7 @@ def build_workflows(prefix='', filter_branch=None, upload=False, indentation=6,
if windows_latest_only and os_type == "win" and filter_branch is None and \ if windows_latest_only and os_type == "win" and filter_branch is None and \
(python_version != python_versions[-1] or (python_version != python_versions[-1] or
(cu_version not in [cu_versions[0], cu_versions[-1]])): (cu_version not in [cu_versions[0], cu_versions[-1]])):
fb = "master" fb = "main"
if not fb and (os_type == 'linux' and if not fb and (os_type == 'linux' and
cu_version == 'cpu' and cu_version == 'cpu' and
btype == 'wheel' and btype == 'wheel' and
...@@ -241,7 +241,7 @@ def unittest_workflows(indentation=6): ...@@ -241,7 +241,7 @@ def unittest_workflows(indentation=6):
if device_type == 'gpu': if device_type == 'gpu':
if python_version != "3.8": if python_version != "3.8":
job['filters'] = gen_filter_branch_tree('master', 'nightly') job['filters'] = gen_filter_branch_tree('main', 'nightly')
job['cu_version'] = 'cu102' job['cu_version'] = 'cu102'
else: else:
job['cu_version'] = 'cpu' job['cu_version'] = 'cpu'
......
.github/workflows/bandit.yml
View file @ 7947fc8f
...@@ -4,7 +4,7 @@ name: Bandit ...@@ -4,7 +4,7 @@ name: Bandit
on: on:
pull_request: pull_request:
branches: [ master ] branches: [ main ]
workflow_dispatch: workflow_dispatch:
......
.github/workflows/codeql.yml
View file @ 7947fc8f
...@@ -4,7 +4,7 @@ name: CodeQL ...@@ -4,7 +4,7 @@ name: CodeQL
on: on:
pull_request: pull_request:
branches: [ master ] branches: [ main ]
workflow_dispatch: workflow_dispatch:
......
CONTRIBUTING.md
View file @ 7947fc8f
...@@ -60,7 +60,7 @@ conda install libpng jpeg ...@@ -60,7 +60,7 @@ conda install libpng jpeg
If you plan to modify the code or documentation, please follow the steps below: If you plan to modify the code or documentation, please follow the steps below:
1. Fork the repository and create your branch from `master`. 1. Fork the repository and create your branch from `main`.
2. If you have modified the code (new feature or bug-fix), please add unit tests. 2. If you have modified the code (new feature or bug-fix), please add unit tests.
3. If you have changed APIs, update the documentation. Make sure the documentation builds. 3. If you have changed APIs, update the documentation. Make sure the documentation builds.
4. Ensure the test suite passes. 4. Ensure the test suite passes.
......
README.rst
View file @ 7947fc8f
...@@ -21,7 +21,7 @@ supported Python versions. ...@@ -21,7 +21,7 @@ supported Python versions.
+--------------------------+--------------------------+---------------------------------+ +--------------------------+--------------------------+---------------------------------+
| ``torch`` | ``torchvision`` | ``python`` | | ``torch`` | ``torchvision`` | ``python`` |
+==========================+==========================+=================================+ +==========================+==========================+=================================+
| ``master`` / ``nightly`` | ``master`` / ``nightly`` | ``>=3.6`` | | ``master`` / ``nightly`` | ``main`` / ``nightly`` | ``>=3.6`` |
+--------------------------+--------------------------+---------------------------------+ +--------------------------+--------------------------+---------------------------------+
| ``1.9.0`` | ``0.10.0`` | ``>=3.6`` | | ``1.9.0`` | ``0.10.0`` | ``>=3.6`` |
+--------------------------+--------------------------+---------------------------------+ +--------------------------+--------------------------+---------------------------------+
...@@ -76,7 +76,7 @@ From source: ...@@ -76,7 +76,7 @@ From source:
In case building TorchVision from source fails, install the nightly version of PyTorch following In case building TorchVision from source fails, install the nightly version of PyTorch following
the linked guide on the `contributing page <https://github.com/pytorch/vision/blob/master/CONTRIBUTING.md#development-installation>`_ and retry the install. the linked guide on the `contributing page <https://github.com/pytorch/vision/blob/main/CONTRIBUTING.md#development-installation>`_ and retry the install.
By default, GPU support is built if CUDA is found and ``torch.cuda.is_available()`` is true. By default, GPU support is built if CUDA is found and ``torch.cuda.is_available()`` is true.
It's possible to force building GPU support by setting ``FORCE_CUDA=1`` environment variable, It's possible to force building GPU support by setting ``FORCE_CUDA=1`` environment variable,
......
android/gradle.properties
View file @ 7947fc8f
...@@ -9,7 +9,7 @@ POM_SCM_URL=https://github.com/pytorch/vision.git ...@@ -9,7 +9,7 @@ POM_SCM_URL=https://github.com/pytorch/vision.git
POM_SCM_CONNECTION=scm:git:https://github.com/pytorch/vision POM_SCM_CONNECTION=scm:git:https://github.com/pytorch/vision
POM_SCM_DEV_CONNECTION=scm:git:git@github.com:pytorch/vision.git POM_SCM_DEV_CONNECTION=scm:git:git@github.com:pytorch/vision.git
POM_LICENSE_NAME=BSD 3-Clause POM_LICENSE_NAME=BSD 3-Clause
POM_LICENSE_URL=https://github.com/pytorch/vision/blob/master/LICENSE POM_LICENSE_URL=https://github.com/pytorch/vision/blob/main/LICENSE
POM_ISSUES_URL=https://github.com/pytorch/vision/issues POM_ISSUES_URL=https://github.com/pytorch/vision/issues
POM_LICENSE_DIST=repo POM_LICENSE_DIST=repo
POM_DEVELOPER_ID=pytorch POM_DEVELOPER_ID=pytorch
......
docs/source/conf.py
View file @ 7947fc8f
...@@ -82,10 +82,10 @@ author = 'Torch Contributors' ...@@ -82,10 +82,10 @@ author = 'Torch Contributors'
# #
# The short X.Y version. # The short X.Y version.
# TODO: change to [:2] at v1.0 # TODO: change to [:2] at v1.0
version = 'master (' + torchvision.__version__ + ' )' version = 'main (' + torchvision.__version__ + ' )'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
# TODO: verify this works as expected # TODO: verify this works as expected
release = 'master' release = 'main'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
......
test/test_cpp_models.py
View file @ 7947fc8f
...@@ -45,7 +45,7 @@ def read_image2(): ...@@ -45,7 +45,7 @@ def read_image2():
@unittest.skipIf( @unittest.skipIf(
sys.platform == "darwin" or True, sys.platform == "darwin" or True,
"C++ models are broken on OS X at the moment, and there's a BC breakage on master; " "C++ models are broken on OS X at the moment, and there's a BC breakage on main; "
"see https://github.com/pytorch/vision/issues/1191") "see https://github.com/pytorch/vision/issues/1191")
class Tester(unittest.TestCase): class Tester(unittest.TestCase):
pretrained = False pretrained = False
......
torchvision/__init__.py
View file @ 7947fc8f
...@@ -66,7 +66,7 @@ def set_video_backend(backend): ...@@ -66,7 +66,7 @@ def set_video_backend(backend):
It generally decodes faster than :mod:`pyav`, but is perhaps less robust. It generally decodes faster than :mod:`pyav`, but is perhaps less robust.
.. note:: .. note::
Building with FFMPEG is disabled by default in the latest master. If you want to use the 'video_reader' Building with FFMPEG is disabled by default in the latest `main`. If you want to use the 'video_reader'
backend, please compile torchvision from source. backend, please compile torchvision from source.
""" """
global _video_backend global _video_backend
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment