Skip to content

Use INTEL_MKL_VERSION flag #2035

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
merged 3 commits into from
Sep 15, 2024
Merged

Use INTEL_MKL_VERSION flag #2035

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1263b04
use MKL_VERSION flag
Sep 13, 2024
c69af05
Merge branch 'master' into use_MKL_version
vtavana Sep 14, 2024
9f34b5a
update CHANGELOG.md
Sep 14, 2024
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
6 changes: 0 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,6 @@ else()
find_package(oneDPL REQUIRED PATHS ${CMAKE_SOURCE_DIR}/dpnp/backend/cmake/Modules NO_DEFAULT_PATH)
endif()

if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "2025.0.0")
add_definitions(-DCOMPILER_VERSION_2025_OR_LATER=1)
else()
add_definitions(-DCOMPILER_VERSION_2025_OR_LATER=0)
endif()

include(GNUInstallDirs)

# Fetch pybind11
Expand Down
28 changes: 14 additions & 14 deletions dpnp/backend/extensions/fft/common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@ class DescriptorWrapper
const typename valT::value_type dim = get_dim();

valT fwd_strides(dim + 1);
#if COMPILER_VERSION_2025_OR_LATER
#if INTEL_MKL_VERSION >= 20250000
descr_.get_value(mkl_dft::config_param::FWD_STRIDES, &fwd_strides);
#else
descr_.get_value(mkl_dft::config_param::FWD_STRIDES,
fwd_strides.data());
#endif // COMPILER_VERSION_2025_OR_LATER
#endif // INTEL_MKL_VERSION
return fwd_strides;
}

Expand All @@ -129,11 +129,11 @@ class DescriptorWrapper
throw py::value_error(
"Strides length does not match descriptor's dimension");
}
#if COMPILER_VERSION_2025_OR_LATER
#if INTEL_MKL_VERSION >= 20250000
descr_.set_value(mkl_dft::config_param::FWD_STRIDES, strides);
#else
descr_.set_value(mkl_dft::config_param::FWD_STRIDES, strides.data());
#endif // COMPILER_VERSION_2025_OR_LATER
#endif // INTEL_MKL_VERSION
}

// config_param::BWD_STRIDES
Expand All @@ -143,12 +143,12 @@ class DescriptorWrapper
const typename valT::value_type dim = get_dim();

valT bwd_strides(dim + 1);
#if COMPILER_COMPILER_VERSION_2025_OR_LATER
#if INTEL_MKL_VERSION >= 20250000
descr_.get_value(mkl_dft::config_param::BWD_STRIDES, &bwd_strides);
#else
descr_.get_value(mkl_dft::config_param::BWD_STRIDES,
bwd_strides.data());
#endif // COMPILER_VERSION_2025_OR_LATER
#endif // INTEL_MKL_VERSION
return bwd_strides;
}

Expand All @@ -161,11 +161,11 @@ class DescriptorWrapper
throw py::value_error(
"Strides length does not match descriptor's dimension");
}
#if COMPILER_VERSION_2025_OR_LATER
#if INTEL_MKL_VERSION >= 20250000
descr_.set_value(mkl_dft::config_param::BWD_STRIDES, strides);
#else
descr_.set_value(mkl_dft::config_param::BWD_STRIDES, strides.data());
#endif // COMPILER_VERSION_2025_OR_LATER
#endif // INTEL_MKL_VERSION
}

// config_param::FWD_DISTANCE
Expand Down Expand Up @@ -203,7 +203,7 @@ class DescriptorWrapper
// config_param::PLACEMENT
bool get_in_place()
{
#if defined(USE_ONEMKL_INTERFACES) || COMPILER_VERSION_2025_OR_LATER
#if defined(USE_ONEMKL_INTERFACES) || INTEL_MKL_VERSION >= 20250000
mkl_dft::config_value placement;
descr_.get_value(mkl_dft::config_param::PLACEMENT, &placement);
return (placement == mkl_dft::config_value::INPLACE);
Expand All @@ -212,12 +212,12 @@ class DescriptorWrapper
DFTI_CONFIG_VALUE placement;
descr_.get_value(mkl_dft::config_param::PLACEMENT, &placement);
return (placement == DFTI_CONFIG_VALUE::DFTI_INPLACE);
#endif // USE_ONEMKL_INTERFACES or COMPILER_VERSION_2025_OR_LATER
#endif // USE_ONEMKL_INTERFACES or INTEL_MKL_VERSION
}

void set_in_place(const bool &in_place_request)
{
#if defined(USE_ONEMKL_INTERFACES) || COMPILER_VERSION_2025_OR_LATER
#if defined(USE_ONEMKL_INTERFACES) || INTEL_MKL_VERSION >= 20250000
descr_.set_value(mkl_dft::config_param::PLACEMENT,
(in_place_request)
? mkl_dft::config_value::INPLACE
Expand All @@ -228,7 +228,7 @@ class DescriptorWrapper
(in_place_request)
? DFTI_CONFIG_VALUE::DFTI_INPLACE
: DFTI_CONFIG_VALUE::DFTI_NOT_INPLACE);
#endif // USE_ONEMKL_INTERFACES or COMPILER_VERSION_2025_OR_LATER
#endif // USE_ONEMKL_INTERFACES or INTEL_MKL_VERSION
}

// config_param::PRECISION
Expand All @@ -243,7 +243,7 @@ class DescriptorWrapper
// config_param::COMMIT_STATUS
bool is_committed()
{
#if defined(USE_ONEMKL_INTERFACES) || COMPILER_VERSION_2025_OR_LATER
#if defined(USE_ONEMKL_INTERFACES) || INTEL_MKL_VERSION >= 20250000
mkl_dft::config_value committed;
descr_.get_value(mkl_dft::config_param::COMMIT_STATUS, &committed);
return (committed == mkl_dft::config_value::COMMITTED);
Expand All @@ -252,7 +252,7 @@ class DescriptorWrapper
DFTI_CONFIG_VALUE committed;
descr_.get_value(mkl_dft::config_param::COMMIT_STATUS, &committed);
return (committed == DFTI_CONFIG_VALUE::DFTI_COMMITTED);
#endif // USE_ONEMKL_INTERFACES or COMPILER_VERSION_2025_OR_LATER
#endif // USE_ONEMKL_INTERFACES or INTEL_MKL_VERSION
}

private:
Expand Down
Loading