Unverified Commit 8520f0be authored by Francisco Massa's avatar Francisco Massa Committed by GitHub
Browse files

Miscellaneous linter fixes (#3095)

Replace tabs with spaces, add newlines to files and replace whitelist with allowlist
parent a0e5bbea
......@@ -2876,4 +2876,4 @@ workflows:
- master
jobs:
- smoke_test_docker_image_build:
context: org-member
\ No newline at end of file
context: org-member
......@@ -212,6 +212,7 @@ if __name__ == "__main__":
loader=jinja2.FileSystemLoader(d),
lstrip_blocks=True,
autoescape=False,
keep_trailing_newline=True,
)
with open(os.path.join(d, 'config.yml'), 'w') as f:
......
......@@ -15,4 +15,4 @@ dependencies:
- future
- pillow>=4.1.1
- scipy
- av
\ No newline at end of file
- av
......@@ -5,4 +5,4 @@ set -e
eval "$(./conda/bin/conda shell.bash hook)"
conda activate ./env
codecov
\ No newline at end of file
codecov
......@@ -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
\ No newline at end of file
conda env update --file "${this_dir}/environment.yml" --prune
......@@ -24,4 +24,4 @@ gen.yml
.vscode/
.idea/
*.orig
*-checkpoint.ipynb
\ No newline at end of file
*-checkpoint.ipynb
......@@ -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
......
......@@ -21,7 +21,7 @@ if sys.platform == 'linux':
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',
......@@ -31,7 +31,7 @@ WHITELIST = {
'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',
......@@ -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
......@@ -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
......
......@@ -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
```
\ No newline at end of file
```
......@@ -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))
\ No newline at end of file
[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))
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