Skip to content
GitLab
Commit 1d2f29bc authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed issue with ASSOC_TYPE NEAREST (Thanks to V. de Lapparent). 

Fixed regression with Eli Rykoff's fixes.
Fixed issue with FFTW includes.
Fixed typos in VOTable output.
Added translation of Boolean T and F to Y and N in XSLT.
Added --with-mkl-dir option in configure.
Pushed version number to 2.18.11.
parent 79e12583
Expand all Hide whitespace changes
Inline Side-by-side
acx_mkl.m4
View file @ 1d2f29bc
...@@ -23,7 +23,7 @@ dnl You should have received a copy of the GNU General Public License ...@@ -23,7 +23,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with AstrOmatic software. dnl along with AstrOmatic software.
dnl If not, see <http://www.gnu.org/licenses/>. dnl If not, see <http://www.gnu.org/licenses/>.
dnl dnl
dnl Last modified: 04/04/2013 dnl Last modified: 17/04/2013
dnl dnl
dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
dnl dnl
...@@ -72,81 +72,137 @@ dnl ---------------------- ...@@ -72,81 +72,137 @@ dnl ----------------------
dnl Set architecture flags dnl Set architecture flags
dnl ---------------------- dnl ----------------------
if icc -V 2>&1 | grep -i "Intel(R) 64" > /dev/null 2>&1; then dnl check if INTEL compiler is present
dnl INTEL compiler uses x86_64 architecture icc -V 2>&1 | grep -i "Intel" > /dev/null 2>&1 && flagicc=yes
if test x$2 = xyes; then dnl check if INTEL compiler uses x86_64 architecture
icc -V 2>&1 | grep -i "Intel(R) 64" > /dev/null 2>&1 && flag64=yes
dnl check if the platform is OSX
icc -dumpmachine 2>&1 | grep -i "darwin" > /dev/null 2>&1 && flagosx=yes
dnl ----------------------
dnl Exit if INTEL compiler is not found
dnl ----------------------
if test x$flagicc = x; then
AC_SUBST(MKL_CFLAGS, "")
AC_SUBST(MKL_LDFLAGS, "")
AC_SUBST(MKL_LIBS, "")
MKL_WARN="INTEL compiler not detected"
AC_SUBST(MKL_WARN)
exit
fi
if test x$flagosx = xyes; then
dnl MacOSX
if test x$flag64 = xyes; then
dnl INTEL compiler uses Intel64 architecture
if test x$2 = xyes; then
dnl 64 bit pointers dnl 64 bit pointers
AC_SUBST(MKL_CFLAGS, "-DMKL_ILP64") AC_SUBST(MKL_CFLAGS, "-openmp -DMKL_ILP64 -I$mklroot/include")
if test x$3 = xyes; then if test x$3 = xyes; then
dnl Static linking uses a duplicated libmkl_intel_ilp64.a to fool libtool dnl Static linking
AC_SUBST(MKL_LIBS, AC_SUBST(MKL_LIBS, ["$mklroot/lib/libmkl_intel_ilp64.a \
["$startgroup,$mklroot/lib/intel64/libmkl_intel_ilp64.a,\ $mklroot/lib/libmkl_intel_thread.a \
$mklroot/lib/intel64/libmkl_intel_thread.a,\ $mklroot/lib/libmkl_core.a -lpthread -lm"])
$mklroot/lib/intel64/libmkl_core.a,-end-group -openmp -lpthread -lm"]) else
dnl Dynamic linking
AC_SUBST(MKL_LIBS, "-L$mklroot/lib -lmkl_intel_ilp64 \
-lmkl_intel_thread -lmkl_core -lpthread -lm")
fi
else else
AC_SUBST(MKL_LIBS, "-lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core \ dnl 32 bit pointers
-openmp -lpthread -lm") AC_SUBST(MKL_CFLAGS, "-openmp -I$mklroot/include")
if test x$3 = xyes; then
dnl Static linking
AC_SUBST(MKL_LIBS, ["$mklroot/lib/libmkl_intel_lp64.a \
$mklroot/lib/libmkl_intel_thread.a \
$mklroot/lib/libmkl_core.a -lpthread -lm"])
else
dnl Dynamic linking
AC_SUBST(MKL_LIBS, "-L$mklroot/lib -lmkl_intel_lp64 \
-lmkl_intel_thread -lmkl_core -lpthread -lm")
fi
fi fi
else else
dnl 32 bit pointers dnl INTEL compiler uses IA32 architecture
AC_SUBST(MKL_CFLAGS, "") AC_SUBST(MKL_CFLAGS, "-openmp -I$mklroot/include")
if test x$3 = xyes; then if test x$3 = xyes; then
dnl Static linking uses a duplicated libmkl_intel.a to fool libtool dnl Static linking
AC_SUBST(MKL_LIBS, ["$mklroot/lib/libmkl_intel.a \
$mklroot/lib/libmkl_intel_thread.a \
$mklroot/lib/libmkl_core.a -lpthread -lm"])
else
dnl Dynamic linking
AC_SUBST(MKL_LIBS, "-L$mklroot/lib -lmkl_intel -lmkl_intel_thread \
-lmkl_core -lpthread -lm")
fi
fi
else
dnl Linux
if test x$flag64 = xyes; then
dnl INTEL compiler uses Intel64 architecture
if test x$2 = xyes; then
dnl 64 bit pointers
AC_SUBST(MKL_CFLAGS, "-openmp -DMKL_ILP64 -I$mklroot/include")
if test x$3 = xyes; then
dnl Static linking
AC_SUBST(MKL_LIBS, AC_SUBST(MKL_LIBS,
["$startgroup,$mklroot/lib/intel64/libmkl_intel_lp64.a,\ ["$startgroup,$mklroot/lib/intel64/libmkl_intel_ilp64.a,\
$mklroot/lib/intel64/libmkl_intel_thread.a,\ $mklroot/lib/intel64/libmkl_intel_thread.a,\
$mklroot/lib/intel64/libmkl_core.a,--end-group -openmp -lpthread -lm"]) $mklroot/lib/intel64/libmkl_core.a,-end-group -lpthread -lm"])
else
dnl Dynamic linking
AC_SUBST(MKL_LIBS, "-L$mklroot/lib/intel64 -lmkl_intel_ilp64 \
-lmkl_intel_thread -lmkl_core -lpthread -lm")
fi
else else
dnl 32 bit pointers
AC_SUBST(MKL_CFLAGS, "-openmp -I$mklroot/include")
if test x$3 = xyes; then
dnl Static linking
AC_SUBST(MKL_LIBS,
["$startgroup,$mklroot/lib/intel64/libmkl_intel_lp64.a,\
$mklroot/lib/intel64/libmkl_intel_thread.a,\
$mklroot/lib/intel64/libmkl_core.a,--end-group -lpthread -lm"])
else
dnl Dynamic linking dnl Dynamic linking
AC_SUBST(MKL_LIBS, "-lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core \ AC_SUBST(MKL_LIBS, "-L$mklroot/lib/intel64 -lmkl_intel_lp64 \
-openmp -lpthread -lm") -lmkl_intel_thread -lmkl_core -lpthread -lm")
fi
fi fi
fi else
elif icc -V 2>&1 | grep -i "Intel(R)" > /dev/null 2>&1; then
dnl INTEL compiler uses IA32 architecture dnl INTEL compiler uses IA32 architecture
AC_SUBST(MKL_CFLAGS, "") AC_SUBST(MKL_CFLAGS, "-openmp -I$mklroot/include")
if test x$3 = xyes; then if test x$3 = xyes; then
dnl Static linking uses a duplicated libmkl_intel.a to fool libtool dnl Static linking
AC_SUBST(MKL_LIBS, ["$startgroup,$mklroot/lib/ia32/libmkl_intel.a,\ AC_SUBST(MKL_LIBS, ["$startgroup,$mklroot/lib/ia32/libmkl_intel.a,\
$mklroot/lib/ia32/libmkl_intel_thread.a,\ $mklroot/lib/ia32/libmkl_intel_thread.a,\
$mklroot/lib/ia32/libmkl_core.a,--end-group -openmp -lpthread -lm"]) $mklroot/lib/ia32/libmkl_core.a,--end-group -lpthread -lm"])
else else
dnl Dynamic linking dnl Dynamic linking
AC_SUBST(MKL_LIBS, "-lmkl_intel -lmkl_intel_thread -lmkl_core \ AC_SUBST(MKL_LIBS, "-L$mklroot/lib/ia32 -lmkl_intel -lmkl_intel_thread \
-openmp -lpthread -lm") -lmkl_core -lpthread -lm")
fi
fi fi
AC_SUBST(MKL_LDFLAGS, "")
else
dnl INTEL compiler not found
AC_SUBST(MKL_CFLAGS, "")
AC_SUBST(MKL_LDFLAGS, "")
AC_SUBST(MKL_LIBS, "")
MKL_WARN="INTEL compiler not detected"
AC_SUBST(MKL_WARN)
fi fi
if test x$MKL_WARN = x; then AC_SUBST(MKL_LDFLAGS, "")
dnl -------------------- dnl --------------------
dnl Set internal flags dnl Set internal flags
dnl -------------------- dnl --------------------
AC_DEFINE(HAVE_MKL,1, [Define if you have the MKL libraries.]) AC_DEFINE(HAVE_MKL,1, [Define if you have the MKL libraries.])
AC_DEFINE(HAVE_FFTW,1, [Define if you have the FFTW libraries.]) AC_DEFINE(HAVE_FFTW,1, [Define if you have the FFTW libraries.])
AC_DEFINE(HAVE_LAPACK,1, [Define if you have the LAPACK libraries.]) AC_DEFINE(HAVE_LAPACK,1, [Define if you have the LAPACK libraries.])
AC_DEFINE(HAVE_LAPACKE,1, [Define if you have the LAPACKe libraries.]) AC_DEFINE(HAVE_LAPACKE,1, [Define if you have the LAPACKe libraries.])
dnl -------------------- dnl --------------------
dnl Set include files dnl Set include files
dnl -------------------- dnl --------------------
AC_DEFINE_UNQUOTED(MKL_H, "mkl.h", [MKL header filename.]) AC_DEFINE_UNQUOTED(MKL_H, "mkl.h", [MKL header filename.])
AC_DEFINE_UNQUOTED(FFTW_H, "fftw/fftw3_mkl.h", [FFTW header filename.]) AC_DEFINE_UNQUOTED(FFTW_H, "fftw/fftw3_mkl.h", [FFTW header filename.])
AC_DEFINE_UNQUOTED(LAPACK_H, "mkl_lapack.h", [LAPACK header filename.]) AC_DEFINE_UNQUOTED(LAPACK_H, "mkl_lapack.h", [LAPACK header filename.])
AC_DEFINE_UNQUOTED(LAPACKE_H, "mkl_lapacke.h", [LAPACKe header filename.]) AC_DEFINE_UNQUOTED(LAPACKE_H, "mkl_lapacke.h", [LAPACKe header filename.])
fi
])dnl ACX_MKL ])dnl ACX_MKL
configure
View file @ 1d2f29bc
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for sextractor 2.18.9. # Generated by GNU Autoconf 2.69 for sextractor 2.18.11.
# #
# Report bugs to <bertin@iap.fr>. # Report bugs to <bertin@iap.fr>.
# #
...@@ -590,8 +590,8 @@ MAKEFLAGS= ...@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='sextractor' PACKAGE_NAME='sextractor'
PACKAGE_TARNAME='sextractor' PACKAGE_TARNAME='sextractor'
PACKAGE_VERSION='2.18.9' PACKAGE_VERSION='2.18.11'
PACKAGE_STRING='sextractor 2.18.9' PACKAGE_STRING='sextractor 2.18.11'
PACKAGE_BUGREPORT='bertin@iap.fr' PACKAGE_BUGREPORT='bertin@iap.fr'
PACKAGE_URL='' PACKAGE_URL=''
...@@ -648,8 +648,8 @@ FFTW_ERROR ...@@ -648,8 +648,8 @@ FFTW_ERROR
FFTW_LIBS FFTW_LIBS
FFTW_WARN FFTW_WARN
MKL_WARN MKL_WARN
MKL_LDFLAGS
MKL_LIBS MKL_LIBS
MKL_LDFLAGS
MKL_CFLAGS MKL_CFLAGS
USE_THREADS_FALSE USE_THREADS_FALSE
USE_THREADS_TRUE USE_THREADS_TRUE
...@@ -789,6 +789,7 @@ with_atlas_libdir ...@@ -789,6 +789,7 @@ with_atlas_libdir
with_atlas_incdir with_atlas_incdir
with_fftw_libdir with_fftw_libdir
with_fftw_incdir with_fftw_incdir
with_mkl_dir
with_xsl_url with_xsl_url
enable_model_fitting enable_model_fitting
enable_threads enable_threads
...@@ -1344,7 +1345,7 @@ if test "$ac_init_help" = "long"; then ...@@ -1344,7 +1345,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures sextractor 2.18.9 to adapt to many kinds of systems. \`configure' configures sextractor 2.18.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
...@@ -1414,7 +1415,7 @@ fi ...@@ -1414,7 +1415,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of sextractor 2.18.9:";; short | recursive ) echo "Configuration of sextractor 2.18.11:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
...@@ -1466,6 +1467,8 @@ Optional Packages: ...@@ -1466,6 +1467,8 @@ Optional Packages:
--with-fftw-incdir=<FFTW include dir> --with-fftw-incdir=<FFTW include dir>
Provide an alternative path to the FFTW include Provide an alternative path to the FFTW include
directory directory
--with-mkl-dir=<MKL path>
Provide an alternative path to the MKL library
--with-xsl_url=<default URL for XSLT filter> --with-xsl_url=<default URL for XSLT filter>
Provide an alternative default URL of the XSLT Provide an alternative default URL of the XSLT
filter filter
...@@ -1546,7 +1549,7 @@ fi ...@@ -1546,7 +1549,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
sextractor configure 2.18.9 sextractor configure 2.18.11
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
...@@ -1969,7 +1972,7 @@ cat >config.log <<_ACEOF ...@@ -1969,7 +1972,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by sextractor $as_me 2.18.9, which was It was created by sextractor $as_me 2.18.11, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
...@@ -2783,7 +2786,7 @@ fi ...@@ -2783,7 +2786,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='sextractor' PACKAGE='sextractor'
VERSION='2.18.9' VERSION='2.18.11'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
...@@ -12900,6 +12903,14 @@ if test "${with_fftw_incdir+set}" = set; then : ...@@ -12900,6 +12903,14 @@ if test "${with_fftw_incdir+set}" = set; then :
fi fi
# Provide special options for the MKL library
# Check whether --with-mkl-dir was given.
if test "${with_mkl_dir+set}" = set; then :
withval=$with_mkl_dir;
fi
# Provide a special option for the default XSLT URL # Provide a special option for the default XSLT URL
with_xsl_url="file://"$(# PATH urbi_resolve_dir(DIR) with_xsl_url="file://"$(# PATH urbi_resolve_dir(DIR)
# -------------------------- # --------------------------
...@@ -13371,10 +13382,10 @@ if test "$enable_model_fitting" = "yes"; then ...@@ -13371,10 +13382,10 @@ if test "$enable_model_fitting" = "yes"; then
if test x = x; then if test x$with_mkl_dir = x; then
mklroot=${MKLROOT} mklroot=${MKLROOT}
else else
mklroot= mklroot=$with_mkl_dir
fi fi
...@@ -13385,64 +13396,112 @@ else ...@@ -13385,64 +13396,112 @@ else
fi fi
if icc -V 2>&1 | grep -i "Intel(R) 64" > /dev/null 2>&1; then icc -V 2>&1 | grep -i "Intel" > /dev/null 2>&1 && flagicc=yes
if test x = xyes; then icc -V 2>&1 | grep -i "Intel(R) 64" > /dev/null 2>&1 && flag64=yes
MKL_CFLAGS="-DMKL_ILP64" icc -dumpmachine 2>&1 | grep -i "darwin" > /dev/null 2>&1 && flagosx=yes
if test x$enable_best_link = xyes; then if test x$flagicc = x; then
MKL_LIBS="$startgroup,$mklroot/lib/intel64/libmkl_intel_ilp64.a,\ MKL_CFLAGS=""
$mklroot/lib/intel64/libmkl_intel_thread.a,\
$mklroot/lib/intel64/libmkl_core.a,-end-group -openmp -lpthread -lm" MKL_LDFLAGS=""
MKL_LIBS=""
MKL_WARN="INTEL compiler not detected"
exit
fi
if test x$flagosx = xyes; then
if test x$flag64 = xyes; then
if test x = xyes; then
MKL_CFLAGS="-openmp -DMKL_ILP64 -I$mklroot/include"
if test x$enable_best_link = xyes; then
MKL_LIBS="$mklroot/lib/libmkl_intel_ilp64.a \
$mklroot/lib/libmkl_intel_thread.a \
$mklroot/lib/libmkl_core.a -lpthread -lm"
else
MKL_LIBS="-L$mklroot/lib -lmkl_intel_ilp64 \
-lmkl_intel_thread -lmkl_core -lpthread -lm"
fi
else else
MKL_LIBS="-lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core \ MKL_CFLAGS="-openmp -I$mklroot/include"
-openmp -lpthread -lm"
if test x$enable_best_link = xyes; then
MKL_LIBS="$mklroot/lib/libmkl_intel_lp64.a \
$mklroot/lib/libmkl_intel_thread.a \
$mklroot/lib/libmkl_core.a -lpthread -lm"
else
MKL_LIBS="-L$mklroot/lib -lmkl_intel_lp64 \
-lmkl_intel_thread -lmkl_core -lpthread -lm"
fi
fi fi
else else
MKL_CFLAGS="" MKL_CFLAGS="-openmp -I$mklroot/include"
if test x$enable_best_link = xyes; then if test x$enable_best_link = xyes; then
MKL_LIBS="$startgroup,$mklroot/lib/intel64/libmkl_intel_lp64.a,\ MKL_LIBS="$mklroot/lib/libmkl_intel.a \
$mklroot/lib/intel64/libmkl_intel_thread.a,\ $mklroot/lib/libmkl_intel_thread.a \
$mklroot/lib/intel64/libmkl_core.a,--end-group -openmp -lpthread -lm" $mklroot/lib/libmkl_core.a -lpthread -lm"
else else
MKL_LIBS="-lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core \ MKL_LIBS="-L$mklroot/lib -lmkl_intel -lmkl_intel_thread \
-openmp -lpthread -lm" -lmkl_core -lpthread -lm"
fi fi
fi fi
else
if test x$flag64 = xyes; then
if test x = xyes; then
MKL_CFLAGS="-openmp -DMKL_ILP64 -I$mklroot/include"
elif icc -V 2>&1 | grep -i "Intel(R)" > /dev/null 2>&1; then if test x$enable_best_link = xyes; then
MKL_CFLAGS="" MKL_LIBS="$startgroup,$mklroot/lib/intel64/libmkl_intel_ilp64.a,\
$mklroot/lib/intel64/libmkl_intel_thread.a,\
if test x$enable_best_link = xyes; then $mklroot/lib/intel64/libmkl_core.a,-end-group -lpthread -lm"
MKL_LIBS="$startgroup,$mklroot/lib/ia32/libmkl_intel.a,\
$mklroot/lib/ia32/libmkl_intel_thread.a,\
$mklroot/lib/ia32/libmkl_core.a,--end-group -openmp -lpthread -lm"
else
MKL_LIBS="-lmkl_intel -lmkl_intel_thread -lmkl_core \
-openmp -lpthread -lm"
fi else
MKL_LIBS="-L$mklroot/lib/intel64 -lmkl_intel_ilp64 \
-lmkl_intel_thread -lmkl_core -lpthread -lm"
MKL_LDFLAGS="" fi
else
MKL_CFLAGS="-openmp -I$mklroot/include"
if test x$enable_best_link = xyes; then
MKL_LIBS="$startgroup,$mklroot/lib/intel64/libmkl_intel_lp64.a,\
$mklroot/lib/intel64/libmkl_intel_thread.a,\
$mklroot/lib/intel64/libmkl_core.a,--end-group -lpthread -lm"
else else
MKL_CFLAGS="" MKL_LIBS="-L$mklroot/lib/intel64 -lmkl_intel_lp64 \
-lmkl_intel_thread -lmkl_core -lpthread -lm"
MKL_LDFLAGS="" fi
fi
else
MKL_CFLAGS="-openmp -I$mklroot/include"
MKL_LIBS="" if test x$enable_best_link = xyes; then
MKL_LIBS="$startgroup,$mklroot/lib/ia32/libmkl_intel.a,\
$mklroot/lib/ia32/libmkl_intel_thread.a,\
$mklroot/lib/ia32/libmkl_core.a,--end-group -lpthread -lm"
MKL_WARN="INTEL compiler not detected" else
MKL_LIBS="-L$mklroot/lib/ia32 -lmkl_intel -lmkl_intel_thread \
-lmkl_core -lpthread -lm"
fi
fi
fi fi
if test x$MKL_WARN = x; then MKL_LDFLAGS=""
...@@ -13479,7 +13538,6 @@ cat >>confdefs.h <<_ACEOF ...@@ -13479,7 +13538,6 @@ cat >>confdefs.h <<_ACEOF
#define LAPACKE_H "mkl_lapacke.h" #define LAPACKE_H "mkl_lapacke.h"
_ACEOF _ACEOF
fi
if test "$MKL_WARN" != ""; then if test "$MKL_WARN" != ""; then
...@@ -15656,7 +15714,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ...@@ -15656,7 +15714,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by sextractor $as_me 2.18.9, which was This file was extended by sextractor $as_me 2.18.11, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
...@@ -15722,7 +15780,7 @@ _ACEOF ...@@ -15722,7 +15780,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
sextractor config.status 2.18.9 sextractor config.status 2.18.11
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"
......
configure.ac
View file @ 1d2f29bc
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SExtractor. If not, see <http://www.gnu.org/licenses/>. # along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
# #
# Last modified: 05/04/2013 # Last modified: 25/04/2013
# #
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
...@@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],) ...@@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],)
define([AC_CACHE_SAVE],) define([AC_CACHE_SAVE],)
# This is your standard Bertin source code... # This is your standard Bertin source code...
AC_INIT(sextractor, 2.18.9, [bertin@iap.fr]) AC_INIT(sextractor, 2.18.11, [bertin@iap.fr])
AC_CONFIG_SRCDIR(src/makeit.c) AC_CONFIG_SRCDIR(src/makeit.c)
AC_CONFIG_AUX_DIR(autoconf) AC_CONFIG_AUX_DIR(autoconf)
AC_CONFIG_HEADERS(config.h) AC_CONFIG_HEADERS(config.h)
...@@ -149,6 +149,11 @@ AC_ARG_WITH(fftw-incdir, ...@@ -149,6 +149,11 @@ AC_ARG_WITH(fftw-incdir,
[AS_HELP_STRING([--with-fftw-incdir=<FFTW include dir>], [AS_HELP_STRING([--with-fftw-incdir=<FFTW include dir>],
[Provide an alternative path to the FFTW include directory])]) [Provide an alternative path to the FFTW include directory])])
# Provide special options for the MKL library
AC_ARG_WITH(mkl-dir,
[AS_HELP_STRING([--with-mkl-dir=<MKL path>],
[Provide an alternative path to the MKL library])])
# Provide a special option for the default XSLT URL # Provide a special option for the default XSLT URL
with_xsl_url="file://"$(URBI_RESOLVE_DIR([$datadir]))"/$PACKAGE_NAME/$PACKAGE_NAME.xsl" with_xsl_url="file://"$(URBI_RESOLVE_DIR([$datadir]))"/$PACKAGE_NAME/$PACKAGE_NAME.xsl"
AC_ARG_WITH(xsl_url, AC_ARG_WITH(xsl_url,
...@@ -232,7 +237,7 @@ if test "$enable_model_fitting" = "yes"; then ...@@ -232,7 +237,7 @@ if test "$enable_model_fitting" = "yes"; then
############ handle the INTEL MKL library (FFTW + LAPACK) ########### ############ handle the INTEL MKL library (FFTW + LAPACK) ###########
if test "$enable_mkl" = "yes"; then if test "$enable_mkl" = "yes"; then
convlibs="${srcdir}/wcs/libwcs_c.a,${srcdir}/levmar/liblevmar.a" convlibs="${srcdir}/wcs/libwcs_c.a,${srcdir}/levmar/liblevmar.a"
ACX_MKL(,,$enable_best_link,$convlibs) ACX_MKL($with_mkl_dir,,$enable_best_link,$convlibs)
if test "$MKL_WARN" != ""; then if test "$MKL_WARN" != ""; then
AC_MSG_WARN([$MKL_WARN]) AC_MSG_WARN([$MKL_WARN])
fi fi
......
man/sex.1
View file @ 1d2f29bc
.TH SEXTRACTOR "1" "April 2013" "SExtractor 2.18.9" "User Commands" .TH SEXTRACTOR "1" "April 2013" "SExtractor 2.18.11" "User Commands"
.SH NAME .SH NAME
sex \- extract a source catalogue from an astronomical FITS image sex \- extract a source catalogue from an astronomical FITS image
.SH SYNOPSIS .SH SYNOPSIS
......
src/assoc.c
View file @ 1d2f29bc
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * This file part of: SExtractor
* *
* Copyright: (C) 1997-2011 Emmanuel Bertin -- IAP/CNRS/UPMC * Copyright: (C) 1997-2013 Emmanuel Bertin -- IAP/CNRS/UPMC
* *
* License: GNU General Public License * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 04/05/2011 * Last modified: 17/04/2013
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -165,7 +165,14 @@ assocstruct *load_assoc(char *filename, wcsstruct *wcs) ...@@ -165,7 +165,14 @@ assocstruct *load_assoc(char *filename, wcsstruct *wcs)
else else
{ {
mindex = -1; mindex = -1;
prefs.assoc_type = ASSOC_FIRST; if (prefs.assoc_type == ASSOC_MEAN
|| prefs.assoc_type == ASSOC_MAGMEAN
|| prefs.assoc_type == ASSOC_MIN
|| prefs.assoc_type == ASSOC_MAX)
{
warning("ASSOC_PARAMS #3 missing,", " reverting to ASSOC_TYPE FIRST");
prefs.assoc_type = ASSOC_FIRST;
}
} }
nlist = ndata+3; nlist = ndata+3;
......
src/fft.c
View file @ 1d2f29bc
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 29/03/2013 * Last modified: 17/04/2013
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -37,7 +37,10 @@ ...@@ -37,7 +37,10 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "fftw/fftw3_mkl.h" #ifndef FFTW3_H
#include FFTW_H
#endif
#include "define.h" #include "define.h"
#include "globals.h" #include "globals.h"
#include "fft.h" #include "fft.h"
...@@ -165,7 +168,7 @@ void fft_conv(float *data1, float *fdata2, int *size) ...@@ -165,7 +168,7 @@ void fft_conv(float *data1, float *fdata2, int *size)
fdata1p = (float *)fdata1; fdata1p = (float *)fdata1;
fdata2p = fdata2; fdata2p = fdata2;
#pragma ivdep #pragma ivdep
for (i=npix2; i--; ) for (i=npix2; i--;)
{ {
real = *fdata1p **fdata2p - *(fdata1p+1)**(fdata2p+1); real = *fdata1p **fdata2p - *(fdata1p+1)**(fdata2p+1);
imag = *(fdata1p+1)**fdata2p + *fdata1p**(fdata2p+1); imag = *(fdata1p+1)**fdata2p + *fdata1p**(fdata2p+1);
......
src/profit.c
View file @ 1d2f29bc
...@@ -1896,7 +1896,7 @@ INPUT Profile-fitting structure, ...@@ -1896,7 +1896,7 @@ INPUT Profile-fitting structure,
OUTPUT RETURN_ERROR if the rasters don't overlap, RETURN_OK otherwise. OUTPUT RETURN_ERROR if the rasters don't overlap, RETURN_OK otherwise.
NOTES -. NOTES -.
AUTHOR E. Bertin (IAP) AUTHOR E. Bertin (IAP)
VERSION 13/02/2013 VERSION 24/04/2013
***/ ***/
int profit_resample(profitstruct *profit, float *inpix, PIXTYPE *outpix, int profit_resample(profitstruct *profit, float *inpix, PIXTYPE *outpix,
float factor) float factor)
...@@ -1921,7 +1921,7 @@ int profit_resample(profitstruct *profit, float *inpix, PIXTYPE *outpix, ...@@ -1921,7 +1921,7 @@ int profit_resample(profitstruct *profit, float *inpix, PIXTYPE *outpix,
xsin = xcin - xcout*invpixstep; /* Input start x-coord*/ xsin = xcin - xcout*invpixstep; /* Input start x-coord*/
if ((int)xsin >= profit->modnaxisn[0]) if ((int)xsin >= profit->modnaxisn[0] || !finitef(xsin))
return RETURN_ERROR; return RETURN_ERROR;
ixsout = 0; /* Int. part of output start x-coord */ ixsout = 0; /* Int. part of output start x-coord */
if (xsin<0.0) if (xsin<0.0)
...@@ -1947,7 +1947,7 @@ int profit_resample(profitstruct *profit, float *inpix, PIXTYPE *outpix, ...@@ -1947,7 +1947,7 @@ int profit_resample(profitstruct *profit, float *inpix, PIXTYPE *outpix,
ycout += *dy/profit->subsamp; ycout += *dy/profit->subsamp;
ysin = ycin - ycout*invpixstep; /* Input start y-coord*/ ysin = ycin - ycout*invpixstep; /* Input start y-coord*/
if ((int)ysin >= profit->modnaxisn[1]) if ((int)ysin >= profit->modnaxisn[1] || !finitef(ysin))
return RETURN_ERROR; return RETURN_ERROR;
iysout = 0; /* Int. part of output start y-coord */ iysout = 0; /* Int. part of output start y-coord */
if (ysin<0.0) if (ysin<0.0)
...@@ -3068,7 +3068,7 @@ INPUT Pointer to the profit structure, ...@@ -3068,7 +3068,7 @@ INPUT Pointer to the profit structure,
OUTPUT . OUTPUT .
NOTES -. NOTES -.
AUTHOR E. Bertin (IAP) AUTHOR E. Bertin (IAP)
VERSION 15/01/2013 VERSION 24/04/2013
***/ ***/
void profit_resetparam(profitstruct *profit, paramenum paramtype) void profit_resetparam(profitstruct *profit, paramenum paramtype)
{ {
...@@ -3100,8 +3100,8 @@ void profit_resetparam(profitstruct *profit, paramenum paramtype) ...@@ -3100,8 +3100,8 @@ void profit_resetparam(profitstruct *profit, paramenum paramtype)
fittype = PARFIT_LINBOUND; fittype = PARFIT_LINBOUND;
param = profit->guessdy; param = profit->guessdy;
range = profit->guessradius*4.0; range = profit->guessradius*4.0;
if (range>profit->objnaxisn[1]*profit->subsamp*2) if (range>profit->objnaxisn[1]*profit->subsamp*2.0)
range = profit->objnaxisn[1]*profit->subsamp*2; range = profit->objnaxisn[1]*profit->subsamp*2.0;
parammin = -range; parammin = -range;
parammax = range; parammax = range;
break; break;
......
src/xml.c
View file @ 1d2f29bc
This diff is collapsed.
src/xml.h
View file @ 1d2f29bc
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* This file part of: SExtractor * This file part of: SExtractor
* *
* Copyright: (C) 2006-2010 Emmanuel Bertin -- IAP/CNRS/UPMC * Copyright: (C) 2006-2013 Emmanuel Bertin -- IAP/CNRS/UPMC
* *
* License: GNU General Public License * License: GNU General Public License
* *
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with SExtractor. If not, see <http://www.gnu.org/licenses/>. * along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
* *
* Last modified: 11/10/2010 * Last modified: 25/04/2013
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
...@@ -68,6 +68,8 @@ extern int end_xml(void), ...@@ -68,6 +68,8 @@ extern int end_xml(void),
picstruct *wfield), picstruct *wfield),
write_xml(char *filename), write_xml(char *filename),
write_xml_header(FILE *file), write_xml_header(FILE *file),
write_xml_meta(FILE *file, char *error); write_xml_meta(FILE *file, char *error),
write_xmlconfigparam(FILE *file, char *name, char *unit,
char *ucd, char *format);
extern void write_xmlerror(char *filename, char *error); extern void write_xmlerror(char *filename, char *error);
xsl/sextractor.xsl
View file @ 1d2f29bc
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# #
# This file part of: SExtractor # This file part of: SExtractor
# #
# Copyright: (C) 2005-2010 Emmanuel Bertin - IAP/CNRS/UPMC # Copyright: (C) 2005-2013 Emmanuel Bertin - IAP/CNRS/UPMC
# #
# License: GNU General Public License # License: GNU General Public License
# #
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SExtractor. If not, see <http://www.gnu.org/licenses/>. # along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
# #
# Last modified: 11/10/2010 # Last modified: 27/04/2013
# #
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --> #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -->
...@@ -517,7 +517,21 @@ ...@@ -517,7 +517,21 @@
<xsl:for-each select="PARAM[position()>2]"> <xsl:for-each select="PARAM[position()>2]">
<tr > <tr >
<td><el><xsl:value-of select="@name"/></el></td> <td><el><xsl:value-of select="@name"/></el></td>
<td><el><xsl:value-of select="@value"/></el></td> <xsl:choose>
<xsl:when test="@datatype != 'boolean' ">
<td><el><xsl:value-of select="@value"/></el></td>
</xsl:when>
<xsl:otherwise>
<xsl:choose>
<xsl:when test="@value = 'T' ">
<td><el>Y</el></td>
</xsl:when>
<xsl:otherwise>
<td><el>N</el></td>
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
</xsl:choose>
</tr> </tr>
</xsl:for-each> </xsl:for-each>
</TABLE> </TABLE>
......
Supports Markdown
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