Commit 991ac874 authored by Giovanni Lacopo's avatar Giovanni Lacopo
Browse files

cufftmp bug fixing

parent 088dbb22

cuda_fft.cpp

+4 −3
Original line number Diff line number Diff line
@@ -5,10 +5,11 @@ 
#include <cuda_runtime.h>

#include <complex.h>

#include "cuComplex.h"

#include "w-stacking_omp.h"

#include "proto.h"

#include "errcodes.h"

#include <time.h>



#if defined(CUFFTMP) && !defined(USE_FFTW)

#if defined(CUFFTMP) && defined(USE_FFTW)



void cuda_fft(

	      int num_w_planes,
@@ -77,7 +78,7 @@ void cuda_fft( 


  for (int iw=0; iw<num_w_planes; iw++)

    {

      printf("select the %d w-plane to transform\n", iw);

      //printf("select the %d w-plane to transform\n", iw);

      for (int iv=0; iv<yaxis; iv++)

	{

	  for (int iu=0; iu<xaxis; iu++)

fourier_transform.c

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#include "proto.h"



#if defined(CUFFTMP)

#include "w-stacking_omp.h"

void cuda_fft( int, int, int, int, int, double*, double*, int, MPI_Comm );

#endif



                                                // ------------------------------------

proto.h

+11 −1
Original line number Diff line number Diff line 
/* function declaration */



#include <mpi.h>



/* init.c */
@@ -40,6 +40,11 @@ void write_gridded_data(void); 
#ifdef __cplusplus

extern "C" {

  void fftw_data();



 #ifdef CUFFTMP

  void cuda_fft( int, int, int, int, int, double*, double*, int, MPI_Comm );

 #endif

  

  void write_fftw_data();

  void write_result();

}
@@ -48,6 +53,11 @@ extern "C" { 
/* fourier_transform.c */



void fftw_data();



#ifdef CUFFTMP

void cuda_fft( int, int, int, int, int, double*, double*, int, MPI_Comm );

#endif



void write_fftw_data();

void write_result();

#endif

w-stacking_omp.h

+0 −26
Original line number Diff line number Diff line
@@ -96,32 +96,6 @@ void phase_correction( 
		      int);

#endif



#ifdef __cplusplus

extern "C" {

void cuda_fft(

        int,

        int,

        int,

        int,

        int,

        double*,

        double*,

        int,

        MPI_Comm);

}

#else

void cuda_fft(

        int,

        int,

        int,

        int,

        int,

        double*,

        double*,

        int,

        MPI_Comm);

#endif



#ifdef ACCOMP

#ifdef NVIDIA

void getGPUInfo(int);