Commit c314271f authored by myron's avatar myron

test

parent 6c2ddf89
......@@ -964,6 +964,8 @@ void CCspace_reconstructSHARED(CCspace * self ,int sn, int npbunches,int ntoktr
if( self->params.DO_RING_FILTER ) {
// data = (float*) malloc((mydata_end-mydata_start)*self->params.nprojs_span * size1 *sizeof(float)) ;
printf(" TRACKER nslices_data %d mydata_start %d start_slice_2s %d \n", nslices_data, mydata_start, start_slice_2s ) ;
if( self->params.RING_FILTER_KIND == RING_Filter_ID ) {
if (self->params.verbosity>0) printf(" ring_filter \n" );
CCspace_RING_Filter_implementation(self, data,
......@@ -4846,11 +4848,18 @@ void CCspace_tranpose_chunk (CCspace * self , int sn, int ntoktreated, int
AcTypeMPI , MPI_COMM_WORLD);
printf(" VADO in MPI OK\n");
self->transposeddatatokens->islice_tracker[ntoktransposed] = (int *) malloc( (top_slice-start_slice)*sizeof(int)) ;
memset( self->transposeddatatokens->islice_tracker[ntoktransposed] ,0, (top_slice-start_slice)*sizeof(int) );
numprojs = self->params.nprojs_span ;
printf(" TRACKER alloco top_slice %d start_slice %d\n", top_slice,start_slice ) ;
{
int my_wished_margine = self->params.CONICITY_MARGIN_DOWN_wished[sn_nb*self->nprocs + self->iproc ] ;
int my_wished_margine_up = self->params.CONICITY_MARGIN_UP_wished[sn_nb*self->nprocs + self->iproc ] ;
self->transposeddatatokens->islice_tracker[ntoktransposed] = (int *) malloc( (top_slice-start_slice + my_wished_margine+ my_wished_margine_up )*sizeof(int)) ;
memset( self->transposeddatatokens->islice_tracker[ntoktransposed] ,0, (top_slice-start_slice+ + my_wished_margine+ my_wished_margine_up )*sizeof(int) );
}
numprojs = self->params.nprojs_span ;
int tot_npj = 0;
for(jproc=0; jproc<self->nprocs; jproc++) {
tot_npj += self->reading_infos. proj_mpi_numpjs [jproc];
......@@ -4878,7 +4887,7 @@ void CCspace_tranpose_chunk (CCspace * self , int sn, int ntoktreated, int
/* continue ; */
/* } */
for(jproc=0; jproc<self->nprocs; jproc++) {
numpjs_jproc = self->reading_infos. proj_mpi_numpjs [jproc] ;
numpjs_offset = self->reading_infos. proj_mpi_offsets[jproc] ;
......@@ -8098,7 +8107,7 @@ void CCspace_RING_Filter_implementation(CCspace * self, float *data,
int doit=1;
sem_wait( &(self->islicetracker_sem));
if ( islicetracker[slice_count] ) {
doit=0;
doit=0;
}
islicetracker[slice_count]=1;
sem_post( &(self->islicetracker_sem) );
......
......@@ -436,14 +436,14 @@ def do_pyhst():
module = Extension(name='PyHST2_'+version+'.Cspace',
sources=c_sorgenti ,
depends=depends,
sources=c_sorgenti ,
depends=depends,
library_dirs= mpilibs_dirs,
libraries=["fftw3f_threads", "fftw3f",hdf5_lib, "mpi"],
libraries=["fftw3f_threads", "fftw3f",hdf5_lib, "mpi"],
extra_link_args=['-fopenmp'] ,
extra_compile_args={'gcc': ["-fPIC",'-fopenmp' ]},
define_macros=define_macros,
include_dirs=[ CUDA['include'], numpy.get_include()] + mpi_dirs + hdf5_dirs )
extra_compile_args={'gcc': ["-fPIC",'-fopenmp',"-g" ]},
define_macros=define_macros,
include_dirs=[ CUDA['include'], numpy.get_include()] + mpi_dirs + hdf5_dirs )
return module
......
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