Skip to content

Fix build issue with --enable-threads option. #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ebertin merged 1 commit into from
Jan 17, 2025
Merged

Fix build issue with --enable-threads option. #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
#
# This file part of: SExtractor
#
# Copyright: (C) 2002-2023 CFHT/IAP/CNRS/SorbonneU
# Copyright: (C) 2002-2021 IAP/CNRS/SorbonneU
# (C) 2021-2023 CFHT/CNRS
# (C) 2023-2024 CEA/AIM/UParisSaclay
#
# License: GNU General Public License
#
Expand All @@ -22,7 +24,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: 07/03/2023
# Last modified: 18/12/2024
#
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

Expand All @@ -31,7 +33,7 @@ define([AC_CACHE_LOAD],)
define([AC_CACHE_SAVE],)

# This is your standard AstrOmatic source code...
AC_INIT([SExtractor],[2.28.1],[astromatic@astromatic.iap.fr],
AC_INIT([SExtractor],[2.28.2],[astromatic@astromatic.iap.fr],
[sextractor],[http://astromatic.net/software/sextractor])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR(autoconf)
Expand Down Expand Up @@ -246,8 +248,6 @@ AC_ARG_ENABLE(threads,
fi,
use_pthreads=yes
)
# Deactivate multithreading for now
use_pthreads="no"

# Provide special option for profiling
AC_MSG_CHECKING([for profiler mode])
Expand Down
6 changes: 4 additions & 2 deletions src/fft.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
*
* This file part of: SExtractor
*
* Copyright: (C) 2007-2017 IAP/CNRS/UPMC
# Copyright: (C) 2002-2021 IAP/CNRS/SorbonneU
# (C) 2021-2023 CFHT/CNRS
# (C) 2023-2024 CEA/AIM/UParisSaclay
*
* License: GNU General Public License
*
Expand Down Expand Up @@ -69,7 +71,7 @@ void fft_init(int nthreads)
#ifdef USE_THREADS
if (nthreads > 1)
{
if (!fftw_init_threads())
if (!fftwf_init_threads())
error(EXIT_FAILURE, "*Error*: thread initialization failed in ", "FFTW");
fftwf_plan_with_nthreads(prefs.nthreads);
}
Expand Down
Loading