Removed multithreading in FFTs (would degrade performance). (7f3c6c33) · Commits · csst-pipeline / msc / sextractor

configure

+12 −10

Original line number	Diff line number	Diff line
		#! /bin/sh
		# Guess values for system-dependent variables and create Makefiles.
		# Generated by GNU Autoconf 2.61 for sextractor 2.8.6.
		# Generated by GNU Autoconf 2.61 for sextractor 2.8.7.
		#
		# Report bugs to <bertin@iap.fr>.
		#
		@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
		# Identity of this package.
		PACKAGE_NAME='sextractor'
		PACKAGE_TARNAME='sextractor'
		PACKAGE_VERSION='2.8.6'
		PACKAGE_STRING='sextractor 2.8.6'
		PACKAGE_VERSION='2.8.7'
		PACKAGE_STRING='sextractor 2.8.7'
		PACKAGE_BUGREPORT='bertin@iap.fr'

		ac_unique_file="src/makeit.c"
		@@ -1405,7 +1405,7 @@ if test "$ac_init_help" = "long"; then
		# 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.
		cat <<_ACEOF
		\`configure' configures sextractor 2.8.6 to adapt to many kinds of systems.
		\`configure' configures sextractor 2.8.7 to adapt to many kinds of systems.

		Usage: $0 [OPTION]... [VAR=VALUE]...

		@@ -1475,7 +1475,7 @@ fi

		if test -n "$ac_init_help"; then
		case $ac_init_help in
		short \| recursive ) echo "Configuration of sextractor 2.8.6:";;
		short \| recursive ) echo "Configuration of sextractor 2.8.7:";;
		esac
		cat <<\_ACEOF

		@@ -1599,7 +1599,7 @@ fi
		test -n "$ac_init_help" && exit $ac_status
		if $ac_init_version; then
		cat <<\_ACEOF
		sextractor configure 2.8.6
		sextractor configure 2.8.7
		generated by GNU Autoconf 2.61

		Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
		@@ -1613,7 +1613,7 @@ cat >config.log <<_ACEOF
		This file contains any messages produced by compilers while
		running configure, to aid debugging if configure makes a mistake.

		It was created by sextractor $as_me 2.8.6, which was
		It was created by sextractor $as_me 2.8.7, which was
		generated by GNU Autoconf 2.61. Invocation command line was

		$ $0 $@
		@@ -2290,7 +2290,7 @@ fi

		# Define the identity of the package.
		PACKAGE='sextractor'
		VERSION='2.8.6'
		VERSION='2.8.7'


		cat >>confdefs.h <<_ACEOF
		@@ -22567,6 +22567,8 @@ else

		fi

		# Deactivate multithreading for now
		use_pthreads="no"

		# Provide special option for gprof profiling
		{ echo "$as_me:$LINENO: checking for gprof profiler mode" >&5
		@@ -27297,7 +27299,7 @@ exec 6>&1
		# report actual input values of CONFIG_FILES etc. instead of their
		# values after options handling.
		ac_log="
		This file was extended by sextractor $as_me 2.8.6, which was
		This file was extended by sextractor $as_me 2.8.7, which was
		generated by GNU Autoconf 2.61. Invocation command line was

		CONFIG_FILES = $CONFIG_FILES
		@@ -27350,7 +27352,7 @@ Report bugs to <bug-autoconf@gnu.org>."
		_ACEOF
		cat >>$CONFIG_STATUS <<_ACEOF
		ac_cs_version="\\
		sextractor config.status 2.8.6
		sextractor config.status 2.8.7
		configured by $0, generated by GNU Autoconf 2.61,
		with options \\"`echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

configure.ac

+3 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ define([AC_CACHE_LOAD],)
		define([AC_CACHE_SAVE],)

		# This is your standard Bertin source code...
		AC_INIT(sextractor, 2.8.6, [bertin@iap.fr])
		AC_INIT(sextractor, 2.8.7, [bertin@iap.fr])
		AC_CONFIG_SRCDIR(src/makeit.c)
		AC_CONFIG_AUX_DIR(autoconf)
		AM_CONFIG_HEADER(config.h)
		@@ -148,6 +148,8 @@ AC_ARG_ENABLE(threads,
		fi,
		use_pthreads=yes
		)
		# Deactivate multithreading for now
		use_pthreads="no"

		# Provide special option for gprof profiling
		AC_MSG_CHECKING([for gprof profiler mode])

man/sex.1

+1 −1

Original line number	Diff line number	Diff line
		.TH SEXTRACTOR "1" "May 2009" "SWarp 2.8.6" "User Commands"
		.TH SEXTRACTOR "1" "May 2009" "SWarp 2.8.7" "User Commands"
		.SH NAME
		sex \- extract a source catalog from an astronomical FITS image
		.SH SYNOPSIS

src/catout.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		*
		* Contents: functions for output of catalog data.
		*
		* Last modify: 18/03/2009
		* Last modify: 29/05/2009
		*
		*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
		*/
		@@ -209,6 +209,7 @@ void updateparamflags()
		\| FLAG(obj2.prof_concentration)
		\| FLAG(obj2.prof_class_star);
		FLAG(obj2.mag_prof) \|= FLAG(obj2.magerr_prof);
		FLAG(obj2.magerr_prof) \|= FLAG(obj2.fluxerr_prof);
		FLAG(obj2.flux_prof) \|= FLAG(obj2.mag_prof) \| FLAG(obj2.fluxerr_prof);
		FLAG(obj2.prof_spheroid_mag) \|= FLAG(obj2.prof_spheroid_magerr);
		FLAG(obj2.prof_spheroid_reff) \|= FLAG(obj2.prof_spheroid_refferr);

src/fft.c

+9 −6

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		*
		* Contents: Routines dealing with double precision FFT.
		*
		* Last modify: 26/03/2007
		* Last modify: 28/05/2009
		*
		*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
		*/
		@@ -46,17 +46,20 @@ INPUT -.
		OUTPUT -.
		NOTES Global preferences are used for multhreading.
		AUTHOR E. Bertin (IAP)
		VERSION 29/11/2006
		VERSION 28/05/2009
		***/
		void fft_init(void)
		void fft_init(int nthreads)
		{
		if (!firsttimeflag)
		{
		#ifdef USE_THREADS
		QPTHREAD_MUTEX_INIT(&fftmutex, NULL);
		if (nthreads > 1)
		{
		if (!fftw_init_threads())
		error(EXIT_FAILURE, "Error: thread initialization failed in ", "FFTW");
		fftw_plan_with_nthreads(prefs.nthreads);
		QPTHREAD_MUTEX_INIT(&fftmutex, NULL);
		}
		#endif
		firsttimeflag = 1;
		}