Skip to content

Fftw.cpp malloc size fix #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hyschive merged 8 commits into from
Jun 6, 2025
Merged

Fftw.cpp malloc size fix #469

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6ac66af
Replace ComputePaddedTotalSize() and ComputeTotalSize() with fftw_mpi…
Jun 5, 2025
d9be315
Replace MemUnit calculate methode from amr->NPatchComma[0][1]*PS1 to …
Jun 5, 2025
caf6eee
Remove unused function ComputePaddedTotalSize() and ComputeTotalSize(…
Jun 5, 2025
681d665
Remove unused function ComputePaddedTotalSize() and ComputeTotalSize().
Jun 5, 2025
02f1de9
Bring back ComputePaddedTotalSize() and ComputeTotalSize() for serial…
Jun 6, 2025
46c762b
Remove redundent line.
Jun 6, 2025
8ed0d98
Apply comment suggestions.
Jun 6, 2025
b3a9f86
Remove extra )
Jun 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 36 additions & 2 deletions src/Init/Init_FFTW.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,15 @@ gramfe_fftw::complex_plan_1d FFTW_Plan_ExtPsi, FFTW_Plan_ExtPsi_Inv; // ExtPsi
// Return : length of array that is large enough to store FFT input and output
//-------------------------------------------------------------------------------------------------------
size_t ComputePaddedTotalSize(int* size) {
# ifdef SERIAL
return 2*((size_t)size[0]/2+1)*size[1]*size[2];
# else
mpi_index_int local_nz, local_z_start, local_ny_after_transpose, local_y_start_after_transpose;

return (size_t)fftw_mpi_local_size_3d_transposed(size[2], size[1], 2*(size[0]/2+1),
MPI_COMM_WORLD, &local_nz, &local_z_start, &local_ny_after_transpose,
&local_y_start_after_transpose);
# endif //#if SERIAL
} // FUNCTION : ComputePaddedTotalSize


Expand All @@ -41,7 +49,15 @@ size_t ComputePaddedTotalSize(int* size) {
// Return : length of array that is large enough to store FFT input and output
//-------------------------------------------------------------------------------------------------------
size_t ComputeTotalSize(int* size) {
# ifdef SERIAL
return (size_t)size[0]*size[1]*size[2];
# else
mpi_index_int local_nz, local_z_start, local_ny_after_transpose, local_y_start_after_transpose;

return (size_t)fftw_mpi_local_size_3d_transposed(size[2], size[1], size[0],
MPI_COMM_WORLD, &local_nz, &local_z_start, &local_ny_after_transpose,
&local_y_start_after_transpose);
# endif
} // FUNCTION : ComputeTotalSize


Expand Down Expand Up @@ -167,7 +183,7 @@ void Init_FFTW()
RhoK = (real*) root_fftw::fft_malloc(ComputePaddedTotalSize(Gravity_FFT_Size) * sizeof(real));
# endif // # ifdef GRAVITY
# if ( MODEL == ELBDM )
PsiK = (real*) root_fftw::fft_malloc( ComputeTotalSize ( Psi_FFT_Size ) * sizeof(real) * 2 ); // 2 * real for size of complex number
PsiK = (real*) root_fftw::fft_malloc( ComputeTotalSize ( Psi_FFT_Size ) * sizeof(real) * 2 ); // 2 * real for size of complex number
# endif // # if ( MODEL == ELBDM )

# if ( WAVE_SCHEME == WAVE_GRAMFE )
Expand Down Expand Up @@ -337,7 +353,7 @@ void Patch2Slab( real *VarS, real *SendBuf_Var, real *RecvBuf_Var, long *SendBuf
const int SSize[2] = { ( InPlacePad ? 2*(FFT_Size[0]/2+1) : FFT_Size[0] ), FFT_Size[1] }; // padded slab size in the x and y directions
const int PSSize = PS1*PS1; // patch slice size
// const int MemUnit = amr->NPatchComma[0][1]*PS1/MPI_NRank; // set arbitrarily
const int MemUnit = amr->NPatchComma[0][1]*PS1; // set arbitrarily
const int MemUnit = amr->NPatchComma[0][1]/MPI_NRank; // set arbitrarily
const int AveNz = FFT_Size[2]/MPI_NRank + ( ( FFT_Size[2]%MPI_NRank == 0 ) ? 0 : 1 ); // average slab thickness
const int Scale0 = amr->scale[0];

Expand All @@ -363,6 +379,15 @@ void Patch2Slab( real *VarS, real *SendBuf_Var, real *RecvBuf_Var, long *SendBuf
TempBuf_SIdx [r] = (long*)malloc( MemSize[r]*sizeof(long) );
TempBuf_Var [r] = (real*)malloc( MemSize[r]*sizeof(real)*PSSize );
List_NSend_SIdx[r] = 0;

if ( List_PID[r] == NULL )
Aux_Error( ERROR_INFO, "List_PID[%d] is NULL on Rank %d !!\n", r, MPI_Rank );
if ( List_k[r] == NULL )
Aux_Error( ERROR_INFO, "List_k[%d] is NULL on Rank %d !!\n", r, MPI_Rank );
if ( TempBuf_SIdx[r] == NULL )
Aux_Error( ERROR_INFO, "TempBuf_SIdx[%d] is NULL on Rank %d !!\n", r, MPI_Rank );
if ( TempBuf_Var[r] == NULL )
Aux_Error( ERROR_INFO, "TempBuf_Var[%d] is NULL on Rank %d !!\n", r, MPI_Rank );
}


Expand Down Expand Up @@ -441,6 +466,15 @@ void Patch2Slab( real *VarS, real *SendBuf_Var, real *RecvBuf_Var, long *SendBuf
List_k [TRank] = (int* )realloc( List_k [TRank], MemSize[TRank]*sizeof(int) );
TempBuf_SIdx[TRank] = (long*)realloc( TempBuf_SIdx[TRank], MemSize[TRank]*sizeof(long) );
TempBuf_Var [TRank] = (real*)realloc( TempBuf_Var [TRank], MemSize[TRank]*sizeof(real)*PSSize );

if ( List_PID[TRank] == NULL )
Aux_Error( ERROR_INFO, "List_PID[%d] is NULL on Rank %d !!\n", TRank, MPI_Rank );
if ( List_k[TRank] == NULL )
Aux_Error( ERROR_INFO, "List_k[%d] is NULL on Rank %d !!\n", TRank, MPI_Rank );
if ( TempBuf_SIdx[TRank] == NULL )
Aux_Error( ERROR_INFO, "TempBuf_SIdx[%d] is NULL on Rank %d !!\n", TRank, MPI_Rank );
if ( TempBuf_Var[TRank] == NULL )
Aux_Error( ERROR_INFO, "TempBuf_Var[%d] is NULL on Rank %d !!\n", TRank, MPI_Rank );
}

// record list
Expand Down
Loading