[NFC] Reflow files in buildbot and sycl-fusion dirs (#14792)

Run `black` on python files in buildbot and fusion directories. Those files skipped the original formatting effort, so any change to them now would cause a formatting CI job to fail.
danhoeflinger · Jul 31, 2024 · 300b1f8 · 300b1f8
1 parent c79c3df
commit 300b1f8
Show file tree

Hide file tree

Showing 6 changed files with 440 additions and 188 deletions.
diff --git a/buildbot/check.py b/buildbot/check.py
@@ -6,6 +6,7 @@
 
 DEFAULT_CPU_COUNT = 4
 
+
 def do_check(args):
     try:
         cpu_count = multiprocessing.cpu_count()
@@ -14,52 +15,75 @@ def do_check(args):
 
     # Get absolute path to source directory
     if args.src_dir:
-      abs_src_dir = os.path.abspath(args.src_dir)
+        abs_src_dir = os.path.abspath(args.src_dir)
     else:
-      abs_src_dir = os.path.abspath(os.path.join(__file__, "../.."))
+        abs_src_dir = os.path.abspath(os.path.join(__file__, "../.."))
     # Get absolute path to build directory
     if args.obj_dir:
-      abs_obj_dir = os.path.abspath(args.obj_dir)
+        abs_obj_dir = os.path.abspath(args.obj_dir)
     else:
-      abs_obj_dir = os.path.join(abs_src_dir, "build")
+        abs_obj_dir = os.path.join(abs_src_dir, "build")
 
     cmake_cmd = [
         "cmake",
-        "--build", abs_obj_dir,
+        "--build",
+        abs_obj_dir,
         "--",
         args.test_suite,
-        "-j", str(cpu_count)]
+        "-j",
+        str(cpu_count),
+    ]
 
     print("[Cmake Command]: {}".format(" ".join(cmake_cmd)))
 
-    env_tmp=os.environ
-    env_tmp["LIT_ARGS"]="\"{}\"".format("-v")
+    env_tmp = os.environ
+    env_tmp["LIT_ARGS"] = '"{}"'.format("-v")
 
     subprocess.check_call(cmake_cmd, cwd=abs_obj_dir, env=env_tmp)
 
     ret = True
     return ret
 
+
 def main():
-    parser = argparse.ArgumentParser(prog="check.py",
-                                     description="script to do LIT testing",
-                                     formatter_class=argparse.RawTextHelpFormatter)
-    parser.add_argument("-n", "--build-number", metavar="BUILD_NUM", help="build number")
+    parser = argparse.ArgumentParser(
+        prog="check.py",
+        description="script to do LIT testing",
+        formatter_class=argparse.RawTextHelpFormatter,
+    )
+    parser.add_argument(
+        "-n", "--build-number", metavar="BUILD_NUM", help="build number"
+    )
     parser.add_argument("-b", "--branch", metavar="BRANCH", help="pull request branch")
-    parser.add_argument("-d", "--base-branch", metavar="BASE_BRANCH", help="pull request base branch")
-    parser.add_argument("-r", "--pr-number", metavar="PR_NUM", help="pull request number")
-    parser.add_argument("-w", "--builder-dir", metavar="BUILDER_DIR",
-                        help="builder directory, which is the directory containing source and build directories")
+    parser.add_argument(
+        "-d", "--base-branch", metavar="BASE_BRANCH", help="pull request base branch"
+    )
+    parser.add_argument(
+        "-r", "--pr-number", metavar="PR_NUM", help="pull request number"
+    )
+    parser.add_argument(
+        "-w",
+        "--builder-dir",
+        metavar="BUILDER_DIR",
+        help="builder directory, which is the directory containing source and build directories",
+    )
     parser.add_argument("-s", "--src-dir", metavar="SRC_DIR", help="source directory")
     parser.add_argument("-o", "--obj-dir", metavar="OBJ_DIR", help="build directory")
-    parser.add_argument("-t", "--test-suite", metavar="TEST_SUITE", default="check-all", help="check-xxx target")
+    parser.add_argument(
+        "-t",
+        "--test-suite",
+        metavar="TEST_SUITE",
+        default="check-all",
+        help="check-xxx target",
+    )
 
     args = parser.parse_args()
 
     print("args:{}".format(args))
 
     return do_check(args)
 
+
 if __name__ == "__main__":
     ret = main()
     exit_code = 0 if ret else 1

diff --git a/buildbot/clang_tidy.py b/buildbot/clang_tidy.py
@@ -5,10 +5,16 @@
 
 FILE_EXTENSIONS = [".h", ".hpp", ".c", ".cc", ".cpp"]
 
+
 def do_clang_tidy(args):
     ret = False
 
-    merge_base_cmd = ["git", "merge-base", "origin/{}".format(args.base_branch), args.branch]
+    merge_base_cmd = [
+        "git",
+        "merge-base",
+        "origin/{}".format(args.base_branch),
+        args.branch,
+    ]
     print(merge_base_cmd)
     base_commit = subprocess.check_output(merge_base_cmd, cwd=args.src_dir)
     base_commit = base_commit.rstrip()
@@ -19,13 +25,15 @@ def do_clang_tidy(args):
 
     diff_cmd = ["git", "--no-pager", "diff", base_commit, args.branch, "--name-only"]
     print(diff_cmd)
-    with open(changed_files, 'w') as f:
-        subprocess.check_call(merge_base_cmd, cwd=args.src_dir, stdout=f, stderr=subprocess.STDOUT)
+    with open(changed_files, "w") as f:
+        subprocess.check_call(
+            merge_base_cmd, cwd=args.src_dir, stdout=f, stderr=subprocess.STDOUT
+        )
 
     if os.path.isfile(changed_files):
         clang_tidy_binary = os.path.join(args.obj_dir, "bin", "clang-tidy")
         if os.path.isfile(clang_tidy_binary):
-            with open(changed_files, 'r') as f:
+            with open(changed_files, "r") as f:
                 for line in f:
                     filename, file_extension = os.path.splitext(line)
                     if file_extension.lower() in FILE_EXTENSIONS:
@@ -41,28 +49,51 @@ def do_clang_tidy(args):
 
     return ret
 
+
 def main():
-    parser = argparse.ArgumentParser(prog="clang_tidy.py",
-                                     description="script to do clang_tidy",
-                                     formatter_class=argparse.RawTextHelpFormatter)
-    parser.add_argument("-n", "--build-number", metavar="BUILD_NUM", help="build number")
-    parser.add_argument("-b", "--branch", metavar="BRANCH", required=True, help="pull request branch")
-    parser.add_argument("-d", "--base-branch", metavar="BASE_BRANCH", required=True,
-                        help="pull request base branch")
-    parser.add_argument("-r", "--pr-number", metavar="PR_NUM", help="pull request number")
-    parser.add_argument("-w", "--builder-dir", metavar="BUILDER_DIR", required=True,
-                        help="builder directory, which is the directory containing source and build directories")
-    parser.add_argument("-s", "--src-dir", metavar="SRC_DIR", required=True, help="source directory")
-    parser.add_argument("-o", "--obj-dir", metavar="OBJ_DIR", required=True, help="build directory")
+    parser = argparse.ArgumentParser(
+        prog="clang_tidy.py",
+        description="script to do clang_tidy",
+        formatter_class=argparse.RawTextHelpFormatter,
+    )
+    parser.add_argument(
+        "-n", "--build-number", metavar="BUILD_NUM", help="build number"
+    )
+    parser.add_argument(
+        "-b", "--branch", metavar="BRANCH", required=True, help="pull request branch"
+    )
+    parser.add_argument(
+        "-d",
+        "--base-branch",
+        metavar="BASE_BRANCH",
+        required=True,
+        help="pull request base branch",
+    )
+    parser.add_argument(
+        "-r", "--pr-number", metavar="PR_NUM", help="pull request number"
+    )
+    parser.add_argument(
+        "-w",
+        "--builder-dir",
+        metavar="BUILDER_DIR",
+        required=True,
+        help="builder directory, which is the directory containing source and build directories",
+    )
+    parser.add_argument(
+        "-s", "--src-dir", metavar="SRC_DIR", required=True, help="source directory"
+    )
+    parser.add_argument(
+        "-o", "--obj-dir", metavar="OBJ_DIR", required=True, help="build directory"
+    )
 
     args = parser.parse_args()
 
     print("args:{}".format(args))
 
     return do_clang_tidy(args)
 
+
 if __name__ == "__main__":
     ret = main()
     exit_code = 0 if ret else 1
     sys.exit(exit_code)
-
diff --git a/buildbot/compile.py b/buildbot/compile.py
@@ -18,24 +18,27 @@ def do_compile(args):
 
     # Get absolute path to source directory
     if args.src_dir:
-      abs_src_dir = os.path.abspath(args.src_dir)
+        abs_src_dir = os.path.abspath(args.src_dir)
     else:
-      abs_src_dir = os.path.abspath(os.path.join(__file__, "../.."))
+        abs_src_dir = os.path.abspath(os.path.join(__file__, "../.."))
     # Get absolute path to build directory
     if args.obj_dir:
-      abs_obj_dir = os.path.abspath(args.obj_dir)
+        abs_obj_dir = os.path.abspath(args.obj_dir)
     else:
-      abs_obj_dir = os.path.join(abs_src_dir, "build")
+        abs_obj_dir = os.path.join(abs_src_dir, "build")
 
     cmake_cmd = [
         "cmake",
-        "--build", abs_obj_dir,
+        "--build",
+        abs_obj_dir,
         "--",
         args.build_target,
-        "-j", str(cpu_count)]
+        "-j",
+        str(cpu_count),
+    ]
 
     if args.verbose:
-      cmake_cmd.append("--verbose")
+        cmake_cmd.append("--verbose")
 
     print("[Cmake Command]: {}".format(" ".join(cmake_cmd)))
 
@@ -45,20 +48,45 @@ def do_compile(args):
 
 
 def main():
-    parser = argparse.ArgumentParser(prog="compile.py",
-                                     description="script to do compile",
-                                     formatter_class=argparse.RawTextHelpFormatter)
-    parser.add_argument("-n", "--build-number", metavar="BUILD_NUM", help="build number")
+    parser = argparse.ArgumentParser(
+        prog="compile.py",
+        description="script to do compile",
+        formatter_class=argparse.RawTextHelpFormatter,
+    )
+    parser.add_argument(
+        "-n", "--build-number", metavar="BUILD_NUM", help="build number"
+    )
     parser.add_argument("-b", "--branch", metavar="BRANCH", help="pull request branch")
-    parser.add_argument("-d", "--base-branch", metavar="BASE_BRANCH", help="pull request base branch")
-    parser.add_argument("-r", "--pr-number", metavar="PR_NUM", help="pull request number")
-    parser.add_argument("-w", "--builder-dir", metavar="BUILDER_DIR",
-                        help="builder directory, which is the directory containing source and build directories")
+    parser.add_argument(
+        "-d", "--base-branch", metavar="BASE_BRANCH", help="pull request base branch"
+    )
+    parser.add_argument(
+        "-r", "--pr-number", metavar="PR_NUM", help="pull request number"
+    )
+    parser.add_argument(
+        "-w",
+        "--builder-dir",
+        metavar="BUILDER_DIR",
+        help="builder directory, which is the directory containing source and build directories",
+    )
     parser.add_argument("-s", "--src-dir", metavar="SRC_DIR", help="source directory")
     parser.add_argument("-o", "--obj-dir", metavar="OBJ_DIR", help="build directory")
-    parser.add_argument("-j", "--build-parallelism", metavar="BUILD_PARALLELISM", help="build parallelism")
-    parser.add_argument("-v", "--verbose", action='store_true', help="verbose build output")
-    parser.add_argument("-t", "--build-target", metavar="BUILD_TARGET", default="deploy-sycl-toolchain", help="set build target")
+    parser.add_argument(
+        "-j",
+        "--build-parallelism",
+        metavar="BUILD_PARALLELISM",
+        help="build parallelism",
+    )
+    parser.add_argument(
+        "-v", "--verbose", action="store_true", help="verbose build output"
+    )
+    parser.add_argument(
+        "-t",
+        "--build-target",
+        metavar="BUILD_TARGET",
+        default="deploy-sycl-toolchain",
+        help="set build target",
+    )
 
     args = parser.parse_args()