diff options
| author | Paul Kuberry <pkuberry@gmail.com> | 2023-04-17 11:19:08 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-17 10:19:08 -0700 |
| commit | 4519b42214ecd392cbb28d35016182522d62f0f0 (patch) | |
| tree | ac19c9d63dfde1c71629df16742941336eb0d48d /var | |
| parent | 8e50c08b3f134a9ec18e502f5446c734da50b26a (diff) | |
| download | spack-4519b42214ecd392cbb28d35016182522d62f0f0.tar.gz spack-4519b42214ecd392cbb28d35016182522d62f0f0.tar.bz2 spack-4519b42214ecd392cbb28d35016182522d62f0f0.tar.xz spack-4519b42214ecd392cbb28d35016182522d62f0f0.zip | |
xyce: patch issue affecting MPICH (#36826)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/xyce/450-mpich-xyce.patch | 34 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/xyce/package.py | 7 |
2 files changed, 41 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/xyce/450-mpich-xyce.patch b/var/spack/repos/builtin/packages/xyce/450-mpich-xyce.patch new file mode 100644 index 0000000000..e47e273cd5 --- /dev/null +++ b/var/spack/repos/builtin/packages/xyce/450-mpich-xyce.patch @@ -0,0 +1,34 @@ +From 8a622dd8204754733c769f0d13b685419e6607db Mon Sep 17 00:00:00 2001 +From: Paul Kuberry <pakuber@sandia.gov> +Date: Wed, 12 Apr 2023 13:36:28 -0600 +Subject: [PATCH] Remove use of OpenMPI specific struct member + +MPITest/testBUG967 could not be built with MPICH because it used +OpenMPI specific struct member variable `_ucount`. + +Replaced use of `_ucount` with call to MPI_Get_count, which is +compatible with OpenMPI and MPICH. +--- + src/test/MPITest/testBUG967.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/test/MPITest/testBUG967.c b/src/test/MPITest/testBUG967.c +index cdf7f918f..26e1b5311 100644 +--- a/src/test/MPITest/testBUG967.c ++++ b/src/test/MPITest/testBUG967.c +@@ -45,8 +45,10 @@ int main(int narg, char**arg) + for (i=0; i < nrecvs; i++){ + MPI_Wait(req + i, &status); + procs_from[i] = status.MPI_SOURCE; +- printf("%d wait source %d count %lu \n", +- my_proc, status.MPI_SOURCE, status._ucount); ++ int count; ++ MPI_Get_count(&status, MPI_INT, &count); ++ printf("%d wait source %d count %d \n", ++ my_proc, status.MPI_SOURCE, count); + } + + for (i = 0; i < nrecvs; i++) +-- +2.37.1 (Apple Git-137.1) + diff --git a/var/spack/repos/builtin/packages/xyce/package.py b/var/spack/repos/builtin/packages/xyce/package.py index 93759be6ab..1dba6aab59 100644 --- a/var/spack/repos/builtin/packages/xyce/package.py +++ b/var/spack/repos/builtin/packages/xyce/package.py @@ -127,6 +127,13 @@ class Xyce(CMakePackage): # HDF5 depends_on("hdf5~shared", when="^hdf5") + # fix MPI issue + patch( + "450-mpich-xyce.patch", + sha256="e91063d22afeeff01e6c572cef2ac2e3abea27b2fcb5a7e6ac5f41e4734a556d", + when="@:7.6,master", + ) + # fix RPATH issue on mac patch( "https://github.com/xyce/xyce/commit/40dbc0e0341a5cf9a7fa82a87313869dc284fdd9.patch?full_index=1", |