Commit 6db945fa authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Merge branch 'mpi-explosive' of geraldine.fjfi.cvut.cz:/local/projects/tnl/tnl into mpi-explosive

parents b37c63ef 6adb3c44

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ if( WITH_CUDA STREQUAL "yes" ) 
                set( CUDA_ARCH_SOURCE ${PROJECT_SOURCE_DIR}/src/Tools/tnl-cuda-arch.cu)

                message( "Compiling tnl-cuda-arch ..." )

                file( MAKE_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} )

                execute_process( COMMAND nvcc --compiler-bindir ${CUDA_HOST_COMPILER} ${CUDA_ARCH_SOURCE} -o ${CUDA_ARCH_EXECUTABLE}

                execute_process( COMMAND nvcc --compiler-bindir ${CUDA_HOST_COMPILER} --std=c++11 ${CUDA_ARCH_SOURCE} -o ${CUDA_ARCH_EXECUTABLE}

                                 RESULT_VARIABLE CUDA_ARCH_RESULT

                                 OUTPUT_VARIABLE CUDA_ARCH_OUTPUT

                                 ERROR_VARIABLE CUDA_ARCH_OUTPUT )

build

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ then 
       echo "Warning:mpic++ is not installed on this system. MPI support is turned off." 

    else

       export CXX=mpic++

       export CUDA_HOST_COMPILER=mpic++

    fi

    if ! [ -x  "$(command -v mpicc)" ]; then

       echo "Warning: mpicc is not installed on this system."