Skip to content

Develop #85

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 3 commits into from
Jan 17, 2025
Merged

Develop #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fed30a8
Fix issues reported by user ryandesign.
ebertin Oct 11, 2024
ce96b56
Fix build issue with --enable-threads option.
ebertin Dec 18, 2024
41485e0
Merge pull request #84 from astromatic/threads
ebertin Jan 17, 2025
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.0],[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
10 changes: 4 additions & 6 deletions src/fits/fitscat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* This file part of: AstrOmatic FITS/LDAC library
*
* Copyright: (C) 1995-2023 CFHT/IAP/CNRS/SorbonneU
* Copyright: (C) 1995-2024 CEA/AIM/UParisSaclay
*
* License: GNU General Public License
*
Expand All @@ -23,8 +23,6 @@
* along with AstrOmatic software.
* If not, see <http://www.gnu.org/licenses/>.
*
* Last modified: 25/02/2023
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/

#ifdef HAVE_CONFIG_H
Expand Down Expand Up @@ -176,8 +174,8 @@ PURPOSE Close a file previously opened by cfitsio
INPUT fitsfile structure.
OUTPUT RETURN_OK if everything went as expected (exit in error otherwise).
NOTES the fitsfile pointer is set to NULL;
AUTHOR E. Bertin (CFHT/IAP/CNRS/SorbonneU)
VERSION 25/02/2023
AUTHOR E. Bertin (CEA/AIM/UParisSaclay)
VERSION 11/10/2024
***/
int close_cfitsio(catstruct *cat) {

Expand All @@ -190,7 +188,7 @@ int close_cfitsio(catstruct *cat) {
cat->filename);
} else {
// Successfully closed FITS file with cfitsio
cat->infptr == NULL;
cat->infptr = NULL;
// Free random seed in CFITSIO.
QFREE(fits_rand_value);
}
Expand Down
12 changes: 5 additions & 7 deletions src/fits/fitswrite.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* This file part of: AstrOmatic FITS/LDAC library
*
* Copyright: (C) 1995-2020 IAP/CNRS/SorbonneU
* Copyright: (C) 1995-2024 CEA/AIM/UParisSaclay
*
* License: GNU General Public License
*
Expand All @@ -23,8 +23,6 @@
* along with AstrOmatic software.
* If not, see <http://www.gnu.org/licenses/>.
*
* Last modified: 26/08/2020
*
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/

#ifdef HAVE_CONFIG_H
Expand Down Expand Up @@ -452,7 +450,7 @@ void print_obj(FILE *stream, tabstruct *tab)
fprintf(stream, "F");
}
else
fprintf(stream, key->printf?key->printf:"%d", (int)*ptr);
fprintf(stream, *key->printf?key->printf:"%d", (int)*ptr);
if (i)
putc(' ', stream);
break;
Expand Down Expand Up @@ -480,8 +478,8 @@ INPUT Output stream
Table structure.
OUTPUT -.
NOTES -.
AUTHOR G. Tissier & E.Bertin (IAP)
VERSION 13/06/2012
AUTHOR G. Tissier (IAP) & E.Bertin (CEA/AIM/UParisSaclay)
VERSION 11/10/2024
***/
void voprint_obj(FILE *stream, tabstruct *tab)

Expand Down Expand Up @@ -538,7 +536,7 @@ void voprint_obj(FILE *stream, tabstruct *tab)
fprintf(stream, "F");
}
else
fprintf(stream, key->printf?key->printf:"%d", (int)*ptr);
fprintf(stream, *key->printf?key->printf:"%d", (int)*ptr);
if (i)
putc(' ', stream);
break;
Expand Down
Loading