Commit bc00517d authored by Alessandro Mirone's avatar Alessandro Mirone

final cleaning

parent fdd283ce
......@@ -722,6 +722,13 @@ void CCspace_ffstatus_dealloc(CCspace * self ) {
}
void CCspace_end(CCspace * self ) {
MPI_Barrier(MPI_COMM_WORLD);
MPI_Finalize();
exit(0);
}
void dimmi_somma( char * msg , float *x , int n ) {
......
......@@ -1301,6 +1301,8 @@ void CCspace_reconstructSHARED(CCspace * self ,int sn, int npbunches,int ntoktr
void CCspace_prepare_concurrent_ff_reading(CCspace * self);
void CCspace_ffstatus_dealloc(CCspace * self);
void CCspace_end(CCspace * self ) ;
void CCspace_set_nchunks( CCspace * self ,int nchunks ) ;
......
......@@ -115,9 +115,13 @@ Cspace_dealloc(Cspace *self)
Py_DECREF(self->OParameters);
CCspace_ffstatus_dealloc( self->myCCspace);
CCspace_end(self->myCCspace);
if(self && 0 )
free(self);
DEBUG("... going to destroy a Cspace ... OK")
}
static PyObject *
......
......@@ -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
sum=sum+ (P.NUM_IMAGE_1*n_projs_max* (NSLICESATONCE + 2*c_margin))*2*2
## 2 because there are transmit and receive buffers to get it
## --------------------- C -------------------------------
......@@ -2387,7 +2387,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.75* MemPerProc*coresperproc ):
if( req <0.65* MemPerProc*coresperproc ):
break
NSLICESATONCE -=1
if Parameters.VERBOSITY>0 : print( " with RAWDATA_MEMORY_REUSE = " , RAWDATA_MEMORY_REUSE , " NSLICESATONCE " , NSLICESATONCE)
......
......@@ -64,8 +64,10 @@ casi = [ "ID11_SNOW" ]
##################################################
PREFIX="/home/esrf/mirone/WORKS/TEST_PYHST/DATASETS"
casi=["CRAYON"]
casi=CASI_ALL
LAUNCHING_INSTRUCTION = "PyHST2_2020a input.par p9-04,0"
outputprefix="/home/esrf/mirone/nobackup/TEST_PYHST/RESULTS/p9-04/"
outputprefix="/home/esrf/mirone/nobackup/TEST_PYHST/RESULTS/p9-04/monogpu"
# outputprefix="/tmp/TEST_PYHST/RESULTS/p9-04/"
###############################################################
......
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