Commit 601d807b authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed issue with using the ILP64 model instead of LP64 in the MKL. 

Fixed tests.
parent a02dec89

configure.ac

+3 −3
Original line number Diff line number Diff line
@@ -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:		20/06/2017

#	Last modified:		21/06/2017

#

#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],) 
define([AC_CACHE_SAVE],)



# This is your standard Bertin source code...

AC_INIT(SExtractor, 2.24.1,[astromatic@astromatic.net],

AC_INIT(SExtractor, 2.24.2,[astromatic@astromatic.net],

	sextractor, [http://astromatic.net/software/sextractor])

AC_CONFIG_MACRO_DIR([m4])

AC_CONFIG_AUX_DIR(autoconf)
@@ -244,7 +244,7 @@ if test "$enable_model_fitting" != "no"; then 
############ handle the INTEL MKL library (FFTW + LAPACKe) ###########

  if test "$enable_mkl" = "yes"; then

    convlibs="${srcdir}/wcs/libwcs_c.a,${srcdir}/levmar/liblevmar.a"

    ACX_MKL($with_mkl_dir,yes,$enable_best_link,$convlibs)

    ACX_MKL($with_mkl_dir,,$enable_best_link,$convlibs)

    if test "$MKL_WARN" == ""; then

      AC_MSG_RESULT([yes])

    else

doc/src/conf.py

+4 −4
Original line number Diff line number Diff line
@@ -67,9 +67,9 @@ author = u'E. Bertin' 
# built documents.

#

# The short X.Y version.

version = '2.24.0'

version = '2.24.2'

# The full version, including alpha/beta/rc tags.

release = '2.24.0'

release = '2.24.2'



# The language for content autogenerated by Sphinx. Refer to documentation

# for a list of supported languages.
@@ -81,7 +81,7 @@ language = None 
# There are two options for replacing |today|: either, you set today to some

# non-false value, then it is used:

#

today = 'Tue Jun 20 2017'

today = 'Wed Jun 21 2017'

#

# Else, today_fmt is used as the format for a strftime call.

#
@@ -144,7 +144,7 @@ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] 
# The name for this set of Sphinx documents.

# "<project> v<release> documentation" by default.

#

# html_title = u'SExtractor v2.24.0'

# html_title = u'SExtractor v2.24.2'



# A shorter title for the navigation bar.  Default is the same as html_title.

#

man/sex.1

+1 −1
Original line number Diff line number Diff line 
.TH SEXTRACTOR "1" "June 2017" "SExtractor 2.24.0" "User Commands"

.TH SEXTRACTOR "1" "June 2017" "SExtractor 2.24.2" "User Commands"

.SH NAME

sex \- extract a source catalogue from an astronomical FITS image

.SH SYNOPSIS

tests/Makefile.am

+3 −3
Original line number Diff line number Diff line 
# Test Makefile for SExtractor

# Copyright (C) 2007 Emmanuel Bertin.

TESTS		= efigi1.test

# Copyright (C) 2007-2017 Emmanuel Bertin.

TESTS		= modelfit.test

EXTRA_DIST	= galaxies.fits galaxies.weight.fits \

		  default.psf default.sex default.param \

		  default.conv efigi1.test

		  gauss_4.0_7x7.conv modelfit.test

distclean-local:

		-rm *.cat *.xml

tests/default.conv

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
CONV NORM

# 3x3 ``all-ground'' convolution mask with FWHM = 2 pixels.

1 2 1

2 4 2

1 2 1