Skip to content
GitLab
Commit fb1a0772 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Moved codebase to new autogen.sh pre-configure stage. 

Replaced doc PDF with (very preliminary) Sphinx source.
Pushed version number to 2.24.
parent 779e15bc
Hide whitespace changes
Inline Side-by-side
doc/src/references.rst 0 → 100644
View file @ fb1a0772
.. only:: html
Bibliography
============
.. bibliography:: references.bib
:style: adsarxiv
doc/theme/css/custom.css 0 → 100644
View file @ fb1a0772
/* Change heading font */
/*
h1,h2,h3 {
font-weight: 700;
font-family: "CherrySoda","ff-tisa-web-pro","Georgia",Arial,sans-serif;
}
@font-face {
font-family: "CherrySoda";
font-style: normal;
font-weight: 700;
src: url(../fonts/CherrySoda.ttf) format('truetype');
}
*/
/* Extend page width size limit */
.wy-nav-content {
max-width: 1600px;
}
/* Justified and slightly lower line interval for text */
li, p {
text-align: justify;
line-height: 20px;
}
/* Smaller caption text, further away from the figure */
.caption {
font-size: smaller;
margin-top: 1em;
}
/* Override responsive image scaling */
img {
width: auto;
}
/* Move equation no to the right */
.eqno {
float: right;
margin: 1em 0em;
}
/* Override Mathjax colors forced to dark grey */
span[id*="MathJax-Span"] {
color: inherit;
}
m4/acx_atlas.m4 0 → 100644
View file @ fb1a0772
dnl
dnl acx_atlas.m4
dnl
dnl Figure out if the ATLAS library and header files are installed.
dnl
dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
dnl
dnl This file part of: AstrOmatic software
dnl
dnl Copyright: (C) 2003-2016 IAP/CNRS/UPMC
dnl
dnl License: GNU General Public License
dnl
dnl AstrOmatic software is free software: you can redistribute it and/or
dnl modify it under the terms of the GNU General Public License as
dnl published by the Free Software Foundation, either version 3 of the
dnl License, or (at your option) any later version.
dnl AstrOmatic software is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
dnl You should have received a copy of the GNU General Public License
dnl along with AstrOmatic software.
dnl If not, see <http://www.gnu.org/licenses/>.
dnl
dnl Last modified: 19/10/2016
dnl
dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
dnl
dnl @synopsis ACX_ATLAS([ATLAS_LIBSDIR, ATLAS_INCDIR, ATLAS_PFLAG,
dnl [ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]])
dnl You may wish to use these variables in your default LIBS:
dnl
dnl LIBS="$ATLAS_LIBS $LIBS"
dnl
dnl ACTION-IF-FOUND is a list of shell commands to run if BLAS/LAPACK
dnl is found (HAVE_ATLAS is defined first), and ACTION-IF-NOT-FOUND
dnl is a list of commands to run it if it is not found.
AC_DEFUN([ACX_ATLAS], [
AC_REQUIRE([AC_CANONICAL_HOST])
dnl --------------------
dnl Search include files
dnl --------------------
ATLAS_ERROR=""
if test x$2 = x; then
acx_atlas_incdir=""
AC_CHECK_HEADERS([cblas.h clapack.h],,
[
acx_atlas_incdir="atlas/"
AC_CHECK_HEADERS([${acx_atlas_incdir}cblas.h ${acx_atlas_incdir}clapack.h],,
[ATLAS_ERROR="ATLAS header files not found!"])
]
)
else
acx_atlas_incdir="$2/"
AC_CHECK_HEADERS([${acx_atlas_incdir}cblas.h ${acx_atlas_incdir}clapack.h],,
[
[acx_atlas_incdir="$2/include/"]
AC_CHECK_HEADER(
[${acx_atlas_incdir}cblas.h ${acx_atlas_incdir}clapack.h],,
[ATLAS_ERROR="ATLAS header files not found in "$2"!"]
)
]
)
fi
if test x$ATLAS_ERROR = x; then
AC_DEFINE_UNQUOTED(ATLAS_BLAS_H, "${acx_atlas_incdir}cblas.h", [BLAS header filename.])
AC_DEFINE_UNQUOTED(ATLAS_LAPACK_H, "${acx_atlas_incdir}clapack.h", [CLAPACK header filename.])
dnl --------------------
dnl Search library files
dnl --------------------
OLIBS="$LIBS"
LIBS=""
if test x$1 = x; then
if test -d "/usr/lib64/atlas"; then
acx_atlas_libopt="-L/usr/lib64/atlas"
elif test -d "/usr/lib/atlas"; then
acx_atlas_libopt="-L/usr/lib/atlas"
else
acx_atlas_libopt=""
fi
else
acx_atlas_libopt="-L$1"
fi
if test x$3 == xyes; then
dnl Parallel ATLAS 3.10+
acx_atlas_newlibs="tatlas"
dnl Older parallel ATLAS
acx_atlas_oldextralibs="-latlas -lptcblas -lcblas"
else
dnl Serial ATLAS 3.10+
acx_atlas_newlibs="satlas"
dnl Older serial ATLAS
acx_atlas_oldextralibs="-latlas -lcblas"
fi
acx_atlas_extralibs=""
AC_SEARCH_LIBS(
[clapack_dpotrf], [$acx_atlas_newlibs],,
[
unset ac_cv_search_clapack_dpotrf
acx_atlas_extralibs=$acx_atlas_oldextralibs
AC_SEARCH_LIBS(
[clapack_dpotrf], [lapack_atlas lapack],,
[
unset ac_cv_search_clapack_dpotrf
acx_atlas_extralibs=""
AC_SEARCH_LIBS(
[clapack_dpotrf], [atlas],
[ATLAS_WARN="Parallel ATLAS not found, reverting to serial!"],
[
unset ac_cv_search_clapack_dpotrf
acx_atlas_extralibs="-latlas -lcblas"
AC_SEARCH_LIBS(
[clapack_dpotrf], [lapack_atlas lapack],
[ATLAS_WARN="Parallel ATLAS not found, reverting to serial!"],
[ATLAS_ERROR="ATLAS library files not found!"],
[$acx_atlas_libopt $acx_atlas_extralibs]
)
],
$acx_atlas_libopt
)
],
[$acx_atlas_libopt $acx_atlas_extralibs]
)
],
$acx_atlas_libopt
)
LIBS="$OLIBS"
fi
dnl -------------------------------------------------------------------------
dnl Finally execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND
dnl -------------------------------------------------------------------------
if test "x$ATLAS_ERROR" = "x"; then
AC_DEFINE(HAVE_ATLAS,1,
[Define if you have the ATLAS libraries and header files.])
ATLAS_LIBS="$acx_atlas_libopt $ac_cv_search_clapack_dpotrf"
AC_SUBST(ATLAS_CFLAGS)
AC_SUBST(ATLAS_LDFLAGS, "")
AC_SUBST(ATLAS_LIBS)
AC_SUBST(ATLAS_WARN)
$4
else
AC_SUBST(ATLAS_ERROR)
$5
fi
])dnl ACX_ATLAS
m4/acx_openblas.m4 0 → 100644
View file @ fb1a0772
dnl
dnl acx_openblas.m4
dnl
dnl Figure out if the OpenBLAS library and header files are installed.
dnl
dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
dnl
dnl This file part of: AstrOmatic software
dnl
dnl Copyright: (C) 2016 IAP/CNRS/UPMC
dnl
dnl License: GNU General Public License
dnl
dnl AstrOmatic software is free software: you can redistribute it and/or
dnl modify it under the terms of the GNU General Public License as
dnl published by the Free Software Foundation, either version 3 of the
dnl License, or (at your option) any later version.
dnl AstrOmatic software is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
dnl You should have received a copy of the GNU General Public License
dnl along with AstrOmatic software.
dnl If not, see <http://www.gnu.org/licenses/>.
dnl
dnl Last modified: 12/10/2016
dnl
dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
dnl
dnl @synopsis ACX_OPENBLAS([OPENBLAS_LIBSDIR, OPENBLAS_INCDIR, OPENBLAS_PFLAG,
dnl ILP64_FLAG, [ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]])
dnl
dnl You may wish to use these variables in your default LIBS:
dnl
dnl LIBS="$OPENBLAS_LIBS $LIBS"
dnl
dnl ACTION-IF-FOUND is a list of shell commands to run if OPENBLAS
dnl is found (HAVE_OPENBLAS is defined first), and ACTION-IF-NOT-FOUND
dnl is a list of commands to run it if it is not found.
AC_DEFUN([ACX_OPENBLAS], [
AC_REQUIRE([AC_CANONICAL_HOST])
dnl --------------------
dnl Search include files
dnl --------------------
OPENBLAS_ERROR=""
if test x$2 = x; then
[acx_openblas_incdir="openblas/"]
AC_CHECK_HEADERS(
[${acx_openblas_incdir}cblas.h ${acx_openblas_incdir}lapacke.h],,
[
[acx_openblas_incdir=""]
AC_CHECK_HEADER(
[cblas.h lapacke.h],,
[OPENBLAS_ERROR="OpenBLAS header files not found!"]
)
]
)
else
acx_openblas_incdir="$2/"
AC_CHECK_HEADER(
[${acx_openblas_incdir}cblas.h],,
[
[acx_openblas_incdir="$2/include/"]
AC_CHECK_HEADERS(
[${acx_openblas_incdir}cblas.h ${acx_openblas_incdir}lapacke.h],,
[OPENBLAS_ERROR="OpenBLAS header files not found in "$2"!"]
)]
)
fi
if test "x$OPENBLAS_ERROR" = "x"; then
AC_DEFINE_UNQUOTED(BLAS_H, "${acx_openblas_incdir}cblas.h", [BLAS header filename.])
AC_DEFINE_UNQUOTED(LAPACKE_H, "${acx_openblas_incdir}lapacke.h", [LAPACKe header filename.])
dnl ----------------------------
dnl Search OpenBLAS library file
dnl ----------------------------
OLIBS="$LIBS"
LIBS=""
if test x$4 = xyes; then
acx_openblas_suffix="64"
OPENBLAS_CFLAGS="-DOPENBLAS_USE64BITINT -DLAPACK_ILP64"
else
acx_openblas_suffix=""
OPENBLAS_CFLAGS=""
fi
if test x$1 = x; then
acx_openblas_libopt=""
else
acx_openblas_libopt="-L$1"
fi
if test x$3 == xyes; then
AC_SEARCH_LIBS(
[LAPACKE_dpotrf], ["openblasp"$acx_openblas_suffix],
AC_DEFINE(HAVE_OPENBLASP,1,
[Define if you have the OpenBLAS parallel library and header files.]),
unset ac_cv_search_LAPACKE_dpotrf
[AC_SEARCH_LIBS(
[LAPACKE_dpotrf], ["openblas"$acx_openblas_suffix],
[OPENBLAS_WARN="parallel OpenBLAS"$acx_openblas_suffix" not found, reverting to scalar OpenBLAS"$acx_openblas_suffix"!"],
[OPENBLAS_ERROR="OpenBLAS"$acx_openblas_suffix" library file not found!"],
$acx_openblas_libopt
)],
$acx_openblas_libopt
)
else
AC_SEARCH_LIBS(
[LAPACKE_dpotrf], ["openblas"$acx_openblas_suffix],,
[OPENBLAS_ERROR="OpenBLAS"$acx_openblas_suffix" library file not found!"],
$acx_openblas_libopt
)
fi
LIBS="$OLIBS"
fi
dnl -------------------------------------------------------------------------
dnl Finally execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND
dnl -------------------------------------------------------------------------
if test "x$OPENBLAS_ERROR" = "x"; then
AC_DEFINE(HAVE_OPENBLAS,1, [Define if you have the OpenBLAS library and header files.])
AC_DEFINE(HAVE_BLAS,1, [Define if you have the BLAS library and header files.])
AC_DEFINE(HAVE_LAPACKE,1, [Define if you have the LAPACKe library and header files.])
OPENBLAS_LIBS="$acx_openblas_libopt $ac_cv_search_LAPACKE_dpotrf"
AC_SUBST(OPENBLAS_CFLAGS)
AC_SUBST(OPENBLAS_LDFLAGS, "")
AC_SUBST(OPENBLAS_LIBS)
AC_SUBST(OPENBLAS_WARN)
$5
else
AC_SUBST(OPENBLAS_ERROR)
$6
fi
])dnl ACX_OPENBLAS
sextractor.spec.in
View file @ fb1a0772
......@@ -22,13 +22,13 @@
# 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: 12/07/2012
# Last modified: 19/06/2017
#
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%define name @PACKAGE_NAME@
%define name @PACKAGE_TARNAME@
%define version @PACKAGE_VERSION@
%define release 1
%define release 1%{?dist}
%undefine _missing_build_ids_terminate_build
Summary: Extract catalogs of sources from astronomical images
......@@ -45,16 +45,16 @@ BuildRequires: fftw-devel >= 3.1
BuildRequires: atlas-devel >= 3.6.0
%description
SExtractor stands for ``Source Extractor'': a software for making catalog of sources from astronomical images.
Extract catalogs of sources from astronomical images
%prep
%setup -q
%build
if test "$USE_BEST"; then
%configure --enable-icc --enable-mkl --enable-auto-flags --enable-best-link
%configure --enable-mkl --enable-auto-flags --enable-best-link
elif test "$USE_ICC"; then
%configure --enable-icc --enable-mkl
%configure --enable-icc
else
%configure
fi
......@@ -69,12 +69,12 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc AUTHORS BUGS ChangeLog COPYRIGHT HISTORY INSTALL LICENSE README THANKS doc/README.DOC doc/sextractor.pdf
%doc config AUTHORS BUGS ChangeLog COPYRIGHT HISTORY INSTALL LICENSE README.md THANKSf
%{_bindir}/sex
%{_bindir}/ldactoasc
%{_mandir}/man1/sex.1*
%{_mandir}/manx/sex.x*
%{_datadir}/@PACKAGE_NAME@
%{_datadir}/@PACKAGE_TARNAME@
%changelog
* @DATE2@ @PACKAGER@ <@PACKAGE_BUGREPORT@>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment