Skip to content

Commit 292c4f6

Browse files
Licht-TLicht-T
committed
Fix conflicts
1 parent 2c60f5c commit 292c4f6

Some content is hidden

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

91 files changed

+2488
-1695
lines changed

‎.circleci/config.yml

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,10 @@ jobs:
127127
- checkout
128128
- run:
129129
command: |
130-
sudo apt-get update -y
131-
sudo apt-get install -y clang-format
132-
./travis-scripts/run-clang-format/run-clang-format.py -r torchvision/csrc
130+
curl https://oss-clang-format.s3.us-east-2.amazonaws.com/linux64/clang-format-linux64 -o clang-format
131+
chmod +x clang-format
132+
sudo mv clang-format /opt/clang-format
133+
./travis-scripts/run-clang-format/run-clang-format.py -r torchvision/csrc --clang-format-executable /opt/clang-format
133134
134135
binary_linux_wheel:
135136
<<: *binary_common
@@ -138,6 +139,7 @@ jobs:
138139
resource_class: 2xlarge+
139140
steps:
140141
- checkout_merge
142+
- designate_upload_channel
141143
- run: packaging/build_wheel.sh
142144
- store_artifacts:
143145
path: dist
@@ -153,6 +155,7 @@ jobs:
153155
resource_class: 2xlarge+
154156
steps:
155157
- checkout_merge
158+
- designate_upload_channel
156159
- run: packaging/build_conda.sh
157160
- store_artifacts:
158161
path: /opt/conda/conda-bld/linux-64
@@ -168,6 +171,7 @@ jobs:
168171
executor: windows-cpu
169172
steps:
170173
- checkout_merge
174+
- designate_upload_channel
171175
- run:
172176
name: Build conda packages
173177
command: |
@@ -193,6 +197,7 @@ jobs:
193197
executor: windows-cpu
194198
steps:
195199
- checkout_merge
200+
- designate_upload_channel
196201
- run:
197202
name: Build wheel packages
198203
command: |
@@ -215,6 +220,7 @@ jobs:
215220
xcode: "9.4.1"
216221
steps:
217222
- checkout_merge
223+
- designate_upload_channel
218224
- run:
219225
# Cannot easily deduplicate this as source'ing activate
220226
# will set environment variables which we need to propagate
@@ -237,6 +243,7 @@ jobs:
237243
xcode: "9.4.1"
238244
steps:
239245
- checkout_merge
246+
- designate_upload_channel
240247
- run:
241248
command: |
242249
curl -o conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
@@ -299,6 +306,7 @@ jobs:
299306
steps:
300307
- attach_workspace:
301308
at: ~/workspace
309+
- designate_upload_channel
302310
- run:
303311
name: install binaries
304312
command: |
@@ -317,6 +325,7 @@ jobs:
317325
steps:
318326
- attach_workspace:
319327
at: ~/workspace
328+
- designate_upload_channel
320329
- run:
321330
name: install binaries
322331
command: |
@@ -337,6 +346,7 @@ jobs:
337346
image_name: torchvision/smoke_test
338347
steps:
339348
- checkout
349+
- designate_upload_channel
340350
- run:
341351
name: Build and push Docker image
342352
no_output_timeout: "1h"
@@ -356,6 +366,7 @@ jobs:
356366
steps:
357367
- attach_workspace:
358368
at: ~/workspace
369+
- designate_upload_channel
359370
- run:
360371
name: install binaries
361372
command: |
@@ -381,6 +392,7 @@ jobs:
381392
steps:
382393
- attach_workspace:
383394
at: ~/workspace
395+
- designate_upload_channel
384396
- run:
385397
name: install binaries
386398
command: |
@@ -404,6 +416,7 @@ jobs:
404416
resource_class: 2xlarge+
405417
steps:
406418
- checkout
419+
- designate_upload_channel
407420
- run:
408421
name: Generate cache key
409422
# This will refresh cache on Sundays, nightly build should generate new cache.
@@ -444,6 +457,7 @@ jobs:
444457
image_name: "pytorch/manylinux-cuda101"
445458
steps:
446459
- checkout
460+
- designate_upload_channel
447461
- run:
448462
name: Generate cache key
449463
# This will refresh cache on Sundays, nightly build should generate new cache.
@@ -465,7 +479,7 @@ jobs:
465479
- env
466480
- run:
467481
name: Install torchvision
468-
command: docker run -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/install.sh
482+
command: docker run -t --gpus all -v $PWD:$PWD -w $PWD -e UPLOAD_CHANNEL "${image_name}" .circleci/unittest/linux/scripts/install.sh
469483
- run:
470484
name: Run tests
471485
command: docker run -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/run_test.sh
@@ -481,6 +495,7 @@ jobs:
481495
name: windows-cpu
482496
steps:
483497
- checkout
498+
- designate_upload_channel
484499
- run:
485500
name: Generate cache key
486501
# This will refresh cache on Sundays, nightly build should generate new cache.
@@ -520,6 +535,7 @@ jobs:
520535
CUDA_VERSION: "10.1"
521536
steps:
522537
- checkout
538+
- designate_upload_channel
523539
- run:
524540
name: Generate cache key
525541
# This will refresh cache on Sundays, nightly build should generate new cache.
@@ -558,6 +574,7 @@ jobs:
558574
resource_class: large
559575
steps:
560576
- checkout
577+
- designate_upload_channel
561578
- run:
562579
name: Install wget
563580
command: HOMEBREW_NO_AUTO_UPDATE=1 brew install wget
@@ -600,6 +617,7 @@ jobs:
600617
resource_class: 2xlarge+
601618
steps:
602619
- checkout_merge
620+
- designate_upload_channel
603621
- run:
604622
name: Setup conda
605623
command: .circleci/unittest/linux/scripts/setup_env.sh
@@ -617,19 +635,21 @@ jobs:
617635
CU_VERSION: << parameters.cu_version >>
618636
steps:
619637
- checkout_merge
638+
- designate_upload_channel
620639
- run:
621640
name: Setup conda
622641
command: docker run -e CU_VERSION -e PYTHON_VERSION -e UNICODE_ABI -e PYTORCH_VERSION -t --gpus all -v $PWD:$PWD -w $PWD << parameters.wheel_docker_image >> .circleci/unittest/linux/scripts/setup_env.sh
623642
- run:
624643
name: Build torchvision C++ distribution and test
625-
command: docker run -e CU_VERSION -e PYTHON_VERSION -e UNICODE_ABI -e PYTORCH_VERSION -t --gpus all -v $PWD:$PWD -w $PWD << parameters.wheel_docker_image >> packaging/build_cmake.sh
644+
command: docker run -e CU_VERSION -e PYTHON_VERSION -e UNICODE_ABI -e PYTORCH_VERSION -e UPLOAD_CHANNEL -t --gpus all -v $PWD:$PWD -w $PWD << parameters.wheel_docker_image >> packaging/build_cmake.sh
626645

