Skip to content

Commit fcbeeb2

Browse files
author
Guanheng Zhang
committed
Merge remote-tracking branch 'upstream/master' into xlmr_mlm
2 parents e9f1802 + c2dd2ff commit fcbeeb2

File tree

100 files changed

+2235
-1809
lines changed

Some content is hidden

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

100 files changed

+2235
-1809
lines changed

‎.circleci/config.yml

+197-8
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,16 @@ commands:
2929
our_upload_channel=test
3030
fi
3131
echo "export UPLOAD_CHANNEL=${our_upload_channel}" >> ${BASH_ENV}
32+
load_conda_channel_flags:
33+
description: "Determines whether we need extra conda channels"
34+
steps:
35+
- run:
36+
name: Adding CONDA_CHANNEL_FLAGS to BASH_ENV
37+
command: |
38+
CONDA_CHANNEL_FLAGS=""
39+
if [[ "${PYTHON_VERSION}" = *3.9* ]]; then
40+
echo "export CONDA_CHANNEL_FLAGS=-c=conda-forge" >> ${BASH_ENV}
41+
fi
3242
3343
binary_common: &binary_common
3444
parameters:
@@ -71,7 +81,7 @@ jobs:
7181
binary_linux_wheel:
7282
<<: *binary_common
7383
docker:
74-
- image: "pytorch/manylinux-cuda100"
84+
- image: "pytorch/manylinux-cuda102"
7585
resource_class: 2xlarge+
7686
steps:
7787
- checkout
@@ -92,6 +102,7 @@ jobs:
92102
steps:
93103
- checkout
94104
- designate_upload_channel
105+
- load_conda_channel_flags
95106
- run: packaging/build_conda.sh
96107
- store_artifacts:
97108
path: /opt/conda/conda-bld/linux-64
@@ -127,12 +138,13 @@ jobs:
127138
steps:
128139
- checkout
129140
- designate_upload_channel
141+
- load_conda_channel_flags
130142
- run:
131143
name: build
132144
command: |
133145
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
134146
conda activate base
135-
conda install -yq conda-build "conda-package-handling!=1.5.0"
147+
conda install ${CONDA_CHANNEL_FLAGS} -yq conda-build "conda-package-handling!=1.5.0"
136148
bash packaging/build_conda.sh
137149
rm /C/tools/miniconda3/conda-bld/win-64/vs2019*.tar.bz2
138150
- store_artifacts:
@@ -175,6 +187,7 @@ jobs:
175187
steps:
176188
- checkout
177189
- designate_upload_channel
190+
- load_conda_channel_flags
178191
- run:
179192
command: |
180193
curl -o conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
@@ -232,13 +245,14 @@ jobs:
232245
- attach_workspace:
233246
at: ~/workspace
234247
- designate_upload_channel
248+
- load_conda_channel_flags
235249
- run:
236250
name: install binaries
237251
command: |
238252
set -x
239253
source /usr/local/etc/profile.d/conda.sh && conda activate python${PYTHON_VERSION}
240-
conda install -v -y -c pytorch-${UPLOAD_CHANNEL} pytorch cpuonly
241-
conda install -v -y -c file://$HOME/workspace/conda-bld torchtext
254+
conda install -v -y ${CONDA_CHANNEL_FLAGS} -c pytorch-${UPLOAD_CHANNEL} pytorch
255+
conda install -v -y ${CONDA_CHANNEL_FLAGS} -c file://$HOME/workspace/conda-bld torchtext
242256
- run:
243257
name: smoke test
244258
command: |
@@ -291,6 +305,7 @@ jobs:
291305
- attach_workspace:
292306
at: ~/workspace
293307
- designate_upload_channel
308+
- load_conda_channel_flags
294309
- run:
295310
name: install binaries
296311
command: |
@@ -299,8 +314,8 @@ jobs:
299314
conda env remove -n python${PYTHON_VERSION} || true
300315
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
301316
conda activate python${PYTHON_VERSION}
302-
conda install -v -y -c pytorch-"${UPLOAD_CHANNEL}" pytorch cpuonly
303-
conda install -v -y -c ~/workspace/conda-bld torchtext
317+
conda install -v -y ${CONDA_CHANNEL_FLAGS} -c pytorch-"${UPLOAD_CHANNEL}" pytorch
318+
conda install -v -y ${CONDA_CHANNEL_FLAGS} -c ~/workspace/conda-bld torchtext
304319
- run:
305320
name: smoke test
306321
command: |
@@ -335,11 +350,12 @@ jobs:
335350
unittest_linux:
336351
<<: *binary_common
337352
docker:
338-
- image: "pytorch/manylinux-cuda100"
353+
- image: "pytorch/manylinux-cuda102"
339354
resource_class: 2xlarge+
340355
steps:
341356
- checkout
342357
- designate_upload_channel
358+
- load_conda_channel_flags
343359
- run:
344360
name: Generate cache key
345361
# This will refresh cache on Sundays, nightly build should generate new cache.
@@ -392,6 +408,7 @@ jobs:
392408
steps:
393409
- checkout
394410
- designate_upload_channel
411+
- load_conda_channel_flags
395412
- run:
396413
name: Generate cache key
397414
# This will refresh cache on Sundays, nightly build should generate new cache.
@@ -440,7 +457,7 @@ jobs:
440457
stylecheck:
441458
<<: *binary_common
442459
docker:
443-
- image: "pytorch/manylinux-cuda100"
460+
- image: "pytorch/manylinux-cuda102"
444461
resource_class: medium
445462
steps:
446463
- checkout
@@ -538,6 +555,9 @@ workflows:
538555
- binary_linux_wheel:
539556
name: binary_linux_wheel_py3.8
540557
python_version: '3.8'
558+
- binary_linux_wheel:
559+
name: binary_linux_wheel_py3.9
560+
python_version: '3.9'
541561
- binary_macos_wheel:
542562
name: binary_macos_wheel_py3.6
543563
python_version: '3.6'
@@ -547,6 +567,9 @@ workflows:
547567
- binary_macos_wheel:
548568
name: binary_macos_wheel_py3.8
549569
python_version: '3.8'
570+
- binary_macos_wheel:
571+
name: binary_macos_wheel_py3.9
572+
python_version: '3.9'
550573
- binary_windows_wheel:
551574
name: binary_windows_wheel_py3.6
552575
python_version: '3.6'
@@ -556,6 +579,9 @@ workflows:
556579
- binary_windows_wheel:
557580
name: binary_windows_wheel_py3.8
558581
python_version: '3.8'
582+
- binary_windows_wheel:
583+
name: binary_windows_wheel_py3.9
584+
python_version: '3.9'
559585
- binary_linux_conda:
560586
name: binary_linux_conda_py3.6
561587
python_version: '3.6'
@@ -565,6 +591,9 @@ workflows:
565591
- binary_linux_conda:
566592
name: binary_linux_conda_py3.8
567593
python_version: '3.8'
594+
- binary_linux_conda:
595+
name: binary_linux_conda_py3.9
596+
python_version: '3.9'
568597
- binary_macos_conda:
569598
name: binary_macos_conda_py3.6
570599
python_version: '3.6'
@@ -574,6 +603,9 @@ workflows:
574603
- binary_macos_conda:
575604
name: binary_macos_conda_py3.8
576605
python_version: '3.8'
606+
- binary_macos_conda:
607+
name: binary_macos_conda_py3.9
608+
python_version: '3.9'
577609
- binary_windows_conda:
578610
name: binary_windows_conda_py3.6
579611
python_version: '3.6'
@@ -583,6 +615,9 @@ workflows:
583615
- binary_windows_conda:
584616
name: binary_windows_conda_py3.8
585617
python_version: '3.8'
618+
- binary_windows_conda:
619+
name: binary_windows_conda_py3.9
620+
python_version: '3.9'
586621
- build_docs:
587622
name: build_docs
588623
python_version: '3.8'
@@ -613,6 +648,9 @@ workflows:
613648
- unittest_linux:
614649
name: unittest_linux_py3.8
615650
python_version: '3.8'
651+
- unittest_linux:
652+
name: unittest_linux_py3.9
653+
python_version: '3.9'
616654
- unittest_windows:
617655
name: unittest_windows_py3.6
618656
python_version: '3.6'
@@ -622,6 +660,9 @@ workflows:
622660
- unittest_windows:
623661
name: unittest_windows_py3.8
624662
python_version: '3.8'
663+
- unittest_windows:
664+
name: unittest_windows_py3.9
665+
python_version: '3.9'
625666
nightly:
626667
jobs:
627668
- circleci_consistency:
@@ -712,6 +753,34 @@ workflows:
712753
python_version: '3.8'
713754
requires:
714755
- nightly_binary_linux_wheel_py3.8_upload
756+
- binary_linux_wheel:
757+
filters:
758+
branches:
759+
only: nightly
760+
tags:
761+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
762+
name: nightly_binary_linux_wheel_py3.9
763+
python_version: '3.9'
764+
- binary_wheel_upload:
765+
context: org-member
766+
filters:
767+
branches:
768+
only: nightly
769+
tags:
770+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
771+
name: nightly_binary_linux_wheel_py3.9_upload
772+
requires:
773+
- nightly_binary_linux_wheel_py3.9
774+
- smoke_test_linux_pip:
775+
filters:
776+
branches:
777+
only: nightly
778+
tags:
779+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
780+
name: nightly_binary_linux_wheel_py3.9_smoke_test_pip
781+
python_version: '3.9'
782+
requires:
783+
- nightly_binary_linux_wheel_py3.9_upload
715784
- binary_macos_wheel:
716785
filters:
717786
branches:
@@ -766,6 +835,24 @@ workflows:
766835
name: nightly_binary_macos_wheel_py3.8_upload
767836
requires:
768837
- nightly_binary_macos_wheel_py3.8
838+
- binary_macos_wheel:
839+
filters:
840+
branches:
841+
only: nightly
842+
tags:
843+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
844+
name: nightly_binary_macos_wheel_py3.9
845+
python_version: '3.9'
846+
- binary_wheel_upload:
847+
context: org-member
848+
filters:
849+
branches:
850+
only: nightly
851+
tags:
852+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
853+
name: nightly_binary_macos_wheel_py3.9_upload
854+
requires:
855+
- nightly_binary_macos_wheel_py3.9
769856
- binary_windows_wheel:
770857
filters:
771858
branches:
@@ -850,6 +937,34 @@ workflows:
850937
python_version: '3.8'
851938
requires:
852939
- nightly_binary_windows_wheel_py3.8_upload
940+
- binary_windows_wheel:
941+
filters:
942+
branches:
943+
only: nightly
944+
tags:
945+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
946+
name: nightly_binary_windows_wheel_py3.9
947+
python_version: '3.9'
948+
- binary_wheel_upload:
949+
context: org-member
950+
filters:
951+
branches:
952+
only: nightly
953+
tags:
954+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
955+
name: nightly_binary_windows_wheel_py3.9_upload
956+
requires:
957+
- nightly_binary_windows_wheel_py3.9
958+
- smoke_test_windows_pip:
959+
filters:
960+
branches:
961+
only: nightly
962+
tags:
963+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
964+
name: nightly_binary_windows_wheel_py3.9_smoke_test_pip
965+
python_version: '3.9'
966+
requires:
967+
- nightly_binary_windows_wheel_py3.9_upload
853968
- binary_linux_conda:
854969
filters:
855970
branches:
@@ -934,6 +1049,34 @@ workflows:
9341049
python_version: '3.8'
9351050
requires:
9361051
- nightly_binary_linux_conda_py3.8_upload
1052+
- binary_linux_conda:
1053+
filters:
1054+
branches:
1055+
only: nightly
1056+
tags:
1057+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
1058+
name: nightly_binary_linux_conda_py3.9
1059+
python_version: '3.9'
1060+
- binary_conda_upload:
1061+
context: org-member
1062+
filters:
1063+
branches:
1064+
only: nightly
1065+
tags:
1066+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
1067+
name: nightly_binary_linux_conda_py3.9_upload
1068+
requires:
1069+
- nightly_binary_linux_conda_py3.9
1070+
- smoke_test_linux_conda:
1071+
filters:
1072+
branches:
1073+
only: nightly
1074+
tags:
1075+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
1076+
name: nightly_binary_linux_conda_py3.9_smoke_test_conda
1077+
python_version: '3.9'
1078+
requires:
1079+
- nightly_binary_linux_conda_py3.9_upload
9371080
- binary_macos_conda:
9381081
filters:
9391082
branches:
@@ -988,6 +1131,24 @@ workflows:
9881131
name: nightly_binary_macos_conda_py3.8_upload
9891132
requires:
9901133
- nightly_binary_macos_conda_py3.8
1134+
- binary_macos_conda:
1135+
filters:
1136+
branches:
1137+
only: nightly
1138+
tags:
1139+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
1140+
name: nightly_binary_macos_conda_py3.9
1141+
python_version: '3.9'
1142+
- binary_conda_upload:
1143+
context: org-member
1144+
filters:
1145+
branches:
1146+
only: nightly
1147+
tags:
1148+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
1149+
name: nightly_binary_macos_conda_py3.9_upload
1150+
requires:
1151+
- nightly_binary_macos_conda_py3.9
9911152
- binary_windows_conda:
9921153
filters:
9931154
branches:
@@ -1072,6 +1233,34 @@ workflows:
10721233
python_version: '3.8'
10731234
requires:
10741235
- nightly_binary_windows_conda_py3.8_upload
1236+
- binary_windows_conda:
1237+
filters:
1238+
branches:
1239+
only: nightly
1240+
tags:
1241+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
1242+
name: nightly_binary_windows_conda_py3.9
1243+
python_version: '3.9'
1244+
- binary_conda_upload:
1245+
context: org-member
1246+
filters:
1247+
branches:
1248+
only: nightly
1249+
tags:
1250+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
1251+
name: nightly_binary_windows_conda_py3.9_upload
1252+
requires:
1253+
- nightly_binary_windows_conda_py3.9
1254+
- smoke_test_windows_conda:
1255+
filters:
1256+
branches:
1257+
only: nightly
1258+
tags:
1259+
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
1260+
name: nightly_binary_windows_conda_py3.9_smoke_test_conda
1261+
python_version: '3.9'
1262+
requires:
1263+
- nightly_binary_windows_conda_py3.9_upload
10751264
docker_build:
10761265
triggers:
10771266
- schedule:

0 commit comments

Comments
 (0)