ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/JSOC/configsdp.txt
(Generate patch)

Comparing configsdp.txt (file contents):
Revision 1.7 by arta, Tue May 24 17:41:32 2011 UTC vs.
Revision 1.19 by jim, Thu Mar 7 23:14:12 2013 UTC

# Line 135 | Line 135 | __PROJ__
135              <subdir>apps</subdir>
136              <subdir>off_flat_IDL</subdir>
137          </subdirs>
138 +   </proj>
139 +  <proj>
140 +        <name>rings</name>
141 +        <subdirs>
142 +             <subdir>apps</subdir>
143 +        </subdirs>
144 +   </proj>
145 +  <proj>
146 +        <name>sharp</name>
147 +        <subdirs>
148 +             <subdir>apps</subdir>
149 +        </subdirs>
150          <filters>
151               <filter>
152 <                  <name>JSOC_MACHINE</name>
153 <                  <value>linux_x86_64</value>
152 >                  <name>COMPILER</name>
153 >                  <value>icc</value>
154               </filter>
155         </filters>
156     </proj>
157    <proj>
158 <        <name>rings</name>
158 >        <name>farside</name>
159 >        <subdirs>
160 >             <subdir>apps</subdir>
161 >        </subdirs>
162 >   </proj>
163 >  <proj>
164 >        <name>timed</name>
165          <subdirs>
166               <subdir>apps</subdir>
167          </subdirs>
# Line 154 | Line 172 | __PROJ__
172               <subdir>apps</subdir>
173               <subdir>pfss/apps</subdir>
174               <subdir>ambig/apps</subdir>
175 +             <subdir>harp/apps</subdir>
176 +             <subdir>harp/libs/matlab/mex/src/util</subdir>
177 +             <subdir>harp/libs/matlab/mex/src/mex2c</subdir>
178 +             <subdir>harp/libs/matlab/mfile-mex/standalone</subdir>
179 +             <subdir>harp/libs/matlab/mfile-mex/assignment</subdir>
180 +             <subdir>harp/libs/matlab/mfile-mex/fits</subdir>
181 +             <subdir>harp/libs/matlab/mfile-mex/hmi-mask-patch</subdir>
182               <subdir>ident/apps</subdir>
183               <subdir>ident/libs/mex2c</subdir>
184               <subdir>ident/libs/mexfunctions</subdir>
# Line 176 | Line 201 | __PROJ__
201          <subdirs>
202              <subdir>apps</subdir>
203          </subdirs>
204 +        <filters>
205 +             <filter>
206 +                  <name>COMPILER</name>
207 +                  <value>icc</value>
208 +             </filter>
209 +       </filters>
210     </proj>
211     <proj>
212          <name>vfisv</name>
# Line 198 | Line 229 | __PROJCFG__
229   # directory).
230  
231   find ../proj/lev0/scripts -mindepth 1 \( -path \*CVS -prune -o -exec ln -s {} . \; -a -exec echo "  " {} " OK" \; \) -o -exec echo "  " {} " ERROR - couldn't create link" \;
201
202 find ../proj/datacapture/scripts -mindepth 1 \( -path \*CVS -prune -o -exec ln -s {} . \; -a -exec echo "  " {} " OK" \; \) -o -exec echo "  " {} " ERROR - couldn't create link" \;
232   __END__
233   __LIBS__
234   # JSOC_SDP third-party libraries used by base
235      POSTGRES_LIB = pq
236      CFITSIO_LIB = cfitsio
237  
238 +    ifeq ($(JSOC_MACHINE), linux_avx)
239 +      POSTGRES_INCS = /usr/include
240 +      POSTGRES_LIBS = /usr/lib64
241 +      CFITSIO_INCS = /home/jsoc/avx/include
242 +      CFITSIO_LIBS = /home/jsoc/avx/lib
243 +    endif
244 +
245      ifeq ($(JSOC_MACHINE), linux_x86_64)
246        POSTGRES_INCS = /usr/include
247        POSTGRES_LIBS = /usr/lib64
# Line 224 | Line 260 | __LIBS__
260        POSTGRES_INCS = /usr/include/pgsql
261        POSTGRES_LIBS = /usr/lib
262        CFITSIO_INCS = /home/jsoc/include
263 <      CFITSIO_LIBS = /home/jsoc/lib/linux-x86_64
263 >      CFITSIO_LIBS = /home/jsoc/lib/linux-ia64
264      endif
265  
266   # JSOC_SDP third-party libraries used by the project directories
231    FFTW3_LIB = fftw3
267  
268      ifeq ($(JSOC_MACHINE), linux_ia32)
269        FFTW_INCS = /home/jsoc/include
270        FFTW_LIBS = /home/jsoc/lib/linux-ia32
271 +      GSL_INCS = /home/jsoc/include
272 +      GSL_LIBS = /home/jsoc/lib/linux-ia32
273 +    endif
274 +    
275 +    ifeq ($(JSOC_MACHINE), linux_ia64)
276 +      FFTW_INCS = /home/jsoc/include
277 +      FFTW_LIBS = /home/jsoc/lib/linux-x86_64
278 +      GSL_INCS = /home/jsoc/include
279 +      GSL_LIBS = /home/jsoc/lib/linux-x86_64
280      endif
281  
282      ifeq ($(JSOC_MACHINE), linux_x86_64)
283        FFTW_INCS = /home/jsoc/include
284        FFTW_LIBS = /home/jsoc/lib/linux-x86_64
285 +      GSL_INCS = /home/jsoc/include
286 +      GSL_LIBS = /home/jsoc/lib/linux-x86_64
287 +      MPI_INCS = /home/jsoc/mpich2/include
288 +      MPI_LIBS = /home/jsoc/mpich2/lib
289 +      MPI_PATH = /home/jsoc/mpich2/bin
290 +    endif
291 +
292 +    ifeq ($(JSOC_MACHINE), linux_avx)
293 +      FFTW_INCS = /home/jsoc/avx/include
294 +      FFTW_LIBS = /home/jsoc/avx/lib
295 +      GSL_INCS = /home/jsoc/avx/include
296 +      GSL_LIBS = /home/jsoc/avx/lib
297 +      MPI_INCS = /home/jsoc/avx/include
298 +      MPI_LIBS = /home/jsoc/avx/lib
299 +      MPI_PATH = /home/jsoc/avx/bin
300      endif
301  
302   # Try to specialize for non-default machines

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines