Commit 0de11cb1 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Small fixes. 

TNL compiles with MPI by default.
parent c152dc04

build

+23 −6
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ HELP="no" 
VERBOSE=""



WITH_CLANG="no"

WITH_MPI="yes"

WITH_CUDA="yes"

WITH_CUDA_ARCH="auto"

WITH_OPENMP="yes"
@@ -42,6 +43,7 @@ do 
        --verbose                        ) VERBOSE="VERBOSE=1" ;;

        --help                           ) HELP="yes" ;;

        --with-clang=*                   ) WITH_CLANG="${option#*=}" ;;

        --with-mpi=*                     ) WITH_MPI="${option#*=}" ;;

        --with-mic=*                     ) WITH_MIC="${option#*=}" ;;

        --with-cuda=*                    ) WITH_CUDA="${option#*=}" ;;

        --with-cuda-arch=*               ) WITH_CUDA_ARCH="${option#*=}";;
@@ -76,12 +78,13 @@ then 
    echo "   --build-jobs=NUM                      Number of processes to be used for the build. It is set to the number of available CPU cores by default."

    echo "   --prefix=PATH                         Prefix for the installation directory. ${HOME}/local by default."

    echo "   --install=yes/no                      Enables the installation of TNL files."

    echo "   --with-mic=yes/no                     Enable MIC (Intel Xeon Phi). 'no' by default (Intel Compiler required)."

    echo "   --with-cuda=yes/no                    Enable CUDA. 'yes' by default (CUDA Toolkit is required)."

    echo "   --with-cuda-arch=all/auto/30/35/...   Choose CUDA architecture. 'auto' by default."

    echo "   --with-openmp=yes/no                  Enable OpenMP. 'yes' by default."

    echo "   --with-tests=yes/no                   Enable unit tests. 'yes' by default."

    echo "   --with-coverage=yes/no                Enable code coverage reports for unit tests. 'no' by default (lcov is required)."

    echo "   --with-mpi=yes/no                     Enables MPI. 'no' by default (Intel Compiler required)."

    echo "   --with-mic=yes/no                     Enables MIC (Intel Xeon Phi). 'no' by default (Intel Compiler required)."

    echo "   --with-cuda=yes/no                    Enables CUDA. 'yes' by default (CUDA Toolkit is required)."

    echo "   --with-cuda-arch=all/auto/30/35/...   Chooses CUDA architecture. 'auto' by default."

    echo "   --with-openmp=yes/no                  Enables OpenMP. 'yes' by default."

    echo "   --with-tests=yes/no                   Enables unit tests. 'yes' by default."

    echo "   --with-coverage=yes/no                Enables code coverage reports for unit tests. 'no' by default (lcov is required)."

    echo "   --with-examples=yes/no                Compile the 'examples' directory. 'yes' by default."

    echo "   --with-templates-instantiation=yes/no Precompiles some TNL templates during the build. 'no' by default."

    echo "   --cmake=CMAKE                         Path to cmake. 'cmake' by default."
@@ -98,6 +101,20 @@ then 
   export CC=clang

fi



if test ${WITH_MPI} = "yes";

then

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

       echo "Warning:mpic++ is not installed on this system. MPI support is turned off." 

    else

       export CXX=mpic++

    fi

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

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

    else

       export CC=mpicc

    fi

fi





echo "Configuring ${BUILD} $TARGET ..."

src/UnitTests/Mpi/DistributedGridIOTest.h

+3 −3
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ class TestDistributedGridIO{ 


        SharedPointer<MeshType> gridptr;

        SharedPointer<MeshFunctionType> meshFunctionptr;

        distrgrid.SetupGrid(*gridptr);

        distrgrid.setupGrid(*gridptr);

       

        DofType dof(gridptr->template getEntitiesCount< Cell >());

        dof.setValue(0);
@@ -332,7 +332,7 @@ class TestDistributedGridIO{ 
        //Crete "distributedgrid driven" grid filed by load

        SharedPointer<MeshType> loadGridptr;

        SharedPointer<MeshFunctionType> loadMeshFunctionptr;

        distrgrid.SetupGrid(*loadGridptr);

        distrgrid.setupGrid(*loadGridptr);

        

        DofType loadDof(loadGridptr->template getEntitiesCount< Cell >());

        loadDof.setValue(0);
@@ -346,7 +346,7 @@ class TestDistributedGridIO{ 
        //Crete "distributedgrid driven" grid filed by evaluated linear function

        SharedPointer<MeshType> gridptr;

        SharedPointer<MeshFunctionType> meshFunctionptr;

        distrgrid.SetupGrid(*gridptr);

        distrgrid.setupGrid(*gridptr);

        

        DofType dof(gridptr->template getEntitiesCount< Cell >());

        dof.setValue(-1);

src/UnitTests/Mpi/DistributedGridTest_1D.cpp

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ class DistributedGirdTest_1D : public ::testing::Test { 
    distrgrid=new DistributedMeshType();

    distrgrid->template setGlobalGrid<CommunicatorType>(globalGrid,overlap);

    

    distrgrid->SetupGrid(*gridptr);

    distrgrid->setupGrid(*gridptr);

    dof=new DofType(gridptr->template getEntitiesCount< Cell >());

    

    meshFunctionptr->bind(gridptr,*dof);

src/UnitTests/Mpi/DistributedGridTest_2D.cpp

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ class DistributedGirdTest_2D : public ::testing::Test { 
    distr[1]=3;

    distrgrid->template setGlobalGrid<CommunicatorType>(globalGrid,overlap, distr);

    

    distrgrid->SetupGrid(*gridptr);

    distrgrid->setupGrid(*gridptr);

    dof=new DofType(gridptr->template getEntitiesCount< Cell >());

    

    meshFunctionptr->bind(gridptr,*dof);

src/UnitTests/Mpi/DistributedGridTest_3D.cpp

+1 −1
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ class DistributedGirdTest_3D : public ::testing::Test { 
    distr[2]=3;

    distrgrid->template setGlobalGrid<CommunicatorType>(globalGrid,overlap,distr);

    

    distrgrid->SetupGrid(*gridptr);

    distrgrid->setupGrid(*gridptr);

    dof=new DofType(gridptr->template getEntitiesCount< Cell >());

    

    meshFunctionptr->bind(gridptr,*dof);