9
1
mirror of https://github.com/QuantumPackage/qp2.git synced 2024-07-16 07:50:21 +02:00

Fixing Davidson

This commit is contained in:
Anthony Scemama 2019-01-26 12:37:25 +01:00
parent da61f60ba4
commit f1e14f0851
2 changed files with 14 additions and 43 deletions

View File

@ -13,6 +13,7 @@ end
subroutine davidson_slave_tcp(i)
implicit none
integer, intent(in) :: i
call sleep(1) ! Let the master start
call davidson_run_slave(0,i)
end
@ -42,48 +43,18 @@ subroutine davidson_run_slave(thread,iproc)
zmq_socket_push = new_zmq_push_socket(thread)
integer :: ierr, doexit
do
doexit = 0
if (connect_to_taskserver(zmq_to_qp_run_socket,worker_id,thread) == -1) then
call sleep( int(1.5+float(mpi_rank)/10.) )
if (connect_to_taskserver(zmq_to_qp_run_socket,worker_id,thread) == -1) then
doexit=1
endif
endif
IRP_IF MPI
include 'mpif.h'
integer :: sendbuf, recvbuf
sendbuf = doexit
recvbuf = doexit
call MPI_ALLREDUCE(sendbuf, recvbuf, 1, MPI_INTEGER, MPI_SUM, MPI_COMM_WORLD, ierr)
if (ierr /= MPI_SUCCESS) then
print *, irp_here//': Unable to reduce '
stop -1
endif
doexit = recvbuf
IRP_ENDIF
if (doexit == 0) then
exit
else
if (thread == 0) then
print *, irp_here, ': Connection failed. Exiting Davidson.'
return
endif
if (connect_to_taskserver(zmq_to_qp_run_socket,worker_id,thread) == -1) then
return
endif
if (zmq_get_N_states_diag_notouch(zmq_to_qp_run_socket,1) == -1) then
if (disconnect_from_taskserver(zmq_to_qp_run_socket,worker_id) == -1) then
continue
endif
enddo
return
endif
do
if (zmq_get_N_states_diag_notouch(zmq_to_qp_run_socket,1) == -1) then
call sleep(1)
print *, irp_here, ': waiting for N_states_diag'
else
exit
endif
enddo
SOFT_TOUCH N_states_diag
! SOFT_TOUCH N_states_diag
call davidson_slave_work(zmq_to_qp_run_socket, zmq_socket_push, N_states_diag, N_det, worker_id)

View File

@ -663,17 +663,16 @@ integer function connect_to_taskserver(zmq_to_qp_run_socket,worker_id,thread)
rc = f77_zmq_recv(zmq_to_qp_run_socket, message, 510, 0)
message = trim(message(1:rc))
if(message(1:5) == "error") then
connect_to_taskserver = -1
return
go to 10
end if
read(message,*, end=10, err=10) reply, state, worker_id, address
if (trim(reply) /= 'connect_reply') then
connect_to_taskserver = -1
return
go to 10
endif
if (trim(state) /= zmq_state) then
integer, external :: disconnect_from_taskserver_state
if (disconnect_from_taskserver_state(zmq_to_qp_run_socket, worker_id, state) == -1) then
print *, irp_here//': Wrong zmq_state. Disconnecting.'
continue
endif
connect_to_taskserver = -1
@ -682,6 +681,7 @@ integer function connect_to_taskserver(zmq_to_qp_run_socket,worker_id,thread)
return
10 continue
print *, irp_here//': '//trim(message)
connect_to_taskserver = -1
end