Fix for COBE

scripts/tools/parcoach.py

@@ -13,8 +13,7 @@ class Tool(AbstractTool):
         pass
 
     def build(self, rootdir, cached=True):
-        # nothing to do
-        pass
+        self.setup()
 
     def setup(self):
         # os.environ['PATH'] = os.environ['PATH'] + f":/tmp/build-parcoach/parcoach-2.4.0-shared-Linux/bin"
@@ -40,10 +39,8 @@ class Tool(AbstractTool):
         self.so_files = [str(p) for p in list(Path(os.path.dirname(self.parcoach_exe)).rglob("*.so"))]
 
     def run(self, execcmd, filename, binary, id, number, timeout, batchinfo, loglevel=logging.INFO):
-
-        self.setup()
-
-        os.environ['PATH'] = os.environ['PATH'] + f":/tmp/build-parcoach/parcoach-2.4.0-shared-Linux/bin"
+        # os.environ['PATH'] = os.environ['PATH'] + f":/tmp/build-parcoach/parcoach-2.4.0-shared-Linux/bin"
+        command_suffix = f"{execcmd}" if execcmd.startswith("-I") else ""
         os.environ['OMPI_CC'] = "clang-15"
         os.environ['OMPI_ALLOW_RUN_AS_ROOT'] = "1"
         os.environ['OMPI_ALLOW_RUN_AS_ROOT_CONFIRM'] = "1"
@@ -57,7 +54,7 @@ class Tool(AbstractTool):
                 # buildcmd=f"parcoachcc -check=rma --args mpicc {filename} -c -o {binary}.o",
                 # buildcmd=f"parcoachcc -check=rma --args mpicc {filename} -c -o {binary}.o \n mpicc {binary}.o -o {binary} -L/tmp/build-parcoach/parcoach-2.4.0-shared-Linux/lib/ -lParcoachRMADynamic_MPI_C",
                 # execcmd=f"mpicc {binary}.o -lParcoachRMADynamic_MPI_C -L/tmp/build-parcoach/parcoach-2.4.0-shared-Linux/lib/",
-                buildcmd=f"mpicc {filename} -S -emit-llvm -o {binary}.ir",
+                buildcmd=f"mpicc {command_suffix} {filename} -S -emit-llvm -o {binary}.ir",
                 execcmd=f"{self.parcoach_exe} --check=rma {binary}.ir ",
                 # execcmd=execcmd,
                 cachefile=cachefile,
@@ -72,7 +69,7 @@ class Tool(AbstractTool):
             self.run_cmd(
                 # buildcmd=f"parcoachcc -instrum-inter --args mpicc {filename} -c -o {binary}.o",
                 # buildcmd=f"parcoachcc -instrum-inter --args mpicc {filename} -c -o {binary}.o \n mpicc {binary}.o -o {binary} -L/tmp/build-parcoach/parcoach-2.4.0-shared-Linux/lib/ -lParcoachCollDynamic_MPI_C",
-                buildcmd=f"mpicc {filename} -S -emit-llvm -o {binary}.ir",
+                buildcmd=f"mpicc {command_suffix} {filename} -S -emit-llvm -o {binary}.ir",
                 execcmd=f"{self.parcoach_exe} --check=mpi {binary}.ir ",
                 # execcmd=f"mpicc {binary}.o -lParcoachCollDynamic_MPI_C -L/tmp/build-parcoach/parcoach-2.4.0-shared-Linux/lib/",
                 # execcmd=execcmd,