9
1
mirror of https://github.com/QuantumPackage/qp2.git synced 2024-12-25 13:03:28 +01:00

Work in progress

This commit is contained in:
Anthony Scemama 2020-03-03 15:49:45 +01:00
parent 882a8fd100
commit 6ac5eb6da9

24
configure vendored
View File

@ -165,8 +165,8 @@ function update_submodules() {
EZFIO=$(find_dir "${QP_ROOT}"/external/ezfio) EZFIO=$(find_dir "${QP_ROOT}"/external/ezfio)
if [[ ${EZFIO} = $(not_found) ]] ; then if [[ ${EZFIO} = $(not_found) ]] ; then
cd "${QP_ROOT}"/external || failwith "Unable to extract EZFIO" cd "${QP_ROOT}"/external || failwith "Unable to extract EZFIO"
tar --gunzip --extract --file ${EZFIO_TGZ}
rm -rf ezfio rm -rf ezfio
tar --gunzip --extract --file ${EZFIO_TGZ}
mv EZFIO ezfio mv EZFIO ezfio
fi fi
} }
@ -176,7 +176,6 @@ function source_spack() {
source ${QP_ROOT}/external/spack/share/spack/setup-env.sh source ${QP_ROOT}/external/spack/share/spack/setup-env.sh
} }
function install_exe() { function install_exe() {
NAME=$1 NAME=$1
shift shift
@ -200,19 +199,18 @@ function install_spack_packages() {
spack env deactivate spack env deactivate
spack env create qp || : spack env create qp || :
spack env activate qp spack env activate qp
spack add python@2.7:2.8 spack install python@2.7:2.8 %gcc
# spack add py-docopt ^python@2.7:2.8 spack load python
# spack add py-resultsfile@1.0 ^python@2.7:2.8 spack install py-docopt ^python@2.7:2.8
# spack add py-irpf90 ^python@2.7:2.8 spack install py-resultsfile@1.0 ^python@2.7:2.8
spack add bats spack install py-irpf90 ^python@2.7:2.8
spack add ninja ^python@2.7:2.8 spack install bats
spack add f77-zmq ^libzmq~libsodium ^python@2.7:2.8 spack install ninja %gcc ^python@2.7:2.8
spack add opam@2.0: ^ocaml@4.09.0 spack install f77-zmq %gcc ^libzmq~libsodium ^python@2.7:2.8
spack install opam@2.0: %gcc ^ocaml@4.09.0
if [[ $(find_exe ifort) = $(not_found) ]] ; then if [[ $(find_exe ifort) = $(not_found) ]] ; then
spack add openblas threads=openmp spack install openblas %gcc threads=openmp
fi fi
spack concretize -f
spack install
} }
function install_python_packages() { function install_python_packages() {