From fe9209e7def880de88e4f7f3f29aed3d21aac656 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Fri, 13 Jul 2018 10:05:51 +0200 Subject: [PATCH] Update on Olympe --- ocaml/Launcher.ml | 10 ++++++++++ ocaml/Qmcchem_run.ml | 3 +++ src/ZMQ/worker.irp.f | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ocaml/Launcher.ml b/ocaml/Launcher.ml index 2c03b70..a06ff93 100644 --- a/ocaml/Launcher.ml +++ b/ocaml/Launcher.ml @@ -9,6 +9,16 @@ let to_string = function | Srun -> "srun" | Bash -> "env" | MPI -> Lazy.force Qmcchem_config.mpirun +(* +let to_string = function + | MPI + | Srun -> String.concat ~sep:" " [ Lazy.force Qmcchem_config.mpirun ; + match Sys.getenv "QMCCHEM_MPIRUN_FLAGS" with + | None -> "" + | Some p -> p + ] + | Bash -> "env" +*) (** Find the launcher for the current job scheduler *) diff --git a/ocaml/Qmcchem_run.ml b/ocaml/Qmcchem_run.ml index c9883b1..ffbd61b 100644 --- a/ocaml/Qmcchem_run.ml +++ b/ocaml/Qmcchem_run.ml @@ -49,6 +49,7 @@ let full_run ?(start_dataserver=true) ezfio_filename = end; +(* (* Check if the Zmq Rep socket is open *) let test_open_rep_socket () = let zmq_context = @@ -94,6 +95,8 @@ let full_run ?(start_dataserver=true) ezfio_filename = in if (not (count 300)) then Watchdog.kill (); + *) + Time.pause (Time.Span.of_sec 3.); (* Start the qmc processes *) diff --git a/src/ZMQ/worker.irp.f b/src/ZMQ/worker.irp.f index bcc773f..8650c43 100644 --- a/src/ZMQ/worker.irp.f +++ b/src/ZMQ/worker.irp.f @@ -351,7 +351,7 @@ subroutine get_running(do_run) return else - timeout = 5 ! seconds + timeout = 600 ! seconds ! Polling items ! -------------