diff --git a/install/build.ninja b/install/build.ninja index 1418f2a..ecca938 100644 --- a/install/build.ninja +++ b/install/build.ninja @@ -4,11 +4,14 @@ ###### 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_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_F77ZMQ="https://github.com/scemama/f77_zmq/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/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 ####### @@ -49,7 +52,8 @@ build _build/irpf90.ok ../bin/irpman ../bin/irpf90: install | Downloads/irpf90.t target = 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 descr = ZeroMQ diff --git a/install/scripts/install_f77_zmq.sh b/install/scripts/install_f77_zmq.sh index d859a6c..cff0c7b 100755 --- a/install/scripts/install_f77_zmq.sh +++ b/install/scripts/install_f77_zmq.sh @@ -15,7 +15,8 @@ function _install() cd - 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}"/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 } diff --git a/install/scripts/install_zmq.sh b/install/scripts/install_zmq.sh index 4196b78..e2fab9c 100755 --- a/install/scripts/install_zmq.sh +++ b/install/scripts/install_zmq.sh @@ -16,10 +16,10 @@ function _install() make install cd - rm -f -- "${QMCCHEM_PATH}"/lib/libzmq.{a,so,so.$LIBVERSION} -# cp "${BUILD}"/.libs/libzmq.a "${QMCCHEM_PATH}"/lib/ -# 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.so "${QMCCHEM_PATH}"/lib/libzmq.so.$LIBVERSION + cp "${BUILD}"/.libs/libzmq.a "${QMCCHEM_PATH}"/lib/ + 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.so "${QMCCHEM_PATH}"/lib/libzmq.so.$LIBVERSION cp "${BUILD}"/include/{zmq,zmq_utils}.h "${QMCCHEM_PATH}"/lib/ cd "${QMCCHEM_PATH}"/lib ln libzmq.so.$LIBVERSION libzmq.so || cp libzmq.so.$LIBVERSION libzmq.so diff --git a/ocaml/Qmcchem_config.ml b/ocaml/Qmcchem_config.ml index 3a82387..d9f302d 100644 --- a/ocaml/Qmcchem_config.ml +++ b/ocaml/Qmcchem_config.ml @@ -83,7 +83,7 @@ let hostname = lazy ( try Unix.gethostname () with - | _ -> "127.0.0.1" + | _ -> "localhost" ) diff --git a/ocaml/Qmcchem_run.ml b/ocaml/Qmcchem_run.ml index 3960ed4..33c9e12 100644 --- a/ocaml/Qmcchem_run.ml +++ b/ocaml/Qmcchem_run.ml @@ -35,7 +35,7 @@ let full_run ?(start_dataserver=true) ezfio_filename = if (start_dataserver) then begin (* 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 *) @@ -67,7 +67,7 @@ let full_run ?(start_dataserver=true) ezfio_filename = Zmq.Socket.send socket (Message.(to_string Test)); Zmq.Socket.recv socket ) with - | Unix.Unix_error (_,_,_) -> + | Unix.Unix_error _ -> begin "Failed" end diff --git a/src/PROPERTIES/properties.irp.f b/src/PROPERTIES/properties.irp.f index 999ce14..f50473f 100644 --- a/src/PROPERTIES/properties.irp.f +++ b/src/PROPERTIES/properties.irp.f @@ -59,7 +59,7 @@ END_SHELL ! DIMENSIONS !==========================================================================! -BEGIN_SHELL [ /usr/bin/python2 ] +BEGIN_SHELL [ /usr/bin/env python2 ] from properties import * make_dims() END_SHELL diff --git a/src/ezfio_interface.irp.f b/src/ezfio_interface.irp.f index 7b1888b..950b66b 100644 --- a/src/ezfio_interface.irp.f +++ b/src/ezfio_interface.irp.f @@ -1,4 +1,4 @@ -BEGIN_SHELL [ /usr/bin/python2 ] +BEGIN_SHELL [ /usr/bin/env python2 ] data = [ \ ("electrons_elec_coord_pool_size" , "integer" , "" ),