Commit 4e303eea authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed issue with FWHMPSF_WORLD. 

Added support for AVX extensions with INTEL compiler v12.
Version number pushed to 2.14.2.
parent 9a5020d1

acx_prog_cc_optim.m4

+2 −2
Original line number Original line Diff line number Diff line
@@ -60,14 +60,14 @@ EOF 
      if $CC -V 2>&1 | grep -i "Intel(R) 64" > /dev/null 2>&1 &&

      if $CC -V 2>&1 | grep -i "Intel(R) 64" > /dev/null 2>&1 &&

           $CC -c -O conftest.c > /dev/null 2>&1 &&

           $CC -c -O conftest.c > /dev/null 2>&1 &&

           test -f conftest.o; then

           test -f conftest.o; then

        prog_cc_optim_cv_flags="-O3 -axSSE3,SSE4.1,SSE4.2 -ip -no-prec-div -unroll"

        prog_cc_optim_cv_flags="-O3 -axSSE3,SSE4.1,SSE4.2,AVX -no-prec-div -unroll"

        prog_ld_optim_cv_flags="-static-intel"

        prog_ld_optim_cv_flags="-static-intel"





      dnl INTEL C 32bits compiler

      dnl INTEL C 32bits compiler

      elif $CC -V 2>&1 | grep -i "Intel(R)" > /dev/null 2>&1 &&

      elif $CC -V 2>&1 | grep -i "Intel(R)" > /dev/null 2>&1 &&

           $CC -c -O conftest.c > /dev/null 2>&1 &&

           $CC -c -O conftest.c > /dev/null 2>&1 &&

           test -f conftest.o; then

           test -f conftest.o; then

        prog_cc_optim_cv_flags="-O3 -axSSE2,SSE3,SSE4.1,SSE4.2 -ip -no-prec-div -unroll"

        prog_cc_optim_cv_flags="-O3 -axSSE2,SSE3,SSE4.1,SSE4.2,AVX -no-prec-div -unroll"

        prog_ld_optim_cv_flags="-static-intel"

        prog_ld_optim_cv_flags="-static-intel"





      dnl GCC

      dnl GCC

config.h.in

+6 −0
Original line number Original line Diff line number Diff line
@@ -147,6 +147,9 @@ 
/* Define to 1 if you have the <sys/mman.h> header file. */

/* Define to 1 if you have the <sys/mman.h> header file. */

#undef HAVE_SYS_MMAN_H

#undef HAVE_SYS_MMAN_H





/* Define to 1 if you have the <sys/param.h> header file. */

#undef HAVE_SYS_PARAM_H



/* Define to 1 if you have the <sys/stat.h> header file. */

/* Define to 1 if you have the <sys/stat.h> header file. */

#undef HAVE_SYS_STAT_H

#undef HAVE_SYS_STAT_H
@@ -178,6 +181,9 @@ 
/* Define to the one symbol short name of this package. */

/* Define to the one symbol short name of this package. */

#undef PACKAGE_TARNAME

#undef PACKAGE_TARNAME





/* Define to the home page for this package. */

#undef PACKAGE_URL



/* Define to the version of this package. */

/* Define to the version of this package. */

#undef PACKAGE_VERSION

#undef PACKAGE_VERSION

configure

+7394 −12755

File changed.

Preview size limit exceeded, changes collapsed.

configure.ac

+2 −2
Original line number Original line Diff line number Diff line
@@ -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:		31/05/2011

#	Last modified:		01/07/2011

#

#

#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -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.14.1, [bertin@iap.fr])

AC_INIT(sextractor, 2.14.2, [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)

AM_CONFIG_HEADER(config.h)

AM_CONFIG_HEADER(config.h)

man/sex.1

+1 −1
Original line number Original line Diff line number Diff line 
.TH SEXTRACTOR "1" "May 2011" "SExtractor 2.14.1" "User Commands"

.TH SEXTRACTOR "1" "July 2011" "SExtractor 2.14.2" "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