mirror of
https://github.com/aportelli/LatAnalyze.git
synced 2024-11-10 00:45:36 +00:00
Compare commits
12 Commits
d786524508
...
442624912e
Author | SHA1 | Date | |
---|---|---|---|
442624912e | |||
e8b0565164 | |||
c93cdf5c5a | |||
81c4dc1248 | |||
f5b3e33fc8 | |||
a0c654003d | |||
ccdc54243e | |||
7d55fc30b5 | |||
f4dcadd3bb | |||
656ae91fe5 | |||
341b4bc73b | |||
cc0154f58c |
20
.gitignore
vendored
20
.gitignore
vendored
@ -1,7 +1,5 @@
|
|||||||
# builds
|
# builds
|
||||||
build/*
|
build
|
||||||
build_debug/*
|
|
||||||
sandbox/*
|
|
||||||
|
|
||||||
# Apple stuff
|
# Apple stuff
|
||||||
*.xcodeproj
|
*.xcodeproj
|
||||||
@ -10,24 +8,12 @@ sandbox/*
|
|||||||
# VIM
|
# VIM
|
||||||
*.swp
|
*.swp
|
||||||
|
|
||||||
# autotools
|
|
||||||
autom4te.cache/*
|
|
||||||
configure
|
|
||||||
configure~
|
|
||||||
.buildutils/*
|
|
||||||
aclocal.m4
|
|
||||||
|
|
||||||
# bison/flex generated sources
|
|
||||||
lib/LatAnalyze/*Lexer.cpp
|
|
||||||
lib/LatAnalyze/*Parser.cpp
|
|
||||||
lib/LatAnalyze/*Parser.hpp
|
|
||||||
|
|
||||||
# Eigen headers and archives
|
# Eigen headers and archives
|
||||||
lib/LatAnalyze/Eigen
|
/lib/LatAnalyze/Eigen
|
||||||
eigen-*.tar.bz2
|
eigen-*.tar.bz2
|
||||||
|
|
||||||
# CI builds
|
# CI builds
|
||||||
ci-scripts/local/*
|
/ci-scripts/local
|
||||||
|
|
||||||
# VS Code Studio stuff
|
# VS Code Studio stuff
|
||||||
.vscode
|
.vscode
|
||||||
|
63
.travis.yml
63
.travis.yml
@ -1,63 +0,0 @@
|
|||||||
language: cpp
|
|
||||||
|
|
||||||
cache:
|
|
||||||
directories:
|
|
||||||
- ci-scripts/local
|
|
||||||
- ci-scripts/clang
|
|
||||||
|
|
||||||
matrix:
|
|
||||||
include:
|
|
||||||
- os: osx
|
|
||||||
osx_image: xcode10.1
|
|
||||||
compiler: clang
|
|
||||||
- os: osx
|
|
||||||
osx_image: xcode10.1
|
|
||||||
compiler: gcc
|
|
||||||
env: VERSION=-7
|
|
||||||
- compiler: gcc
|
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
sources:
|
|
||||||
- ubuntu-toolchain-r-test
|
|
||||||
packages:
|
|
||||||
- g++-7
|
|
||||||
- flex
|
|
||||||
- bison
|
|
||||||
env: VERSION=-7
|
|
||||||
- compiler: clang
|
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
sources:
|
|
||||||
- ubuntu-toolchain-r-test
|
|
||||||
packages:
|
|
||||||
- g++-7
|
|
||||||
- flex
|
|
||||||
- bison
|
|
||||||
env: CLANG_LINK=http://releases.llvm.org/7.0.1/clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-14.04.tar.xz
|
|
||||||
|
|
||||||
before_install:
|
|
||||||
- export LATDIR=`pwd`
|
|
||||||
- cd ci-scripts
|
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "clang" ]] && [ ! -e clang/bin ]; then wget $CLANG_LINK; tar -xf `basename $CLANG_LINK`; mkdir clang; mv clang+*/* clang/; fi
|
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "clang" ]]; then export PATH="${LATDIR}/ci-scripts/clang/bin:${PATH}"; fi
|
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "clang" ]]; then export LD_LIBRARY_PATH="${LATDIR}/ci-scripts/clang/lib:${LD_LIBRARY_PATH}"; fi
|
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
|
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install bison flex cmake; export PATH="/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH"; fi
|
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc@${VERSION#-}; fi
|
|
||||||
|
|
||||||
install:
|
|
||||||
- export CC=$CC$VERSION
|
|
||||||
- export CXX=$CXX$VERSION
|
|
||||||
- echo $PATH
|
|
||||||
- which $CC
|
|
||||||
- $CC --version
|
|
||||||
- which $CXX
|
|
||||||
- $CXX --version
|
|
||||||
- ./install-deps.sh `pwd`/local
|
|
||||||
- cd ..
|
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export LD_LIBRARY_PATH=${LATDIR}/ci-scripts/local/lib:$LD_LIBRARY_PATH; fi
|
|
||||||
- if [[ "$CC" == "gcc-7" ]]; then export CXXFLAGS='-Wno-int-in-bool-context'; fi
|
|
||||||
|
|
||||||
script:
|
|
||||||
- cd ci-scripts
|
|
||||||
- ./install-latan.sh `pwd`/local
|
|
@ -6,13 +6,39 @@ project(
|
|||||||
LANGUAGES C CXX)
|
LANGUAGES C CXX)
|
||||||
|
|
||||||
# includes
|
# includes
|
||||||
|
include(CheckCXXCompilerFlag)
|
||||||
include(CMakePackageConfigHelpers)
|
include(CMakePackageConfigHelpers)
|
||||||
include(FetchContent)
|
include(FetchContent)
|
||||||
include(FindPackageMessage)
|
include(FindPackageMessage)
|
||||||
include(GNUInstallDirs)
|
include(GNUInstallDirs)
|
||||||
|
|
||||||
# C++ standard
|
# C++ compile flags
|
||||||
set(CMAKE_CXX_STANDARD 14)
|
set(CMAKE_CXX_STANDARD 14)
|
||||||
|
set(CMAKE_CXX_STANDARD_REQUIRED True)
|
||||||
|
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||||
|
check_cxx_compiler_flag("-march=native" COMPILER_SUPPORTS_MARCH_NATIVE)
|
||||||
|
if(COMPILER_SUPPORTS_MARCH_NATIVE)
|
||||||
|
set(MARCH_FLAG "-march=native")
|
||||||
|
endif()
|
||||||
|
check_cxx_compiler_flag("-mtune=native" COMPILER_SUPPORTS_MTUNE_NATIVE)
|
||||||
|
if(COMPILER_SUPPORTS_MTUNE_NATIVE)
|
||||||
|
set(MTUNE_FLAG "-mtune=native")
|
||||||
|
endif()
|
||||||
|
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG ${MARCH_FLAG} ${MTUNE_FLAG}")
|
||||||
|
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
|
||||||
|
"-O3 -g -DNDEBUG ${MARCH_FLAG} ${MTUNE_FLAG}")
|
||||||
|
set(gcc_like_cxx "$<COMPILE_LANG_AND_ID:CXX,ARMClang,AppleClang,Clang,GNU,LCC>")
|
||||||
|
add_library(compiler_flags INTERFACE)
|
||||||
|
target_compile_features(compiler_flags INTERFACE cxx_std_14)
|
||||||
|
target_compile_options(
|
||||||
|
compiler_flags
|
||||||
|
INTERFACE "$<${gcc_like_cxx}:-Wall;-Wextra;-Wshadow;-Wformat=2;-Wunused>")
|
||||||
|
|
||||||
|
# position idependent code
|
||||||
|
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||||
|
|
||||||
|
# installation rpath setup
|
||||||
|
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
|
||||||
|
|
||||||
# fetch and create symbolic link to Eigen headers
|
# fetch and create symbolic link to Eigen headers
|
||||||
set(FETCHCONTENT_BASE_DIR ${CMAKE_BINARY_DIR}/deps)
|
set(FETCHCONTENT_BASE_DIR ${CMAKE_BINARY_DIR}/deps)
|
||||||
@ -25,10 +51,11 @@ if(NOT eigen3_POPULATED)
|
|||||||
FetchContent_Populate(Eigen3)
|
FetchContent_Populate(Eigen3)
|
||||||
message(STATUS "Eigen3 fetched")
|
message(STATUS "Eigen3 fetched")
|
||||||
endif()
|
endif()
|
||||||
file(CREATE_LINK ${eigen3_SOURCE_DIR}/Eigen ${CMAKE_SOURCE_DIR}/lib/LatAnalyze/Eigen
|
file(CREATE_LINK ${eigen3_SOURCE_DIR}/Eigen
|
||||||
SYMBOLIC)
|
${CMAKE_SOURCE_DIR}/lib/LatAnalyze/Eigen SYMBOLIC)
|
||||||
|
|
||||||
# dependencies
|
# dependencies
|
||||||
|
find_package(Threads REQUIRED)
|
||||||
find_package(GSL REQUIRED)
|
find_package(GSL REQUIRED)
|
||||||
find_package(HDF5 REQUIRED COMPONENTS C CXX)
|
find_package(HDF5 REQUIRED COMPONENTS C CXX)
|
||||||
find_package(Minuit2 QUIET)
|
find_package(Minuit2 QUIET)
|
||||||
@ -53,6 +80,9 @@ endif()
|
|||||||
|
|
||||||
# subdirectories
|
# subdirectories
|
||||||
add_subdirectory(lib)
|
add_subdirectory(lib)
|
||||||
|
add_subdirectory(examples)
|
||||||
|
add_subdirectory(physics)
|
||||||
|
add_subdirectory(utils)
|
||||||
|
|
||||||
# summary
|
# summary
|
||||||
message(STATUS "---------------------------")
|
message(STATUS "---------------------------")
|
||||||
|
@ -1,5 +0,0 @@
|
|||||||
SUBDIRS = lib utils physics examples
|
|
||||||
|
|
||||||
bin_SCRIPTS=latan-config
|
|
||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I .buildutils/m4
|
|
64
Readme.md
64
Readme.md
@ -3,19 +3,19 @@
|
|||||||
[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![DOI](https://zenodo.org/badge/10201777.svg)](https://zenodo.org/badge/latestdoi/10201777) [![Build Ubuntu](https://github.com/aportelli/LatAnalyze/actions/workflows/build-ubuntu.yml/badge.svg)](https://github.com/aportelli/LatAnalyze/actions/workflows/build-ubuntu.yml) [![Build macOS](https://github.com/aportelli/LatAnalyze/actions/workflows/build-macos.yml/badge.svg)](https://github.com/aportelli/LatAnalyze/actions/workflows/build-macos.yml)
|
[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![DOI](https://zenodo.org/badge/10201777.svg)](https://zenodo.org/badge/latestdoi/10201777) [![Build Ubuntu](https://github.com/aportelli/LatAnalyze/actions/workflows/build-ubuntu.yml/badge.svg)](https://github.com/aportelli/LatAnalyze/actions/workflows/build-ubuntu.yml) [![Build macOS](https://github.com/aportelli/LatAnalyze/actions/workflows/build-macos.yml/badge.svg)](https://github.com/aportelli/LatAnalyze/actions/workflows/build-macos.yml)
|
||||||
|
|
||||||
## Description
|
## Description
|
||||||
LatAnalyze is a C++11 library for statistical data analysis based on bootstrap
|
LatAnalyze is a C++14 library for statistical data analysis based on bootstrap
|
||||||
resampling. It has been written with lattice QCD data analysis in mind (hence
|
resampling. It has been written with lattice QCD data analysis in mind (hence
|
||||||
the name), but its features are not lattice specific and can be used more general statistical context.
|
the name), but its features are not lattice specific and can be used more general statistical context.
|
||||||
|
|
||||||
Sadly a proper documentation was never written, but some comprehensive examples covering most features can be found in the `examples` directory.
|
Sadly a proper documentation was never written, but some comprehensive examples covering several key features can be found in the `examples` directory.
|
||||||
|
|
||||||
The main features are the following:
|
The main features are the following:
|
||||||
|
|
||||||
* Array and matrix types with fast arithmetic operations based on [Eigen](http://eigen.tuxfamily.org).
|
* Array and matrix types with fast arithmetic operations based on [Eigen](http://eigen.tuxfamily.org).
|
||||||
* High-level types for bootstrap sample manipulation (including various statistical estimators and histogramming).
|
* High-level types for bootstrap sample manipulation (including various statistical estimators and histogramming).
|
||||||
* Mathematical expression parser for runtime defined functions.
|
* Mathematical expression parser for runtime defined functions.
|
||||||
* Data I/O in ASCII and HDF5 (optional).
|
* Data I/O in ASCII, XML, and HDF5.
|
||||||
* High-level wrappers to minimisation routines from the [GSL](http://www.gnu.org/software/gsl/), [Minuit](http://seal.web.cern.ch/seal/snapshot/work-packages/mathlibs/minuit/) (optional) and [NLopt](http://ab-initio.mit.edu/wiki/index.php/NLopt).
|
* High-level wrappers to minimisation routines from the [GSL](http://www.gnu.org/software/gsl/), [Minuit 2](https://github.com/root-project/root/tree/master/math/minuit2) (optional) and [NLopt](http://ab-initio.mit.edu/wiki/index.php/NLopt).
|
||||||
* Non-linear regression with error on independent variables (through total least squares).
|
* Non-linear regression with error on independent variables (through total least squares).
|
||||||
* High-level wrappers to numerical integrator and non-linear solver from the [GSL](http://www.gnu.org/software/gsl/).
|
* High-level wrappers to numerical integrator and non-linear solver from the [GSL](http://www.gnu.org/software/gsl/).
|
||||||
* High-level functional types for function of model. General functions can be defined from C pointers, C++ objects, strings of mathematical expressions or tabulated data.
|
* High-level functional types for function of model. General functions can be defined from C pointers, C++ objects, strings of mathematical expressions or tabulated data.
|
||||||
@ -24,14 +24,14 @@ The main features are the following:
|
|||||||
## Installation
|
## Installation
|
||||||
The head of the `master` branch always points to the latest stable release. The `develop` branch is the main unstable branch of LatAnalyze.
|
The head of the `master` branch always points to the latest stable release. The `develop` branch is the main unstable branch of LatAnalyze.
|
||||||
|
|
||||||
LatAnalyze is written in C++11 and requires a rather recent C++ compiler to be built. It has been successfully built on various Linux and OS X platforms using clang (from 3.7), GCC (from 4.9) and the Intel C++ compiler (2016).
|
LatAnalyze is written in C++14. It has been successfully built on various Unix platform using reasonably recent versions of Clang or GCC.
|
||||||
The only strict dependencies is the [GSL](http://www.gnu.org/software/gsl/).
|
The only strict dependencies are the [GSL](http://www.gnu.org/software/gsl/) and [HDF5](https://www.hdfgroup.org/HDF5/) (built with C++ support).
|
||||||
Additionally, autoconf, automake (from 1.11), libtool, bison (from 3.0) and flex are necessary to build the library. Unless you use a very exotic system, these tools are standard on any Unix platform and should be already present or easy to install through a package manager.
|
Additionally, cmake (from 3.11), bison (from 3.0) and flex are necessary to build the library. Unless you use a very exotic system, these tools are standard on any Unix platform and should be already present or easy to install through a package manager.
|
||||||
Optional dependencies are [HDF5](https://www.hdfgroup.org/HDF5/) (built with C++ support), [Minuit](http://seal.web.cern.ch/seal/snapshot/work-packages/mathlibs/minuit/) and [NLopt](http://ab-initio.mit.edu/wiki/index.php/NLopt).
|
Optional dependencies are [Minuit 2](https://github.com/root-project/root/tree/master/math/minuit2) and [NLopt](http://ab-initio.mit.edu/wiki/index.php/NLopt).
|
||||||
|
|
||||||
Below are instructions for a quick installation. For a more customised installation, one first needs to generate the build system by running `./bootstrap.sh` in the root directory. Then the library can be built and installed through the usual GNU mantra `./configure <options> && make && make install`. Use `./configure --help` to obtain a list of possible options for `./configure`. Because Eigen expressions rely a lot on inlining and compiler optimisations it is strongly recommended to set the `CXXFLAGS` variable to `-O3 -march=native -mtune=native`.
|
LatAnalyze is built through CMake. Below are example instructions for compiling and installing LatAnalyze.
|
||||||
|
|
||||||
### General quick installation
|
### Portable quick installation
|
||||||
For a quick installation with all possible extensions execute:
|
For a quick installation with all possible extensions execute:
|
||||||
```
|
```
|
||||||
./install-latan.sh <prefix>
|
./install-latan.sh <prefix>
|
||||||
@ -43,19 +43,53 @@ All the dependencies of LatAnalyze can be installed through the [Homebrew](https
|
|||||||
```
|
```
|
||||||
brew install automake autoconf libtool bison flex gsl minuit2 nlopt hdf5
|
brew install automake autoconf libtool bison flex gsl minuit2 nlopt hdf5
|
||||||
```
|
```
|
||||||
Then generate the build system in LatAnalyze main directory by running the `./bootstrap.sh` script. Finally, build the library
|
Then build the library with `cmake`
|
||||||
```
|
```
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
../configure --prefix=<prefix> --with-minuit=/usr/local --with-nlopt=/usr/local \
|
cmake -DCMAKE_INSTALL_PREFIX=<prefix> -DCMAKE_BUILD_TYPE=Release ..
|
||||||
--with-hdf5=/usr/local --with-gsl=/usr/local \
|
|
||||||
CXXFLAGS='-g -O3 -march=native -mtune=native'
|
|
||||||
make -j <n>
|
make -j <n>
|
||||||
make install
|
make install
|
||||||
```
|
```
|
||||||
where `<prefix>` should be replaced by the desired prefix for LatAnalyze installation, and `<n>` is the number of parallel build processes (typically twice your number of cores).
|
where `<prefix>` should be replaced by the desired prefix for LatAnalyze installation, and `<n>` is the number of parallel build processes.
|
||||||
|
|
||||||
|
### Dependencies through Homebrew/Linuxbrew
|
||||||
|
If you use Homebrew/Linuxbrew to manage packages, the following command can install all the dependencies of LatAnalyze (including optional ones)
|
||||||
|
|
||||||
|
## Using LatAnalyze in CMake projects
|
||||||
|
When LatAnalyze is installed, the necessary CMake module configuration files to link against the library are available in the installation prefix.
|
||||||
|
|
||||||
|
To link against LatAnalyze in a downstream CMake project, simply use
|
||||||
|
```cmake
|
||||||
|
find_package(LatAnalyze)
|
||||||
|
target_link_libraries(<my_app> LatAnalyze::LatAnalyze)
|
||||||
|
```
|
||||||
|
where `<my_app>` is a CMake target. If LatAnalyze was installed in a non-standard prefix, you might have to set `CMAKE_PREFIX_PATH` accordingly for `find_package` to be successful.
|
||||||
|
|
||||||
|
You can additionally modify the `find_package` to ensure specific components are supported
|
||||||
|
```cmake
|
||||||
|
find_package(LatAnalyze REQUIRED COMPONENTS <...>)
|
||||||
|
```
|
||||||
|
where `<...>` is a space separated list of components. Currently available components are
|
||||||
|
- `MINUIT2`: Minuit 2 minimisers
|
||||||
|
- `NLOPT`: NLopt minimisers
|
||||||
|
|
||||||
## History
|
## History
|
||||||
|
#### v3.6
|
||||||
|
Build system:
|
||||||
|
* automake build discontinued, now using CMake
|
||||||
|
* CI through GitHub Actions
|
||||||
|
|
||||||
|
Additions:
|
||||||
|
* Discrete wavelet transform
|
||||||
|
* Thread pools
|
||||||
|
* Correlation dynamic range (CDR) calculation
|
||||||
|
* Data filtering and CDR optimisation
|
||||||
|
|
||||||
|
Changes:
|
||||||
|
* Significant optimisation of covariance matrix calculation
|
||||||
|
* Covariance matrix available for any `StatArray` (not only resampled arrays)
|
||||||
|
|
||||||
#### v3.5.1
|
#### v3.5.1
|
||||||
Various fixes and cleaning of outdated code.
|
Various fixes and cleaning of outdated code.
|
||||||
|
|
||||||
|
542
acinclude.m4
542
acinclude.m4
@ -1,542 +0,0 @@
|
|||||||
AC_DEFUN([AX_GCC_OPTION], [
|
|
||||||
AC_REQUIRE([AC_PROG_CC])
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([if gcc accepts $1 option])
|
|
||||||
|
|
||||||
AS_IF([ test "x$GCC" = "xyes" ],[
|
|
||||||
AS_IF([ test -z "$3" ],[
|
|
||||||
ax_gcc_option_test="int main()
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}"
|
|
||||||
],[
|
|
||||||
ax_gcc_option_test="$3"
|
|
||||||
])
|
|
||||||
|
|
||||||
# Dump the test program to file
|
|
||||||
cat <<EOF > conftest.c
|
|
||||||
$ax_gcc_option_test
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# Dump back the file to the log, useful for debugging purposes
|
|
||||||
AC_TRY_COMMAND(cat conftest.c 1>&AS_MESSAGE_LOG_FD)
|
|
||||||
|
|
||||||
AS_IF([ AC_TRY_COMMAND($CC $2 $1 -c conftest.c 1>&AS_MESSAGE_LOG_FD) ],[
|
|
||||||
AC_MSG_RESULT([yes])
|
|
||||||
$4
|
|
||||||
],[
|
|
||||||
AC_MSG_RESULT([no])
|
|
||||||
$5
|
|
||||||
])
|
|
||||||
],[
|
|
||||||
AC_MSG_RESULT([no gcc available])
|
|
||||||
])
|
|
||||||
])
|
|
||||||
|
|
||||||
AC_DEFUN([AX_GCC_VERSION], [
|
|
||||||
GCC_VERSION=""
|
|
||||||
AX_GCC_OPTION([-dumpversion],[],[],[
|
|
||||||
ax_gcc_version_option=yes
|
|
||||||
],[
|
|
||||||
ax_gcc_version_option=no
|
|
||||||
])
|
|
||||||
AS_IF([test "x$GCC" = "xyes"],[
|
|
||||||
AS_IF([test "x$ax_gcc_version_option" != "xno"],[
|
|
||||||
AC_CACHE_CHECK([gcc version],[ax_cv_gcc_version],[
|
|
||||||
ax_cv_gcc_version="`$CC -dumpversion`"
|
|
||||||
AS_IF([test "x$ax_cv_gcc_version" = "x"],[
|
|
||||||
ax_cv_gcc_version=""
|
|
||||||
])
|
|
||||||
])
|
|
||||||
GCC_VERSION=$ax_cv_gcc_version
|
|
||||||
])
|
|
||||||
])
|
|
||||||
AC_SUBST([GCC_VERSION])
|
|
||||||
])
|
|
||||||
|
|
||||||
AC_DEFUN([AX_GXX_VERSION], [
|
|
||||||
GXX_VERSION=""
|
|
||||||
AX_GCC_OPTION([-dumpversion],[],[],[
|
|
||||||
ax_gcc_version_option=yes
|
|
||||||
],[
|
|
||||||
ax_gcc_version_option=no
|
|
||||||
])
|
|
||||||
AS_IF([test "x$GXX" = "xyes"],[
|
|
||||||
AS_IF([test "x$ax_gxx_version_option" != "no"],[
|
|
||||||
AC_CACHE_CHECK([gxx version],[ax_cv_gxx_version],[
|
|
||||||
ax_cv_gxx_version="`$CXX -dumpversion`"
|
|
||||||
AS_IF([test "x$ax_cv_gxx_version" = "x"],[
|
|
||||||
ax_cv_gxx_version=""
|
|
||||||
])
|
|
||||||
])
|
|
||||||
GXX_VERSION=$ax_cv_gxx_version
|
|
||||||
])
|
|
||||||
])
|
|
||||||
AC_SUBST([GXX_VERSION])
|
|
||||||
])
|
|
||||||
|
|
||||||
AC_DEFUN([AX_COMPILER_VENDOR],
|
|
||||||
[
|
|
||||||
AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
|
|
||||||
[ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown
|
|
||||||
# note: don't check for gcc first since some other compilers define __GNUC__
|
|
||||||
for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ pathscale:__PATHCC__,__PATHSCALE__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do
|
|
||||||
vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")"
|
|
||||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
|
|
||||||
#if !($vencpp)
|
|
||||||
thisisanerror;
|
|
||||||
#endif
|
|
||||||
])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break])
|
|
||||||
done
|
|
||||||
])
|
|
||||||
])
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
|
|
||||||
# ============================================================================
|
|
||||||
#
|
|
||||||
# SYNOPSIS
|
|
||||||
#
|
|
||||||
# AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
|
|
||||||
#
|
|
||||||
# DESCRIPTION
|
|
||||||
#
|
|
||||||
# Check for baseline language coverage in the compiler for the C++11
|
|
||||||
# standard; if necessary, add switches to CXXFLAGS to enable support.
|
|
||||||
#
|
|
||||||
# The first argument, if specified, indicates whether you insist on an
|
|
||||||
# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
|
|
||||||
# -std=c++11). If neither is specified, you get whatever works, with
|
|
||||||
# preference for an extended mode.
|
|
||||||
#
|
|
||||||
# The second argument, if specified 'mandatory' or if left unspecified,
|
|
||||||
# indicates that baseline C++11 support is required and that the macro
|
|
||||||
# should error out if no mode with that support is found. If specified
|
|
||||||
# 'optional', then configuration proceeds regardless, after defining
|
|
||||||
# HAVE_CXX11 if and only if a supporting mode is found.
|
|
||||||
#
|
|
||||||
# LICENSE
|
|
||||||
#
|
|
||||||
# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
|
|
||||||
# Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
|
|
||||||
# Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
|
|
||||||
# Copyright (c) 2014 Alexey Sokolov <sokolov@google.com>
|
|
||||||
#
|
|
||||||
# Copying and distribution of this file, with or without modification, are
|
|
||||||
# permitted in any medium without royalty provided the copyright notice
|
|
||||||
# and this notice are preserved. This file is offered as-is, without any
|
|
||||||
# warranty.
|
|
||||||
|
|
||||||
m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[
|
|
||||||
template <typename T>
|
|
||||||
struct check
|
|
||||||
{
|
|
||||||
static_assert(sizeof(int) <= sizeof(T), "not big enough");
|
|
||||||
};
|
|
||||||
|
|
||||||
struct Base {
|
|
||||||
virtual void f() {}
|
|
||||||
};
|
|
||||||
struct Child : public Base {
|
|
||||||
virtual void f() override {}
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef check<check<bool>> right_angle_brackets;
|
|
||||||
|
|
||||||
int a;
|
|
||||||
decltype(a) b;
|
|
||||||
|
|
||||||
typedef check<int> check_type;
|
|
||||||
check_type c;
|
|
||||||
check_type&& cr = static_cast<check_type&&>(c);
|
|
||||||
|
|
||||||
auto d = a;
|
|
||||||
auto l = [](){};
|
|
||||||
]])
|
|
||||||
|
|
||||||
AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
|
|
||||||
m4_if([$1], [], [],
|
|
||||||
[$1], [ext], [],
|
|
||||||
[$1], [noext], [],
|
|
||||||
[m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl
|
|
||||||
m4_if([$2], [], [ax_cxx_compile_cxx11_required=true],
|
|
||||||
[$2], [mandatory], [ax_cxx_compile_cxx11_required=true],
|
|
||||||
[$2], [optional], [ax_cxx_compile_cxx11_required=false],
|
|
||||||
[m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])
|
|
||||||
AC_LANG_PUSH([C++])dnl
|
|
||||||
ac_success=no
|
|
||||||
AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
|
|
||||||
ax_cv_cxx_compile_cxx11,
|
|
||||||
[AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
|
|
||||||
[ax_cv_cxx_compile_cxx11=yes],
|
|
||||||
[ax_cv_cxx_compile_cxx11=no])])
|
|
||||||
if test x$ax_cv_cxx_compile_cxx11 = xyes; then
|
|
||||||
ac_success=yes
|
|
||||||
fi
|
|
||||||
|
|
||||||
m4_if([$1], [noext], [], [dnl
|
|
||||||
if test x$ac_success = xno; then
|
|
||||||
for switch in -std=gnu++11 -std=gnu++0x; do
|
|
||||||
cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
|
|
||||||
AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
|
|
||||||
$cachevar,
|
|
||||||
[ac_save_CXXFLAGS="$CXXFLAGS"
|
|
||||||
CXXFLAGS="$CXXFLAGS $switch"
|
|
||||||
AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
|
|
||||||
[eval $cachevar=yes],
|
|
||||||
[eval $cachevar=no])
|
|
||||||
CXXFLAGS="$ac_save_CXXFLAGS"])
|
|
||||||
if eval test x\$$cachevar = xyes; then
|
|
||||||
CXXFLAGS="$CXXFLAGS $switch"
|
|
||||||
ac_success=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi])
|
|
||||||
|
|
||||||
m4_if([$1], [ext], [], [dnl
|
|
||||||
if test x$ac_success = xno; then
|
|
||||||
for switch in -std=c++11 -std=c++0x; do
|
|
||||||
cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
|
|
||||||
AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
|
|
||||||
$cachevar,
|
|
||||||
[ac_save_CXXFLAGS="$CXXFLAGS"
|
|
||||||
CXXFLAGS="$CXXFLAGS $switch"
|
|
||||||
AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
|
|
||||||
[eval $cachevar=yes],
|
|
||||||
[eval $cachevar=no])
|
|
||||||
CXXFLAGS="$ac_save_CXXFLAGS"])
|
|
||||||
if eval test x\$$cachevar = xyes; then
|
|
||||||
CXXFLAGS="$CXXFLAGS $switch"
|
|
||||||
ac_success=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi])
|
|
||||||
AC_LANG_POP([C++])
|
|
||||||
if test x$ax_cxx_compile_cxx11_required = xtrue; then
|
|
||||||
if test x$ac_success = xno; then
|
|
||||||
AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if test x$ac_success = xno; then
|
|
||||||
HAVE_CXX11=0
|
|
||||||
AC_MSG_NOTICE([No compiler with C++11 support was found])
|
|
||||||
else
|
|
||||||
HAVE_CXX11=1
|
|
||||||
AC_DEFINE(HAVE_CXX11,1,
|
|
||||||
[define if the compiler supports basic C++11 syntax])
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_SUBST(HAVE_CXX11)
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
|
|
||||||
# ===========================================================================
|
|
||||||
# http://www.gnu.org/software/autoconf-archive/ax_lib_hdf5.html
|
|
||||||
# ===========================================================================
|
|
||||||
#
|
|
||||||
# SYNOPSIS
|
|
||||||
#
|
|
||||||
# AX_LIB_HDF5([serial/parallel])
|
|
||||||
#
|
|
||||||
# DESCRIPTION
|
|
||||||
#
|
|
||||||
# This macro provides tests of the availability of HDF5 library.
|
|
||||||
#
|
|
||||||
# The optional macro argument should be either 'serial' or 'parallel'. The
|
|
||||||
# former only looks for serial HDF5 installations via h5cc. The latter
|
|
||||||
# only looks for parallel HDF5 installations via h5pcc. If the optional
|
|
||||||
# argument is omitted, serial installations will be preferred over
|
|
||||||
# parallel ones.
|
|
||||||
#
|
|
||||||
# The macro adds a --with-hdf5 option accepting one of three values:
|
|
||||||
#
|
|
||||||
# no - do not check for the HDF5 library.
|
|
||||||
# yes - do check for HDF5 library in standard locations.
|
|
||||||
# path - complete path to the HDF5 helper script h5cc or h5pcc.
|
|
||||||
#
|
|
||||||
# If HDF5 is successfully found, this macro calls
|
|
||||||
#
|
|
||||||
# AC_SUBST(HDF5_VERSION)
|
|
||||||
# AC_SUBST(HDF5_CC)
|
|
||||||
# AC_SUBST(HDF5_CFLAGS)
|
|
||||||
# AC_SUBST(HDF5_CPPFLAGS)
|
|
||||||
# AC_SUBST(HDF5_LDFLAGS)
|
|
||||||
# AC_SUBST(HDF5_LIBS)
|
|
||||||
# AC_SUBST(HDF5_FC)
|
|
||||||
# AC_SUBST(HDF5_FFLAGS)
|
|
||||||
# AC_SUBST(HDF5_FLIBS)
|
|
||||||
# AC_DEFINE(HAVE_HDF5)
|
|
||||||
#
|
|
||||||
# and sets with_hdf5="yes". Additionally, the macro sets
|
|
||||||
# with_hdf5_fortran="yes" if a matching Fortran wrapper script is found.
|
|
||||||
# Note that Autconf's Fortran support is not used to perform this check.
|
|
||||||
# H5CC and H5FC will contain the appropriate serial or parallel HDF5
|
|
||||||
# wrapper script locations.
|
|
||||||
#
|
|
||||||
# If HDF5 is disabled or not found, this macros sets with_hdf5="no" and
|
|
||||||
# with_hdf5_fortran="no".
|
|
||||||
#
|
|
||||||
# Your configuration script can test $with_hdf to take any further
|
|
||||||
# actions. HDF5_{C,CPP,LD}FLAGS may be used when building with C or C++.
|
|
||||||
# HDF5_F{FLAGS,LIBS} should be used when building Fortran applications.
|
|
||||||
#
|
|
||||||
# To use the macro, one would code one of the following in "configure.ac"
|
|
||||||
# before AC_OUTPUT:
|
|
||||||
#
|
|
||||||
# 1) dnl Check for HDF5 support
|
|
||||||
# AX_LIB_HDF5()
|
|
||||||
#
|
|
||||||
# 2) dnl Check for serial HDF5 support
|
|
||||||
# AX_LIB_HDF5([serial])
|
|
||||||
#
|
|
||||||
# 3) dnl Check for parallel HDF5 support
|
|
||||||
# AX_LIB_HDF5([parallel])
|
|
||||||
#
|
|
||||||
# One could test $with_hdf5 for the outcome or display it as follows
|
|
||||||
#
|
|
||||||
# echo "HDF5 support: $with_hdf5"
|
|
||||||
#
|
|
||||||
# You could also for example, override the default CC in "configure.ac" to
|
|
||||||
# enforce compilation with the compiler that HDF5 uses:
|
|
||||||
#
|
|
||||||
# AX_LIB_HDF5([parallel])
|
|
||||||
# if test "$with_hdf5" = "yes"; then
|
|
||||||
# CC="$HDF5_CC"
|
|
||||||
# else
|
|
||||||
# AC_MSG_ERROR([Unable to find HDF5, we need parallel HDF5.])
|
|
||||||
# fi
|
|
||||||
#
|
|
||||||
# LICENSE
|
|
||||||
#
|
|
||||||
# Copyright (c) 2009 Timothy Brown <tbrown@freeshell.org>
|
|
||||||
# Copyright (c) 2010 Rhys Ulerich <rhys.ulerich@gmail.com>
|
|
||||||
#
|
|
||||||
# Copying and distribution of this file, with or without modification, are
|
|
||||||
# permitted in any medium without royalty provided the copyright notice
|
|
||||||
# and this notice are preserved. This file is offered as-is, without any
|
|
||||||
# warranty.
|
|
||||||
|
|
||||||
AC_DEFUN([AX_LIB_HDF5], [
|
|
||||||
|
|
||||||
AC_REQUIRE([AC_PROG_SED])
|
|
||||||
AC_REQUIRE([AC_PROG_AWK])
|
|
||||||
AC_REQUIRE([AC_PROG_GREP])
|
|
||||||
|
|
||||||
dnl Check first argument is one of the recognized values.
|
|
||||||
dnl Fail eagerly if is incorrect as this simplifies case statements below.
|
|
||||||
if test "m4_normalize(m4_default([$1],[]))" = "" ; then
|
|
||||||
: # Recognized value
|
|
||||||
elif test "m4_normalize(m4_default([$1],[]))" = "serial" ; then
|
|
||||||
: # Recognized value
|
|
||||||
elif test "m4_normalize(m4_default([$1],[]))" = "parallel"; then
|
|
||||||
: # Recognized value
|
|
||||||
else
|
|
||||||
AC_MSG_ERROR([
|
|
||||||
Unrecognized value for AX[]_LIB_HDF5 within configure.ac.
|
|
||||||
If supplied, argument 1 must be either 'serial' or 'parallel'.
|
|
||||||
])
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl Add a default --with-hdf5 configuration option.
|
|
||||||
AC_ARG_WITH([hdf5],
|
|
||||||
AS_HELP_STRING(
|
|
||||||
[--with-hdf5=[yes/no/PATH]],
|
|
||||||
m4_case(m4_normalize([$1]),
|
|
||||||
[serial], [location of h5cc for serial HDF5 configuration],
|
|
||||||
[parallel], [location of h5pcc for parallel HDF5 configuration],
|
|
||||||
[location of h5cc or h5pcc for HDF5 configuration])
|
|
||||||
),
|
|
||||||
[if test "$withval" = "no"; then
|
|
||||||
with_hdf5="no"
|
|
||||||
elif test "$withval" = "yes"; then
|
|
||||||
with_hdf5="yes"
|
|
||||||
else
|
|
||||||
with_hdf5="yes"
|
|
||||||
H5CC="$withval"
|
|
||||||
fi],
|
|
||||||
[with_hdf5="yes"]
|
|
||||||
)
|
|
||||||
|
|
||||||
dnl Set defaults to blank
|
|
||||||
HDF5_CC=""
|
|
||||||
HDF5_VERSION=""
|
|
||||||
HDF5_CFLAGS=""
|
|
||||||
HDF5_CPPFLAGS=""
|
|
||||||
HDF5_LDFLAGS=""
|
|
||||||
HDF5_LIBS=""
|
|
||||||
HDF5_FC=""
|
|
||||||
HDF5_FFLAGS=""
|
|
||||||
HDF5_FLIBS=""
|
|
||||||
|
|
||||||
dnl Try and find hdf5 compiler tools and options.
|
|
||||||
if test "$with_hdf5" = "yes"; then
|
|
||||||
if test -z "$H5CC"; then
|
|
||||||
dnl Check to see if H5CC is in the path.
|
|
||||||
AC_PATH_PROGS(
|
|
||||||
[H5CC],
|
|
||||||
m4_case(m4_normalize([$1]),
|
|
||||||
[serial], [h5cc],
|
|
||||||
[parallel], [h5pcc],
|
|
||||||
[h5cc h5pcc]),
|
|
||||||
[])
|
|
||||||
else
|
|
||||||
AC_MSG_CHECKING([Using provided HDF5 C wrapper])
|
|
||||||
AC_MSG_RESULT([$H5CC])
|
|
||||||
fi
|
|
||||||
AC_MSG_CHECKING([for HDF5 libraries])
|
|
||||||
if test ! -f "$H5CC" || test ! -x "$H5CC"; then
|
|
||||||
AC_MSG_RESULT([no])
|
|
||||||
AC_MSG_WARN(m4_case(m4_normalize([$1]),
|
|
||||||
[serial], [
|
|
||||||
Unable to locate serial HDF5 compilation helper script 'h5cc'.
|
|
||||||
Please specify --with-hdf5=<LOCATION> as the full path to h5cc.
|
|
||||||
HDF5 support is being disabled (equivalent to --with-hdf5=no).
|
|
||||||
], [parallel],[
|
|
||||||
Unable to locate parallel HDF5 compilation helper script 'h5pcc'.
|
|
||||||
Please specify --with-hdf5=<LOCATION> as the full path to h5pcc.
|
|
||||||
HDF5 support is being disabled (equivalent to --with-hdf5=no).
|
|
||||||
], [
|
|
||||||
Unable to locate HDF5 compilation helper scripts 'h5cc' or 'h5pcc'.
|
|
||||||
Please specify --with-hdf5=<LOCATION> as the full path to h5cc or h5pcc.
|
|
||||||
HDF5 support is being disabled (equivalent to --with-hdf5=no).
|
|
||||||
]))
|
|
||||||
with_hdf5="no"
|
|
||||||
with_hdf5_fortran="no"
|
|
||||||
else
|
|
||||||
dnl Get the h5cc output
|
|
||||||
HDF5_SHOW=$(eval $H5CC -show)
|
|
||||||
|
|
||||||
dnl Get the actual compiler used
|
|
||||||
HDF5_CC=$(eval $H5CC -show | $AWK '{print $[]1}')
|
|
||||||
if test "$HDF5_CC" = "ccache"; then
|
|
||||||
HDF5_CC=$(eval $H5CC -show | $AWK '{print $[]2}')
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl h5cc provides both AM_ and non-AM_ options
|
|
||||||
dnl depending on how it was compiled either one of
|
|
||||||
dnl these are empty. Lets roll them both into one.
|
|
||||||
|
|
||||||
dnl Look for "HDF5 Version: X.Y.Z"
|
|
||||||
HDF5_VERSION=$(eval $H5CC -showconfig | $GREP 'HDF5 Version:' \
|
|
||||||
| $AWK '{print $[]3}')
|
|
||||||
|
|
||||||
dnl A ideal situation would be where everything we needed was
|
|
||||||
dnl in the AM_* variables. However most systems are not like this
|
|
||||||
dnl and seem to have the values in the non-AM variables.
|
|
||||||
dnl
|
|
||||||
dnl We try the following to find the flags:
|
|
||||||
dnl (1) Look for "NAME:" tags
|
|
||||||
dnl (2) Look for "H5_NAME:" tags
|
|
||||||
dnl (3) Look for "AM_NAME:" tags
|
|
||||||
dnl
|
|
||||||
HDF5_tmp_flags=$(eval $H5CC -showconfig \
|
|
||||||
| $GREP 'FLAGS\|Extra libraries:' \
|
|
||||||
| $AWK -F: '{printf("%s "), $[]2}' )
|
|
||||||
|
|
||||||
dnl Find the installation directory and append include/
|
|
||||||
HDF5_tmp_inst=$(eval $H5CC -showconfig \
|
|
||||||
| $GREP 'Installation point:' \
|
|
||||||
| $AWK '{print $[]NF}' )
|
|
||||||
|
|
||||||
dnl Add this to the CPPFLAGS
|
|
||||||
HDF5_CPPFLAGS="-I${HDF5_tmp_inst}/include"
|
|
||||||
|
|
||||||
dnl Now sort the flags out based upon their prefixes
|
|
||||||
for arg in $HDF5_SHOW $HDF5_tmp_flags ; do
|
|
||||||
case "$arg" in
|
|
||||||
-I*) echo $HDF5_CPPFLAGS | $GREP -e "$arg" 2>&1 >/dev/null \
|
|
||||||
|| HDF5_CPPFLAGS="$arg $HDF5_CPPFLAGS"
|
|
||||||
;;
|
|
||||||
-L*) echo $HDF5_LDFLAGS | $GREP -e "$arg" 2>&1 >/dev/null \
|
|
||||||
|| HDF5_LDFLAGS="$arg $HDF5_LDFLAGS"
|
|
||||||
;;
|
|
||||||
-l*) echo $HDF5_LIBS | $GREP -e "$arg" 2>&1 >/dev/null \
|
|
||||||
|| HDF5_LIBS="$arg $HDF5_LIBS"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
HDF5_LIBS="$HDF5_LIBS -lhdf5"
|
|
||||||
AC_MSG_RESULT([yes (version $[HDF5_VERSION])])
|
|
||||||
|
|
||||||
dnl See if we can compile
|
|
||||||
ax_lib_hdf5_save_CC=$CC
|
|
||||||
ax_lib_hdf5_save_CPPFLAGS=$CPPFLAGS
|
|
||||||
ax_lib_hdf5_save_LIBS=$LIBS
|
|
||||||
ax_lib_hdf5_save_LDFLAGS=$LDFLAGS
|
|
||||||
CC=$HDF5_CC
|
|
||||||
CPPFLAGS=$HDF5_CPPFLAGS
|
|
||||||
LIBS=$HDF5_LIBS
|
|
||||||
LDFLAGS=$HDF5_LDFLAGS
|
|
||||||
AC_CHECK_HEADER([hdf5.h], [ac_cv_hadf5_h=yes], [ac_cv_hadf5_h=no])
|
|
||||||
AC_CHECK_LIB([hdf5], [H5Fcreate], [ac_cv_libhdf5=yes],
|
|
||||||
[ac_cv_libhdf5=no])
|
|
||||||
if test "$ac_cv_hadf5_h" = "no" && test "$ac_cv_libhdf5" = "no" ; then
|
|
||||||
AC_MSG_WARN([Unable to compile HDF5 test program])
|
|
||||||
fi
|
|
||||||
dnl Look for HDF5's high level library
|
|
||||||
AC_HAVE_LIBRARY([hdf5_hl], [HDF5_LIBS="$HDF5_LIBS -lhdf5_hl"], [], [])
|
|
||||||
|
|
||||||
CC=$ax_lib_hdf5_save_CC
|
|
||||||
CPPFLAGS=$ax_lib_hdf5_save_CPPFLAGS
|
|
||||||
LIBS=$ax_lib_hdf5_save_LIBS
|
|
||||||
LDFLAGS=$ax_lib_hdf5_save_LDFLAGS
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([for matching HDF5 Fortran wrapper])
|
|
||||||
dnl Presume HDF5 Fortran wrapper is just a name variant from H5CC
|
|
||||||
H5FC=$(eval echo -n $H5CC | $SED -n 's/cc$/fc/p')
|
|
||||||
if test -x "$H5FC"; then
|
|
||||||
AC_MSG_RESULT([$H5FC])
|
|
||||||
with_hdf5_fortran="yes"
|
|
||||||
AC_SUBST([H5FC])
|
|
||||||
|
|
||||||
dnl Again, pry any remaining -Idir/-Ldir from compiler wrapper
|
|
||||||
for arg in `$H5FC -show`
|
|
||||||
do
|
|
||||||
case "$arg" in #(
|
|
||||||
-I*) echo $HDF5_FFLAGS | $GREP -e "$arg" >/dev/null \
|
|
||||||
|| HDF5_FFLAGS="$arg $HDF5_FFLAGS"
|
|
||||||
;;#(
|
|
||||||
-L*) echo $HDF5_FFLAGS | $GREP -e "$arg" >/dev/null \
|
|
||||||
|| HDF5_FFLAGS="$arg $HDF5_FFLAGS"
|
|
||||||
dnl HDF5 installs .mod files in with libraries,
|
|
||||||
dnl but some compilers need to find them with -I
|
|
||||||
echo $HDF5_FFLAGS | $GREP -e "-I${arg#-L}" >/dev/null \
|
|
||||||
|| HDF5_FFLAGS="-I${arg#-L} $HDF5_FFLAGS"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
dnl Make Fortran link line by inserting Fortran libraries
|
|
||||||
for arg in $HDF5_LIBS
|
|
||||||
do
|
|
||||||
case "$arg" in #(
|
|
||||||
-lhdf5_hl) HDF5_FLIBS="$HDF5_FLIBS -lhdf5hl_fortran $arg"
|
|
||||||
;; #(
|
|
||||||
-lhdf5) HDF5_FLIBS="$HDF5_FLIBS -lhdf5_fortran $arg"
|
|
||||||
;; #(
|
|
||||||
*) HDF5_FLIBS="$HDF5_FLIBS $arg"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT([no])
|
|
||||||
with_hdf5_fortran="no"
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_SUBST([HDF5_VERSION])
|
|
||||||
AC_SUBST([HDF5_CC])
|
|
||||||
AC_SUBST([HDF5_CFLAGS])
|
|
||||||
AC_SUBST([HDF5_CPPFLAGS])
|
|
||||||
AC_SUBST([HDF5_LDFLAGS])
|
|
||||||
AC_SUBST([HDF5_LIBS])
|
|
||||||
AC_SUBST([HDF5_FC])
|
|
||||||
AC_SUBST([HDF5_FFLAGS])
|
|
||||||
AC_SUBST([HDF5_FLIBS])
|
|
||||||
AC_DEFINE([HAVE_HDF5], [1], [Defined if you have HDF5 support])
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
rm -rf .buildutils
|
|
||||||
mkdir -p .buildutils/m4
|
|
||||||
./update_eigen.sh eigen-3.4.0.tar.bz2
|
|
||||||
autoreconf -fvi
|
|
@ -1,16 +1,16 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
if (($# != 2)); then
|
if (($# != 2)); then
|
||||||
echo "usage: `basename $0` <prefix> <ntasks>" 1>&2
|
echo "usage: $(basename "$0") <prefix> <ntasks>" 1>&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
PREFIX=$1
|
prefix=$1
|
||||||
NTASKS=$2
|
ntasks=$2
|
||||||
|
|
||||||
set -ex
|
set -ex
|
||||||
mkdir -p local/build
|
mkdir -p local/build
|
||||||
for d in gsl nlopt minuit hdf5; do
|
for d in gsl nlopt minuit hdf5; do
|
||||||
if [ ! -e local/.built.${d} ]; then
|
if [ ! -e local/.built.${d} ]; then
|
||||||
./install-${d}.sh ${PREFIX} ${NTASKS}
|
./install-${d}.sh "${prefix}" "${ntasks}"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@ -1,27 +1,27 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
NAME='gsl-2.6'
|
name='gsl-2.6'
|
||||||
|
|
||||||
if (($# != 2)); then
|
if (($# != 2)); then
|
||||||
echo "usage: `basename $0` <prefix> <ntasks>" 1>&2
|
echo "usage: $(basename "$0") <prefix> <ntasks>" 1>&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
PREFIX=$1
|
prefix=$1
|
||||||
NTASKS=$2
|
ntasks=$2
|
||||||
|
|
||||||
set -ex
|
set -ex
|
||||||
INITDIR=$(pwd -P)
|
init_dir=$(pwd -P)
|
||||||
mkdir -p ${PREFIX}
|
mkdir -p "${prefix}"
|
||||||
cd ${PREFIX}
|
cd "${prefix}"
|
||||||
PREFIX=$(pwd -P)
|
prefix=$(pwd -P)
|
||||||
cd ${INITDIR}/local/build
|
cd "${init_dir}/local/build"
|
||||||
wget http://ftpmirror.gnu.org/gsl/${NAME}.tar.gz
|
wget http://ftpmirror.gnu.org/gsl/${name}.tar.gz
|
||||||
tar -xzvf ${NAME}.tar.gz
|
tar -xzvf ${name}.tar.gz
|
||||||
mkdir -p ${NAME}/build
|
mkdir -p ${name}/build
|
||||||
cd ${NAME}/build
|
cd ${name}/build
|
||||||
../configure --prefix=${PREFIX}
|
../configure --prefix="${prefix}"
|
||||||
make -j${NTASKS}
|
make -j"${ntasks}"
|
||||||
make install
|
make install
|
||||||
cd ${INITDIR}/local
|
cd "${init_dir}/local"
|
||||||
touch .built.gsl
|
touch .built.gsl
|
||||||
cd ${INITDIR}
|
cd "${init_dir}"
|
||||||
|
@ -1,27 +1,27 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
NAME='hdf5-1.10.8'
|
name='hdf5-1.14.3'
|
||||||
|
|
||||||
if (($# != 2)); then
|
if (($# != 2)); then
|
||||||
echo "usage: `basename $0` <prefix> <ntasks>" 1>&2
|
echo "usage: $(basename "$0") <prefix> <ntasks>" 1>&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
PREFIX=$1
|
prefix=$1
|
||||||
NTASKS=$2
|
ntasks=$2
|
||||||
|
|
||||||
set -ex
|
set -ex
|
||||||
INITDIR=$(pwd -P)
|
init_dir=$(pwd -P)
|
||||||
mkdir -p ${PREFIX}
|
mkdir -p "${prefix}"
|
||||||
cd ${PREFIX}
|
cd "${prefix}"
|
||||||
PREFIX=$(pwd -P)
|
prefix=$(pwd -P)
|
||||||
cd ${INITDIR}/local/build
|
cd "${init_dir}/local/build"
|
||||||
wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${NAME}/src/${NAME}.tar.gz
|
wget "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/${name}/src/${name}.tar.gz"
|
||||||
tar -xzvf ${NAME}.tar.gz
|
tar -xzvf ${name}.tar.gz
|
||||||
mkdir ${NAME}/build
|
mkdir ${name}/build
|
||||||
cd ${NAME}/build
|
cd ${name}/build
|
||||||
../configure --prefix=${PREFIX} --enable-cxx
|
../configure --prefix="${prefix}" --enable-cxx
|
||||||
make -j${NTASKS}
|
make -j "${ntasks}"
|
||||||
make install
|
make install
|
||||||
cd ${INITDIR}/local
|
cd "${init_dir}/local"
|
||||||
touch .built.hdf5
|
touch .built.hdf5
|
||||||
cd ${INITDIR}
|
cd "${init_dir}"
|
||||||
|
@ -1,23 +1,22 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
if (($# != 2)); then
|
if (($# != 2)); then
|
||||||
echo "usage: `basename $0` <prefix> <ntasks>" 1>&2
|
echo "usage: $(basename "$0") <prefix> <ntasks>" 1>&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
PREFIX=$1
|
prefix=$1
|
||||||
NTASKS=$2
|
ntasks=$2
|
||||||
|
|
||||||
set -ex
|
set -ex
|
||||||
INITDIR=$(pwd -P)
|
init_dir=$(pwd -P)
|
||||||
mkdir -p ${PREFIX}
|
mkdir -p "${prefix}"
|
||||||
cd ${PREFIX}
|
cd "${prefix}"
|
||||||
PREFIX=$(pwd -P)
|
prefix=$(pwd -P)
|
||||||
cd ${INITDIR}
|
cd "${init_dir}"
|
||||||
./install-deps.sh ${PREFIX} ${NTASKS}
|
./install-deps.sh "${prefix}" "${ntasks}"
|
||||||
cd ..
|
mkdir -p "${init_dir}/local/build/latan"
|
||||||
./bootstrap.sh
|
cd "${init_dir}/local/build/latan"
|
||||||
mkdir -p build
|
cmake -DCMAKE_INSTALL_PREFIX="${prefix}" -DCMAKE_PREFIX_PATH="${prefix}" \
|
||||||
cd build
|
-DCMAKE_BUILD_TYPE="RelWithDebInfo" "${init_dir}/.."
|
||||||
../configure --prefix=${PREFIX} --with-minuit=${PREFIX} --with-nlopt=${PREFIX} --with-hdf5=${PREFIX} --with-gsl=${PREFIX} CXXFLAGS="${CXXFLAGS} -O3 -march=native -mtune=native"
|
make -j "${ntasks}"
|
||||||
make -j${NTASKS}
|
|
||||||
make install
|
make install
|
||||||
|
@ -1,26 +1,26 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
|
||||||
if (($# != 2)); then
|
if (($# != 2)); then
|
||||||
echo "usage: `basename $0` <prefix> <ntasks>" 1>&2
|
echo "usage: $(basename "$0") <prefix> <ntasks>" 1>&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
PREFIX=$1
|
prefix=$1
|
||||||
NTASKS=$2
|
ntasks=$2
|
||||||
|
|
||||||
set -ex
|
set -ex
|
||||||
INITDIR=$(pwd -P)
|
init_dir=$(pwd -P)
|
||||||
mkdir -p ${PREFIX}
|
mkdir -p "${prefix}"
|
||||||
cd ${PREFIX}
|
cd "${prefix}"
|
||||||
PREFIX=$(pwd -P)
|
prefix=$(pwd -P)
|
||||||
cd ${INITDIR}/local/build
|
cd "${init_dir}/local/build"
|
||||||
rm -rf root
|
rm -rf root
|
||||||
git clone https://github.com/root-project/root.git
|
git clone https://github.com/root-project/root.git
|
||||||
cd root/math/minuit2/
|
cd root/math/minuit2/
|
||||||
mkdir build; cd build
|
mkdir build
|
||||||
cmake .. -Dminuit2_standalone=ON -DCMAKE_INSTALL_PREFIX=${PREFIX}
|
cd build
|
||||||
make -j${NTASKS}
|
cmake .. -Dminuit2_standalone=ON -DCMAKE_INSTALL_PREFIX="${prefix}"
|
||||||
|
make -j "${ntasks}"
|
||||||
make install
|
make install
|
||||||
cd ${INITDIR}/local
|
cd "${init_dir}/local"
|
||||||
touch .built.minuit
|
touch .built.minuit
|
||||||
cd ${INITDIR}
|
cd "${init_dir}"
|
||||||
|
@ -1,28 +1,30 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
NAME='2.6.1'
|
name='2.6.1'
|
||||||
|
|
||||||
if (($# != 2)); then
|
if (($# != 2)); then
|
||||||
echo "usage: `basename $0` <prefix> <ntasks>" 1>&2
|
echo "usage: $(basename "$0") <prefix> <ntasks>" 1>&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
PREFIX=$1
|
prefix=$1
|
||||||
NTASKS=$2
|
ntasks=$2
|
||||||
|
|
||||||
set -ex
|
set -ex
|
||||||
INITDIR=$(pwd -P)
|
init_dir=$(pwd -P)
|
||||||
mkdir -p ${PREFIX}
|
mkdir -p "${prefix}"
|
||||||
cd ${PREFIX}
|
cd "${prefix}"
|
||||||
PREFIX=$(pwd -P)
|
prefix=$(pwd -P)
|
||||||
cd ${INITDIR}/local/build
|
cd "${init_dir}/local/build"
|
||||||
wget https://github.com/stevengj/nlopt/archive/v${NAME}.tar.gz
|
wget "https://github.com/stevengj/nlopt/archive/v${name}.tar.gz"
|
||||||
tar -xzvf v${NAME}.tar.gz
|
tar -xzvf v${name}.tar.gz
|
||||||
NAME=nlopt-${NAME}
|
name=nlopt-${name}
|
||||||
mkdir -p ${NAME}/build
|
mkdir -p ${name}/build
|
||||||
cd ${NAME}/build
|
cd ${name}/build
|
||||||
cmake -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=TRUE -DCMAKE_INSTALL_NAME_DIR="${PREFIX}/lib" ..
|
cmake -DCMAKE_INSTALL_PREFIX="${prefix}" -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=TRUE \
|
||||||
make -j${NTASKS}
|
-DCMAKE_INSTALL_NAME_DIR="${prefix}/lib" -DNLOPT_PYTHON=OFF -DNLOPT_OCTAVE=OFF \
|
||||||
|
-DNLOPT_MATLAB=OFF -DNLOPT_GUILE=OFF -DNLOPT_SWIG=OFF ..
|
||||||
|
make -j "${ntasks}"
|
||||||
make install
|
make install
|
||||||
cd ${INITDIR}/local
|
cd "${init_dir}/local"
|
||||||
touch .built.nlopt
|
touch .built.nlopt
|
||||||
cd ${INITDIR}
|
cd "${init_dir}"
|
||||||
|
167
configure.ac
167
configure.ac
@ -1,167 +0,0 @@
|
|||||||
# Process this file with autoconf to produce a configure script.
|
|
||||||
|
|
||||||
# Initialization
|
|
||||||
AC_PREREQ([2.63])
|
|
||||||
AC_INIT([LatAnalyze],[3.5.1-dev],[antonin.portelli@me.com],[LatAnalyze])
|
|
||||||
AC_CONFIG_AUX_DIR([.buildutils])
|
|
||||||
AC_CONFIG_SRCDIR([lib/Global.cpp])
|
|
||||||
AC_CONFIG_SRCDIR([utils/sample_read.cpp])
|
|
||||||
AC_CONFIG_SRCDIR([examples/exMathInterpreter.cpp])
|
|
||||||
AC_CONFIG_MACRO_DIR([.buildutils/m4])
|
|
||||||
AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign subdir-objects])
|
|
||||||
AM_SILENT_RULES([yes])
|
|
||||||
AC_CONFIG_HEADERS([config.h])
|
|
||||||
AM_CONDITIONAL([HAVE_AM_MINOR_LE_11],
|
|
||||||
[test `automake --version | grep automake | awk -F '.' '{print $2}'` -le 11])
|
|
||||||
# Checks for programs
|
|
||||||
AC_PROG_CXX
|
|
||||||
AC_PROG_AWK
|
|
||||||
AC_PROG_CC
|
|
||||||
AC_PROG_CPP
|
|
||||||
AC_PROG_INSTALL
|
|
||||||
AC_PROG_LN_S
|
|
||||||
AC_PROG_MAKE_SET
|
|
||||||
AC_PROG_LEX
|
|
||||||
AC_PROG_YACC
|
|
||||||
m4_ifdef([AM_PROG_AR],[AM_PROG_AR])
|
|
||||||
|
|
||||||
LT_INIT
|
|
||||||
|
|
||||||
# Options
|
|
||||||
AC_ARG_WITH([gsl],
|
|
||||||
[AS_HELP_STRING([--with-gsl=prefix],
|
|
||||||
[try this for a non-standard install prefix of the GSL library])],
|
|
||||||
[AM_CXXFLAGS="$AM_CXXFLAGS -I$with_gsl/include"]
|
|
||||||
[AM_LDFLAGS="$AM_LDFLAGS -L$with_gsl/lib"])
|
|
||||||
AC_ARG_WITH([minuit],
|
|
||||||
[AS_HELP_STRING([--with-minuit=prefix],
|
|
||||||
[try this for a non-standard install prefix of the Minuit2 library])],
|
|
||||||
[AM_CXXFLAGS="$AM_CXXFLAGS -I$with_minuit/include -I$with_minuit/include/Minuit2 -I$with_minuit/include/Fit"]
|
|
||||||
[AM_LDFLAGS="$AM_LDFLAGS -L$with_minuit/lib"])
|
|
||||||
AC_ARG_WITH([nlopt],
|
|
||||||
[AS_HELP_STRING([--with-nlopt=prefix],
|
|
||||||
[try this for a non-standard install prefix of the NLopt library])],
|
|
||||||
[AM_CXXFLAGS="$AM_CXXFLAGS -I$with_nlopt/include"]
|
|
||||||
[AM_LDFLAGS="$AM_LDFLAGS -L$with_nlopt/lib"])
|
|
||||||
AC_ARG_WITH([hdf5],
|
|
||||||
[AS_HELP_STRING([--with-hdf5=prefix],
|
|
||||||
[try this for a non-standard install prefix of the HDF5 library])],
|
|
||||||
[AM_CXXFLAGS="$AM_CXXFLAGS -I$with_hdf5/include"]
|
|
||||||
[AM_LDFLAGS="$AM_LDFLAGS -L$with_hdf5/lib"])
|
|
||||||
|
|
||||||
# Get compilers informations
|
|
||||||
AX_COMPILER_VENDOR
|
|
||||||
AC_DEFINE_UNQUOTED([C_COMP_VENDOR],["$ax_cv_c_compiler_vendor"],
|
|
||||||
[vendor of C compiler that will compile the code])
|
|
||||||
AM_CONDITIONAL([CC_GNU],[test $ax_cv_c_compiler_vendor = "gnu"])
|
|
||||||
AM_CONDITIONAL([CC_INTEL],[test $ax_cv_c_compiler_vendor = "intel"])
|
|
||||||
AC_LANG([C++])
|
|
||||||
AX_CXX_COMPILE_STDCXX_11([noext],[mandatory])
|
|
||||||
AX_COMPILER_VENDOR
|
|
||||||
AC_DEFINE_UNQUOTED([CXX_COMP_VENDOR],["$ax_cv_cxx_compiler_vendor"],
|
|
||||||
[vendor of C++ compiler that will compile the code])
|
|
||||||
AM_CONDITIONAL([CXX_GNU],[test $ax_cv_cxx_compiler_vendor = "gnu"])
|
|
||||||
AM_CONDITIONAL([CXX_INTEL],[test $ax_cv_cxx_compiler_vendor = "intel"])
|
|
||||||
AX_GCC_VERSION
|
|
||||||
AC_DEFINE_UNQUOTED([GCC_VERSION],["$GCC_VERSION"],
|
|
||||||
[version of gcc that will compile the code])
|
|
||||||
AX_GXX_VERSION
|
|
||||||
AC_DEFINE_UNQUOTED([GXX_VERSION],["$GXX_VERSION"],
|
|
||||||
[version of g++ that will compile the code])
|
|
||||||
|
|
||||||
# Checks for libraries.
|
|
||||||
CXXFLAGS_CPY=$CXXFLAGS
|
|
||||||
LDFLAGS_CPY=$LDFLAGS
|
|
||||||
CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS"
|
|
||||||
LDFLAGS="$AM_LDFLAGS $LDFLAGS"
|
|
||||||
AC_CHECK_LIB([pthread],[pthread_create],[],[AC_MSG_ERROR([pthread library not found])])
|
|
||||||
AC_CHECK_LIB([m],[cos],[],[AC_MSG_ERROR([libm library not found])])
|
|
||||||
AC_CHECK_LIB([gslcblas],[cblas_dgemm],[],
|
|
||||||
[AC_MSG_ERROR([GSL CBLAS library not found])])
|
|
||||||
AC_CHECK_LIB([gsl],[gsl_blas_dgemm],[],[AC_MSG_ERROR([GSL library not found])])
|
|
||||||
AC_CHECK_LIB([nlopt],[nlopt_create],
|
|
||||||
[AC_DEFINE([HAVE_NLOPT],
|
|
||||||
[1],
|
|
||||||
[Define to 1 if you have the `NLopt' library (-lnlopt).])]
|
|
||||||
[have_nlopt=true]
|
|
||||||
[LIBS="$LIBS -lnlopt"],[])
|
|
||||||
AM_CONDITIONAL([HAVE_NLOPT], [test x$have_nlopt = xtrue])
|
|
||||||
AC_CHECK_LIB([hdf5_cpp],[H5Fopen],
|
|
||||||
[LIBS="$LIBS -lhdf5_cpp -lhdf5"],
|
|
||||||
[AC_MSG_ERROR([HDF5 library not found])], [-lhdf5])
|
|
||||||
SAVED_LDFLAGS=$LDFLAGS
|
|
||||||
LDFLAGS="$LDFLAGS -lMinuit2"
|
|
||||||
AC_MSG_CHECKING([for ROOT::Minuit2::VariableMetricMinimizer in -lMinuit2]);
|
|
||||||
AC_LINK_IFELSE(
|
|
||||||
[AC_LANG_PROGRAM([#include <Minuit2/VariableMetricMinimizer.h>],
|
|
||||||
[ROOT::Minuit2::VariableMetricMinimizer dummy()])],
|
|
||||||
[LIBS="$LIBS -lMinuit2"]
|
|
||||||
[AC_DEFINE([HAVE_MINUIT2],
|
|
||||||
[1],
|
|
||||||
[Define to 1 if you have the `Minuit2' library (-lMinuit2).])]
|
|
||||||
[have_minuit=true]
|
|
||||||
[AC_MSG_RESULT([yes])],
|
|
||||||
[have_minuit=false]
|
|
||||||
[AC_MSG_RESULT([no])])
|
|
||||||
AM_CONDITIONAL([HAVE_MINUIT], [test x$have_minuit = xtrue])
|
|
||||||
LDFLAGS="$LDFLAGS -lMinuit2Math"
|
|
||||||
AC_MSG_CHECKING([for ROOT::Math::MinimizerOptions in -lMinuit2Math]);
|
|
||||||
AC_LINK_IFELSE(
|
|
||||||
[AC_LANG_PROGRAM([#include <Minuit2/Math/MinimizerOptions.h>],
|
|
||||||
[ROOT::Math::MinimizerOptions dummy()])],
|
|
||||||
[LIBS="$LIBS -lMinuit2Math"]
|
|
||||||
[AC_DEFINE([HAVE_MINUIT2MATH],
|
|
||||||
[1],
|
|
||||||
[Define to 1 if you have the `Minuit2Math' library (-lMinuit2Math).])]
|
|
||||||
[have_minuitmath=true]
|
|
||||||
[AC_MSG_RESULT([yes])],
|
|
||||||
[have_minuitmath=false]
|
|
||||||
[AC_MSG_RESULT([no])])
|
|
||||||
AM_CONDITIONAL([HAVE_MINUITMATH], [test x$have_minuit = xtrue])
|
|
||||||
LDFLAGS=$SAVED_LDFLAGS
|
|
||||||
CXXFLAGS=$CXXFLAGS_CPY
|
|
||||||
LDFLAGS=$LDFLAGS_CPY
|
|
||||||
|
|
||||||
# Checks for header files.
|
|
||||||
AC_HEADER_STDC
|
|
||||||
|
|
||||||
cwd=`pwd -P`; cd ${srcdir}; abs_srcdir=`pwd -P`; cd ${cwd}
|
|
||||||
LATAN_CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS"
|
|
||||||
LATAN_LDFLAGS="$AM_LDFLAGS $LDFLAGS"
|
|
||||||
LATAN_LIBS=$LIBS
|
|
||||||
LATAN_SHORT_SHA=`git rev-parse --short HEAD`
|
|
||||||
LATAN_SHA=`git rev-parse HEAD`
|
|
||||||
LATAN_BRANCH=`git rev-parse --abbrev-ref HEAD`
|
|
||||||
AM_CXXFLAGS="-I${abs_srcdir}/lib $AM_CXXFLAGS"
|
|
||||||
AM_CFLAGS="-I${abs_srcdir}/lib $AM_CFLAGS"
|
|
||||||
CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS"
|
|
||||||
LDFLAGS="$AM_LDFLAGS $LDFLAGS"
|
|
||||||
AC_SUBST([LIBS])
|
|
||||||
AC_SUBST([AM_CXXFLAGS])
|
|
||||||
AC_SUBST([AM_LDFLAGS])
|
|
||||||
AC_SUBST([LATAN_CXXFLAGS])
|
|
||||||
AC_SUBST([LATAN_LDFLAGS])
|
|
||||||
AC_SUBST([LATAN_LIBS])
|
|
||||||
AC_SUBST([LATAN_SHA])
|
|
||||||
AC_SUBST([LATAN_BRANCH])
|
|
||||||
|
|
||||||
AC_CONFIG_FILES([latan-config], [chmod +x latan-config])
|
|
||||||
AC_CONFIG_FILES([Makefile])
|
|
||||||
AC_CONFIG_FILES([lib/Makefile])
|
|
||||||
AC_CONFIG_FILES([utils/Makefile])
|
|
||||||
AC_CONFIG_FILES([physics/Makefile])
|
|
||||||
AC_CONFIG_FILES([examples/Makefile])
|
|
||||||
AC_OUTPUT
|
|
||||||
|
|
||||||
echo "*********************************************"
|
|
||||||
echo "* ${PACKAGE_NAME} v${VERSION}" build options
|
|
||||||
echo "*********************************************"
|
|
||||||
echo "* C++ compiler : $CXX"
|
|
||||||
echo "* Minuit minimizers: `test x$HAVE_MINUIT_TRUE = 'x' && echo yes \
|
|
||||||
|| echo no`"
|
|
||||||
echo "* NLopt minimizers : `test x$HAVE_NLOPT_TRUE = 'x' && echo yes \
|
|
||||||
|| echo no`"
|
|
||||||
echo "*********************************************"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
21
examples/CMakeLists.txt
Normal file
21
examples/CMakeLists.txt
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
set(EXAMPLES_STEM
|
||||||
|
exCompiledDoubleFunction
|
||||||
|
exDerivative
|
||||||
|
exDWT
|
||||||
|
exFit
|
||||||
|
exFitSample
|
||||||
|
exIntegrator
|
||||||
|
exInterp
|
||||||
|
exMat
|
||||||
|
exMathInterpreter
|
||||||
|
exMin
|
||||||
|
exPlot
|
||||||
|
exPValue
|
||||||
|
exRand
|
||||||
|
exRootFinder
|
||||||
|
exThreadPool)
|
||||||
|
|
||||||
|
foreach(_stem ${EXAMPLES_STEM})
|
||||||
|
add_executable(${_stem} ${_stem}.cpp)
|
||||||
|
target_link_libraries(${_stem} LatAnalyze compiler_flags)
|
||||||
|
endforeach()
|
@ -1 +0,0 @@
|
|||||||
../lib
|
|
@ -1,86 +0,0 @@
|
|||||||
if CXX_GNU
|
|
||||||
COM_CXXFLAGS = -Wall -W -pedantic -Wno-deprecated-declarations
|
|
||||||
else
|
|
||||||
if CXX_INTEL
|
|
||||||
COM_CXXFLAGS = -wd1682 -Wall
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
noinst_PROGRAMS = \
|
|
||||||
exCompiledDoubleFunction\
|
|
||||||
exDerivative \
|
|
||||||
exDWT \
|
|
||||||
exFit \
|
|
||||||
exFitSample \
|
|
||||||
exIntegrator \
|
|
||||||
exInterp \
|
|
||||||
exMat \
|
|
||||||
exMathInterpreter \
|
|
||||||
exMin \
|
|
||||||
exPlot \
|
|
||||||
exPValue \
|
|
||||||
exRand \
|
|
||||||
exRootFinder \
|
|
||||||
exThreadPool
|
|
||||||
|
|
||||||
exCompiledDoubleFunction_SOURCES = exCompiledDoubleFunction.cpp
|
|
||||||
exCompiledDoubleFunction_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
exCompiledDoubleFunction_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
exDerivative_SOURCES = exDerivative.cpp
|
|
||||||
exDerivative_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
exDerivative_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
exDWT_SOURCES = exDWT.cpp
|
|
||||||
exDWT_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
exDWT_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
exFit_SOURCES = exFit.cpp
|
|
||||||
exFit_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
exFit_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
exFitSample_SOURCES = exFitSample.cpp
|
|
||||||
exFitSample_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
exFitSample_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
exInterp_SOURCES = exInterp.cpp
|
|
||||||
exInterp_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
exInterp_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
exIntegrator_SOURCES = exIntegrator.cpp
|
|
||||||
exIntegrator_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
exIntegrator_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
exMat_SOURCES = exMat.cpp
|
|
||||||
exMat_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
exMat_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
exMin_SOURCES = exMin.cpp
|
|
||||||
exMin_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
exMin_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
exMathInterpreter_SOURCES = exMathInterpreter.cpp
|
|
||||||
exMathInterpreter_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
exMathInterpreter_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
exPlot_SOURCES = exPlot.cpp
|
|
||||||
exPlot_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
exPlot_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
exPValue_SOURCES = exPValue.cpp
|
|
||||||
exPValue_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
exPValue_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
exRand_SOURCES = exRand.cpp
|
|
||||||
exRand_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
exRand_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
exRootFinder_SOURCES = exRootFinder.cpp
|
|
||||||
exRootFinder_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
exRootFinder_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
exThreadPool_SOURCES = exThreadPool.cpp
|
|
||||||
exThreadPool_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
exThreadPool_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I .buildutils/m4
|
|
@ -1,79 +0,0 @@
|
|||||||
#! /bin/sh
|
|
||||||
|
|
||||||
prefix=@prefix@
|
|
||||||
exec_prefix=@exec_prefix@
|
|
||||||
includedir=@includedir@
|
|
||||||
|
|
||||||
usage()
|
|
||||||
{
|
|
||||||
cat <<EOF
|
|
||||||
Usage: latan-config [OPTION]
|
|
||||||
|
|
||||||
Known values for OPTION are:
|
|
||||||
|
|
||||||
--prefix show LatAnalyze installation prefix
|
|
||||||
--cxxflags print pre-processor and compiler flags
|
|
||||||
--ldflags print library linking flags
|
|
||||||
--libs print library linking information
|
|
||||||
--help display this help and exit
|
|
||||||
--version output version information
|
|
||||||
--git print git revision
|
|
||||||
|
|
||||||
EOF
|
|
||||||
|
|
||||||
exit $1
|
|
||||||
}
|
|
||||||
|
|
||||||
if test $# -eq 0; then
|
|
||||||
usage 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
cflags=false
|
|
||||||
libs=false
|
|
||||||
|
|
||||||
while test $# -gt 0; do
|
|
||||||
case "$1" in
|
|
||||||
-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
|
|
||||||
*) optarg= ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
--prefix)
|
|
||||||
echo $prefix
|
|
||||||
;;
|
|
||||||
|
|
||||||
--version)
|
|
||||||
echo @VERSION@
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
|
|
||||||
--git)
|
|
||||||
echo "@LATAN_BRANCH@ @LATAN_SHA@"
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
|
|
||||||
--help)
|
|
||||||
usage 0
|
|
||||||
;;
|
|
||||||
|
|
||||||
--cxxflags)
|
|
||||||
echo @LATAN_CXXFLAGS@
|
|
||||||
;;
|
|
||||||
|
|
||||||
--ldflags)
|
|
||||||
echo @LATAN_LDFLAGS@
|
|
||||||
;;
|
|
||||||
|
|
||||||
--libs)
|
|
||||||
echo @LIBS@
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
usage
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
|
|
||||||
exit 0
|
|
@ -1,8 +1,16 @@
|
|||||||
# rpath config
|
|
||||||
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
|
|
||||||
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}")
|
|
||||||
|
|
||||||
# config.h header for package version and name
|
# config.h header for package version and name
|
||||||
|
execute_process(
|
||||||
|
COMMAND git rev-parse --short HEAD
|
||||||
|
OUTPUT_VARIABLE LATAN_SHORT_SHA
|
||||||
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
|
execute_process(
|
||||||
|
COMMAND git rev-parse HEAD
|
||||||
|
OUTPUT_VARIABLE LATAN_SHA
|
||||||
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
|
execute_process(
|
||||||
|
COMMAND git rev-parse --abbrev-ref HEAD
|
||||||
|
OUTPUT_VARIABLE LATAN_BRANCH
|
||||||
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
|
configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
|
||||||
|
|
||||||
# find bison & flex
|
# find bison & flex
|
||||||
@ -25,6 +33,18 @@ flex_target(MathLexer LatAnalyze/Core/MathLexer.lpp
|
|||||||
${CMAKE_CURRENT_BINARY_DIR}/MathLexer.cpp)
|
${CMAKE_CURRENT_BINARY_DIR}/MathLexer.cpp)
|
||||||
add_flex_bison_dependency(MathLexer MathParser)
|
add_flex_bison_dependency(MathLexer MathParser)
|
||||||
|
|
||||||
|
# intermediate libraries
|
||||||
|
add_library(parsers STATIC)
|
||||||
|
target_include_directories(parsers PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
target_sources(
|
||||||
|
parsers PRIVATE ${BISON_AsciiParser_OUTPUTS} ${FLEX_AsciiLexer_OUTPUTS}
|
||||||
|
${BISON_MathParser_OUTPUTS} ${FLEX_MathLexer_OUTPUTS})
|
||||||
|
|
||||||
|
add_library(tinyxml2 STATIC)
|
||||||
|
target_include_directories(parsers PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
target_sources(tinyxml2 PRIVATE LatAnalyze/Io/Xml/tinyxml2.hpp
|
||||||
|
LatAnalyze/Io/Xml/tinyxml2.cpp)
|
||||||
|
|
||||||
# library target
|
# library target
|
||||||
add_library(LatAnalyze SHARED)
|
add_library(LatAnalyze SHARED)
|
||||||
file(GLOB_RECURSE EIGEN_HEADERS LatAnalyze/Eigen/*)
|
file(GLOB_RECURSE EIGEN_HEADERS LatAnalyze/Eigen/*)
|
||||||
@ -32,9 +52,7 @@ target_include_directories(LatAnalyze PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
|
|||||||
include(source-list.cmake)
|
include(source-list.cmake)
|
||||||
target_sources(
|
target_sources(
|
||||||
LatAnalyze
|
LatAnalyze
|
||||||
PRIVATE ${BISON_AsciiParser_OUTPUTS} ${FLEX_AsciiLexer_OUTPUTS}
|
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/config.h ${LATAN_SOURCES}
|
||||||
${BISON_MathParser_OUTPUTS} ${FLEX_MathLexer_OUTPUTS}
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/config.h ${LATAN_SOURCES}
|
|
||||||
PUBLIC FILE_SET
|
PUBLIC FILE_SET
|
||||||
public_headers
|
public_headers
|
||||||
TYPE
|
TYPE
|
||||||
@ -42,7 +60,9 @@ target_sources(
|
|||||||
FILES
|
FILES
|
||||||
${EIGEN_HEADERS}
|
${EIGEN_HEADERS}
|
||||||
${LATAN_HEADERS})
|
${LATAN_HEADERS})
|
||||||
target_link_libraries(LatAnalyze PUBLIC GSL::gsl hdf5::hdf5 hdf5::hdf5_cpp)
|
target_link_libraries(LatAnalyze PRIVATE compiler_flags parsers tinyxml2)
|
||||||
|
target_link_libraries(LatAnalyze PUBLIC GSL::gsl hdf5::hdf5 hdf5::hdf5_cpp
|
||||||
|
${CMAKE_THREAD_LIBS_INIT})
|
||||||
if(Minuit2_FOUND)
|
if(Minuit2_FOUND)
|
||||||
target_link_libraries(LatAnalyze PUBLIC Minuit2::Minuit2)
|
target_link_libraries(LatAnalyze PUBLIC Minuit2::Minuit2)
|
||||||
endif()
|
endif()
|
||||||
|
@ -36,7 +36,7 @@ unsigned int RunContext::addFunction(const string &name, DoubleFunction *init)
|
|||||||
|
|
||||||
return getFunctionAddress(name);
|
return getFunctionAddress(name);
|
||||||
}
|
}
|
||||||
catch (Exceptions::Definition)
|
catch (Exceptions::Definition &)
|
||||||
{
|
{
|
||||||
unsigned int address = fTable_.size();
|
unsigned int address = fTable_.size();
|
||||||
|
|
||||||
@ -55,7 +55,7 @@ unsigned int RunContext::addVariable(const string &name, double init)
|
|||||||
|
|
||||||
return getVariableAddress(name);
|
return getVariableAddress(name);
|
||||||
}
|
}
|
||||||
catch (Exceptions::Definition)
|
catch (Exceptions::Definition &)
|
||||||
{
|
{
|
||||||
unsigned int address = vTable_.size();
|
unsigned int address = vTable_.size();
|
||||||
|
|
||||||
@ -92,7 +92,7 @@ unsigned int RunContext::getFunctionAddress(const string &name) const
|
|||||||
{
|
{
|
||||||
return fTable_.at(name);
|
return fTable_.at(name);
|
||||||
}
|
}
|
||||||
catch (out_of_range)
|
catch (out_of_range &)
|
||||||
{
|
{
|
||||||
LATAN_ERROR(Definition, "undefined function '" + name + "'");
|
LATAN_ERROR(Definition, "undefined function '" + name + "'");
|
||||||
}
|
}
|
||||||
@ -139,7 +139,7 @@ unsigned int RunContext::getVariableAddress(const string &name) const
|
|||||||
{
|
{
|
||||||
return vTable_.at(name);
|
return vTable_.at(name);
|
||||||
}
|
}
|
||||||
catch (out_of_range)
|
catch (out_of_range &)
|
||||||
{
|
{
|
||||||
LATAN_ERROR(Definition, "undefined variable '" + name + "'");
|
LATAN_ERROR(Definition, "undefined variable '" + name + "'");
|
||||||
}
|
}
|
||||||
@ -449,7 +449,7 @@ try\
|
|||||||
{\
|
{\
|
||||||
address = (table).at(name);\
|
address = (table).at(name);\
|
||||||
}\
|
}\
|
||||||
catch (out_of_range)\
|
catch (out_of_range &)\
|
||||||
{\
|
{\
|
||||||
address = (table).size();\
|
address = (table).size();\
|
||||||
(table)[(name)] = address;\
|
(table)[(name)] = address;\
|
||||||
|
@ -25,9 +25,12 @@ using namespace Latan;
|
|||||||
|
|
||||||
PlaceHolder Latan::_;
|
PlaceHolder Latan::_;
|
||||||
|
|
||||||
const string Env::fullName = strFrom(PROJECT_NAME) + " v" + strFrom(PROJECT_VERSION);
|
const string Env::fullName = strFrom(PROJECT_NAME) + " " + strFrom(LATAN_SHORT_SHA) + " (v" + strFrom(PROJECT_VERSION) + ")";
|
||||||
const string Env::name = PROJECT_NAME;
|
const string Env::name = PROJECT_NAME;
|
||||||
const string Env::version = PROJECT_VERSION;
|
const string Env::version = PROJECT_VERSION;
|
||||||
|
const string Env::gitShortSha = LATAN_SHORT_SHA;
|
||||||
|
const string Env::gitSha = LATAN_SHA;
|
||||||
|
const string Env::gitBranch = LATAN_BRANCH;
|
||||||
const string Env::msgPrefix = "[" + Env::fullName + "] ";
|
const string Env::msgPrefix = "[" + Env::fullName + "] ";
|
||||||
|
|
||||||
void Env::function(void)
|
void Env::function(void)
|
||||||
|
@ -54,6 +54,9 @@ namespace Env
|
|||||||
extern const std::string fullName;
|
extern const std::string fullName;
|
||||||
extern const std::string name;
|
extern const std::string name;
|
||||||
extern const std::string version;
|
extern const std::string version;
|
||||||
|
extern const std::string gitShortSha;
|
||||||
|
extern const std::string gitSha;
|
||||||
|
extern const std::string gitBranch;
|
||||||
extern const std::string msgPrefix;
|
extern const std::string msgPrefix;
|
||||||
// empty function for library test
|
// empty function for library test
|
||||||
void function(void);
|
void function(void);
|
||||||
|
@ -105,12 +105,12 @@ const IoT& File::getData(const std::string &name) const
|
|||||||
{
|
{
|
||||||
return dynamic_cast<const IoT &>(*(data_.at(name)));
|
return dynamic_cast<const IoT &>(*(data_.at(name)));
|
||||||
}
|
}
|
||||||
catch(std::out_of_range)
|
catch (std::out_of_range &)
|
||||||
{
|
{
|
||||||
LATAN_ERROR(Definition, "no data with name '" + name + "' in file "
|
LATAN_ERROR(Definition, "no data with name '" + name + "' in file "
|
||||||
+ name_);
|
+ name_);
|
||||||
}
|
}
|
||||||
catch(std::bad_cast)
|
catch (std::bad_cast &)
|
||||||
{
|
{
|
||||||
LATAN_ERROR(Definition, "data with name '" + name + "' in file "
|
LATAN_ERROR(Definition, "data with name '" + name + "' in file "
|
||||||
+ name_ + " does not have type '" + typeid(IoT).name()
|
+ name_ + " does not have type '" + typeid(IoT).name()
|
||||||
|
@ -1,2 +1,5 @@
|
|||||||
#cmakedefine PROJECT_NAME "@PROJECT_NAME@"
|
#cmakedefine PROJECT_NAME "@PROJECT_NAME@"
|
||||||
#cmakedefine PROJECT_VERSION "@PROJECT_VERSION@"
|
#cmakedefine PROJECT_VERSION "@PROJECT_VERSION@"
|
||||||
|
#cmakedefine LATAN_SHORT_SHA "@LATAN_SHORT_SHA@"
|
||||||
|
#cmakedefine LATAN_SHA "@LATAN_SHA@"
|
||||||
|
#cmakedefine LATAN_BRANCH "@LATAN_BRANCH@"
|
||||||
|
@ -76,7 +76,6 @@ set(LATAN_SOURCES
|
|||||||
LatAnalyze/Io/File.cpp
|
LatAnalyze/Io/File.cpp
|
||||||
LatAnalyze/Io/Hdf5File.cpp
|
LatAnalyze/Io/Hdf5File.cpp
|
||||||
LatAnalyze/Io/Io.cpp
|
LatAnalyze/Io/Io.cpp
|
||||||
LatAnalyze/Io/Xml/tinyxml2.cpp
|
|
||||||
LatAnalyze/Io/XmlReader.cpp
|
LatAnalyze/Io/XmlReader.cpp
|
||||||
LatAnalyze/Numerical/DWT.cpp
|
LatAnalyze/Numerical/DWT.cpp
|
||||||
LatAnalyze/Numerical/DWTFilters.cpp
|
LatAnalyze/Numerical/DWTFilters.cpp
|
||||||
|
@ -376,10 +376,10 @@ int main(int argc, char *argv[])
|
|||||||
unsigned int k = 0;
|
unsigned int k = 0;
|
||||||
while (k < 10)
|
while (k < 10)
|
||||||
{
|
{
|
||||||
auto &f = it->second;
|
auto &itFit = it->second;
|
||||||
|
|
||||||
cout << "#" << k + 1 << " -- [" << f.tMin << ", " << f.tMax << "] -- ";
|
cout << "#" << k + 1 << " -- [" << itFit.tMin << ", " << itFit.tMax << "] -- ";
|
||||||
f.result.print();
|
itFit.result.print();
|
||||||
cout << endl;
|
cout << endl;
|
||||||
k++;
|
k++;
|
||||||
it++;
|
it++;
|
||||||
|
7
physics/CMakeLists.txt
Normal file
7
physics/CMakeLists.txt
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
set(PHYSICS_STEM 2pt-fit)
|
||||||
|
|
||||||
|
foreach(_stem ${PHYSICS_STEM})
|
||||||
|
add_executable(latan-${_stem} ${_stem}.cpp)
|
||||||
|
target_link_libraries(latan-${_stem} LatAnalyze compiler_flags)
|
||||||
|
install(TARGETS latan-${_stem} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||||
|
endforeach()
|
@ -1 +0,0 @@
|
|||||||
../lib
|
|
@ -1,15 +0,0 @@
|
|||||||
if CXX_GNU
|
|
||||||
COM_CXXFLAGS = -Wall -W -pedantic -Wno-deprecated-declarations
|
|
||||||
else
|
|
||||||
if CXX_INTEL
|
|
||||||
COM_CXXFLAGS = -wd1682 -Wall
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
bin_PROGRAMS = latan-2pt-fit
|
|
||||||
|
|
||||||
latan_2pt_fit_SOURCES = 2pt-fit.cpp
|
|
||||||
latan_2pt_fit_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
latan_2pt_fit_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I .buildutils/m4
|
|
@ -1,19 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
if (( $# != 1 )); then
|
|
||||||
echo "usage: `basename $0` <archive>" 1>&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
ARC=$1
|
|
||||||
|
|
||||||
INITDIR=$(pwd -P)
|
|
||||||
rm -rf lib/Eigen
|
|
||||||
ARCDIR=`tar -tf ${ARC} | head -n1 | sed -e 's@/.*@@'`
|
|
||||||
tar -xf ${ARC}
|
|
||||||
cd ${ARCDIR}
|
|
||||||
(tar -cf - Eigen --exclude='*.txt' 2>/dev/null) | tar -xf - -C ../lib/
|
|
||||||
cd ../lib
|
|
||||||
echo 'eigen_files =\' > eigen_files.mk
|
|
||||||
find Eigen -type f -print | sed 's/^/ /;$q;s/$/ \\/' >> eigen_files.mk
|
|
||||||
cd ${INITDIR}
|
|
||||||
rm -rf ${ARCDIR}
|
|
18
utils/CMakeLists.txt
Normal file
18
utils/CMakeLists.txt
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
set(UTILS_STEM
|
||||||
|
plot
|
||||||
|
resample
|
||||||
|
sample-combine
|
||||||
|
sample-dwt
|
||||||
|
sample-element
|
||||||
|
sample-fake
|
||||||
|
sample-ft
|
||||||
|
sample-merge
|
||||||
|
sample-plot-corr
|
||||||
|
sample-plot
|
||||||
|
sample-read)
|
||||||
|
|
||||||
|
foreach(_stem ${UTILS_STEM})
|
||||||
|
add_executable(latan-${_stem} ${_stem}.cpp)
|
||||||
|
target_link_libraries(latan-${_stem} LatAnalyze compiler_flags)
|
||||||
|
install(TARGETS latan-${_stem} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||||
|
endforeach()
|
@ -1 +0,0 @@
|
|||||||
../lib
|
|
@ -1,66 +0,0 @@
|
|||||||
if CXX_GNU
|
|
||||||
COM_CXXFLAGS = -Wall -W -pedantic -Wno-deprecated-declarations
|
|
||||||
else
|
|
||||||
if CXX_INTEL
|
|
||||||
COM_CXXFLAGS = -wd1682 -Wall
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
bin_PROGRAMS = \
|
|
||||||
latan-plot \
|
|
||||||
latan-sample-combine \
|
|
||||||
latan-sample-dwt \
|
|
||||||
latan-sample-element \
|
|
||||||
latan-sample-fake \
|
|
||||||
latan-sample-ft \
|
|
||||||
latan-sample-merge \
|
|
||||||
latan-sample-plot \
|
|
||||||
latan-sample-plot-corr\
|
|
||||||
latan-sample-read \
|
|
||||||
latan-resample
|
|
||||||
|
|
||||||
latan_plot_SOURCES = plot.cpp
|
|
||||||
latan_plot_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
latan_plot_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
latan_sample_combine_SOURCES = sample-combine.cpp
|
|
||||||
latan_sample_combine_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
latan_sample_combine_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
latan_sample_dwt_SOURCES = sample-dwt.cpp
|
|
||||||
latan_sample_dwt_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
latan_sample_dwt_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
latan_sample_element_SOURCES = sample-element.cpp
|
|
||||||
latan_sample_element_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
latan_sample_element_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
latan_sample_fake_SOURCES = sample-fake.cpp
|
|
||||||
latan_sample_fake_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
latan_sample_fake_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
latan_sample_ft_SOURCES = sample-ft.cpp
|
|
||||||
latan_sample_ft_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
latan_sample_ft_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
latan_sample_merge_SOURCES = sample-merge.cpp
|
|
||||||
latan_sample_merge_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
latan_sample_merge_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
latan_sample_plot_corr_SOURCES = sample-plot-corr.cpp
|
|
||||||
latan_sample_plot_corr_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
latan_sample_plot_corr_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
latan_sample_plot_SOURCES = sample-plot.cpp
|
|
||||||
latan_sample_plot_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
latan_sample_plot_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
latan_sample_read_SOURCES = sample-read.cpp
|
|
||||||
latan_sample_read_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
latan_sample_read_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
latan_resample_SOURCES = resample.cpp
|
|
||||||
latan_resample_CXXFLAGS = $(COM_CXXFLAGS)
|
|
||||||
latan_resample_LDFLAGS = -L../lib/.libs -lLatAnalyze
|
|
||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I .buildutils/m4
|
|
@ -20,7 +20,6 @@
|
|||||||
#include <LatAnalyze/Core/OptParser.hpp>
|
#include <LatAnalyze/Core/OptParser.hpp>
|
||||||
#include <LatAnalyze/Statistics/Dataset.hpp>
|
#include <LatAnalyze/Statistics/Dataset.hpp>
|
||||||
#include <LatAnalyze/Io/Io.hpp>
|
#include <LatAnalyze/Io/Io.hpp>
|
||||||
#include <LatAnalyze/includes.hpp>
|
|
||||||
|
|
||||||
#ifndef DEF_NSAMPLE
|
#ifndef DEF_NSAMPLE
|
||||||
#define DEF_NSAMPLE "100"
|
#define DEF_NSAMPLE "100"
|
||||||
|
@ -75,7 +75,7 @@ void loadAndCheck(vector<DMatSample> &sample, const vector<string> &fileName)
|
|||||||
gotSize = true;
|
gotSize = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exceptions::Definition)
|
catch (Exceptions::Definition &)
|
||||||
{
|
{
|
||||||
failed.insert(i);
|
failed.insert(i);
|
||||||
}
|
}
|
||||||
@ -233,7 +233,7 @@ int main(int argc, char *argv[])
|
|||||||
{
|
{
|
||||||
process<DSample>(outFileName, fileName, code);
|
process<DSample>(outFileName, fileName, code);
|
||||||
}
|
}
|
||||||
catch (Exceptions::Definition)
|
catch (Exceptions::Definition &)
|
||||||
{
|
{
|
||||||
process<DMatSample>(outFileName, fileName, code);
|
process<DMatSample>(outFileName, fileName, code);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user