Merge branch 'master' into windows_ops

Author: willyd

.circleci/config.yml

@@ -2876,4 +2876,4 @@ workflows:
                 - master
     jobs:
       - smoke_test_docker_image_build:
-          context: org-member
+          context: org-member

.circleci/regenerate.py

@@ -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:

.circleci/unittest/linux/scripts/environment.yml

@@ -15,4 +15,4 @@ dependencies:
     - future
     - pillow>=4.1.1
     - scipy
-    - av
+    - av

.circleci/unittest/linux/scripts/post_process.sh

@@ -5,4 +5,4 @@ set -e
 eval "$(./conda/bin/conda shell.bash hook)"
 conda activate ./env
 
-codecov
+codecov

.circleci/unittest/windows/scripts/setup_env.sh

@@ -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

.gitignore

@@ -24,4 +24,4 @@ gen.yml
 .vscode/
 .idea/
 *.orig
-*-checkpoint.ipynb
+*-checkpoint.ipynb

CMakeLists.txt

@@ -36,9 +36,11 @@ file(GLOB HEADERS torchvision/csrc/*.h)
 # Image extension
 file(GLOB IMAGE_HEADERS torchvision/csrc/cpu/image/*.h)
 file(GLOB IMAGE_SOURCES torchvision/csrc/cpu/image/*.cpp)
-file(GLOB OPERATOR_SOURCES torchvision/csrc/cpu/*.h torchvision/csrc/cpu/*.cpp ${IMAGE_HEADERS} ${IMAGE_SOURCES} ${HEADERS} torchvision/csrc/*.cpp)
+file(GLOB OPERATOR_HEADERS torchvision/csrc/cpu/*.h)
+file(GLOB OPERATOR_SOURCES ${OPERATOR_HEADERS} torchvision/csrc/cpu/*.cpp ${IMAGE_HEADERS} ${IMAGE_SOURCES} ${HEADERS} torchvision/csrc/*.cpp)
 if(WITH_CUDA)
-  file(GLOB OPERATOR_SOURCES ${OPERATOR_SOURCES} torchvision/csrc/cuda/*.h torchvision/csrc/cuda/*.cu)
+  file(GLOB OPERATOR_HEADERS ${OPERATOR_HEADERS} torchvision/csrc/cuda/*.h)
+  file(GLOB OPERATOR_SOURCES ${OPERATOR_SOURCES} ${OPERATOR_HEADERS} torchvision/csrc/cuda/*.cu)
 endif()
 file(GLOB MODELS_HEADERS torchvision/csrc/models/*.h)
 file(GLOB MODELS_SOURCES torchvision/csrc/models/*.h torchvision/csrc/models/*.cpp)
@@ -113,11 +115,11 @@ install(EXPORT TorchVisionTargets
 
 install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
 install(FILES
-  torchvision/csrc/cpu/vision_cpu.h
+  ${OPERATOR_HEADERS}
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/cpu)
 if(WITH_CUDA)
   install(FILES
-    torchvision/csrc/cuda/vision_cuda.h
+    ${OPERATOR_HEADERS}
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/cuda)
 endif()
 install(FILES ${MODELS_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/models)

packaging/conda/build_vision.sh

@@ -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

packaging/wheel/relocate.py

@@ -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',
@@ -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',
@@ -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
 

references/video_classification/README.md

@@ -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
-```
+```