create mpi wrapper; rm deprecated wrapper

tudasc · Jun 29, 2021 · 303724e · 303724e
1 parent 2ab9f88
commit 303724e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 72 deletions.
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
@@ -37,8 +37,8 @@ function(configure_typeart_script input output)
 
   if(ARG_COMPILER)
     set(TYPEART_COMPILER ${ARG_COMPILER})
-    set(TYPEART_OPT opt)
-    set(TYPEART_LLC llc)
+    set(TYPEART_OPT ${LLVM_TOOLS_BINARY_DIR}/opt)
+    set(TYPEART_LLC ${LLVM_TOOLS_BINARY_DIR}/llc)
   endif()
 
   if(ENABLE_TSAN)
@@ -87,28 +87,33 @@ configure_typeart_script(apply.sh.in apply-typeart.sh
 
 configure_typeart_script(typeart-wrapper.in typeart-clang
   INSTALL_MODE ON
-  COMPILER clang)
+  COMPILER ${LLVM_TOOLS_BINARY_DIR}/clang)
 configure_typeart_script(typeart-wrapper.in typeart-clang++
   INSTALL_MODE ON
-  COMPILER clang++)
+  COMPILER ${LLVM_TOOLS_BINARY_DIR}/clang++)
+
+if(${MPI_C_FOUND})
+  configure_typeart_script(typeart-wrapper.in typeart-mpicc
+    INSTALL_MODE ON
+    COMPILER "env OMPI_CC=${LLVM_TOOLS_BINARY_DIR}/clang ${MPI_C_COMPILER}")
+endif()
+
+if(${MPI_CXX_FOUND})
+  configure_typeart_script(typeart-wrapper.in typeart-mpic++
+    INSTALL_MODE ON
+    COMPILER "env OMPI_CXX=${LLVM_TOOLS_BINARY_DIR}/clang++ ${MPI_CXX_COMPILER}")
+endif()
 
 configure_typeart_coverage_script(llvm-gcov.sh.in llvm-gcov.sh)
 
-#configure_file(clang-typeart.in clang-typeart)
-#configure_file(clang-typeart++.in clang-typeart++)
 
 install(
   PROGRAMS
     ${CMAKE_CURRENT_BINARY_DIR}/run-typeart.sh
     ${CMAKE_CURRENT_BINARY_DIR}/apply-typeart.sh
     ${CMAKE_CURRENT_BINARY_DIR}/typeart-clang++
     ${CMAKE_CURRENT_BINARY_DIR}/typeart-clang
+  ${CMAKE_CURRENT_BINARY_DIR}/typeart-mpic++
+  ${CMAKE_CURRENT_BINARY_DIR}/typeart-mpicc
   DESTINATION bin
 )
-
-#install(
-#  PROGRAMS
-#    ${CMAKE_CURRENT_BINARY_DIR}/clang-typeart
-#    ${CMAKE_CURRENT_BINARY_DIR}/clang-typeart++
-#  DESTINATION bin
-#)
diff --git a/scripts/clang-typeart++.in b/scripts/clang-typeart++.in
diff --git a/scripts/clang-typeart.in b/scripts/clang-typeart.in
diff --git a/scripts/typeart-wrapper.in b/scripts/typeart-wrapper.in
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 function global_init() {
-  compiler=@TYPEART_COMPILER@
-  opt_tool=@TYPEART_OPT@
-  llc_tool=@TYPEART_LLC@
+  compiler="@TYPEART_COMPILER@"
+  opt_tool="@TYPEART_OPT@"
+  llc_tool="@TYPEART_LLC@"
 
   typeart_ldflags="-L@CMAKE_INSTALL_PREFIX@/lib/ \
                    -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/lib/ \