xyce: add version 7.7.0 and specialize patch (#39696)
This commit is contained in:
		| @@ -1,34 +0,0 @@ | |||||||
| 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) |  | ||||||
|  |  | ||||||
| @@ -25,6 +25,7 @@ class Xyce(CMakePackage): | |||||||
|     maintainers("kuberry", "tbird2001") |     maintainers("kuberry", "tbird2001") | ||||||
| 
 | 
 | ||||||
|     version("master", branch="master") |     version("master", branch="master") | ||||||
|  |     version("7.7.0", sha256="1b95450e1905c3af3c16b42c41d5ef1f8ab0e640f48086d0cb4d52961a90a175") | ||||||
|     version("7.6.0", sha256="fc25557e2edc82adbe0436a15fca2929a2f9ab08ddf91f1a47aab5e8b27ec88c") |     version("7.6.0", sha256="fc25557e2edc82adbe0436a15fca2929a2f9ab08ddf91f1a47aab5e8b27ec88c") | ||||||
|     version("7.5.0", sha256="854d7d5e19e0ee2138d1f20f10f8f27f2bebb94ec81c157040955cff7250dacd") |     version("7.5.0", sha256="854d7d5e19e0ee2138d1f20f10f8f27f2bebb94ec81c157040955cff7250dacd") | ||||||
|     version("7.4.0", sha256="2d6bc1b7377834b2e0bf50131e96728c5be83dbb3548e765bb48911067c87c91") |     version("7.4.0", sha256="2d6bc1b7377834b2e0bf50131e96728c5be83dbb3548e765bb48911067c87c91") | ||||||
| @@ -123,9 +124,9 @@ class Xyce(CMakePackage): | |||||||
| 
 | 
 | ||||||
|     # fix MPI issue |     # fix MPI issue | ||||||
|     patch( |     patch( | ||||||
|         "450-mpich-xyce.patch", |         "https://github.com/xyce/xyce/commit/2f95783637a5171a7f65f5d18c24d9a580a7f39e.patch?full_index=1", | ||||||
|         sha256="e91063d22afeeff01e6c572cef2ac2e3abea27b2fcb5a7e6ac5f41e4734a556d", |         sha256="1aeaac78830fbc9ae089a50ef61c6cbd89d29ead54ce7fdca258e194fa05b1a3", | ||||||
|         when="@:7.6,master", |         when="@:7.6", | ||||||
|     ) |     ) | ||||||
| 
 | 
 | ||||||
|     # fix RPATH issue on mac |     # fix RPATH issue on mac | ||||||
| @@ -142,12 +143,11 @@ class Xyce(CMakePackage): | |||||||
|         when="@7.4:7.6 +pymi", |         when="@7.4:7.6 +pymi", | ||||||
|     ) |     ) | ||||||
| 
 | 
 | ||||||
|     # fix oneapi issue 7.6 and prior |     # fix oneapi issue | ||||||
|     # can switch to github PR once in master |  | ||||||
|     patch( |     patch( | ||||||
|         "454-oneapi-xyce.patch", |         "454-oneapi-xyce.patch", | ||||||
|         sha256="76a3ff987e43d1657f24d55cfd864b487876a72a9a7c8a37c3151a9b586a21c1", |         sha256="76a3ff987e43d1657f24d55cfd864b487876a72a9a7c8a37c3151a9b586a21c1", | ||||||
|         when="@:7.6", |         when="%oneapi", | ||||||
|     ) |     ) | ||||||
| 
 | 
 | ||||||
|     def cmake_args(self): |     def cmake_args(self): | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Paul Kuberry
					Paul Kuberry