Changed mpirun into gaspi_run

This commit is contained in:
Anthony Scemama 2017-07-22 12:52:05 +02:00
parent 4845b14fdc
commit fe76bd313a
1 changed files with 8 additions and 8 deletions

View File

@ -15,7 +15,7 @@ let print_list () =
let () = let () =
Random.self_init () Random.self_init ()
let run slave mpi_command exe ezfio_file = let run slave gaspi_command exe ezfio_file =
(** Check availability of the ports *) (** Check availability of the ports *)
@ -115,9 +115,9 @@ let run slave mpi_command exe ezfio_file =
match Sys.getenv "QP_PREFIX" with match Sys.getenv "QP_PREFIX" with
| Some x -> x^" " | Some x -> x^" "
| None -> "" | None -> ""
and mpi_command = and gaspi_command =
match mpi_command with match gaspi_command with
| Some mpirun -> mpirun^" " | Some gaspi_run -> gaspi_run^" "
| None -> "" | None -> ""
and exe = and exe =
match (List.find ~f:(fun (x,_) -> x = exe) executables) with match (List.find ~f:(fun (x,_) -> x = exe) executables) with
@ -125,7 +125,7 @@ let run slave mpi_command exe ezfio_file =
| None -> assert false | None -> assert false
in in
let exit_code = let exit_code =
match (Sys.command (prefix^mpi_command^exe^ezfio_file)) with match (Sys.command (prefix^gaspi_command^exe^ezfio_file)) with
| 0 -> 0 | 0 -> 0
| i -> (Printf.printf "Program exited with code %d.\n%!" i; i) | i -> (Printf.printf "Program exited with code %d.\n%!" i; i)
in in
@ -146,7 +146,7 @@ let spec =
empty empty
+> flag "slave" no_arg +> flag "slave" no_arg
~doc:(" Needed for slave tasks") ~doc:(" Needed for slave tasks")
+> flag "mpirun" (optional string) +> flag "gaspi_run" (optional string)
~doc:(" mpi launcher with its options") ~doc:(" mpi launcher with its options")
+> anon ("executable" %: string) +> anon ("executable" %: string)
+> anon ("ezfio_file" %: string) +> anon ("ezfio_file" %: string)
@ -165,8 +165,8 @@ Executes a Quantum Package binary file among these:\n\n"
) )
) )
spec spec
(fun slave mpi_command exe ezfio_file () -> (fun slave gaspi_command exe ezfio_file () ->
run slave mpi_command exe ezfio_file run slave gaspi_command exe ezfio_file
) )
|> Command.run ~version: Git.sha1 ~build_info: Git.message |> Command.run ~version: Git.sha1 ~build_info: Git.message