Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2876,4 +2876,4 @@ workflows:
- master
jobs:
- smoke_test_docker_image_build:
context: org-member
context: org-member
1 change: 1 addition & 0 deletions .circleci/regenerate.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ def cmake_workflows(indentation=6):
loader=jinja2.FileSystemLoader(d),
lstrip_blocks=True,
autoescape=False,
keep_trailing_newline=True,
)

with open(os.path.join(d, 'config.yml'), 'w') as f:
Expand Down
2 changes: 1 addition & 1 deletion .circleci/unittest/linux/scripts/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ dependencies:
- future
- pillow>=4.1.1
- scipy
- av
- av
2 changes: 1 addition & 1 deletion .circleci/unittest/linux/scripts/post_process.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ set -e
eval "$(./conda/bin/conda shell.bash hook)"
conda activate ./env

codecov
codecov
2 changes: 1 addition & 1 deletion .circleci/unittest/windows/scripts/setup_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ conda activate "${env_dir}"

# 3. Install Conda dependencies
printf "* Installing dependencies (except PyTorch)\n"
conda env update --file "${this_dir}/environment.yml" --prune
conda env update --file "${this_dir}/environment.yml" --prune
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ gen.yml
.vscode/
.idea/
*.orig
*-checkpoint.ipynb
*-checkpoint.ipynb
4 changes: 2 additions & 2 deletions packaging/conda/build_vision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ for py_ver in "${DESIRED_PYTHON[@]}"; do
mkdir "$output_folder"

if [[ "$py_ver" == 3.5 ]]; then
export CONDA_TYPING_CONSTRAINT="- typing"
export CONDA_TYPING_CONSTRAINT="- typing"
else
export CONDA_TYPING_CONSTRAINT=""
export CONDA_TYPING_CONSTRAINT=""
fi

export VSTOOLCHAIN_PACKAGE=vs2017
Expand Down
8 changes: 4 additions & 4 deletions packaging/wheel/relocate.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from wheel.bdist_wheel import get_abi_tag


WHITELIST = {
ALLOWLIST = {
'libgcc_s.so.1', 'libstdc++.so.6', 'libm.so.6',
'libdl.so.2', 'librt.so.1', 'libc.so.6',
'libnsl.so.1', 'libutil.so.1', 'libpthread.so.0',
Expand All @@ -31,7 +31,7 @@
'libglib-2.0.so.0', 'ld-linux-x86-64.so.2', 'ld-2.17.so'
}

WINDOWS_WHITELIST = {
WINDOWS_ALLOWLIST = {
'MSVCP140.dll', 'KERNEL32.dll',
'VCRUNTIME140_1.dll', 'VCRUNTIME140.dll',
'api-ms-win-crt-heap-l1-1-0.dll',
Expand Down Expand Up @@ -164,7 +164,7 @@ def relocate_elf_library(patchelf, output_dir, output_library, binary):
print('Omitting {0}'.format(library))
continue

if library in WHITELIST:
if library in ALLOWLIST:
# Omit glibc/gcc/system libraries
print('Omitting {0}'.format(library))
continue
Expand Down Expand Up @@ -275,7 +275,7 @@ def relocate_dll_library(dumpbin, output_dir, output_library, binary):

while binary_queue != []:
library, parent = binary_queue.pop(0)
if library in WINDOWS_WHITELIST or library.startswith('api-ms-win'):
if library in WINDOWS_ALLOWLIST or library.startswith('api-ms-win'):
print('Omitting {0}'.format(library))
continue

Expand Down
2 changes: 1 addition & 1 deletion references/video_classification/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ python -m torch.distributed.launch --nproc_per_node=8 --use_env train.py --data-

```bash
python train.py --data-path=/data/kinectics400 --train-dir=train --val-dir=val --batch-size=8 --cache-dataset
```
```
2 changes: 1 addition & 1 deletion torchvision/models/video/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ This translates in the following set of command-line arguments (please note that

[0] _D. Tran, H. Wang, L. Torresani, J. Ray, Y. LeCun and M. Paluri_: A Closer Look at Spatiotemporal Convolutions for Action Recognition. _CVPR 2018_ ([paper](https://research.fb.com/wp-content/uploads/2018/04/a-closer-look-at-spatiotemporal-convolutions-for-action-recognition.pdf))

[1] _W. Kay, J. Carreira, K. Simonyan, B. Zhang, C. Hillier, S. Vijayanarasimhan, F. Viola, T. Green, T. Back, P. Natsev, M. Suleyman, A. Zisserman_: The Kinetics Human Action Video Dataset ([paper](https://arxiv.org/abs/1705.06950))
[1] _W. Kay, J. Carreira, K. Simonyan, B. Zhang, C. Hillier, S. Vijayanarasimhan, F. Viola, T. Green, T. Back, P. Natsev, M. Suleyman, A. Zisserman_: The Kinetics Human Action Video Dataset ([paper](https://arxiv.org/abs/1705.06950))