Commit aa52c8bf authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Added support for the INTEL MKL library in place of ATLAS and FFTW (configure --enable-mkl option). 

Updated LevMar library to V2.6.
Pushed version number to 2.18.0.
parent 1b190b55

Makefile.am

+4 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#

#	This file part of:	SExtractor

#

#	Copyright:		(C) 2002-2010 Emmanuel Bertin -- IAP/CNRS/UPMC

#	Copyright:		(C) 2002-2012 Emmanuel Bertin -- IAP/CNRS/UPMC

#

#	License:		GNU General Public License

#
@@ -22,7 +22,7 @@ 
#	You should have received a copy of the GNU General Public License

#	along with SExtractor. If not, see <http://www.gnu.org/licenses/>.

#

#	Last modified:		11/10/2010

#	Last modified:		09/07/2012

#

#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -31,8 +31,8 @@ SUBDIRS = man src tests 
dist_pkgdata_DATA	= config/* xsl/sextractor.xsl

EXTRA_DIST		= doc AUTHORS BUGS ChangeLog COPYRIGHT HISTORY \

			  INSTALL LICENSE README THANKS \

			  acx_atlas.m4 acx_prog_cc_optim.m4 \

			  acx_urbi_resolve_dir.m4

			  acx_atlas.m4 acx_fftw.m4 acx_mkl.m4 \

			  acx_prog_cc_optim.m4 acx_urbi_resolve_dir.m4

RPM_ROOTDIR		= `rpmbuild --nobuild -E %_topdir`

RPM_SRCDIR		= $(RPM_ROOTDIR)/SOURCES

dist-hook:

Makefile.in

+187 −82

File changed.

Preview size limit exceeded, changes collapsed.

aclocal.m4

+6748 −4828

File changed.

Preview size limit exceeded, changes collapsed.

acx_atlas.m4

+8 −8
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ dnl You should have received a copy of the GNU General Public License 
dnl	along with AstrOmatic software.

dnl	If not, see <http://www.gnu.org/licenses/>.

dnl

dnl	Last modified:		10/10/2010

dnl	Last modified:		12/12/2011

dnl

dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

dnl

dnl @synopsis ACX_ATLAS([ATLAS_LIBDIR, ATLAS_INCDIR, ATLAS_PFLAG,

dnl @synopsis ACX_ATLAS([ATLAS_LIBSDIR, ATLAS_INCDIR, ATLAS_PFLAG,

dnl                     [ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]])

dnl You may wish to use these variables in your default LIBS:

dnl
@@ -218,24 +218,24 @@ dnl Check whether the multithreaded version of ATLAS is there too: 
    AC_CHECK_LIB(ptcblas, cblas_dgemm, [acx_atlast_ok=yes], [acx_atlast_ok=no],

	[$ATLAS_LIBPATH -lcblas -latlas -lm])

    if test x$acx_atlast_ok = xyes; then

      ATLAS_LIB="$ATLAS_LIBPATH -llapack -lptcblas -lcblas -latlas"

      ATLAS_LIBS="$ATLAS_LIBPATH -llapack -lptcblas -lcblas -latlas"

      LIBS="$OLIBS"

      AC_SUBST(ATLAS_LIB)

      AC_SUBST(ATLAS_LIBS)

      AC_DEFINE(HAVE_ATLAS_MP,1,

	[Define if you have the parallel ATLAS libraries.])

      $4

    else

      ATLAS_LIB="$ATLAS_LIBPATH -llapack -lcblas -latlas"

      ATLAS_LIBS="$ATLAS_LIBPATH -llapack -lcblas -latlas"

      LIBS="$OLIBS"

      AC_SUBST(ATLAS_LIB)

      AC_SUBST(ATLAS_LIBS)

      ATLAS_WARN="CBLAS/LAPack was compiled without multithreading support!"

      AC_SUBST(ATLAS_WARN)

      $4         

    fi

  else

    ATLAS_LIB="$ATLAS_LIBPATH -llapack -lcblas -latlas"

    ATLAS_LIBS="$ATLAS_LIBPATH -llapack -lcblas -latlas"

    LIBS="$OLIBS"

    AC_SUBST(ATLAS_LIB)

    AC_SUBST(ATLAS_LIBS)

    $4

  fi

else

acx_mkl.m4

0 → 100644
+79 −0
Original line number Diff line number Diff line 
dnl

dnl				acx_mkl.m4

dnl

dnl Set up options for using the INTEL MKL library.

dnl

dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

dnl

dnl	This file part of:	AstrOmatic software

dnl

dnl	Copyright:		(C) 2003-2012 Emmanuel Bertin -- IAP/CNRS/UPMC

dnl

dnl	License:		GNU General Public License

dnl

dnl	AstrOmatic software is free software: you can redistribute it and/or

dnl	modify it under the terms of the GNU General Public License as

dnl	published by the Free Software Foundation, either version 3 of the

dnl	License, or (at your option) any later version.

dnl	AstrOmatic software is distributed in the hope that it will be useful,

dnl	but WITHOUT ANY WARRANTY; without even the implied warranty of

dnl	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

dnl	GNU General Public License for more details.

dnl	You should have received a copy of the GNU General Public License

dnl	along with AstrOmatic software.

dnl	If not, see <http://www.gnu.org/licenses/>.

dnl

dnl	Last modified:		09/07/2012

dnl

dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

dnl

dnl @synopsis ACX_MKL()

dnl

dnl You may wish to use these variables in your default LIBS:

dnl

dnl        LIBS="$MKL_LIBS $LIBS"

dnl

dnl You may wish to use these variables in your default CFLAGS:

dnl

dnl        CFLAGS="$CFLAGS $MKL_CFLAGS"

dnl



AC_DEFUN([ACX_MKL], [

AC_REQUIRE([AC_CANONICAL_HOST])



dnl ----------------------

dnl Set architecture flags

dnl ----------------------



dnl Try to find INTEL architecture (Intel 64 or ia32)

if icc -V 2>&1 | grep -i "Intel(R) 64" > /dev/null 2>&1; then

  AC_SUBST(MKL_CFLAGS, "-DMKL_ILP64")

  AC_SUBST(MKL_LIBS, "-mkl")

elif icc -V 2>&1 | grep -i "Intel(R)" > /dev/null 2>&1; then

  AC_SUBST(MKL_CFLAGS, "")

  AC_SUBST(MKL_LIBS, "-mkl")

else

  AC_SUBST(MKL_CFLAGS, "")

  AC_SUBST(MKL_LIBS, "")

  MKL_WARN="INTEL compiler not detected"

  AC_SUBST(MKL_WARN)

fi



dnl --------------------

dnl Set internal flags

dnl --------------------



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_LAPACKE,1, [Define if you have the LAPACKe libraries.])



dnl --------------------

dnl Set include files

dnl --------------------



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(LAPACKE_H, "mkl_lapacke.h", [LAPACKe header filename.])





])dnl ACX_MKL