Switched back to using cmake build for simplicity

LLNL · Nov 11, 2024 · 609b9b3 · 609b9b3
1 parent b7be579
commit 609b9b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.gitlab/scripts.yml b/.gitlab/scripts.yml
@@ -27,10 +27,7 @@
   script:
     - CI_BUILD_DIR=$(cat ci-dir.txt)
     - cd $CI_BUILD_DIR && cat job-name.txt
-    - ./$SCRIPT_DIR/devtools/host-config-build.py --no-clean --host-config gitlab.cmake $EXTRA_CMAKE_ARGS
-    - cd build_gitlab/build
-    - make -j $NPROC
-    - make -j $NPROC install
+    - ./$SCRIPT_DIR/devtools/host-config-build.py --no-clean --build --nprocs $NPROCS --host-config gitlab.cmake $EXTRA_CMAKE_ARGS
   artifacts:
     paths:
       - ci-dir.txt

diff --git a/scripts/devtools/host-config-build.py b/scripts/devtools/host-config-build.py
@@ -31,6 +31,9 @@ def parse_args():
   parser.add_argument('--build', action='store_true',
       help='Run make -j install after configuring build dirs.')
 
+  parser.add_argument('--nprocs', default=48,
+      help="Set number of procs to use while building. This is not used if --build is not enabled.")
+
   parser.add_argument('--lc-modules', type=str, default="",
       help='LC Modules to use during build, install and smoke test. This is not used if --build is not enabled.')
 
@@ -106,8 +109,9 @@ def main():
     print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
     print("~~~~~ Building Spheral")
     print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
+    build_cmd = f"{ml_cmd} {cmake_cmd} --build . --target install -j {args.nprocs}"
 
-    sexe("{0} {1} --build . -j 48 --target install".format(ml_cmd, cmake_cmd), echo=True, ret_output=False)
+    sexe(build_cmd, echo=True, ret_output=False)
 
 if __name__ == "__main__":
   main()