diff options
| author | Eric Bavier <bavier@member.fsf.org> | 2020-12-05 01:00:42 -0600 |
|---|---|---|
| committer | Eric Bavier <bavier@member.fsf.org> | 2020-12-05 11:14:56 -0600 |
| commit | 705af5403b3a8d7e942820bdff74195a1c3d9c89 (patch) | |
| tree | 36eb33f20cfce7e15aad28c5451c35dfca5aada9 /gnu/packages/patches | |
| parent | 38dd27e866f2fc930afbd96223f0f6119d9ab1db (diff) | |
| download | guix-705af5403b3a8d7e942820bdff74195a1c3d9c89.tar guix-705af5403b3a8d7e942820bdff74195a1c3d9c89.tar.gz | |
gnu: superlu-dist: Update to 6.4.0.
* gnu/packages/maths.scm (superlu-dist): Update to 6.4.0
[source]: Use git-fetch, as tarballs are no longer published.
* gnu/packages/patches/superlu-dist-awpm-grid.patch: Remove all but the first
hunk; they are unnecessary.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/superlu-dist-awpm-grid.patch | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/gnu/packages/patches/superlu-dist-awpm-grid.patch b/gnu/packages/patches/superlu-dist-awpm-grid.patch index d6cb8e521d..42d1683cc4 100644 --- a/gnu/packages/patches/superlu-dist-awpm-grid.patch +++ b/gnu/packages/patches/superlu-dist-awpm-grid.patch @@ -1,8 +1,8 @@ Create the CombBLAS::SpParMat with the MPI_Comm from the input 'gridinfo_t'. This prevents a warning/error from CombBLAS about using MPI_COMM_WORLD. ---- a/SRC/AWPM_CombBLAS.hpp -+++ b/SRC/AWPM_CombBLAS.hpp +--- a/SRC/dHWPM_CombBLAS.hpp ++++ b/SRC/dHWPM_CombBLAS.hpp @@ -52,7 +52,7 @@ { printf("AWPM only supports square process grid. Retuning without a permutation.\n"); @@ -12,25 +12,14 @@ This prevents a warning/error from CombBLAS about using MPI_COMM_WORLD. std::vector< std::vector < std::tuple<int_t,int_t,double> > > data(procs); /* ------------------------------------------------------------ -@@ -100,11 +100,10 @@ - combblas::AWPM(Adcsc, mateRow2Col, mateCol2Row,true); - - // now gather the matching vector -- MPI_Comm World = mateRow2Col.getcommgrid()->GetWorld(); - int * rdispls = new int[procs]; - int sendcnt = mateRow2Col.LocArrSize(); - int * recvcnt = new int[procs]; -- MPI_Allgather(&sendcnt, 1, MPI_INT, recvcnt, 1, MPI_INT, World); -+ MPI_Allgather(&sendcnt, 1, MPI_INT, recvcnt, 1, MPI_INT, grid->comm); - rdispls[0] = 0; - for(int i=0; i<procs-1; ++i) +--- a/SRC/zHWPM_CombBLAS.hpp ++++ b/SRC/zHWPM_CombBLAS.hpp +@@ -52,7 +52,7 @@ { -@@ -112,7 +111,7 @@ + printf("AWPM only supports square process grid. Retuning without a permutation.\n"); } - int_t *senddata = (int_t *)mateRow2Col.GetLocArr(); - -- MPI_Allgatherv(senddata, sendcnt, combblas::MPIType<int_t>(), ScalePermstruct->perm_r, recvcnt, rdispls, combblas::MPIType<int_t>(), World); -+ MPI_Allgatherv(senddata, sendcnt, combblas::MPIType<int_t>(), ScalePermstruct->perm_r, recvcnt, rdispls, combblas::MPIType<int_t>(), grid->comm); +- combblas::SpParMat < int_t, double, combblas::SpDCCols<int_t,double> > Adcsc; ++ combblas::SpParMat < int_t, double, combblas::SpDCCols<int_t,double> > Adcsc(grid->comm); + std::vector< std::vector < std::tuple<int_t,int_t,double> > > data(procs); - delete[] rdispls; - delete[] recvcnt; + /* ------------------------------------------------------------ |