627646
cmake_macos_cpu:
628647
<<: *binary_common
629648
macos:
630-
xcode: "9.0"
649+
xcode: "9.4.1"
631650
steps:
632651
- checkout_merge
652+
- designate_upload_channel
633653
- run:
634654
command: |
635655
curl -o conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
@@ -644,6 +664,7 @@ jobs:
644664
name: windows-cpu
645665
steps:
646666
- checkout_merge
667+
- designate_upload_channel
647668
- run:
648669
command: |
649670
set -ex
@@ -656,6 +677,7 @@ jobs:
656677
name: windows-gpu
657678
steps:
658679
- checkout_merge
680+
- designate_upload_channel
659681
- run:
660682
command: |
661683
set -ex

‎.circleci/config.yml.in

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,10 @@ jobs:
127127
- checkout
128128
- run:
129129
command: |
130-
sudo apt-get update -y
131-
sudo apt-get install -y clang-format
132-
./travis-scripts/run-clang-format/run-clang-format.py -r torchvision/csrc
130+
curl https://oss-clang-format.s3.us-east-2.amazonaws.com/linux64/clang-format-linux64 -o clang-format
131+
chmod +x clang-format
132+
sudo mv clang-format /opt/clang-format
133+
./travis-scripts/run-clang-format/run-clang-format.py -r torchvision/csrc --clang-format-executable /opt/clang-format
133134

134135
binary_linux_wheel:
135136
<<: *binary_common
@@ -138,6 +139,7 @@ jobs:
138139
resource_class: 2xlarge+
139140
steps:
140141
- checkout_merge
142+
- designate_upload_channel
141143
- run: packaging/build_wheel.sh
142144
- store_artifacts:
143145
path: dist
@@ -153,6 +155,7 @@ jobs:
153155
resource_class: 2xlarge+
154156
steps:
155157
- checkout_merge
158+
- designate_upload_channel
156159
- run: packaging/build_conda.sh
157160
- store_artifacts:
158161
path: /opt/conda/conda-bld/linux-64
@@ -168,6 +171,7 @@ jobs:
168171
executor: windows-cpu
169172
steps:
170173
- checkout_merge
174+
- designate_upload_channel
171175
- run:
172176
name: Build conda packages
173177
command: |
@@ -193,6 +197,7 @@ jobs:
193197
executor: windows-cpu
194198
steps:
195199
- checkout_merge
200+
- designate_upload_channel
196201
- run:
197202
name: Build wheel packages
198203
command: |
@@ -215,6 +220,7 @@ jobs:
215220
xcode: "9.4.1"
216221
steps:
217222
- checkout_merge
223+
- designate_upload_channel
218224
- run:
219225
# Cannot easily deduplicate this as source'ing activate
220226
# will set environment variables which we need to propagate
@@ -237,6 +243,7 @@ jobs:
237243
xcode: "9.4.1"
238244
steps:
239245
- checkout_merge
246+
- designate_upload_channel
240247
- run:
241248
command: |
242249
curl -o conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
@@ -299,6 +306,7 @@ jobs:
299306
steps:
300307
- attach_workspace:
301308
at: ~/workspace
309+
- designate_upload_channel
302310
- run:
303311
name: install binaries
304312
command: |
@@ -317,6 +325,7 @@ jobs:
317325
steps:
318326
- attach_workspace:
319327
at: ~/workspace
328+
- designate_upload_channel
320329
- run:
321330
name: install binaries
322331
command: |
@@ -337,6 +346,7 @@ jobs:
337346
image_name: torchvision/smoke_test
338347
steps:
339348
- checkout
349+
- designate_upload_channel
340350
- run:
341351
name: Build and push Docker image
342352
no_output_timeout: "1h"
@@ -356,6 +366,7 @@ jobs:
356366
steps:
357367
- attach_workspace:
358368
at: ~/workspace
369+
- designate_upload_channel
359370
- run:
360371
name: install binaries
361372
command: |
@@ -381,6 +392,7 @@ jobs:
381392
steps:
382393
- attach_workspace:
383394
at: ~/workspace
395+
- designate_upload_channel
384396
- run:
385397
name: install binaries
386398
command: |
@@ -404,6 +416,7 @@ jobs:
404416
resource_class: 2xlarge+
405417
steps:
406418
- checkout
419+
- designate_upload_channel
407420
- run:
408421
name: Generate cache key
409422
# This will refresh cache on Sundays, nightly build should generate new cache.
@@ -444,6 +457,7 @@ jobs:
444457
image_name: "pytorch/manylinux-cuda101"
445458
steps:
446459
- checkout
460+
- designate_upload_channel
447461
- run:
448462
name: Generate cache key
449463
# This will refresh cache on Sundays, nightly build should generate new cache.
@@ -465,7 +479,7 @@ jobs:
465479
- env
466480
- run:
467481
name: Install torchvision
468-
command: docker run -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/install.sh
482+
command: docker run -t --gpus all -v $PWD:$PWD -w $PWD -e UPLOAD_CHANNEL "${image_name}" .circleci/unittest/linux/scripts/install.sh
469483
- run:
470484
name: Run tests
471485
command: docker run -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/run_test.sh
@@ -481,6 +495,7 @@ jobs:
481495
name: windows-cpu
482496
steps:
483497
- checkout
498+
- designate_upload_channel
484499
- run:
485500
name: Generate cache key
486501
# This will refresh cache on Sundays, nightly build should generate new cache.
@@ -520,6 +535,7 @@ jobs:
520535
CUDA_VERSION: "10.1"
521536
steps:
522537
- checkout
538+
- designate_upload_channel
523539
- run:
524540
name: Generate cache key
525541
# This will refresh cache on Sundays, nightly build should generate new cache.
@@ -558,6 +574,7 @@ jobs:
558574
resource_class: large
559575
steps:
560576
- checkout
577+
- designate_upload_channel
561578
- run:
562579
name: Install wget
563580
command: HOMEBREW_NO_AUTO_UPDATE=1 brew install wget
@@ -600,6 +617,7 @@ jobs:
600617
resource_class: 2xlarge+
601618
steps:
602619
- checkout_merge
620+
- designate_upload_channel
603621
- run:
604622
name: Setup conda
605623
command: .circleci/unittest/linux/scripts/setup_env.sh
@@ -617,19 +635,21 @@ jobs:
617635
CU_VERSION: << parameters.cu_version >>
618636
steps:
619637
- checkout_merge
638+
- designate_upload_channel
620639
- run:
621640
name: Setup conda
622641
command: docker run -e CU_VERSION -e PYTHON_VERSION -e UNICODE_ABI -e PYTORCH_VERSION -t --gpus all -v $PWD:$PWD -w $PWD << parameters.wheel_docker_image >> .circleci/unittest/linux/scripts/setup_env.sh
623642
- run:
624643
name: Build torchvision C++ distribution and test
625-
command: docker run -e CU_VERSION -e PYTHON_VERSION -e UNICODE_ABI -e PYTORCH_VERSION -t --gpus all -v $PWD:$PWD -w $PWD << parameters.wheel_docker_image >> packaging/build_cmake.sh
644+
command: docker run -e CU_VERSION -e PYTHON_VERSION -e UNICODE_ABI -e PYTORCH_VERSION -e UPLOAD_CHANNEL -t --gpus all -v $PWD:$PWD -w $PWD << parameters.wheel_docker_image >> packaging/build_cmake.sh
626645

627646
cmake_macos_cpu:
628647
<<: *binary_common
629648
macos:
630-
xcode: "9.0"
649+
xcode: "9.4.1"
631650
steps:
632651
- checkout_merge
652+
- designate_upload_channel
633653
- run:
634654
command: |
635655
curl -o conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
@@ -644,6 +664,7 @@ jobs:
644664
name: windows-cpu
645665
steps:
646666
- checkout_merge
667+
- designate_upload_channel
647668
- run:
648669
command: |
649670
set -ex
@@ -656,6 +677,7 @@ jobs:
656677
name: windows-gpu
657678
steps:
658679
- checkout_merge
680+
- designate_upload_channel
659681
- run:
660682
command: |
661683
set -ex

0 commit comments

Comments
 (0)