Skip to content

Commit 9e53c0c

Browse files
authored
Fix Intel oneMKL FFT setup (#4231)
1 parent 2aa22d1 commit 9e53c0c

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

Src/FFT/AMReX_FFT_Helper.H

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,10 @@ struct Plan
254254
strides.push_back(1);
255255
#ifndef AMREX_USE_MKL_DFTI_2024
256256
pp->set_value(oneapi::mkl::dft::config_param::FWD_STRIDES, strides);
257-
pp->set_value(oneapi::mkl::dft::config_param::BWD_STRIDES, strides);
257+
// Do not set BWD_STRIDES
258258
#else
259259
pp->set_value(oneapi::mkl::dft::config_param::FWD_STRIDES, strides.data());
260-
pp->set_value(oneapi::mkl::dft::config_param::BWD_STRIDES, strides.data());
260+
// Do not set BWD_STRIDES
261261
#endif
262262
pp->set_value(oneapi::mkl::dft::config_param::WORKSPACE,
263263
oneapi::mkl::dft::config_value::WORKSPACE_EXTERNAL);
@@ -1239,7 +1239,7 @@ void Plan<T>::init_r2c (IntVectND<M> const& fft_size, void* pbf, void* pbb, bool
12391239

12401240
#ifndef AMREX_USE_MKL_DFTI_2024
12411241
pp->set_value(oneapi::mkl::dft::config_param::FWD_STRIDES, strides);
1242-
pp->set_value(oneapi::mkl::dft::config_param::BWD_STRIDES, strides);
1242+
// Do not set BWD_STRIDES
12431243
#else
12441244
pp->set_value(oneapi::mkl::dft::config_param::FWD_STRIDES, strides.data());
12451245
// Do not set BWD_STRIDES

Src/FFT/AMReX_FFT_OpenBCSolver.H

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ OpenBCSolver<T>::OpenBCSolver (Box const& domain, Info const& info)
5252
{
5353
#if (AMREX_SPACEDIM == 3)
5454
if (m_info.batch_mode) {
55-
#if defined(AMREX_USE_SYCL)
56-
amrex::Abort("FFT::OpenBCSolver: batch mode not support because Intel does not support batched 2d fft.");
57-
#endif
5855
auto gdom = make_grown_domain(domain,m_info);
5956
gdom.enclosedCells(2);
6057
gdom.setSmall(2, 0);

Src/FFT/AMReX_FFT_R2C.H

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ R2C<T,D,S>::R2C (Box const& domain, Info const& info)
246246
int myproc = ParallelContext::MyProcSub();
247247
int nprocs = std::min(ParallelContext::NProcsSub(), m_info.nprocs);
248248

249-
#if (AMREX_SPACEDIM == 3) && !defined(AMREX_USE_SYCL) /* Intel does not support batched 2d fft */
249+
#if (AMREX_SPACEDIM == 3)
250250
if (S == DomainStrategy::slab && (m_real_domain.length(1) > 1)) {
251251
m_slab_decomp = true;
252252
}

0 commit comments

Comments
 (0)