LCPQ/qmcchem
10
1
Fork 1
mirror of https://gitlab.com/scemama/qmcchem.git synced 2024-12-22 12:23:30 +01:00
Code Releases Activity

Downgraded dependencies

Browse Source
This commit is contained in:
Anthony Scemama 2018-07-09 19:57:05 +02:00
parent 87fed8350a
commit f2fb5fec11
7 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
install/build.ninja
View File

@ -4,11 +4,14 @@
###### ######
URL_OPAM ="https://raw.github.com/ocaml/opam/master/shell/opam_installer.sh" URL_OPAM ="https://raw.github.com/ocaml/opam/master/shell/opam_installer.sh"
URL_IRPF90="https://github.com/scemama/irpf90/archive/v1.7.2.tar.gz" URL_IRPF90="https://github.com/scemama/irpf90/archive/v1.6.7.tar.gz"
URL_EZFIO ="https://gitlab.com/scemama/EZFIO/-/archive/v1.3.3/EZFIO-v1.3.3.tar.gz" URL_EZFIO ="https://gitlab.com/scemama/EZFIO/-/archive/v1.3.3/EZFIO-v1.3.3.tar.gz"
#URL_IRPF90="https://github.com/scemama/irpf90/archive/v1.7.2.tar.gz"
URL_ZMQ ="https://github.com/zeromq/libzmq/archive/v4.2.5.tar.gz" URL_ZMQ ="http://download.zeromq.org/zeromq-4.1.4.tar.gz"
URL_F77ZMQ="https://github.com/scemama/f77_zmq/archive/v4.2.5.tar.gz" URL_F77ZMQ="https://github.com/scemama/f77_zmq/archive/4.1.4.tar.gz"
#URL_ZMQ ="https://github.com/zeromq/libzmq/archive/v4.2.5.tar.gz"
#URL_F77ZMQ="https://github.com/scemama/f77_zmq/archive/v4.2.5.tar.gz"
# Rules # Rules
####### #######
@ -49,7 +52,8 @@ build _build/irpf90.ok ../bin/irpman ../bin/irpf90: install | Downloads/irpf90.t
target = irpf90 target = irpf90
descr = IRPF90 descr = IRPF90
build _build/zmq.ok ../lib/libzmq.a ../lib/libzmq.so.5 ../lib/libzmq.so ../lib/zmq.h ../lib/zmq_utils.h: install | Downloads/zmq.tar.gz #build _build/zmq.ok ../lib/libzmq.a ../lib/libzmq.so.5 ../lib/libzmq.so ../lib/zmq.h ../lib/zmq_utils.h: install | Downloads/zmq.tar.gz
build _build/zmq.ok ../lib/libzmq.a ../lib/libzmq.so.4 ../lib/libzmq.so ../lib/zmq.h ../lib/zmq_utils.h: install | Downloads/zmq.tar.gz
target = zmq target = zmq
descr = ZeroMQ descr = ZeroMQ

3
install/scripts/install_f77_zmq.sh
View File

@ -15,7 +15,8 @@ function _install()
cd - cd -
rm -f -- "${QMCCHEM_PATH}"/src/ZMQ/f77_zmq.h "${QMCCHEM_PATH}"/lib/libf77zmq.a "${QMCCHEM_PATH}"/lib/libf77zmq.so rm -f -- "${QMCCHEM_PATH}"/src/ZMQ/f77_zmq.h "${QMCCHEM_PATH}"/lib/libf77zmq.a "${QMCCHEM_PATH}"/lib/libf77zmq.so
cp "${BUILD}"/libf77zmq.{a,so} ../lib/ cp "${BUILD}"/libf77zmq.{a,so} ../lib/
cp "${BUILD}"/f77_zmq_free.h ../src/ZMQ/f77_zmq.h cp "${BUILD}"/f77_zmq.h ../src/ZMQ/
# cp "${BUILD}"/f77_zmq_free.h ../src/ZMQ/f77_zmq.h
return 0 return 0
} }

