1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
|
Description: Setup configuration for Debian
Author: Gilles Filippini <pini@debian.org>
Index: syrthes/src/syrthes-install/setup.ini
===================================================================
--- syrthes.orig/src/syrthes-install/setup.ini
+++ syrthes/src/syrthes-install/setup.ini
@@ -4,7 +4,7 @@
#nom_arch Linux_x86_64 <- for specific architecture
#nom_arch <- leave empty for automatic default
# value (based on uname)
-nom_arch
+nom_arch Debian
#
#--------------------------------------------------------
# C compiler (sequential)
@@ -23,8 +23,8 @@ compCX g++
wrapperC mpicc
#
# Specific options for compiler
-#specific_inc= -I /myinclude/inc -I /myinclude2/inc
-#specific_lib= -L /mylib/lib1 -L /mylib/lib2
+specific_inc= -I /usr/lib/@MULTIARCH@/@MPI@/include
+specific_lib= -L /usr/lib/@MULTIARCH@/@MPI@/lib
#specific_debug= -g
#specific_option= -D _SYRTHES_MPI_IO_
#
@@ -34,7 +34,7 @@ wrapperC mpicc
#--------------------------------------------------------
# Graphical user Interface
#--------------------------------------------------------
-gui INSTALL=yes
+gui INSTALL=no
#
#--------------------------------------------------------
# Interpreted functions
@@ -60,12 +60,12 @@ syrthesseq INSTALL=yes
# Select the line corresponding to your choice
#
# for MED format conversion : choose to istall or the path to the libraries
-hdf5 USE=yes INSTALL=yes
+hdf5 USE=yes PATH=@HDF5_DIR@
#hdf5 USE=no INSTALL=no
#hdf5 USE=yes PATH=/.../syrthes4.2/extern-libraries/opt/hdf5-1.8.8/arch/MY_ARCH
#
#
-med USE=yes INSTALL=yes
+med USE=yes PATH=/usr
#med USE=no INSTALL=no
#med USE=yes PATH=/.../syrthes4.2/extern-libraries/opt/med-3.0.6/arch/MY_ARCH
#
@@ -88,15 +88,15 @@ syrthesmed INSTALL=yes
# Select the line corresponding to your choice
# mpi is required, metis AND/OR scotch are required
#
-mpi USE=yes INSTALL=yes
+mpi USE=yes PATH=/usr
#mpi USE=no INSTALL=no
#mpi USE=yes PATH=/.../syrthes4.2/extern-libraries/opt/openmpi-1.4.3/arch/MY_ARCH
#
-metis USE=yes INSTALL=yes
+metis USE=yes PATH=/usr
#metis USE=no INSTALL=no
#metis USE=yes PATH=/.../syrthes4.2/extern-libraries/opt/metis-5.0.2/arch/MY_ARCH
#
-scotch USE=yes INSTALL=yes
+scotch USE=yes PATH=/usr
#scotch USE=no INSTALL=no
#scotch USE=yes PATH=/.../syrthes4.2/extern-libraries/opt/scotch_5.1.12b/arch/MY_ARCH
#
@@ -122,10 +122,10 @@ blas USE=no INSTALL=no
#--------------------------------------------------------
# Warning : MPI installation must be defined before
#
-ple USE=no
+ple USE=yes PATH=/usr
#ple USE=yes PATH=/.../saturne/opt/libple-1.0/arch/MY_ARCH
#
# answer by yes or no
-syrthescfd INSTALL=no
+syrthescfd INSTALL=@CFD@
#
#
Index: syrthes/src/syrthes-install/config_makeFileIN.py
===================================================================
--- syrthes.orig/src/syrthes-install/config_makeFileIN.py
+++ syrthes/src/syrthes-install/config_makeFileIN.py
@@ -285,7 +285,7 @@ INC_SYRTHES_LIBMAT = -I$(DIR_SYRTHES)/sr
# create build directory if needed
-$(shell mkdir -p $(BUILDDIR))
+#$(shell mkdir -p $(BUILDDIR))
INC_SYRTHES = -I$(DIR_SYRTHES)/src/syrthes-kernel/include
@@ -328,13 +328,13 @@ endif
# ---------------------------
if self.dicolib['metis'].has_key('PATH'):
- makefileinFile.write("LIBMETIS=-L $(DIR_METIS)/lib -lmetis\n")
+ makefileinFile.write("LIBMETIS=-lmetis\n")
makefileinFile.write("INC_METIS=-I$(DIR_METIS)/include\n")
if self.dicolib['scotch'].has_key('PATH'):
makefileinFile.write("LIBSCOTCH=-L $(DIR_SCOTCH)/lib -lscotch -L $(DIR_SCOTCH)/lib -lscotcherr\n")
- makefileinFile.write("INC_SCOTCH=-I$(DIR_SCOTCH)/include\n")
+ makefileinFile.write("INC_SCOTCH=-I$(DIR_SCOTCH)/include/scotch\n")
makefileinFile.close()
Index: syrthes/src/syrthes-install/syrthes_install.py
===================================================================
--- syrthes.orig/src/syrthes-install/syrthes_install.py
+++ syrthes/src/syrthes-install/syrthes_install.py
@@ -241,13 +241,13 @@ class Setup(Setupmakefilein, Setupsyrthe
ft.write(' **************************************\n')
ft.write(' \n')
ft.close()
- os.system("env >> tmp")
+ os.system("env | grep -viE 'error|erreur' >> tmp")
os.system("cat resume tmp > tmp2; mv tmp2 resume; rm tmp")
- os.system("grep -i erreur resume > ERREUR.log")
- os.system("grep -i error resume >> ERREUR.log")
- os.system("grep -i erreur ../*.log >> ERREUR.log")
- os.system("grep -i error ../*.log >> ERREUR.log")
+ os.system("grep -iw erreur resume > ERREUR.log")
+ os.system("grep -iw error resume >> ERREUR.log")
+ os.system("grep -iw erreur ../*.log >> ERREUR.log")
+ os.system("grep -iw error ../*.log >> ERREUR.log")
vide=open("ERREUR.log",'r')
lecture = vide.readlines()
@@ -1272,7 +1272,7 @@ class Setup(Setupmakefilein, Setupsyrthe
shutil.copy(self.installPath+'/syrthes-kernel/src/user_cond.c', self.destPath+self.arch+'/share/syrthes')
shutil.copy(self.installPath+'/syrthes-kernel/src/user_ray.c' , self.destPath+self.arch+'/share/syrthes')
shutil.copy(self.installPath+'/syrthes-kernel/src/user_hmt.c' , self.destPath+self.arch+'/share/syrthes')
- os.system('cp '+self.installPath+'/doc/*.pdf '+self.destPath+self.arch+'/share/syrthes/doc')
+# os.system('cp '+self.installPath+'/doc/*.pdf '+self.destPath+self.arch+'/share/syrthes/doc')
# shutil.copy(self.installPath+'/doc/*.pdf', self.destPath+self.arch+'/share/syrthes/doc')
shutil.copy(self.installPath+'/Makefile2.in' , self.destPath+self.arch+'/share/syrthes/Makefile.in')
shutil.copytree(self.installPath+'/tests' , self.destPath+self.arch+'/share/syrthes/tests')
Index: syrthes/src/syrthes-install/config_env.py
===================================================================
--- syrthes.orig/src/syrthes-install/config_env.py
+++ syrthes/src/syrthes-install/config_env.py
@@ -133,7 +133,7 @@ class Setupsyrthesprofile(object):
#-----------------------------------------------------------
""")
for key in self.dicolib.keys():
- if self.dicolib[key].has_key('PATH'):
+ if key != 'specific_inc' and key != 'specific_lib' and self.dicolib[key].has_key('PATH'):
line='LD_LIBRARY_PATH='+self.dicolib[key]['PATH']+'/lib:$LD_LIBRARY_PATH'
profileFile.write("#"+key+"\n")
profileFile.write(line)
|
