Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
MUST-containers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
High Performance Computing - Public
MUST-containers
Commits
eb8f6f73
Verified
Commit
eb8f6f73
authored
1 year ago
by
Simon Schwitanski
Browse files
Options
Downloads
Patches
Plain Diff
Add TypeART output patch
parent
16a47958
Branches
YL
No related tags found
No related merge requests found
Pipeline
#386098
passed
1 year ago
Stage: build
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+1
-0
1 addition, 0 deletions
Dockerfile
patches/typeart-output.patch
+17
-0
17 additions, 0 deletions
patches/typeart-output.patch
with
18 additions
and
0 deletions
Dockerfile
+
1
−
0
View file @
eb8f6f73
...
@@ -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
&&
\
...
...
This diff is collapsed.
Click to expand it.
patches/typeart-output.patch
0 → 100644
+
17
−
0
View file @
eb8f6f73
--- 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);
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment