Commit 752df6a6 authored by Alessandro Mirone's avatar Alessandro Mirone

adjusted memory limits

parent 67a4fdc6
......@@ -2284,7 +2284,7 @@ def memory_estimator( P, NSLICESATONCE, n_projs_max, n_ff_max, PIECE_MARGE_touse
## treated data
sum=sum+ P.NUM_IMAGE_1*n_projs_max* (NSLICESATONCE + 2*c_margin)
## transposed data
sum=sum+ (P.NUM_IMAGE_1*n_projs_max* (NSLICESATONCE + 2*c_margin))*2*2
sum=sum+ (P.NUM_IMAGE_1*n_projs_max* (NSLICESATONCE + 2*c_margin))*4
## 2 because there are transmit and receive buffers to get it
## --------------------- C -------------------------------
......@@ -2293,7 +2293,12 @@ def memory_estimator( P, NSLICESATONCE, n_projs_max, n_ff_max, PIECE_MARGE_touse
sum=sum+ P.NUM_IMAGE_1*P.numpjs_span * (NSLICESATONCE *1.0/nprocs+2*c_margin )*2
## accounting for extra buffers
sum = sum + P.NUM_IMAGE_1*sizeV*4* P.NPBUNCHES
sum = sum + P.NUM_IMAGE_2*P.NUM_IMAGE_1*8* P.NPBUNCHES
sum = sum + P.numpjs_span*P.NUM_IMAGE_1*8* P.NPBUNCHES
# sum = sum + P.NUM_IMAGE_2*P.NUM_IMAGE_1*sizeV*4
# sum = sum + P.NUM_IMAGE_1*( P.numpjs_span )*2* P.NPBUNCHES
if P.CONICITY:
......@@ -2387,7 +2392,7 @@ if not Parameters.DO_V3D_UNSHARP and Parameters.NSLICESATONCE is None and (sys.
req = memory_estimator(P,NSLICESATONCE,n_projs_max, n_ff_max, PIECE_MARGE_touse, MAX_NSLICESATONCE, C_MARGIN , RAWDATA_MEMORY_REUSE)
req1 = memory_estimator(P, NSLICESATONCE,n_projs_max, n_ff_max, PIECE_MARGE_touse, MAX_NSLICESATONCE, C_MARGIN , RAWDATA_MEMORY_REUSE+1)
if Parameters.VERBOSITY>2 : print( NSLICESATONCE , req, MemPerProc,coresperproc , Parameters.VERBOSITY )# too verbose ?
if( req <0.65* MemPerProc*coresperproc ):
if( req <0.75* MemPerProc*coresperproc ):
break
NSLICESATONCE -=1
if Parameters.VERBOSITY>0 : print( " with RAWDATA_MEMORY_REUSE = " , RAWDATA_MEMORY_REUSE , " NSLICESATONCE " , NSLICESATONCE)
......
......@@ -30,5 +30,4 @@
# is a problem for you.
#############################################################################*/
version = "__init__"
version = "2020a"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment