Skip to content
Snippets Groups Projects
Verified Commit eb8f6f73 authored by Simon Schwitanski's avatar Simon Schwitanski :slight_smile:
Browse files

Add TypeART output patch

parent 16a47958
Branches YL
No related tags found
No related merge requests found
Pipeline #386098 passed
...@@ -105,6 +105,7 @@ RUN wget https://hpc.rwth-aachen.de/must/files/MUST-v${MUST_VERSION}.tar.gz && \ ...@@ -105,6 +105,7 @@ RUN wget https://hpc.rwth-aachen.de/must/files/MUST-v${MUST_VERSION}.tar.gz && \
RUN cd MUST-v${MUST_VERSION} && \ RUN cd MUST-v${MUST_VERSION} && \
patch utility/mustrun2.sh < /patches/mustrun-env.patch && \ patch utility/mustrun2.sh < /patches/mustrun-env.patch && \
patch externals/typeart/scripts/typeart-wrapper.in < /patches/typeart-fpic.patch && \ patch externals/typeart/scripts/typeart-wrapper.in < /patches/typeart-fpic.patch && \
patch modules/MpiTypeArt/MpiTypeArt.cpp < /patches/typeart-output.patch && \
cd build && \ cd build && \
CC=clang CXX=clang++ MPICH_CC=clang MPICH_CXX=clang++ OMPI_CC=clang OMPI_CXX=clang \ CC=clang CXX=clang++ MPICH_CC=clang MPICH_CXX=clang++ OMPI_CC=clang OMPI_CXX=clang \
cmake .. -DCMAKE_INSTALL_PREFIX=/opt/must -DUSE_BACKWARD=ON -DENABLE_TESTS=ON -DENABLE_FORTRAN=ON -DLLVM_FILECHECK_PATH=$(which FileCheck) -DCMAKE_BUILD_TYPE=Release && \ cmake .. -DCMAKE_INSTALL_PREFIX=/opt/must -DUSE_BACKWARD=ON -DENABLE_TESTS=ON -DENABLE_FORTRAN=ON -DLLVM_FILECHECK_PATH=$(which FileCheck) -DCMAKE_BUILD_TYPE=Release && \
......
--- modules/MpiTypeArt/MpiTypeArt.cpp
+++ modules/MpiTypeArt/MpiTypeArt.cpp
@@ -377,9 +377,11 @@ GTI_ANALYSIS_RETURN MpiTypeArt::checkSendOrRecv(
} else {
const char* typeart_recorded_name = typeart_get_type_name(typeart_type_info);
std::stringstream stream;
- stream << "Incompatible buffer of type " << typeart_type_info << " ("
- << typeart_recorded_name << ") - expected "
- << must_type_info->getPredefinedName() << " instead";
+ stream << "Incompatible buffer of type " << typeart_type_info
+ << " (" << typeart_recorded_name << ") - expected "
+ << get_mpi_name_for(must_type_info)
+ << " with base type " << myDatMod->getPredefinedName(baseType->getPredefinedInfo())
+ << " instead";
createMessage(pId, lId, stream.str(), MUST_ERROR_TYPEMATCH_MISMATCH);
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment