Merge pull request #38 from lanl/brryan/cfm12

Testing issues

.github/workflows/ci.yml

@@ -40,11 +40,11 @@ jobs:
           python-version: '3.x'  # Specify the Python version you need
       - name: Install dependencies
         run: |
+          pip install clang-format==12.0.1.2
           pip install black
       - name: Run format check
         run: |
-          source env/bash
-          VERBOSE=1 ./style/format.sh
+          VERBOSE=1 CFM=clang-format ./style/format.sh
           git diff --exit-code --ignore-submodules
 
   cpu:

tst/scripts/binary/binary.py

@@ -29,6 +29,9 @@
 logging.getLogger("h5py").setLevel(logging.WARNING)
 logging.getLogger("matplotlib").setLevel(logging.WARNING)
 import scripts.utils.analysis as analysis
+import matplotlib
+
+matplotlib.use("Agg")  # Use the Agg backend to avoid issues with DISPLAY not being set
 import matplotlib.colors as colors
 import matplotlib.pyplot as plt
 

tst/scripts/binary_adi/binary_adi.py

@@ -28,6 +28,9 @@
 logging.getLogger("h5py").setLevel(logging.WARNING)
 logging.getLogger("matplotlib").setLevel(logging.WARNING)
 import scripts.utils.analysis as analysis
+import matplotlib
+
+matplotlib.use("Agg")  # Use the Agg backend to avoid issues with DISPLAY not being set
 import matplotlib.colors as colors
 import matplotlib.pyplot as plt
 

tst/scripts/collisions/collisions.py

@@ -25,6 +25,9 @@
 
 logger = logging.getLogger("artemis" + __name__[7:])  # set logger name
 logging.getLogger("matplotlib").setLevel(logging.WARNING)
+import matplotlib
+
+matplotlib.use("Agg")  # Use the Agg backend to avoid issues with DISPLAY not being set
 import matplotlib.colors as colors
 import matplotlib.pyplot as plt
 

tst/scripts/coords/blast.py

@@ -25,6 +25,9 @@
 logging.getLogger("h5py").setLevel(logging.WARNING)
 logging.getLogger("matplotlib").setLevel(logging.WARNING)
 import h5py
+import matplotlib
+
+matplotlib.use("Agg")  # Use the Agg backend to avoid issues with DISPLAY not being set
 import matplotlib.pyplot as plt
 
 _nranks = 1

tst/scripts/diffusion/alpha_disk.py

@@ -25,6 +25,9 @@
 logging.getLogger("h5py").setLevel(logging.WARNING)
 logging.getLogger("matplotlib").setLevel(logging.WARNING)
 import scripts.utils.analysis as analysis
+import matplotlib
+
+matplotlib.use("Agg")  # Use the Agg backend to avoid issues with DISPLAY not being set
 import matplotlib.colors as colors
 import matplotlib.pyplot as plt
 

tst/scripts/diffusion/thermal_diffusion.py

@@ -25,6 +25,9 @@
 logging.getLogger("h5py").setLevel(logging.WARNING)
 logging.getLogger("matplotlib").setLevel(logging.WARNING)
 import scripts.utils.analysis as analysis
+import matplotlib
+
+matplotlib.use("Agg")  # Use the Agg backend to avoid issues with DISPLAY not being set
 import matplotlib.colors as colors
 import matplotlib.pyplot as plt
 

tst/scripts/diffusion/viscous_diffusion.py

@@ -24,6 +24,9 @@
 logging.getLogger("h5py").setLevel(logging.WARNING)
 logging.getLogger("matplotlib").setLevel(logging.WARNING)
 import scripts.utils.analysis as analysis
+import matplotlib
+
+matplotlib.use("Agg")  # Use the Agg backend to avoid issues with DISPLAY not being set
 import matplotlib.colors as colors
 import matplotlib.pyplot as plt
 

tst/scripts/disk/disk.py

@@ -26,6 +26,9 @@
 logging.getLogger("h5py").setLevel(logging.WARNING)
 logging.getLogger("matplotlib").setLevel(logging.WARNING)
 import h5py
+import matplotlib
+
+matplotlib.use("Agg")  # Use the Agg backend to avoid issues with DISPLAY not being set
 import matplotlib.colors as colors
 import matplotlib.pyplot as plt
 

tst/scripts/disk_nbody/disk_nbody.py

@@ -26,6 +26,9 @@
 logging.getLogger("h5py").setLevel(logging.WARNING)
 logging.getLogger("matplotlib").setLevel(logging.WARNING)
 import h5py
+import matplotlib
+
+matplotlib.use("Agg")  # Use the Agg backend to avoid issues with DISPLAY not being set
 import matplotlib.colors as colors
 import matplotlib.pyplot as plt
 

tst/scripts/drag/drag.py

@@ -25,6 +25,9 @@
 logging.getLogger("h5py").setLevel(logging.WARNING)
 logging.getLogger("matplotlib").setLevel(logging.WARNING)
 import h5py
+import matplotlib
+
+matplotlib.use("Agg")  # Use the Agg backend to avoid issues with DISPLAY not being set
 import matplotlib.colors as colors
 import matplotlib.pyplot as plt
 

tst/scripts/nbody/nbody.py

@@ -30,6 +30,9 @@
 logging.getLogger("h5py").setLevel(logging.WARNING)
 logging.getLogger("matplotlib").setLevel(logging.WARNING)
 import scripts.utils.analysis as analysis
+import matplotlib
+
+matplotlib.use("Agg")  # Use the Agg backend to avoid issues with DISPLAY not being set
 import matplotlib.colors as colors
 import matplotlib.pyplot as plt
 

tst/scripts/ssheet/ssheet.py

@@ -27,6 +27,9 @@
 logging.getLogger("h5py").setLevel(logging.WARNING)
 logging.getLogger("matplotlib").setLevel(logging.WARNING)
 import scripts.utils.analysis as analysis
+import matplotlib
+
+matplotlib.use("Agg")  # Use the Agg backend to avoid issues with DISPLAY not being set
 import matplotlib.colors as colors
 import matplotlib.pyplot as plt
 

tst/scripts/utils/artemis.py

@@ -19,6 +19,7 @@
 # Modules
 import logging
 import os
+import shutil
 import subprocess
 from timeit import default_timer as timer
 from .log_pipe import LogPipe
@@ -119,11 +120,18 @@ def make(cmake_args, make_nproc):
 
 # Function for running Artemis (with MPI)
 def run(nproc, input_filename, arguments, restart=None):
+    logger = logging.getLogger("artemis.run")
     # global run_directory
     out_log = LogPipe("artemis.run", logging.INFO)
 
     # Build the run command
-    run_command = ["mpiexec"]
+    run_command = []
+    if shutil.which("mpiexec"):
+        run_command += ["mpiexec"]
+    elif shutil.which("srun"):
+        run_command += ["srun"]
+    else:
+        logger.error("Launcher executable [mpiexec, srun] not found", exc_info=True)
     if use_mpi_oversubscribe:
         run_command += ["--oversubscribe"]
     run_command += ["-n", str(nproc), os.path.join(artemis_exe_dir, "artemis")]