From ec50f969d06d28b72e89eb40dc74e14b3fe860dc Mon Sep 17 00:00:00 2001 From: Henrik Rusche Date: Sun, 20 Jan 2019 08:46:08 +0100 Subject: [PATCH] Added TP sources to compile WM_LABEL_SIZE=64 --- .../SOURCES/ParMGridGen-1.0.patch_64Bit | 38 +++++++++++++++++++ .../SOURCES/ParMetis-3.1.1.patch_64Bit | 11 ++++++ .../rpmBuild/SOURCES/metis-5.1.0_patch_64Bit | 11 ++++++ .../rpmBuild/SOURCES/scotch-6.0.4_patch_64Bit | 12 ++++++ 4 files changed, 72 insertions(+) create mode 100644 ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_64Bit create mode 100644 ThirdParty/rpmBuild/SOURCES/ParMetis-3.1.1.patch_64Bit create mode 100644 ThirdParty/rpmBuild/SOURCES/metis-5.1.0_patch_64Bit create mode 100644 ThirdParty/rpmBuild/SOURCES/scotch-6.0.4_patch_64Bit diff --git a/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_64Bit b/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_64Bit new file mode 100644 index 000000000..aa634ec21 --- /dev/null +++ b/ThirdParty/rpmBuild/SOURCES/ParMGridGen-1.0.patch_64Bit @@ -0,0 +1,38 @@ +--- orig/ParMGridGen-1.0/mgridgen.h 2019-01-15 13:32:54.247812378 +0100 ++++ ParMGridGen-1.0/mgridgen.h 2019-01-15 13:35:03.972952464 +0100 +@@ -1,4 +1,4 @@ +-typedef int idxtype; ++typedef long int idxtype; + typedef double realtype; + + +--- orig/ParMGridGen-1.0/parmgridgen.h 2019-01-15 13:32:54.251812414 +0100 ++++ ParMGridGen-1.0/parmgridgen.h 2019-01-15 13:42:14.344335223 +0100 +@@ -1,4 +1,4 @@ +-typedef int idxtype; ++typedef long int idxtype; + typedef double realtype; + + void ParMGridGen(idxtype *, idxtype *, realtype *, realtype *, idxtype *, +--- orig/ParMGridGen-1.0/ParMGridGen/IMParMetis-2.0/ParMETISLib/struct.h 2019-01-15 13:32:54.247812378 +0100 ++++ ParMGridGen-1.0/ParMGridGen/IMParMetis-2.0/ParMETISLib/struct.h 2019-01-15 13:44:17.605231500 +0100 +@@ -15,7 +15,7 @@ + + /* Indexes are as long as integers for now */ + #ifdef IDXTYPE_INT +-typedef int idxtype; ++typedef long int idxtype; + #define IDX_DATATYPE MPI_INT + #else + typedef short idxtype; +--- orig/ParMGridGen-1.0/MGridGen/IMlib/IMlib.h 2019-01-15 13:32:54.251812414 +0100 ++++ ParMGridGen-1.0/MGridGen/IMlib/IMlib.h 2019-01-15 13:52:11.504522970 +0100 +@@ -16,7 +16,7 @@ + + /* Indexes are as long as integers for now */ + #ifdef IDXTYPE_INT +-typedef int idxtype; ++typedef long int idxtype; + #else + typedef short idxtype; + #endif diff --git a/ThirdParty/rpmBuild/SOURCES/ParMetis-3.1.1.patch_64Bit b/ThirdParty/rpmBuild/SOURCES/ParMetis-3.1.1.patch_64Bit new file mode 100644 index 000000000..0d2684910 --- /dev/null +++ b/ThirdParty/rpmBuild/SOURCES/ParMetis-3.1.1.patch_64Bit @@ -0,0 +1,11 @@ +--- orig/parmetis-4.0.3/metis/include/metis.h 2019-01-15 12:40:31.050842343 +0100 ++++ parmetis-4.0.3/metis/include/metis.h 2019-01-15 12:43:01.883662756 +0100 +@@ -30,7 +30,7 @@ + GCC does provides these definitions in stdint.h, but it may require some + modifications on other architectures. + --------------------------------------------------------------------------*/ +-#define IDXTYPEWIDTH 32 ++#define IDXTYPEWIDTH 64 + + + /*-------------------------------------------------------------------------- diff --git a/ThirdParty/rpmBuild/SOURCES/metis-5.1.0_patch_64Bit b/ThirdParty/rpmBuild/SOURCES/metis-5.1.0_patch_64Bit new file mode 100644 index 000000000..dc702db1d --- /dev/null +++ b/ThirdParty/rpmBuild/SOURCES/metis-5.1.0_patch_64Bit @@ -0,0 +1,11 @@ +--- orig/metis-5.1.0/include/metis.h 2019-01-15 12:40:31.050842343 +0100 ++++ metis-5.1.0/include/metis.h 2019-01-15 12:43:01.883662756 +0100 +@@ -30,7 +30,7 @@ + GCC does provides these definitions in stdint.h, but it may require some + modifications on other architectures. + --------------------------------------------------------------------------*/ +-#define IDXTYPEWIDTH 32 ++#define IDXTYPEWIDTH 64 + + + /*-------------------------------------------------------------------------- diff --git a/ThirdParty/rpmBuild/SOURCES/scotch-6.0.4_patch_64Bit b/ThirdParty/rpmBuild/SOURCES/scotch-6.0.4_patch_64Bit new file mode 100644 index 000000000..fce35365a --- /dev/null +++ b/ThirdParty/rpmBuild/SOURCES/scotch-6.0.4_patch_64Bit @@ -0,0 +1,12 @@ +diff -ruN scotch_6.0.4_orig/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib scotch_6.0.4/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib +--- orig/scotch_6.0.4/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib 2019-01-15 11:26:39.142915259 +0100 ++++ scotch_6.0.4/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib 2019-01-15 11:26:58.871041175 +0100 +@@ -9,7 +9,7 @@ + CCS = gcc + CCP = mpicc + CCD = mpicc -I$(MPI_HOME)/include +-INTSIZE = ++INTSIZE = -DINTSIZE64 + CFLAGS = -O3 $(INTSIZE) -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -Xlinker --no-as-needed + CLIBFLAGS = -shared -fPIC + LDFLAGS = -lz -lm -pthread -lrt