8
install/scripts/install_zmq.sh
View File

@ -16,10 +16,10 @@ function _install()
make install make install
cd - cd -
rm -f -- "${QMCCHEM_PATH}"/lib/libzmq.{a,so,so.$LIBVERSION} rm -f -- "${QMCCHEM_PATH}"/lib/libzmq.{a,so,so.$LIBVERSION}
# cp "${BUILD}"/.libs/libzmq.a "${QMCCHEM_PATH}"/lib/ cp "${BUILD}"/.libs/libzmq.a "${QMCCHEM_PATH}"/lib/
# cp "${BUILD}"/.libs/libzmq.so "${QMCCHEM_PATH}"/lib/libzmq.so.$LIBVERSION cp "${BUILD}"/.libs/libzmq.so "${QMCCHEM_PATH}"/lib/libzmq.so.$LIBVERSION
cp "${BUILD}"/src/.libs/libzmq.a "${QMCCHEM_PATH}"/lib/ # cp "${BUILD}"/src/.libs/libzmq.a "${QMCCHEM_PATH}"/lib/
cp "${BUILD}"/src/.libs/libzmq.so "${QMCCHEM_PATH}"/lib/libzmq.so.$LIBVERSION # cp "${BUILD}"/src/.libs/libzmq.so "${QMCCHEM_PATH}"/lib/libzmq.so.$LIBVERSION
cp "${BUILD}"/include/{zmq,zmq_utils}.h "${QMCCHEM_PATH}"/lib/ cp "${BUILD}"/include/{zmq,zmq_utils}.h "${QMCCHEM_PATH}"/lib/
cd "${QMCCHEM_PATH}"/lib cd "${QMCCHEM_PATH}"/lib
ln libzmq.so.$LIBVERSION libzmq.so || cp libzmq.so.$LIBVERSION libzmq.so ln libzmq.so.$LIBVERSION libzmq.so || cp libzmq.so.$LIBVERSION libzmq.so

2
ocaml/Qmcchem_config.ml
View File

@ -83,7 +83,7 @@ let hostname = lazy (
try try
Unix.gethostname () Unix.gethostname ()
with with
| _ -> "127.0.0.1" | _ -> "localhost"
) )

4
ocaml/Qmcchem_run.ml
View File

@ -35,7 +35,7 @@ let full_run ?(start_dataserver=true) ezfio_filename =
if (start_dataserver) then if (start_dataserver) then
begin begin
(* Reset socket address in EZFIO *) (* Reset socket address in EZFIO *)
Ezfio.set_simulation_http_server "tcp://127.0.0.1:65534"; Ezfio.set_simulation_http_server "tcp://localhost:65534";
(* Start the data server *) (* Start the data server *)
@ -67,7 +67,7 @@ let full_run ?(start_dataserver=true) ezfio_filename =
Zmq.Socket.send socket (Message.(to_string Test)); Zmq.Socket.send socket (Message.(to_string Test));
Zmq.Socket.recv socket Zmq.Socket.recv socket
) with ) with
| Unix.Unix_error (_,_,_) -> | Unix.Unix_error _ ->
begin begin
"Failed" "Failed"
end end

2
src/PROPERTIES/properties.irp.f
View File

@ -59,7 +59,7 @@ END_SHELL
! DIMENSIONS ! DIMENSIONS
!==========================================================================! !==========================================================================!
BEGIN_SHELL [ /usr/bin/python2 ] BEGIN_SHELL [ /usr/bin/env python2 ]
from properties import * from properties import *
make_dims() make_dims()
END_SHELL END_SHELL

2
src/ezfio_interface.irp.f
View File

@ -1,4 +1,4 @@
BEGIN_SHELL [ /usr/bin/python2 ] BEGIN_SHELL [ /usr/bin/env python2 ]
data = [ \ data = [ \
("electrons_elec_coord_pool_size" , "integer" , "" ), ("electrons_elec_coord_pool_size" , "integer" , "" ),