10
0
mirror of https://github.com/QuantumPackage/qp2.git synced 2024-12-22 20:34:58 +01:00

Merge branch 'develop' of https://github.com/QuantumPackage/qp2 into develop

This commit is contained in:
Anthony Scemama 2019-02-04 15:40:32 +01:00
commit ba3c3ab7e1
3 changed files with 25 additions and 11 deletions

View File

@ -210,6 +210,12 @@ Zlib
make make
make install make install
With Debian or Ubuntu, you can use
.. code:: bash
sudo apt install zlib1g-dev
OCaml OCaml
@ -217,6 +223,13 @@ OCaml
*OCaml* is a general purpose programming language with an emphasis on expressiveness and safety. *OCaml* is a general purpose programming language with an emphasis on expressiveness and safety.
* The following packages are required (Debian or Ubuntu):
.. code:: bash
sudo apt install libncurses5-dev pkg-config libgmp3-dev m4
* Download the installer of the OPAM package manager here : * Download the installer of the OPAM package manager here :
`<https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh>`_ `<https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh>`_
and move it in the :file:`${QP_ROOT}/external` directory and move it in the :file:`${QP_ROOT}/external` directory

4
TODO
View File

@ -49,8 +49,6 @@ Refaire les benchmarks
# Documentation de qpsh # Documentation de qpsh
# Documentation de /etc # Documentation de /etc
# Extrapolation qui prend aussi en compe la variance? a tester
Parler dans le papier de rPT2
# Toto # Toto
Re-design de qp command Re-design de qp command
@ -58,3 +56,5 @@ Re-design de qp command
Doc: plugins et qp_plugins Doc: plugins et qp_plugins
Ajouter les symetries dans devel Ajouter les symetries dans devel
Compiler ezfio avec openmp

19
configure vendored
View File

@ -353,23 +353,24 @@ EOF
done done
source quantum_package.rc
NINJA=$(find_exe ninja) NINJA=$(find_exe ninja)
if [[ ${NINJA} = $(not_found) ]] ; then if [[ ${NINJA} = $(not_found) ]] ; then
error "Ninja is not installed." error "Ninja (ninja) is not installed."
fail fail
fi fi
IRPF90=$(find_exe irpf90) IRPF90=$(find_exe irpf90)
if [[ ${IRPF90} = $(not_found) ]] ; then if [[ ${IRPF90} = $(not_found) ]] ; then
error "IRPf90 is not installed." error "IRPf90 (irpf90) is not installed."
fail fail
fi fi
ZEROMQ=$(find_lib -lzmq) ZEROMQ=$(find_lib -lzmq)
if [[ ${ZEROMQ} = $(not_found) ]] ; then if [[ ${ZEROMQ} = $(not_found) ]] ; then
error "ZeroMQ is not installed." error "ZeroMQ (zeromq) is not installed."
fail fail
fi fi
@ -387,31 +388,31 @@ fi
OCAML=$(find_exe ocaml) OCAML=$(find_exe ocaml)
if [[ ${OCAML} = $(not_found) ]] ; then if [[ ${OCAML} = $(not_found) ]] ; then
error "OCaml compiler is not installed." error "OCaml (ocaml) compiler is not installed."
fail fail
fi fi
EZFIO=$(find_dir "${QP_ROOT}"/external/ezfio) EZFIO=$(find_dir "${QP_ROOT}"/external/ezfio)
if [[ ${EZFIO} = $(not_found) ]] ; then if [[ ${EZFIO} = $(not_found) ]] ; then
error "EZFIO is not installed." error "EZFIO (ezfio) is not installed."
fail fail
fi fi
ZLIB=$(find_lib -lz) ZLIB=$(find_lib -lz)
if [[ ${ZLIB} = $(not_found) ]] ; then if [[ ${ZLIB} = $(not_found) ]] ; then
error "Zlib is not installed." error "Zlib (zlib) is not installed."
fail fail
fi fi
DOCOPT=$(find_python_lib docopt) DOCOPT=$(find_python_lib docopt)
if [[ ${DOCOPT} = $(not_found) ]] ; then if [[ ${DOCOPT} = $(not_found) ]] ; then
error "docopt is not installed." error "docopt (docopt) is not installed."
fail fail
fi fi
RESULTSFILE=$(find_python_lib resultsFile) RESULTSFILE=$(find_python_lib resultsFile)
if [[ ${RESULTSFILE} = $(not_found) ]] ; then if [[ ${RESULTSFILE} = $(not_found) ]] ; then
error "resultsFile is not installed." error "resultsFile (resultsFile) is not installed."
fail fail
fi fi