Changeset 4003


Ignore:
Timestamp:
Sep 12, 2019 4:33:40 AM (5 weeks ago)
Author:
stefan
Message:

update get-script and adapt mpi patch; remove ordering patch

Location:
ThirdParty/Mumps/branches/mumps5
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/branches/mumps5/get.Mumps

    r3813 r4003  
    33# Set the following to the latest MUMPS version.
    44#  THERE MUST BE NO SPACE BEFORE AND AFTER THE EQUAL (=) OPERATOR.
    5 mumps_ver=4.10.0
     5mumps_ver=5.2.1
    66
    77set -e
     
    4646echo "Done downloading the source code for MUMPS."
    4747echo " "
    48 echo "Apply a patch to work around a bug in MUMPS."
     48echo "Apply a patch to improve MPI compatibility."
    4949echo " "
    5050
    51 patch -p0 < mumps.patch
    5251patch -p0 < mumps_mpi.patch
    5352mv MUMPS/libseq/mpi.h MUMPS/libseq/mumps_mpi.h
  • ThirdParty/Mumps/branches/mumps5/mumps_mpi.patch

    r3704 r4003  
    1 --- a/MUMPS/examples/c_example.c        2011-05-10 08:56:40.000000000 -0400
    2 +++ MUMPS/examples/c_example.c  2016-11-25 05:20:40.562687719 -0500
    3 @@ -10,7 +10,11 @@
    4   * Solution is [1 2]^T */
    5  #include <stdio.h>
    6  #include <string.h>
     1diff -ur MUMPS_5.2.1/libseq/mpic.c MUMPS/libseq/mpic.c
     2--- MUMPS_5.2.1/libseq/mpic.c   2019-06-14 16:46:08.000000000 +0200
     3+++ MUMPS/libseq/mpic.c 2019-09-12 10:28:06.358911237 +0200
     4@@ -12,7 +12,7 @@
     5  *  http://www.cecill.info/licences/Licence_CeCILL-C_V1-en.html
     6  *
     7  */
     8-#include "mpi.h"
     9+#include "mumps_mpi.h"
     10 LIBSEQ_INT LIBSEQ_CALL MPI_Init(LIBSEQ_INT *pargc, char ***pargv)
     11 {
     12   return 0;
     13diff -ur MUMPS_5.2.1/src/mumps_metis64.h MUMPS/src/mumps_metis64.h
     14--- MUMPS_5.2.1/src/mumps_metis64.h     2019-06-14 16:46:09.000000000 +0200
     15+++ MUMPS/src/mumps_metis64.h   2019-09-12 10:27:32.439311173 +0200
     16@@ -17,7 +17,11 @@
     17 /* Interfacing with 64-bit (par)metis, for METIS 4 or METIS 5 */
     18 #include "mumps_common.h" /* includes mumps_compat.h and mumps_c_types.h */
     19 #if defined(parmetis) || defined(parmetis3)
    720+#ifdef MPI
    821 #include "mpi.h"
     
    1023+#include "mumps_mpi.h"
    1124+#endif
    12  #include "dmumps_c.h"
    13  #define JOB_INIT -1
    14  #define JOB_END -2
    15 --- a/MUMPS/libseq/mpic.c       2011-05-10 08:56:39.000000000 -0400
    16 +++ MUMPS/libseq/mpic.c 2016-11-25 05:17:47.318664538 -0500
    17 @@ -47,7 +47,7 @@
    18   *   systems. Parallel Computing Vol 32 (2), pp 136-156 (2006).
    19   *
    20   */
    21 -#include <mpi.h>
    22 +#include "mumps_mpi.h"
    23  int MPI_Init(int *pargc, char ***pargv)
    24  {
    25    return 0;
    26 --- a/MUMPS/src/mumps_orderings.c       2011-05-10 08:56:41.000000000 -0400
    27 +++ MUMPS/src/mumps_orderings.c 2016-11-25 05:22:56.511565349 -0500
    28 @@ -347,7 +347,12 @@
    29  }
    30  #endif /* scotch */
    31  #if defined(ptscotch)
    32 -/*#include "mpi.h"
    33 +/*
     25 #define MUMPS_PARMETIS_64 \
     26   F_SYMBOL(parmetis_64,PARMETIS_64)
     27 void MUMPS_CALL
     28diff -ur MUMPS_5.2.1/src/mumps_metis.h MUMPS/src/mumps_metis.h
     29--- MUMPS_5.2.1/src/mumps_metis.h       2019-06-14 16:46:09.000000000 +0200
     30+++ MUMPS/src/mumps_metis.h     2019-09-12 10:27:12.016311061 +0200
     31@@ -17,7 +17,11 @@
     32 /* Interfacing with 32-bit (par)metis, for METIS 4 or METIS 5 */
     33 #include "mumps_common.h" /* includes mumps_compat.h and mumps_c_types.h */
     34 #if defined(parmetis) || defined(parmetis3)
    3435+#ifdef MPI
    35 +#include "mpi.h"
     36 #include "mpi.h"
    3637+#else
    3738+#include "mumps_mpi.h"
    3839+#endif
    39  #include <stdio.h>
    40  #include "ptscotch.h"
    41  int mumps_dgraphinit( SCOTCH_Dgraph *, MPI_Fint *, MPI_Fint *);
    42 --- a/MUMPS/src/mumps_orderings.h       2011-05-10 08:56:41.000000000 -0400
    43 +++ MUMPS/src/mumps_orderings.h 2016-11-25 05:24:10.333871363 -0500
    44 @@ -86,7 +86,11 @@
    45                int * const        ncmpa );
     40 #define MUMPS_PARMETIS \
     41   F_SYMBOL(parmetis,PARMETIS)
     42 void MUMPS_CALL
     43diff -ur MUMPS_5.2.1/src/mumps_scotch.h MUMPS/src/mumps_scotch.h
     44--- MUMPS_5.2.1/src/mumps_scotch.h      2019-06-14 16:46:09.000000000 +0200
     45+++ MUMPS/src/mumps_scotch.h    2019-09-12 10:27:43.839157121 +0200
     46@@ -35,7 +35,11 @@
     47               MUMPS_INT * const        ncmpa );
    4648 #endif /*scotch or ptscotch*/
    4749 #if defined(ptscotch)
     
    5355 #include <stdio.h>
    5456 #include "ptscotch.h"
    55  int mumps_dgraphinit( SCOTCH_Dgraph *, MPI_Fint *, MPI_Fint *);
    56 @@ -96,7 +100,11 @@
    57  MUMPS_DGRAPHINIT(SCOTCH_Dgraph *graphptr, MPI_Fint *comm, MPI_Fint *ierr);
    58  #endif /*ptscotch*/
    59  #if defined(parmetis)
    60 +#ifdef MPI
    61  #include "mpi.h"
    62 +#else
    63 +#include "mumps_mpi.h"
    64 +#endif
    65  #include "parmetis.h"
    66  void mumps_parmetis(int *first,      int *vertloctab,
    67                     int *edgeloctab, int *numflag,
     57 #define MUMPS_DGRAPHINIT \
Note: See TracChangeset for help on using the changeset viewer.