From e0812d4b41d13fab430fc857c4dc9874e4dbf5fa Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Thu, 4 May 2017 15:51:33 +0200 Subject: [PATCH] Removed IPC --- ocaml/TaskServer.ml | 13 ++----------- plugins/Full_CI_ZMQ/fci_zmq.irp.f | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/ocaml/TaskServer.ml b/ocaml/TaskServer.ml index 887c7482..62de9fbd 100644 --- a/ocaml/TaskServer.ml +++ b/ocaml/TaskServer.ml @@ -70,16 +70,7 @@ let bind_socket ~socket_type ~socket ~port = with | Unix.Unix_error _ -> (Time.pause @@ Time.Span.of_float 1. ; loop (i-1) ) | other_exception -> raise other_exception - in loop 60; - let filename = - Printf.sprintf "/tmp/qp_run:%d" port - in - begin - match Sys.file_exists filename with - | `Yes -> Sys.remove filename - | _ -> () - end; - ZMQ.Socket.bind socket ("ipc://"^filename) + in loop 60 let hostname = lazy ( @@ -133,7 +124,7 @@ let stop ~port = let req_socket = ZMQ.Socket.create zmq_context ZMQ.Socket.req and address = - Printf.sprintf "ipc:///tmp/qp_run:%d" port + Printf.sprintf "tcp://localhost:%d" port in ZMQ.Socket.set_linger_period req_socket 1_000_000; ZMQ.Socket.connect req_socket address; diff --git a/plugins/Full_CI_ZMQ/fci_zmq.irp.f b/plugins/Full_CI_ZMQ/fci_zmq.irp.f index 3d9acf8b..0d883cae 100644 --- a/plugins/Full_CI_ZMQ/fci_zmq.irp.f +++ b/plugins/Full_CI_ZMQ/fci_zmq.irp.f @@ -147,7 +147,7 @@ program fci_zmq print *, 'E+PT2 = ', E_CI_before(k)+pt2(k) print *, '-----' enddo - call ezfio_set_full_ci_zmq_energy(CI_energy(1)) + call ezfio_set_full_ci_zmq_energy(E_CI_before(1)) call ezfio_set_full_ci_zmq_energy_pt2(E_CI_before(1)+pt2(1)) endif