Skip to content

Commit b75c0ce

Browse files
committed
code works
1 parent 1ac3541 commit b75c0ce

File tree

4 files changed

+329
-199
lines changed

4 files changed

+329
-199
lines changed

lib/include/s2fft.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "thrust/device_vector.h"
1717
#include "s2fft_kernels.h"
1818

19-
2019
namespace s2fft {
2120

2221
/**

lib/include/s2fft_kernels.h

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@ typedef long long int int64;
1111

1212
namespace s2fftKernels {
1313

14-
enum fft_norm {
15-
FORWARD = 1,
16-
BACKWARD = 2,
17-
ORTHO = 3,
18-
NONE = 4
19-
};
14+
enum fft_norm { FORWARD = 1, BACKWARD = 2, ORTHO = 3, NONE = 4 };
2015

2116
template <typename complex>
2217
HRESULT launch_spectral_folding(complex* data, complex* output, const int& nside, const int& L,
@@ -26,13 +21,9 @@ HRESULT launch_spectral_extension(complex* data, complex* output, const int& nsi
2621
cudaStream_t stream);
2722

2823
template <typename complex>
29-
HRESULT launch_shift_normalize_kernel(
30-
cudaStream_t stream,
31-
complex* data, // In-place data buffer
32-
int nside,
33-
bool apply_shift,
34-
int norm
35-
);
24+
HRESULT launch_shift_normalize_kernel(cudaStream_t stream,
25+
complex* data, // In-place data buffer
26+
int nside, bool apply_shift, int norm);
3627

3728
} // namespace s2fftKernels
3829

lib/src/s2fft.cu

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ HRESULT s2fftExec<Complex>::Initialize(const s2fftDescriptor &descriptor) {
109109
return S_OK;
110110
}
111111

112-
113112
template <typename Complex>
114113
HRESULT s2fftExec<Complex>::Forward(const s2fftDescriptor &desc, cudaStream_t stream, Complex *data,
115114
Complex *workspace) {
@@ -148,7 +147,6 @@ HRESULT s2fftExec<Complex>::Forward(const s2fftDescriptor &desc, cudaStream_t st
148147
break;
149148
case s2fftKernels::fft_norm::FORWARD:
150149
// Normalize by sqrt(Npix).
151-
std::cout << "Applying forward normalization." << std::endl;
152150
s2fftKernels::launch_shift_normalize_kernel(stream, data, m_nside, shift, 0);
153151
break;
154152
case s2fftKernels::fft_norm::ORTHO:
@@ -158,7 +156,6 @@ HRESULT s2fftExec<Complex>::Forward(const s2fftDescriptor &desc, cudaStream_t st
158156
default:
159157
return E_INVALIDARG; // Invalid normalization type.
160158
}
161-
162159

163160
return S_OK;
164161
}

0 commit comments

Comments
 (0)