exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

FEATURE: Disabled zoltan compilation by default for scotch 6.0.4 . Author: Martin Beaudoin. Merge: Dominik Christ.

Browse source
This commit is contained in:
Dominik Christ 2015-06-12 09:56:39 +01:00
commit 77aca7d801
4 changed files with 43 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
ThirdParty/rpmBuild/SOURCES/scotch-6.0.4_patch_0 vendored
View file

@ -0,0 +1,40 @@
diff -ruN scotch_6.0.4_orig/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib scotch_6.0.4/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib
--- scotch_6.0.4_orig/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib 1969-12-31 19:00:00.000000000 -0500
+++ scotch_6.0.4/src/Make.inc/Makefile.inc.i686_mac_darwin10.shlib 2015-06-01 23:50:39.279536328 -0400
@@ -0,0 +1,22 @@
+EXE =
+LIB = .dylib
+OBJ = .o
+
+MAKE = make
+AR = gcc
+ARFLAGS = -shared -dynamiclib -undefined dynamic_lookup -o
+
+CAT = cat
+CCS = gcc
+CCP = mpicc
+CCD = mpicc
+CFLAGS = -O3 -fPIC -DCOMMON_TIMING_OLD -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_PTHREAD -DSCOTCH_RENAME
+LDFLAGS = -lz -lm
+LIBLDFLAGS = -dynamiclib -undefined dynamic_lookup
+CP = cp
+LEX = flex
+LN = ln
+MKDIR = mkdir
+MV = mv
+RANLIB = ranlib
+YACC = bison -y
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
--- scotch_6.0.4_orig/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib 2014-08-05 08:56:17.000000000 -0400
+++ scotch_6.0.4/src/Make.inc/Makefile.inc.i686_pc_linux2.shlib 2015-06-01 23:58:05.463559948 -0400
@@ -8,8 +8,8 @@
CAT = cat
CCS = gcc
CCP = mpicc
-CCD = gcc
-CFLAGS = -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict
+CCD = mpicc -I$(MPI_HOME)/include
+CFLAGS = -O3 -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
CP = cp

2
ThirdParty/rpmBuild/SPECS/scotch-6.0.4.spec vendored
View file

@ -72,7 +72,7 @@ Name: %{name}
Version: %{version}
Release: %{release}
URL: https://gforge.inria.fr/frs/download.php/31831
Source: %url/%{name}-%{version}.tar.gz
Source: %url/%{name}_%{version}.tar.gz
Prefix: %{_prefix}
Group: Development/Tools
Patch0: scotch-6.0.4_patch_0

2
etc/prefs.csh-EXAMPLE
View file

@ -212,7 +212,7 @@ setenv WM_THIRD_PARTY_USE_MESQUITE_212 1
setenv WM_THIRD_PARTY_USE_SCOTCH_604 1
#setenv WM_THIRD_PARTY_USE_SCOTCH_600 1
setenv WM_THIRD_PARTY_USE_PARMETIS_403 1
setenv WM_THIRD_PARTY_USE_ZOLTAN_36 1
#setenv WM_THIRD_PARTY_USE_ZOLTAN_36 1
setenv WM_THIRD_PARTY_USE_PYFOAM_064 1
setenv WM_THIRD_PARTY_USE_HWLOC_1101 1
#setenv WM_THIRD_PARTY_USE_HWLOC_172 1

2
etc/prefs.sh-EXAMPLE
View file

@ -222,7 +222,7 @@ export WM_THIRD_PARTY_USE_MESQUITE_212=1
export WM_THIRD_PARTY_USE_SCOTCH_604=1
#export WM_THIRD_PARTY_USE_SCOTCH_600=1
export WM_THIRD_PARTY_USE_PARMETIS_403=1
export WM_THIRD_PARTY_USE_ZOLTAN_36=1
#export WM_THIRD_PARTY_USE_ZOLTAN_36=1
export WM_THIRD_PARTY_USE_PYFOAM_064=1
export WM_THIRD_PARTY_USE_HWLOC_1101=1
#export WM_THIRD_PARTY_USE_HWLOC_172=1