Skip to content

Commit

Permalink
create mpi wrapper; rm deprecated wrapper
Browse files Browse the repository at this point in the history
  • Loading branch information
ahueck committed Jun 29, 2021
1 parent 2ab9f88 commit 303724e
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 72 deletions.
31 changes: 18 additions & 13 deletions scripts/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
#)
28 changes: 0 additions & 28 deletions scripts/clang-typeart++.in

This file was deleted.

28 changes: 0 additions & 28 deletions scripts/clang-typeart.in

This file was deleted.

6 changes: 3 additions & 3 deletions scripts/typeart-wrapper.in
Original file line number Diff line number Diff line change
@@ -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/ \
Expand Down

0 comments on commit 303724e

Please sign in to comment.