From db87e1d3c4a1610529fd26148cfc34745bf0e2cc Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Mon, 27 Nov 2017 12:05:51 +0100 Subject: [PATCH] Removed GPI2 --- scripts/compilation/qp_create_ninja.py | 3 +- scripts/compilation/read_compilation_cfg.py | 1 - src/ZMQ/utils.irp.f | 71 ++++++++++----------- 3 files changed, 34 insertions(+), 41 deletions(-) diff --git a/scripts/compilation/qp_create_ninja.py b/scripts/compilation/qp_create_ninja.py index 5e1e2af6..b3e40a14 100755 --- a/scripts/compilation/qp_create_ninja.py +++ b/scripts/compilation/qp_create_ninja.py @@ -37,7 +37,6 @@ except ImportError: from qp_path import QP_ROOT, QP_SRC, QP_EZFIO LIB = "" # join(QP_ROOT, "lib", "rdtsc.o") -GPI_LIB = join(QP_ROOT, "lib64", "libGPI2.a") EZFIO_LIB = join(QP_ROOT, "lib", "libezfio_irp.a") ZMQ_LIB = join(QP_ROOT, "lib", "libf77zmq.a") + " " + join(QP_ROOT, "lib", "libzmq.a") + " -lstdc++ -lrt" ROOT_BUILD_NINJA = join(QP_ROOT, "config", "build.ninja") @@ -98,7 +97,7 @@ def ninja_create_env_variable(pwd_config_file): l_string.append(str_) lib_lapack = get_compilation_option(pwd_config_file, "LAPACK_LIB") - str_lib = " ".join([LIB, lib_lapack, GPI_LIB, EZFIO_LIB, ZMQ_LIB]) + str_lib = " ".join([LIB, lib_lapack, EZFIO_LIB, ZMQ_LIB]) l_string.append("LIB = {0} ".format(str_lib)) l_string.append("") diff --git a/scripts/compilation/read_compilation_cfg.py b/scripts/compilation/read_compilation_cfg.py index 43a64631..8145527c 100755 --- a/scripts/compilation/read_compilation_cfg.py +++ b/scripts/compilation/read_compilation_cfg.py @@ -41,4 +41,3 @@ if __name__ == '__main__': print get_compilation_option(pwd_cfg, "FC") print get_compilation_option(pwd_cfg, "FCFLAGS") - print get_compilation_option(pwd_cfg, "GPI2_LIB") diff --git a/src/ZMQ/utils.irp.f b/src/ZMQ/utils.irp.f index b868761f..704ac645 100644 --- a/src/ZMQ/utils.irp.f +++ b/src/ZMQ/utils.irp.f @@ -140,12 +140,12 @@ function new_zmq_to_qp_run_socket() stop 'Unable to create zmq req socket' endif -! rc = f77_zmq_setsockopt(new_zmq_to_qp_run_socket, ZMQ_SNDTIMEO, 120000, 4) +! rc = f77_zmq_setsockopt(new_zmq_to_qp_run_socket, ZMQ_SNDTIMEO, 300000, 4) ! if (rc /= 0) then ! stop 'Unable to set send timeout in new_zmq_to_qp_run_socket' ! endif ! -! rc = f77_zmq_setsockopt(new_zmq_to_qp_run_socket, ZMQ_RCVTIMEO, 120000, 4) +! rc = f77_zmq_setsockopt(new_zmq_to_qp_run_socket, ZMQ_RCVTIMEO, 300000, 4) ! if (rc /= 0) then ! stop 'Unable to set recv timeout in new_zmq_to_qp_run_socket' ! endif @@ -180,25 +180,25 @@ function new_zmq_pair_socket(bind) endif - rc = f77_zmq_setsockopt(new_zmq_pair_socket, ZMQ_SNDHWM, 1, 4) - if (rc /= 0) then - stop 'f77_zmq_setsockopt(new_zmq_pair_socket, ZMQ_SNDHWM, 1, 4)' - endif - - rc = f77_zmq_setsockopt(new_zmq_pair_socket, ZMQ_RCVHWM, 1, 4) - if (rc /= 0) then - stop 'f77_zmq_setsockopt(new_zmq_pair_socket, ZMQ_RCVHWM, 1, 4)' - endif - - rc = f77_zmq_setsockopt(new_zmq_pair_socket, ZMQ_IMMEDIATE, 1, 4) - if (rc /= 0) then - stop 'f77_zmq_setsockopt(new_zmq_pair_socket, ZMQ_IMMEDIATE, 1, 4)' - endif - - rc = f77_zmq_setsockopt(new_zmq_pair_socket, ZMQ_LINGER, 600000, 4) - if (rc /= 0) then - stop 'f77_zmq_setsockopt(new_zmq_pair_socket, ZMQ_LINGER, 60000, 4)' - endif +! rc = f77_zmq_setsockopt(new_zmq_pair_socket, ZMQ_SNDHWM, 2, 4) +! if (rc /= 0) then +! stop 'f77_zmq_setsockopt(new_zmq_pair_socket, ZMQ_SNDHWM, 2, 4)' +! endif +! +! rc = f77_zmq_setsockopt(new_zmq_pair_socket, ZMQ_RCVHWM, 2, 4) +! if (rc /= 0) then +! stop 'f77_zmq_setsockopt(new_zmq_pair_socket, ZMQ_RCVHWM, 2, 4)' +! endif +! +! rc = f77_zmq_setsockopt(new_zmq_pair_socket, ZMQ_IMMEDIATE, 1, 4) +! if (rc /= 0) then +! stop 'f77_zmq_setsockopt(new_zmq_pair_socket, ZMQ_IMMEDIATE, 1, 4)' +! endif +! +! rc = f77_zmq_setsockopt(new_zmq_pair_socket, ZMQ_LINGER, 600000, 4) +! if (rc /= 0) then +! stop 'f77_zmq_setsockopt(new_zmq_pair_socket, ZMQ_LINGER, 600000, 4)' +! endif if (bind) then rc = f77_zmq_bind(new_zmq_pair_socket,zmq_socket_pair_inproc_address) @@ -247,12 +247,12 @@ IRP_ENDIF ! stop 'Unable to set ZMQ_LINGER on pull socket' ! endif ! - rc = f77_zmq_setsockopt(new_zmq_pull_socket,ZMQ_RCVBUF,100000000,4) - if (rc /= 0) then - stop 'Unable to set ZMQ_RCVBUF on pull socket' - endif +! rc = f77_zmq_setsockopt(new_zmq_pull_socket,ZMQ_RCVBUF,100000000,4) +! if (rc /= 0) then +! stop 'Unable to set ZMQ_RCVBUF on pull socket' +! endif - rc = f77_zmq_setsockopt(new_zmq_pull_socket,ZMQ_RCVHWM,1,4) + rc = f77_zmq_setsockopt(new_zmq_pull_socket,ZMQ_RCVHWM,3,4) if (rc /= 0) then stop 'Unable to set ZMQ_RCVHWM on pull socket' endif @@ -327,16 +327,16 @@ IRP_ENDIF ! stop 'Unable to set ZMQ_LINGER on push socket' ! endif - rc = f77_zmq_setsockopt(new_zmq_push_socket,ZMQ_SNDHWM,1,4) + rc = f77_zmq_setsockopt(new_zmq_push_socket,ZMQ_SNDHWM,2,4) if (rc /= 0) then stop 'Unable to set ZMQ_SNDHWM on push socket' endif - rc = f77_zmq_setsockopt(new_zmq_push_socket,ZMQ_SNDBUF,100000000,4) - if (rc /= 0) then - stop 'Unable to set ZMQ_SNDBUF on push socket' - endif - +! rc = f77_zmq_setsockopt(new_zmq_push_socket,ZMQ_SNDBUF,100000000,4) +! if (rc /= 0) then +! stop 'Unable to set ZMQ_SNDBUF on push socket' +! endif +! rc = f77_zmq_setsockopt(new_zmq_push_socket,ZMQ_IMMEDIATE,1,4) if (rc /= 0) then stop 'Unable to set ZMQ_IMMEDIATE on push socket' @@ -898,7 +898,7 @@ subroutine end_zmq_to_qp_run_socket(zmq_to_qp_run_socket) character*(8), external :: zmq_port integer :: rc -! rc = f77_zmq_setsockopt(zmq_to_qp_run_socket,ZMQ_LINGER,1000,4) +! rc = f77_zmq_setsockopt(zmq_to_qp_run_socket,ZMQ_LINGER,300000,4) ! if (rc /= 0) then ! stop 'Unable to set ZMQ_LINGER on zmq_to_qp_run_socket' ! endif @@ -940,11 +940,6 @@ subroutine zmq_delete_task(zmq_to_qp_run_socket,zmq_socket_pull,task_id,more) more = 1 else if (reply(16:19) == 'done') then more = 0 -! rc = f77_zmq_setsockopt(zmq_socket_pull, ZMQ_RCVTIMEO, 1000, 4) -! if (rc /= 0) then -! print *, 'f77_zmq_setsockopt(zmq_socket_pull, ZMQ_RCVTIMEO, 3000, 4)' -! stop 'error' -! endif else print *, reply print *, irp_here