likewise adjusting other buildstrings

Author: jlnav

libensemble/tests/functionality_tests/test_asktell_sampling.py

@@ -33,7 +33,6 @@ def sim_f(In):
 
 if __name__ == "__main__":
     nworkers, is_manager, libE_specs, _ = parse_args()
-    libE_specs["gen_on_worker"] = False
 
     sim_specs = {
         "sim_f": sim_f,

libensemble/tests/regression_tests/common.py

@@ -5,6 +5,7 @@
 import glob
 import os
 import os.path
+import sys
 import time
 
 
@@ -72,6 +73,8 @@ def build_simfunc():
     # Build simfunc
     # buildstring='mpif90 -o my_simtask.x my_simtask.f90' # On cray need to use ftn
     buildstring = "mpicc -o my_simtask.x ../unit_tests/simdir/my_simtask.c"
+    if sys.platform == "darwin":
+        buildstring = "mpicc -cc=clang -o my_simtask.x ../unit_tests/simdir/my_simtask.c"
     # subprocess.run(buildstring.split(),check=True) #Python3.5+
     subprocess.check_call(buildstring.split())
 

libensemble/tests/run_tests.py

@@ -264,7 +264,10 @@ def build_forces(root_dir):
     """Build forces.x using mpicc."""
     cprint("Building forces.x before running regression tests...", style="yellow", newline=True)
     forces_app_dir = Path(root_dir) / "libensemble/tests/scaling_tests/forces/forces_app"
-    subprocess.run(["mpicc", "-O3", "-o", "forces.x", "forces.c", "-lm"], cwd=forces_app_dir, check=True)
+    build_cmd = ["mpicc", "-O3", "-o", "forces.x", "forces.c", "-lm"]
+    if platform.system() == "Darwin":
+        build_cmd = ["mpicc", "-cc=clang", "-O3", "-o", "forces.x", "forces.c", "-lm"]
+    subprocess.run(build_cmd, cwd=forces_app_dir, check=True)
     destination_dir = Path(root_dir) / "libensemble/tests/forces_app"
     os.makedirs(destination_dir, exist_ok=True)
     shutil.copy(forces_app_dir / "forces.x", destination_dir)

libensemble/tests/standalone_tests/kill_test/build.sh

@@ -1,2 +1,7 @@
-mpicc -g -o burn_time.x burn_time.c
-mpicc -g -o sleep_and_print.x sleep_and_print.c
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    mpicc -cc=clang -g -o burn_time.x burn_time.c
+    mpicc -cc=clang -g -o sleep_and_print.x sleep_and_print.c
+else
+    mpicc -g -o burn_time.x burn_time.c
+    mpicc -g -o sleep_and_print.x sleep_and_print.c
+fi

libensemble/tests/unit_tests/test_executor.py

@@ -84,6 +84,10 @@ def build_simfuncs():
         app_name = ".".join([sim.split(".")[0], "x"])
         if not os.path.isfile(app_name):
             buildstring = "mpicc -o " + os.path.join("simdir", app_name) + " " + os.path.join("simdir", sim)
+            if sys.platform == "darwin":
+                buildstring = (
+                    "mpicc -cc=clang -o " + os.path.join("simdir", app_name) + " " + os.path.join("simdir", sim)
+                )
             subprocess.check_call(buildstring.split())
 
 

libensemble/tests/unit_tests/test_executor_gpus.py

@@ -48,6 +48,10 @@ def build_simfuncs():
         app_name = ".".join([sim.split(".")[0], "x"])
         if not os.path.isfile(app_name):
             buildstring = "mpicc -o " + os.path.join("simdir", app_name) + " " + os.path.join("simdir", sim)
+            if sys.platform == "darwin":
+                buildstring = (
+                    "mpicc -cc=clang -o " + os.path.join("simdir", app_name) + " " + os.path.join("simdir", sim)
+                )
             subprocess.check_call(buildstring.split())