From 9746c6df28ecf7bd90b14dc201c5466fc24d5881 Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Tue, 26 May 2015 10:42:21 +0200 Subject: [PATCH] Add ninja instaler, First try travis --- .travis.yml | 5 +++-- scripts/install/install_ninja.sh | 25 +++++++++++++++++++++++++ setup_environment.sh | 3 +++ src/Utils/constants.F | 10 ++++++++++ 4 files changed, 41 insertions(+), 2 deletions(-) create mode 100755 scripts/install/install_ninja.sh create mode 100644 src/Utils/constants.F diff --git a/.travis.yml b/.travis.yml index f9ad2d5f..d020685c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,13 @@ python: before_script: - sudo apt-get update - - sudo apt-get install gfortran liblapack-dev + - sudo apt-get install gfortran liblapack-dev gcc - sudo apt-get install graphviz script: - ./setup_environment.sh --robot - source ./quantum_package.rc - cp ./src/Makefile.config.gfortran ./src/Makefile.config - - make build + - ./scripts/compilation/create_ninja_build.py > build.ninja + - ./ninja/ninja - ./tests/unit_test/unit_test.py diff --git a/scripts/install/install_ninja.sh b/scripts/install/install_ninja.sh new file mode 100755 index 00000000..ec73708c --- /dev/null +++ b/scripts/install/install_ninja.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# +# Installs m4 for ocaml +# Thu Oct 23 22:02:08 CEST 2014 + +BASE="ninja" +URL="https://github.com/martine/ninja/archive/master.tar.gz" + +if [[ -z ${QPACKAGE_ROOT} ]] +then + echo "The QPACKAGE_ROOT environment variable is not set." + echo "Please reload the quantum_package.rc file." + exit -1 +fi + +cd ${QPACKAGE_ROOT} + +${QPACKAGE_ROOT}/scripts/install/fetch_from_web.py ${URL} ${QPACKAGE_ROOT}/${BASE}.tar.gz +tar -zxf ${BASE}.tar.gz && rm ${BASE}.tar.gz ||exit 1 +rm -rf ${BASE} +mv ${BASE}-master ${BASE} +cd ${BASE} +./configure.py --bootstrap + + diff --git a/setup_environment.sh b/setup_environment.sh index 878c23e1..e300f613 100755 --- a/setup_environment.sh +++ b/setup_environment.sh @@ -39,6 +39,9 @@ fi mkdir -p ${QPACKAGE_ROOT}/install_logs +echo "${BLUE}===== Installing Ninja ===== ${BLACK}" +${QPACKAGE_ROOT}/scripts/install/install_ninja.sh | tee ${QPACKAGE_ROOT}/install_logs/install_ninja.log + echo "${BLUE}===== Installing Zlib ===== ${BLACK}" ${QPACKAGE_ROOT}/scripts/install/install_zlib.sh | tee ${QPACKAGE_ROOT}/install_logs/install_zlib.log diff --git a/src/Utils/constants.F b/src/Utils/constants.F new file mode 100644 index 00000000..632dc50b --- /dev/null +++ b/src/Utils/constants.F @@ -0,0 +1,10 @@ +integer, parameter :: max_dim = 255 +integer, parameter :: SIMD_vector = 32 + +double precision, parameter :: pi = dacos(-1.d0) +double precision, parameter :: sqpi = dsqrt(dacos(-1.d0)) +double precision, parameter :: pi_5_2 = 34.9868366552d0 +double precision, parameter :: dfour_pi = 4.d0*dacos(-1.d0) +double precision, parameter :: dtwo_pi = 2.d0*dacos(-1.d0) +double precision, parameter :: inv_sq_pi = 1.d0/dsqrt(dacos(-1.d0)) +double precision, parameter :: inv_sq_pi_2 = 0.5d0/dsqrt(dacos(-1.d0))