Skip to content
GitLab
Commit 3103f6da authored by Thomas Purcell's avatar Thomas Purcell
Browse files

First Commit 

Refactored C++ SISSO code now running properly.

Further tests are needed to further debug, need to work on memory access and bringing in new features
parent 6ee36043
Expand all Hide whitespace changes
Inline Side-by-side
COPYING 0 → 120000
View file @ 3103f6da
/usr/share/automake-1.15/COPYING
\ No newline at end of file
INSTALL 0 → 120000
View file @ 3103f6da
/usr/share/automake-1.15/INSTALL
\ No newline at end of file
Makefile.am 0 → 100644
View file @ 3103f6da
SUBDIRS = src
ACLOCAL_AMFLAGS = -I m4
autom4te.cache/output.0 0 → 100644
View file @ 3103f6da
This diff is collapsed.
autom4te.cache/output.1 0 → 100644
View file @ 3103f6da
This diff is collapsed.
autom4te.cache/output.2 0 → 100644
View file @ 3103f6da
This diff is collapsed.
autom4te.cache/output.3 0 → 100644
View file @ 3103f6da
This diff is collapsed.
autom4te.cache/requests 0 → 100644
View file @ 3103f6da
# This file was generated by Autom4te Sun Aug 20 23:09:08 UTC 2017.
# It contains the lists of macros which have been traced.
# It can be safely removed.
@request = (
bless( [
'0',
1,
[
'/usr/share/autoconf'
],
[
'/usr/share/autoconf/autoconf/autoconf.m4f',
'configure.ac'
],
{
'_AM_COND_ENDIF' => 1,
'AC_CONFIG_AUX_DIR' => 1,
'AC_CONFIG_SUBDIRS' => 1,
'AM_MAINTAINER_MODE' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'include' => 1,
'AC_CANONICAL_HOST' => 1,
'_AM_COND_IF' => 1,
'AM_NLS' => 1,
'AM_PROG_FC_C_O' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_SUBST_TRACE' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_LIBSOURCE' => 1,
'AM_PROG_CXX_C_O' => 1,
'AM_PROG_MOC' => 1,
'AC_CANONICAL_BUILD' => 1,
'AM_POT_TOOLS' => 1,
'AC_CANONICAL_TARGET' => 1,
'_AM_MAKEFILE_INCLUDE' => 1,
'm4_pattern_forbid' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'AM_PROG_AR' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
'AM_CONDITIONAL' => 1,
'AC_CONFIG_FILES' => 1,
'AC_FC_PP_DEFINE' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_SUBST' => 1,
'sinclude' => 1,
'm4_include' => 1,
'AM_PATH_GUILE' => 1,
'AC_CONFIG_LINKS' => 1,
'LT_INIT' => 1,
'AC_INIT' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
'AH_OUTPUT' => 1,
'AC_FC_PP_SRCEXT' => 1,
'_LT_AC_TAGCONFIG' => 1,
'AM_MAKEFILE_INCLUDE' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
'_m4_warn' => 1,
'AC_FC_FREEFORM' => 1,
'AM_SILENT_RULES' => 1,
'AM_PROG_LIBTOOL' => 1,
'_AM_COND_ELSE' => 1,
'AM_ENABLE_MULTILIB' => 1,
'AM_PROG_CC_C_O' => 1,
'm4_sinclude' => 1,
'LT_SUPPORTED_TAG' => 1,
'AM_XGETTEXT_OPTION' => 1,
'AM_PROG_F77_C_O' => 1,
'AM_GNU_GETTEXT' => 1,
'm4_pattern_allow' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AC_FC_SRCEXT' => 1
}
], 'Autom4te::Request' ),
bless( [
'1',
1,
[
'/usr/share/autoconf'
],
[
'/usr/share/autoconf/autoconf/autoconf.m4f',
'-',
'/usr/share/aclocal-1.15/internal/ac-config-macro-dirs.m4',
'/usr/share/aclocal-1.15/amversion.m4',
'/usr/share/aclocal-1.15/auxdir.m4',
'/usr/share/aclocal-1.15/cond.m4',
'/usr/share/aclocal-1.15/depend.m4',
'/usr/share/aclocal-1.15/depout.m4',
'/usr/share/aclocal-1.15/init.m4',
'/usr/share/aclocal-1.15/install-sh.m4',
'/usr/share/aclocal-1.15/lead-dot.m4',
'/usr/share/aclocal-1.15/make.m4',
'/usr/share/aclocal-1.15/missing.m4',
'/usr/share/aclocal-1.15/options.m4',
'/usr/share/aclocal-1.15/prog-cc-c-o.m4',
'/usr/share/aclocal-1.15/runlog.m4',
'/usr/share/aclocal-1.15/sanity.m4',
'/usr/share/aclocal-1.15/silent.m4',
'/usr/share/aclocal-1.15/strip.m4',
'/usr/share/aclocal-1.15/substnot.m4',
'/usr/share/aclocal-1.15/tar.m4',
'configure.ac'
],
{
'AM_SET_LEADING_DOT' => 1,
'_AM_CONFIG_MACRO_DIRS' => 1,
'ACX_MPI' => 1,
'_AM_IF_OPTION' => 1,
'm4_pattern_forbid' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'AM_CONDITIONAL' => 1,
'_AM_PROG_CC_C_O' => 1,
'_AM_SET_OPTIONS' => 1,
'_AM_MANGLE_OPTION' => 1,
'_AM_SET_OPTION' => 1,
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AM_PROG_INSTALL_STRIP' => 1,
'AM_AUX_DIR_EXPAND' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'include' => 1,
'AM_RUN_LOG' => 1,
'AU_DEFUN' => 1,
'_AM_DEPENDENCIES' => 1,
'AM_SILENT_RULES' => 1,
'_AM_PROG_TAR' => 1,
'AM_SANITY_CHECK' => 1,
'AM_PROG_CC_C_O' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'AM_MAKE_INCLUDE' => 1,
'AM_DEP_TRACK' => 1,
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AM_MISSING_PROG' => 1,
'm4_pattern_allow' => 1,
'AC_CONFIG_MACRO_DIR' => 1,
'AC_DEFUN' => 1,
'm4_include' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AM_SET_DEPDIR' => 1,
'_AM_AUTOCONF_VERSION' => 1,
'AM_MISSING_HAS_RUN' => 1,
'AM_PROG_INSTALL_SH' => 1,
'AM_SUBST_NOTMAKE' => 1,
'AC_CONFIG_MACRO_DIR_TRACE' => 1,
'_m4_warn' => 1,
'AC_DEFUN_ONCE' => 1
}
], 'Autom4te::Request' ),
bless( [
'2',
1,
[
'/usr/share/autoconf'
],
[
'/usr/share/autoconf/autoconf/autoconf.m4f',
'-',
'/usr/share/aclocal-1.15/internal/ac-config-macro-dirs.m4',
'/usr/share/aclocal-1.15/amversion.m4',
'/usr/share/aclocal-1.15/auxdir.m4',
'/usr/share/aclocal-1.15/cond.m4',
'/usr/share/aclocal-1.15/depend.m4',
'/usr/share/aclocal-1.15/depout.m4',
'/usr/share/aclocal-1.15/init.m4',
'/usr/share/aclocal-1.15/install-sh.m4',
'/usr/share/aclocal-1.15/lead-dot.m4',
'/usr/share/aclocal-1.15/make.m4',
'/usr/share/aclocal-1.15/missing.m4',
'/usr/share/aclocal-1.15/options.m4',
'/usr/share/aclocal-1.15/prog-cc-c-o.m4',
'/usr/share/aclocal-1.15/runlog.m4',
'/usr/share/aclocal-1.15/sanity.m4',
'/usr/share/aclocal-1.15/silent.m4',
'/usr/share/aclocal-1.15/strip.m4',
'/usr/share/aclocal-1.15/substnot.m4',
'/usr/share/aclocal-1.15/tar.m4',
'm4/ax_boost_base.m4',
'm4/ax_cxx_compile_stdcxx_14.m4',
'configure.ac'
],
{
'_AM_SET_OPTION' => 1,
'_AM_MANGLE_OPTION' => 1,
'_AM_SET_OPTIONS' => 1,
'AM_AUX_DIR_EXPAND' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AM_RUN_LOG' => 1,
'include' => 1,
'AU_DEFUN' => 1,
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AM_PROG_INSTALL_STRIP' => 1,
'_AM_CONFIG_MACRO_DIRS' => 1,
'AM_SET_LEADING_DOT' => 1,
'ACX_MPI' => 1,
'_AM_IF_OPTION' => 1,
'AX_BOOST_BASE' => 1,
'AX_CXX_COMPILE_STDCXX_14' => 1,
'AM_CONDITIONAL' => 1,
'_AM_PROG_CC_C_O' => 1,
'm4_pattern_forbid' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'AM_SET_DEPDIR' => 1,
'AC_DEFUN' => 1,
'm4_include' => 1,
'AM_INIT_AUTOMAKE' => 1,
'_m4_warn' => 1,
'AC_DEFUN_ONCE' => 1,
'_AM_AUTOCONF_VERSION' => 1,
'AM_MISSING_HAS_RUN' => 1,
'AM_PROG_INSTALL_SH' => 1,
'AM_SUBST_NOTMAKE' => 1,
'AC_CONFIG_MACRO_DIR_TRACE' => 1,
'AM_SANITY_CHECK' => 1,
'AM_PROG_CC_C_O' => 1,
'_AM_DEPENDENCIES' => 1,
'_AM_PROG_TAR' => 1,
'AM_SILENT_RULES' => 1,
'AM_DEP_TRACK' => 1,
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AM_MISSING_PROG' => 1,
'm4_pattern_allow' => 1,
'AC_CONFIG_MACRO_DIR' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'AM_MAKE_INCLUDE' => 1
}
], 'Autom4te::Request' ),
bless( [
'3',
1,
[
'/usr/share/autoconf'
],
[
'/usr/share/autoconf/autoconf/autoconf.m4f',
'aclocal.m4',
'configure.ac'
],
{
'_AM_COND_IF' => 1,
'AM_NLS' => 1,
'AM_PROG_FC_C_O' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_SUBST_TRACE' => 1,
'AC_LIBSOURCE' => 1,
'AC_CONFIG_HEADERS' => 1,
'AM_PROG_CXX_C_O' => 1,
'AC_CANONICAL_TARGET' => 1,
'AC_CANONICAL_BUILD' => 1,
'AM_POT_TOOLS' => 1,
'AM_PROG_MOC' => 1,
'_AM_MAKEFILE_INCLUDE' => 1,
'm4_pattern_forbid' => 1,
'AM_PROG_AR' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
'AM_CONDITIONAL' => 1,
'_AM_COND_ENDIF' => 1,
'AC_CONFIG_AUX_DIR' => 1,
'AC_CONFIG_SUBDIRS' => 1,
'AM_MAINTAINER_MODE' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'include' => 1,
'AC_CANONICAL_HOST' => 1,
'AM_SILENT_RULES' => 1,
'AM_PROG_LIBTOOL' => 1,
'_AM_COND_ELSE' => 1,
'AM_ENABLE_MULTILIB' => 1,
'AM_PROG_CC_C_O' => 1,
'm4_sinclude' => 1,
'LT_SUPPORTED_TAG' => 1,
'AM_XGETTEXT_OPTION' => 1,
'AM_PROG_F77_C_O' => 1,
'm4_pattern_allow' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AM_GNU_GETTEXT' => 1,
'AC_FC_SRCEXT' => 1,
'AC_CONFIG_FILES' => 1,
'AM_EXTRA_RECURSIVE_TARGETS' => 1,
'AC_FC_PP_DEFINE' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_SUBST' => 1,
'sinclude' => 1,
'm4_include' => 1,
'AM_PATH_GUILE' => 1,
'AC_CONFIG_LINKS' => 1,
'LT_INIT' => 1,
'AC_INIT' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
'AH_OUTPUT' => 1,
'AC_FC_PP_SRCEXT' => 1,
'_LT_AC_TAGCONFIG' => 1,
'AM_MAKEFILE_INCLUDE' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
'AM_PROG_MKDIR_P' => 1,
'AC_FC_FREEFORM' => 1,
'_m4_warn' => 1
}
], 'Autom4te::Request' )
);
autom4te.cache/traces.0 0 → 100644
View file @ 3103f6da
This diff is collapsed.
autom4te.cache/traces.1 0 → 100644
View file @ 3103f6da
This diff is collapsed.
autom4te.cache/traces.2 0 → 100644
View file @ 3103f6da
This diff is collapsed.
autom4te.cache/traces.3 0 → 100644
View file @ 3103f6da
This diff is collapsed.
configure 0 → 100755
View file @ 3103f6da
This diff is collapsed.
configure.ac 0 → 100644
View file @ 3103f6da
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
AC_INIT([sisso],[1.0],[ ])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src/main.cpp])
AC_CONFIG_HEADERS([src/sisso_config.h])
AC_LANG([C])
AC_PREFIX_DEFAULT(["/usr/local/sisso"])
AM_INIT_AUTOMAKE([subdir-objects])
m4_include([m4/acx_mpi.m4])
AC_PROG_CC([gcc])
AC_PROG_CXX([g++])
AC_CHECK_LIB([gslcblas],[cblas_dgemm])
AC_CHECK_LIB([gsl],[gsl_sf_coupling_3j])
AC_CHECK_LIB(boost_system, main, , [
AC_CHECK_LIB(boost_system-mt, main, , [
AC_MSG_ERROR("Linking against boost::system library failed.")
])
])
AC_CHECK_LIB(boost_filesystem, main, , [
AC_CHECK_LIB(boost_filesystem-mt, main, , [
AC_MSG_ERROR("Linking against boost::filesystem library failed.")
])
])
AC_CHECK_LIB(boost_serialization, main, , [
AC_CHECK_LIB(boost_serialization-mt, main, , [
AC_MSG_ERROR("Linking against boost::serialization library failed.")
])
])
AC_CHECK_LIB(boost_mpi, main, , [
AC_CHECK_LIB(boost_mpi-mt, main, , [
AC_MSG_ERROR("Linking against boost::mpi library failed.")
])
])
AX_CXX_COMPILE_STDCXX_14([noext])
AC_CONFIG_MACRO_DIR([m4])
AC_ARG_WITH([include], [AS_HELP_STRING([--with-include],[include flags])], [with_include=$withval], [with_include=no])
if test "x${with_include}" != xno; then
CFLAGS="${with_include} ${CFLAGS}"
CXXFLAGS="${with_include} ${CXXFLAGS}"
CPPFLAGS="${with_include} ${CPPFLAGS}"
fi
AC_CHECK_FUNCS([floor])
AC_CHECK_FUNCS([pow])
AC_CHECK_FUNCS([sqrt])
AC_CHECK_HEADER_STDBOOL
AC_TYPE_SIZE_T
#LDFLAGS="$LDFLAGS -lboost_system -lboost_filesystem -lfftw3 -lm"
#lapack and blas
AC_ARG_ENABLE(mkl, [AS_HELP_STRING([--disable-mkl],[disable MKL extensions.])], [use_mkl=no], [use_mkl=yes])
AX_BOOST_BASE([1.40], [], [AC_MSG_ERROR("BOOST version >= 1.4.0 required.")])
AC_LANG_PUSH([C++])
#AC_ARG_WITH(mpi, [AS_HELP_STRING([--with-mpi],[Use MPI. Please make sure mpicxx and mpif90 are in $PATH])], [with_mpi=$withval], [with_mpi=no])
#if test x${with_mpi} = xopenmpi ; then
# echo "..openmpi requested.."
#elif test x${with_mpi} = xintel ; then
# echo "..Intel mpi requested.."
#elif test x${with_mpi} = xmvapich ; then
# echo "..mvapich requested.."
#elif test x${with_mpi} != xno ; then
# AC_MSG_ERROR("Please specify MPI implementation (openmpi, intel, mvapich)")
#fi
#if test x${with_mpi} != xno; then
# ACX_MPI
# AC_PROG_CC([$MPICC])
# AC_PROG_CXX([$MPICXX])
# LIBS="${MPILIBS} ${LIBS}"
# CXXFLAGS="${CXXFLAGS}"
#fi
# LT_INIT([disable-static])
AC_CONFIG_MACRO_DIR([m4])
AC_ARG_WITH([include], [AS_HELP_STRING([--with-include],[include flags])], [with_include=$withval], [with_include=no])
if test "x${with_include}" != xno; then
CFLAGS="${with_include} ${CFLAGS}"
CXXFLAGS="${with_include} ${CXXFLAGS}"
CPPFLAGS="${with_include} ${CPPFLAGS}"
fi
AC_ARG_WITH(blas, [AS_HELP_STRING([--with-blas],[Make sure the BLAS library is in$LDLIBRARY_PATH])], [blas=$withval], [blas=no])
if test x${blas} = xmkl ; then
echo "..Intel's MKL requested.."
AC_CHECK_HEADERS([mkl.h], [], [AC_MSG_ERROR([mkl.h not found or not working])], [])
AC_CHECK_LIB([mkl_core], main, LIBS="-lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl $LIBS", AC_MSG_ERROR([Cannot find Intel Math Kernel Library]), [-lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl])
CFLAGS="-DMKL ${CFLAGS}"
CXXFLAGS="-DMKL ${CXXFLAGS}"
CPPFLAGS="-DMKL ${CPPFLAGS}"
elif test x${blas} = xacml ; then
echo "..AMD's ACML requested.."
AH_TEMPLATE([HAVE_ACML], [the acml library will be linked.])
AC_CHECK_LIB(acml, main, [AC_DEFINE([HAVE_ACML]) LIBS="-lacml $LIBS"], [AC_MSG_ERROR("Linking against acml library failed.")])
CFLAGS="-DACML ${CFLAGS}"
CXXFLAGS="-DACML ${CXXFLAGS}"
CPPFLAGS="-DACML ${CPPFLAGS}"
elif test x${blas} != xno ; then
AC_MSG_ERROR("Please specify a BLAS Library (acml and mkl are known to work)")
fi
if test "x${use_acml}" = xyes; then
AH_TEMPLATE([HAVE_ACML], [the acml library will be linked.])
AC_CHECK_LIB(acml, main, [AC_DEFINE([HAVE_ACML]) LIBS="-lacml $LIBS"], [AC_MSG_ERROR("Linking against acml library failed.")])
fi
AC_CONFIG_FILES([Makefile
src/Makefile
])
AC_OUTPUT
m4/acx_intel_mpi.m4 0 → 100644
View file @ 3103f6da
AC_DEFUN([ACX_INTEL_MPI], [
AC_ARG_VAR(MPICC,[MPI C compiler command])
AC_CHECK_PROGS(MPICC, mpiicc, $CC)
acx_mpi_save_CC="$CC"
CC="$MPICC"
AC_SUBST(MPICC)
AC_ARG_VAR(MPICXX,[MPI C++ compiler command])
AC_CHECK_PROGS(MPICXX, mpiicpc, $CXX)
acx_mpi_save_CXX="$CXX"
CXX="$MPICXX"
AC_SUBST(MPICXX)
])
m4/acx_mpi.m4 0 → 100644
View file @ 3103f6da
AC_DEFUN([ACX_MPI], [
AC_ARG_VAR(MPICC,[MPI C compiler command])
AC_CHECK_PROGS(MPICC, mpicc, $CC)
acx_mpi_save_CC="$CC"
CC="$MPICC"
AC_SUBST(MPICC)
AC_ARG_VAR(MPICXX,[MPI C++ compiler command])
AC_CHECK_PROGS(MPICXX, mpicxx mpic++, $CXX)
acx_mpi_save_CXX="$CXX"
CXX="$MPICXX"
AC_SUBST(MPICXX)
])
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