Commit 4652ab7a authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

--with-fftw3: changed default to no

parent cda124fb
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
2014-09-19 Uwe Schulzweida 2014-09-19 Uwe Schulzweida
* --with-fftw3: changed default to no
* expand gridfile name parameter [Bug #5196] * expand gridfile name parameter [Bug #5196]
2014-09-18 Uwe Schulzweida 2014-09-18 Uwe Schulzweida
......
...@@ -29,7 +29,8 @@ set -x ...@@ -29,7 +29,8 @@ set -x
case "${HOSTNAME}" in case "${HOSTNAME}" in
# i386-apple-darwin10 # i386-apple-darwin10
bailung*|d133*|d134*) bailung*|d133*|d134*)
CDOLIBS="--with-jasper=$HOME/local \ CDOLIBS="--with-fftw3 \
--with-jasper=$HOME/local \
--with-grib_api=$HOME/local/gribapi-1.10.4 \ --with-grib_api=$HOME/local/gribapi-1.10.4 \
--with-netcdf=$HOME/local \ --with-netcdf=$HOME/local \
--with-hdf5=$HOME/local \ --with-hdf5=$HOME/local \
...@@ -59,7 +60,8 @@ case "${HOSTNAME}" in ...@@ -59,7 +60,8 @@ case "${HOSTNAME}" in
fi fi
;; ;;
hama*) hama*)
CDOLIBS="--with-jasper=/opt/local \ CDOLIBS="--with-fftw3 \
--with-jasper=/opt/local \
--with-grib_api=$HOME/local/gribapi-1.9.16 \ --with-grib_api=$HOME/local/gribapi-1.9.16 \
--with-netcdf=/opt/local \ --with-netcdf=/opt/local \
--with-hdf5=/opt/local \ --with-hdf5=/opt/local \
...@@ -84,18 +86,6 @@ case "${HOSTNAME}" in ...@@ -84,18 +86,6 @@ case "${HOSTNAME}" in
# --with-magics=/Users/m214003/local/Magics-2.18.14nio \ # --with-magics=/Users/m214003/local/Magics-2.18.14nio \
fi fi
;; ;;
# ia64-xxx-linux
ds*)
${CONFPATH}configure --prefix=$HOME/local \
--with-netcdf=/pool/ia64/netcdf/netcdf-3.6.0-p1 \
--with-szlib=$HOME/local \
CC=icc CFLAGS="-g -O2 -Wall -fno-alias -DMIN_BUF_SIZE=4194304"
;;
wasser*)
${CONFPATH}configure --prefix=$HOME/local \
--with-netcdf=/home/dkrz/m214089/local/ia64 \
CC=icc CFLAGS="-g -O2 -Wall -fno-alias"
;;
# x86_64-squeeze-x64-linux # x86_64-squeeze-x64-linux
thunder*) thunder*)
CDOLIBS="--with-jasper=/sw/squeeze-x64/jasper-1.900.1-static \ CDOLIBS="--with-jasper=/sw/squeeze-x64/jasper-1.900.1-static \
...@@ -109,11 +99,18 @@ case "${HOSTNAME}" in ...@@ -109,11 +99,18 @@ case "${HOSTNAME}" in
if test "$COMP" = icc ; then if test "$COMP" = icc ; then
${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/thunder \ ${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/thunder \
--enable-all-static \ --enable-all-static \
--with-fftw3 \
$CDOLIBS \ $CDOLIBS \
CC=icc CFLAGS="-g -Wall -O3 -vec-report2 -march=native -fp-model source -fast-transcendentals" CC=icc CFLAGS="-g -Wall -O3 -vec-report2 -march=native -fp-model source -fast-transcendentals"
elif test "$COMP" = pgcc ; then
${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/thunder \
--enable-all-static \
$CDOLIBS \
CC=pgcc CFLAGS="-g -fast"
else else
${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/thunder \ ${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/thunder \
--enable-all-static \ --enable-all-static \
--with-fftw3 \
$CDOLIBS \ $CDOLIBS \
CC=gcc CFLAGS='-g -Wall -O3 -march=native' CC=gcc CFLAGS='-g -Wall -O3 -march=native'
fi fi
...@@ -131,6 +128,18 @@ case "${HOSTNAME}" in ...@@ -131,6 +128,18 @@ case "${HOSTNAME}" in
--with-proj=/sw/squeeze-x64/proj-4.7.0 \ --with-proj=/sw/squeeze-x64/proj-4.7.0 \
CC=gcc CFLAGS='-g -Wall -O3' CC=gcc CFLAGS='-g -Wall -O3'
;; ;;
# ia64-xxx-linux
ds*)
${CONFPATH}configure --prefix=$HOME/local \
--with-netcdf=/pool/ia64/netcdf/netcdf-3.6.0-p1 \
--with-szlib=$HOME/local \
CC=icc CFLAGS="-g -O2 -Wall -fno-alias -DMIN_BUF_SIZE=4194304"
;;
wasser*)
${CONFPATH}configure --prefix=$HOME/local \
--with-netcdf=/home/dkrz/m214089/local/ia64 \
CC=icc CFLAGS="-g -O2 -Wall -fno-alias"
;;
# x86_64-archlinux # x86_64-archlinux
thingol*) thingol*)
${CONFPATH}configure --prefix=$HOME/local \ ${CONFPATH}configure --prefix=$HOME/local \
......
...@@ -1524,7 +1524,7 @@ Optional Packages: ...@@ -1524,7 +1524,7 @@ Optional Packages:
library for grib2 compression; if a directory is library for grib2 compression; if a directory is
given, it will be used as a value for given, it will be used as a value for
--with-jasper-root --with-jasper-root
--without-fftw3 disable support for fftw3 --with-fftw3 enable support for fftw3
--with-proj=<directory> Specify location of PROJ library for cartographic --with-proj=<directory> Specify location of PROJ library for cartographic
projections. projections.
--with-curl=<directory> Specify location of CURL library. --with-curl=<directory> Specify location of CURL library.
...@@ -17378,7 +17378,6 @@ fi ...@@ -17378,7 +17378,6 @@ fi
   
THREADS_INCLUDE='' THREADS_INCLUDE=''
THREADS_LIBS='' THREADS_LIBS=''
$as_echo with_threads: $with_threads
case $with_threads in #( case $with_threads in #(
no) : no) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking multithreading" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking multithreading" >&5
...@@ -19447,7 +19446,7 @@ $as_echo_n "checking for FFTW3 support... " >&6; } ...@@ -19447,7 +19446,7 @@ $as_echo_n "checking for FFTW3 support... " >&6; }
if test "${with_fftw3+set}" = set; then : if test "${with_fftw3+set}" = set; then :
withval=$with_fftw3; withval=$with_fftw3;
else else
with_fftw3=yes with_fftw3=no
fi fi
   
   
......
...@@ -319,10 +319,10 @@ AC_SUBST([ENABLE_IEG],[$enable_ieg]) ...@@ -319,10 +319,10 @@ AC_SUBST([ENABLE_IEG],[$enable_ieg])
# Compile with fftw support # Compile with fftw support
AC_MSG_CHECKING([for FFTW3 support]) AC_MSG_CHECKING([for FFTW3 support])
AC_ARG_WITH([fftw3], AC_ARG_WITH([fftw3],
[AS_HELP_STRING([--without-fftw3], [AS_HELP_STRING([--with-fftw3],
[disable support for fftw3])], [enable support for fftw3])],
[], [],
[with_fftw3=yes]) [with_fftw3=no])
AS_IF([test "x$with_fftw3" != xno], AS_IF([test "x$with_fftw3" != xno],
[AC_CHECK_HEADERS([fftw3.h]) [AC_CHECK_HEADERS([fftw3.h])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment