Minor edits to build_locally.py

Author: Diptorup Deb

scripts/build_locally.py

@@ -35,7 +35,7 @@ def _get_llvm_sha():
     sha = ""
     base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
     with open(base_dir + "/llvm-sha.txt", "r") as fd:
-        sha = fd.readline()
+        sha = fd.readline().strip()
     if len(sha) == 0:
         raise RuntimeError("sha cannot be empty")
     return sha
@@ -63,6 +63,8 @@ def _sha_matched(llvm_install_dir, llvm_sha):
                 break
     if sha is None:
         raise RuntimeError("Should have found the SHA in a valid LLVM install")
+    if sha != llvm_sha:
+        warnings.warn("Expected SHA " + llvm_sha + " Actual SHA " + sha)
     return sha == llvm_sha
 
 
@@ -467,6 +469,11 @@ def _build_imex(
         action="store_true",
         help="Enables building IMEX with dpnp",
     )
+    imex_builder.add_argument(
+        "--imex-clean-build",
+        action="store_true",
+        help="Removes any existing build directory when building IMEX",
+    )
 
     args = parser.parse_args()
 
@@ -479,7 +486,7 @@ def _build_imex(
     if g_working_dir is None:
         warnings.warn(
             "No working directory specified. Going to use system temp "
-            + "direcotry to build LLVM"
+            + "directory to build LLVM"
         )
         g_working_dir = tempfile.gettempdir()
     if g_working_dir == os.path.dirname(os.path.dirname(os.path.abspath(__file__))):
@@ -511,7 +518,7 @@ def _build_imex(
                 g_llvm_install_dir = _build_llvm(
                     build_type=args.build_type,
                     llvm_src_dir=g_llvm_source_dir,
-                    mlir_install_dir=g_working_dir,
+                    mlir_install_dir=g_working_dir + "/_mlir_install",
                     enable_assertions=args.assertion_setting,
                     c_compiler=args.c_compiler,
                     cxx_compiler=args.cxx_compiler,
@@ -528,7 +535,7 @@ def _build_imex(
         g_llvm_install_dir = _build_llvm(
             build_type=args.build_type,
             llvm_src_dir=g_llvm_source_dir,
-            mlir_install_dir=g_working_dir,
+            mlir_install_dir=g_working_dir + "/_mlir_install",
             enable_assertions=args.assertion_setting,
             c_compiler=args.c_compiler,
             cxx_compiler=args.cxx_compiler,
@@ -540,7 +547,7 @@ def _build_imex(
         g_llvm_install_dir = _build_llvm(
             build_type=args.build_type,
             llvm_src_dir=llvm_src,
-            mlir_install_dir=g_working_dir,
+            mlir_install_dir=g_working_dir + "/_mlir_install",
             enable_assertions=args.assertion_setting,
             c_compiler=args.c_compiler,
             cxx_compiler=args.cxx_compiler,
@@ -551,6 +558,14 @@ def _build_imex(
     # Now we are ready to build IMEX
     setup_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
     imex_build_dir = os.path.abspath(setup_dir + "/_build")
+    if os.path.exists(imex_build_dir):
+        if not args.imex_clean_build:
+            raise RuntimeError(
+                "IMEX build directory already exists. Use --imex-clean-build "
+                + "to remove build directory"
+            )
+        else:
+            shutil.rmtree(imex_build_dir)
     os.mkdir(imex_build_dir)
     _build_imex(
         build_dir=imex_build_dir,