mirror of
https://github.com/TREX-CoE/qmckl.git
synced 2024-08-18 03:11:44 +02:00
Merge branch 'master' into add_lds
This commit is contained in:
commit
8fec863631
4
.github/workflows/test-build.yml
vendored
4
.github/workflows/test-build.yml
vendored
@ -31,7 +31,7 @@ jobs:
|
|||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
QMCKL_DEVEL=1 ./configure --enable-silent-rules --enable-maintainer-mode --enable-debug
|
./configure --enable-silent-rules --enable-debug
|
||||||
make -j 8
|
make -j 8
|
||||||
|
|
||||||
- name: Run test
|
- name: Run test
|
||||||
@ -80,7 +80,7 @@ jobs:
|
|||||||
# - name: Run test
|
# - name: Run test
|
||||||
# run: |
|
# run: |
|
||||||
# ./autogen.sh
|
# ./autogen.sh
|
||||||
# QMCKL_DEVEL=1 ./configure --enable-silent-rules --enable-maintainer-mode --enable-debug
|
# ./configure --enable-silent-rules --enable-debug
|
||||||
# make -j 8
|
# make -j 8
|
||||||
# make -j check
|
# make -j check
|
||||||
# make distcheck
|
# make distcheck
|
||||||
|
@ -90,7 +90,7 @@ share/doc/qmckl/html/index.html: share/doc/qmckl/html/README.html
|
|||||||
$(LN_S) README.html index.html
|
$(LN_S) README.html index.html
|
||||||
|
|
||||||
|
|
||||||
html: $(dist_html_DATA)
|
html-local: $(dist_html_DATA)
|
||||||
text: $(dist_text_DATA)
|
text: $(dist_text_DATA)
|
||||||
doc: html text
|
doc: html text
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@ in org-mode files and produce the source code and the documentation from these f
|
|||||||
|
|
||||||
```
|
```
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
QMCKL_DEVEL=1 ./configure --prefix=$PWD/_install --enable-silent-rules --enable-maintainer-mode
|
./configure --prefix=$PWD/_install
|
||||||
|
|
||||||
make
|
make
|
||||||
make check
|
make check
|
||||||
@ -54,7 +54,7 @@ by the preprocessor otherwise). To enable vfc_ci support, the library should be
|
|||||||
configured with the following command :
|
configured with the following command :
|
||||||
|
|
||||||
```
|
```
|
||||||
QMCKL_DEVEL=1 ./configure --prefix=$PWD/_install \ --enable-silent-rules --enable-maintainer-mode --enable-vfc_ci --host=x86_64 \ CC="verificarlo-f" FC="verificarlo-f"
|
./configure --prefix=$PWD/_install \ --enable-vfc_ci --host=x86_64 \ CC="verificarlo-f" FC="verificarlo-f"
|
||||||
```
|
```
|
||||||
|
|
||||||
where CC and FC are set to verificarlo-f, and support is explicitely enabled
|
where CC and FC are set to verificarlo-f, and support is explicitely enabled
|
||||||
|
@ -1,7 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
python ./tools/build_makefile.py
|
python ./tools/build_makefile.py
|
||||||
autoreconf -i
|
autoreconf -i -Wall --no-recursive
|
||||||
echo "To configure in maintainer mode, use:
|
|
||||||
$ QMCKL_DEVEL=1 ./configure --enable-silent-rules --enable-maintainer-mode
|
|
||||||
"
|
|
||||||
|
38
configure.ac
38
configure.ac
@ -35,11 +35,18 @@
|
|||||||
|
|
||||||
AC_PREREQ([2.69])
|
AC_PREREQ([2.69])
|
||||||
|
|
||||||
AC_INIT([qmckl],[0.1.1],
|
AC_INIT([qmckl],[0.1.1],[https://github.com/TREX-CoE/qmckl/issues],[],[https://trex-coe.github.io/qmckl/index.html])
|
||||||
[https://github.com/TREX-CoE/qmckl/issues], [],
|
AC_CONFIG_AUX_DIR([tools])
|
||||||
[https://trex-coe.github.io/qmckl/index.html])
|
|
||||||
AC_CONFIG_AUX_DIR(tools)
|
|
||||||
AM_INIT_AUTOMAKE([subdir-objects color-tests parallel-tests silent-rules 1.11])
|
AM_INIT_AUTOMAKE([subdir-objects color-tests parallel-tests silent-rules 1.11])
|
||||||
|
|
||||||
|
# Activate developer mode when the source is the git repository.
|
||||||
|
# Otherwise, it is the source distribution and the developer mode should not be activated.
|
||||||
|
AS_IF([test -d .git],
|
||||||
|
[enable_maintainer_mode="yes"],
|
||||||
|
[enable_maintainer_mode="no"]
|
||||||
|
)
|
||||||
|
|
||||||
|
AM_PROG_AR
|
||||||
AM_MAINTAINER_MODE()
|
AM_MAINTAINER_MODE()
|
||||||
LT_INIT
|
LT_INIT
|
||||||
AC_CONFIG_SRCDIR([configure.ac])
|
AC_CONFIG_SRCDIR([configure.ac])
|
||||||
@ -58,7 +65,7 @@ AC_SUBST([VERSION_PATCH])
|
|||||||
|
|
||||||
#AM_SILENT_RULES(yes)
|
#AM_SILENT_RULES(yes)
|
||||||
#AC_SUBST(SHARED_VERSION_INFO)
|
#AC_SUBST(SHARED_VERSION_INFO)
|
||||||
#AM_ENABLE_SHARED(no) dnl shared libs cause too many headaches to be default
|
#AC_ENABLE_SHARED([no]) dnl shared libs cause too many headaches to be default
|
||||||
|
|
||||||
AC_LANG(C)
|
AC_LANG(C)
|
||||||
|
|
||||||
@ -72,7 +79,7 @@ AC_PROG_FC
|
|||||||
AC_PROG_FC_C_O
|
AC_PROG_FC_C_O
|
||||||
AC_FC_SRCEXT([f90])
|
AC_FC_SRCEXT([f90])
|
||||||
AC_FC_FREEFORM
|
AC_FC_FREEFORM
|
||||||
AC_PROG_LIBTOOL
|
LT_INIT
|
||||||
AC_PROG_INSTALL
|
AC_PROG_INSTALL
|
||||||
AC_PROG_LN_S
|
AC_PROG_LN_S
|
||||||
PKG_PROG_PKG_CONFIG([])
|
PKG_PROG_PKG_CONFIG([])
|
||||||
@ -90,7 +97,7 @@ AC_CHECK_HEADERS([assert.h errno.h math.h pthread.h stdbool.h stdint.h stdio.h s
|
|||||||
AC_CHECK_LIB([pthread], [pthread_create])
|
AC_CHECK_LIB([pthread], [pthread_create])
|
||||||
|
|
||||||
# OpenMP
|
# OpenMP
|
||||||
#AC_ARG_WITH(openmp, [AC_HELP_STRING([--with-openmp],[enable OpenMP])], with_omp=$withval, with_omp=no)
|
#AC_ARG_WITH(openmp, [AS_HELP_STRING([--with-openmp],[enable OpenMP])], with_omp=$withval, with_omp=no)
|
||||||
#if test "x$with_omp" = xyes; then
|
#if test "x$with_omp" = xyes; then
|
||||||
# AC_DEFINE([HAVE_OPENMP], [1], [Define to use OpenMP threading.])
|
# AC_DEFINE([HAVE_OPENMP], [1], [Define to use OpenMP threading.])
|
||||||
# AX_OPENMP([],
|
# AX_OPENMP([],
|
||||||
@ -100,7 +107,7 @@ AC_CHECK_LIB([pthread], [pthread_create])
|
|||||||
|
|
||||||
# TREXIO
|
# TREXIO
|
||||||
|
|
||||||
AC_ARG_WITH(trexio, [AC_HELP_STRING([--without-trexio],[disable support for TREXIO])],
|
AC_ARG_WITH(trexio, [AS_HELP_STRING([--without-trexio],[disable support for TREXIO])],
|
||||||
with_trexio=$withval, with_trexio=yes)
|
with_trexio=$withval, with_trexio=yes)
|
||||||
|
|
||||||
AS_IF([test "x$with_trexio" != xno], [
|
AS_IF([test "x$with_trexio" != xno], [
|
||||||
@ -124,7 +131,7 @@ PKG_LIBS="$PKG_LIBS $TREXIO_LIBS"
|
|||||||
|
|
||||||
# Options.
|
# Options.
|
||||||
|
|
||||||
AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug],[compile for debugging])], ok=$enableval, ok=no)
|
AC_ARG_ENABLE(debug, [AS_HELP_STRING([--enable-debug],[compile for debugging])], ok=$enableval, ok=no)
|
||||||
if test "$ok" = "yes"; then
|
if test "$ok" = "yes"; then
|
||||||
if test "$GCC" = "yes"; then
|
if test "$GCC" = "yes"; then
|
||||||
CFLAGS="$CFLAGS \
|
CFLAGS="$CFLAGS \
|
||||||
@ -146,20 +153,20 @@ if test "$ok" = "yes"; then
|
|||||||
ARGS="${ARGS} debug"
|
ARGS="${ARGS} debug"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_ARG_ENABLE(malloc-trace, [AC_HELP_STRING([--enable-malloc-trace],[use debug malloc/free])], ok=$enableval, ok=no)
|
AC_ARG_ENABLE(malloc-trace, [AS_HELP_STRING([--enable-malloc-trace],[use debug malloc/free])], ok=$enableval, ok=no)
|
||||||
if test "$ok" = "yes"; then
|
if test "$ok" = "yes"; then
|
||||||
AC_DEFINE(MALLOC_TRACE,"malloc_trace.dat",[Define to use debugging malloc/free])
|
AC_DEFINE(MALLOC_TRACE,"malloc_trace.dat",[Define to use debugging malloc/free])
|
||||||
ARGS="${ARGS} malloc-trace"
|
ARGS="${ARGS} malloc-trace"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_ARG_ENABLE(prof, [AC_HELP_STRING([--enable-prof],[compile for profiling])], ok=$enableval, ok=no)
|
AC_ARG_ENABLE(prof, [AS_HELP_STRING([--enable-prof],[compile for profiling])], ok=$enableval, ok=no)
|
||||||
if test "$ok" = "yes"; then
|
if test "$ok" = "yes"; then
|
||||||
CFLAGS="${CFLAGS} -pg"
|
CFLAGS="${CFLAGS} -pg"
|
||||||
AC_DEFINE(ENABLE_PROF,1,[Define when using the profiler tool])
|
AC_DEFINE(ENABLE_PROF,1,[Define when using the profiler tool])
|
||||||
ARGS="${ARGS} prof"
|
ARGS="${ARGS} prof"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_ARG_WITH(efence, [AC_HELP_STRING([--with-efence],[use ElectricFence library])], ok=$withval, ok=no)
|
AC_ARG_WITH(efence, [AS_HELP_STRING([--with-efence],[use ElectricFence library])], ok=$withval, ok=no)
|
||||||
if test "$ok" = "yes"; then
|
if test "$ok" = "yes"; then
|
||||||
AC_CHECK_LIB(efence, malloc)
|
AC_CHECK_LIB(efence, malloc)
|
||||||
ARGS="${ARGS} efence"
|
ARGS="${ARGS} efence"
|
||||||
@ -189,11 +196,16 @@ AC_TYPE_UINT64_T
|
|||||||
AC_CHECK_FUNCS([memset strerror])
|
AC_CHECK_FUNCS([memset strerror])
|
||||||
|
|
||||||
# Development mode
|
# Development mode
|
||||||
|
if test "x$enable_maintainer_mode" == "xyes" ; then
|
||||||
|
QMCKL_DEVEL=" -- Developer mode"
|
||||||
|
else
|
||||||
|
QMCKL_DEVEL=""
|
||||||
|
fi
|
||||||
|
|
||||||
AM_CONDITIONAL([QMCKL_DEVEL],[test "x$QMCKL_DEVEL" != x])
|
AM_CONDITIONAL([QMCKL_DEVEL],[test "x$QMCKL_DEVEL" != x])
|
||||||
|
|
||||||
if test "x${QMCKL_DEVEL}" != "x"; then
|
if test "x${QMCKL_DEVEL}" != "x"; then
|
||||||
|
|
||||||
QMCKL_DEVEL=" -- Developer mode"
|
|
||||||
AC_PROG_AWK
|
AC_PROG_AWK
|
||||||
AM_PATH_PYTHON
|
AM_PATH_PYTHON
|
||||||
${PYTHON} ${srcdir}/tools/build_makefile.py
|
${PYTHON} ${srcdir}/tools/build_makefile.py
|
||||||
|
@ -206,7 +206,7 @@ def main():
|
|||||||
"if QMCKL_DEVEL" ]
|
"if QMCKL_DEVEL" ]
|
||||||
for f in DEPS_ORG.keys():
|
for f in DEPS_ORG.keys():
|
||||||
output += [ DEPS_ORG[f] + ": "+f,
|
output += [ DEPS_ORG[f] + ": "+f,
|
||||||
"\t$(tangle_verbose)top_builddir=$(top_builddir) srcdir=$(srcdir) $(srcdir)/tools/tangle.sh "+f,
|
"\t$(tangle_verbose)top_builddir=$(top_builddir) srcdir=$(srcdir) $(srcdir)/tools/missing bash $(srcdir)/tools/tangle.sh "+f,
|
||||||
"" ]
|
"" ]
|
||||||
output += [ "endif",
|
output += [ "endif",
|
||||||
"" ]
|
"" ]
|
||||||
@ -257,7 +257,7 @@ def main():
|
|||||||
|
|
||||||
for f in sorted(DEPS_DOC.keys()):
|
for f in sorted(DEPS_DOC.keys()):
|
||||||
output += [ DEPS_DOC[f] + ": " + f + " $(htmlize_el)",
|
output += [ DEPS_DOC[f] + ": " + f + " $(htmlize_el)",
|
||||||
"\t$(export_verbose)top_builddir=$(top_builddir) srcdir=$(srcdir) $(srcdir)/tools/build_doc.sh "+f,
|
"\t$(export_verbose)top_builddir=$(top_builddir) srcdir=$(srcdir) $(srcdir)/tools/missing bash $(srcdir)/tools/build_doc.sh "+f,
|
||||||
"" ]
|
"" ]
|
||||||
output += ["endif"]
|
output += ["endif"]
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user