Skip to content

Commit 4d8d459

Browse files
authored
Merge pull request #87 from mkstoyanov/port_onemkl_2025p3
* updated heFFTe compatibility to OneMKL 2025.3
2 parents efa4153 + b7b7842 commit 4d8d459

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

include/heffte_backend_oneapi.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ class onemkl_executor : public executor_base{
403403
blocks((dimension == box.order[1]) ? box.osize(2) : 1),
404404
block_stride(box.osize(0) * box.osize(1)),
405405
total_size(box.count()),
406-
embed({0, static_cast<MKL_LONG>(stride), 0}),
406+
embed({0, static_cast<MKL_LONG>(stride)}),
407407
init_cplan(false), init_zplan(false),
408408
cplan(size), zplan(size)
409409
{}
@@ -543,7 +543,7 @@ class onemkl_executor : public executor_base{
543543

544544
sycl::queue &q;
545545
int size, size2, howmanyffts, stride, dist, blocks, block_stride, total_size;
546-
std::vector<MKL_LONG> embed;
546+
std::vector<int64_t> embed;
547547

548548
mutable event_chainer chainer;
549549
mutable bool init_cplan, init_zplan;
@@ -629,7 +629,9 @@ class onemkl_executor_r2c : public executor_base{
629629
void make_plan(onemkl_plan_type &plan) const{
630630
#if INTEL_MKL_VERSION >= 20250100
631631
oneapi::mkl::dft::config_value const not_inplace = oneapi::mkl::dft::config_value::NOT_INPLACE;
632+
#if INTEL_MKL_VERSION <= 20250200
632633
oneapi::mkl::dft::config_value const complex_complex = oneapi::mkl::dft::config_value::COMPLEX_COMPLEX;
634+
#endif
633635
std::vector<std::int64_t> slstride = {0, static_cast<MKL_LONG>(stride)};
634636
#else
635637
DFTI_CONFIG_VALUE const not_inplace = DFTI_NOT_INPLACE;
@@ -638,7 +640,9 @@ class onemkl_executor_r2c : public executor_base{
638640
#endif
639641
plan.set_value(oneapi::mkl::dft::config_param::NUMBER_OF_TRANSFORMS, (MKL_LONG) howmanyffts);
640642
plan.set_value(oneapi::mkl::dft::config_param::PLACEMENT, not_inplace);
643+
#if INTEL_MKL_VERSION <= 20250200
641644
plan.set_value(oneapi::mkl::dft::config_param::CONJUGATE_EVEN_STORAGE, complex_complex);
645+
#endif
642646
plan.set_value(oneapi::mkl::dft::config_param::FWD_STRIDES, slstride);
643647
plan.set_value(oneapi::mkl::dft::config_param::BWD_STRIDES, slstride);
644648
plan.set_value(oneapi::mkl::dft::config_param::FWD_DISTANCE, (MKL_LONG) rdist);

0 commit comments

Comments
 (0)