Merge branch 'main' into arrow-key

Author: Svetlana Karslioglu

.circleci/config.yml

@@ -118,7 +118,7 @@ pytorch_tutorial_build_defaults: &pytorch_tutorial_build_defaults
         echo "declare -x COMMIT_SOURCE=${CIRCLE_BRANCH}" >> /home/circleci/project/env
         # DANGER! DO NOT REMOVE THE `set +x` SETTING HERE!
         set +x
-        if [[ "$CIRCLE_BRANCH" == master ]]; then
+        if [[ "$CIRCLE_BRANCH" == master || "$CIRCLE_BRANCH" == main ]]; then
           if [ -z "${CIRCLECI_AWS_ACCESS_KEY_FOR_PYTORCH_TUTORIAL_BUILD_MASTER_S3_BUCKET}" ]; then exit 1; fi
           if [ -z "${CIRCLECI_AWS_SECRET_KEY_FOR_PYTORCH_TUTORIAL_BUILD_MASTER_S3_BUCKET}" ]; then exit 1; fi
           if [ -z "${GITHUB_PYTORCHBOT_USERNAME}" ]; then exit 1; fi
@@ -185,7 +185,7 @@ pytorch_windows_build_worker: &pytorch_windows_build_worker
 jobs:
   {{ jobs("pr") }}
 
-  {{ jobs("master") }}
+  {{ jobs("trunk") }}
 
   {{ windows_jobs() }}
 
@@ -194,6 +194,6 @@ workflows:
     jobs:
       # Build jobs that only run on PR
       {{ workflows_jobs("pr") }}
-      # Build jobs that only run on master
-      {{ workflows_jobs("master") }}
+      # Build jobs that only run on trunk
+      {{ workflows_jobs("trunk") }}
 #      {{ windows_workflows_jobs() }}

.circleci/config.yml.in

@@ -9,11 +9,11 @@
 import yaml
 from jinja2 import select_autoescape
 
-WORKFLOWS_JOBS_PR = {"filters": {"branches": {"ignore": ["master"]}}}
+WORKFLOWS_JOBS_PR = {"filters": {"branches": {"ignore": ["master", "main"]}}}
 
-WORKFLOWS_JOBS_MASTER = {
+WORKFLOWS_JOBS_TRUNK = {
     "context": "org-member",
-    "filters": {"branches": {"only": ["master"]}},
+    "filters": {"branches": {"only": ["master", "main"]}},
 }
 
 
@@ -23,39 +23,39 @@ def indent(indentation, data_list):
     )
 
 
-def jobs(pr_or_master, num_workers=20, indentation=2):
+def jobs(pr_or_trunk, num_workers=20, indentation=2):
     jobs = {}
 
     # all tutorials that need gpu.nvidia.small.multi machines will be routed
     # by get_files_to_run.py to 0th worker
     needs_gpu_nvidia_small_multi = [0]
-    jobs[f"pytorch_tutorial_{pr_or_master}_build_manager"] = {
+    jobs[f"pytorch_tutorial_{pr_or_trunk}_build_manager"] = {
         "<<": "*pytorch_tutorial_build_manager_defaults"
     }
     for i in range(num_workers):
         job_info = {"<<": "*pytorch_tutorial_build_worker_defaults"}
         if i in needs_gpu_nvidia_small_multi:
             job_info["resource_class"] = "gpu.nvidia.small.multi"
-        jobs[f"pytorch_tutorial_{pr_or_master}_build_worker_{i}"] = job_info
+        jobs[f"pytorch_tutorial_{pr_or_trunk}_build_worker_{i}"] = job_info
 
     return indent(indentation, jobs).replace("'", "")
 
 
-def workflows_jobs(pr_or_master, indentation=6, num_workers=20):
+def workflows_jobs(pr_or_trunk, indentation=6, num_workers=20):
     jobs = []
     job_info = deepcopy(
-        WORKFLOWS_JOBS_PR if pr_or_master == "pr" else WORKFLOWS_JOBS_MASTER
+        WORKFLOWS_JOBS_PR if pr_or_trunk == "pr" else WORKFLOWS_JOBS_TRUNK
     )
 
     for i in range(num_workers):
         jobs.append(
-            {f"pytorch_tutorial_{pr_or_master}_build_worker_{i}": deepcopy(job_info)}
+            {f"pytorch_tutorial_{pr_or_trunk}_build_worker_{i}": deepcopy(job_info)}
         )
 
     job_info["requires"] = [
-        f"pytorch_tutorial_{pr_or_master}_build_worker_{i}" for i in range(num_workers)
+        f"pytorch_tutorial_{pr_or_trunk}_build_worker_{i}" for i in range(num_workers)
     ]
-    jobs.append({f"pytorch_tutorial_{pr_or_master}_build_manager": deepcopy(job_info)})
+    jobs.append({f"pytorch_tutorial_{pr_or_trunk}_build_manager": deepcopy(job_info)})
     return indent(indentation, jobs)
 
 
@@ -65,7 +65,7 @@ def windows_jobs(indentation=2, num_workers=4):
         jobs[f"pytorch_tutorial_windows_pr_build_worker_{i}"] = {
             "<<": "*pytorch_windows_build_worker"
         }
-        jobs[f"pytorch_tutorial_windows_master_build_worker_{i}"] = {
+        jobs[f"pytorch_tutorial_windows_trunk_build_worker_{i}"] = {
             "<<": "*pytorch_windows_build_worker"
         }
     return indent(indentation, jobs).replace("'", "")
@@ -79,10 +79,10 @@ def windows_workflows_jobs(indentation=6, num_workers=4):
             {f"pytorch_tutorial_windows_pr_build_worker_{i}": deepcopy(job_info)}
         )
 
-    job_info = WORKFLOWS_JOBS_MASTER
+    job_info = WORKFLOWS_JOBS_TRUNK
     for i in range(num_workers):
         jobs.append(
-            {f"pytorch_tutorial_windows_master_build_worker_{i}": deepcopy(job_info)}
+            {f"pytorch_tutorial_windows_trunk_build_worker_{i}": deepcopy(job_info)}
         )
 
     return ("\n#").join(indent(indentation, jobs).splitlines())

.circleci/regenerate.py

@@ -1,6 +1,6 @@
 set -ex
 
-if [[ "$COMMIT_SOURCE" == master ]]; then
+if [[ "$COMMIT_SOURCE" == master || "$COMMIT_SOURCE" == main ]]; then
   export BUCKET_NAME=pytorch-tutorial-build-master
 else
   export BUCKET_NAME=pytorch-tutorial-build-pull-request
@@ -153,7 +153,7 @@ elif [[ "${JOB_BASE_NAME}" == *manager ]]; then
   awsv2 s3 cp manager.7z s3://${BUCKET_NAME}/${COMMIT_ID}/manager.7z --acl public-read
 
   # Step 7: push new HTML files and static files to gh-pages
-  if [[ "$COMMIT_SOURCE" == master ]]; then
+  if [[ "$COMMIT_SOURCE" == master || "$COMMIT_SOURCE" == main ]]; then
     git clone https://github.com/pytorch/tutorials.git -b gh-pages gh-pages
     cp -r docs/* gh-pages/
     pushd gh-pages

.jenkins/build.sh

@@ -52,7 +52,6 @@
     "hyperparameter_tuning_tutorial",
     "flask_rest_api_tutorial",
     "text_to_speech_with_torchaudio",
-    "ax_multiobjective_nas_tutorial"
 ]