Skip to content

Fixed fftw guards to be fine-grained #661

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
cliffburdick merged 1 commit into from
Jul 8, 2024
Merged

Fixed fftw guards to be fine-grained #661

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions include/matx/transforms/fft/fft_fftw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

#pragma once

#if MATX_EN_CPU_FFT
#include "matx/core/cache.h"
#include "matx/core/error.h"
#include "matx/core/make_tensor.h"
Expand Down Expand Up @@ -258,7 +257,7 @@ struct FftFFTWParamsKeyEq {

using fft_fftw_cache_t = std::unordered_map<FftFFTWParams_t, std::any, FftFFTWParamsKeyHash, FftFFTWParamsKeyEq>;


#if MATX_EN_CPU_FFT
/**
* Class to manage FFTW initialization and cleanup for single and
* double precision transforms.
Expand Down Expand Up @@ -330,7 +329,7 @@ template<typename OutTensorType, typename InTensorType> class matxFFTWPlan_t {
auto fft_dir = (params_.dir == detail::FFTDirection::FORWARD) ? FFTW_FORWARD : FFTW_BACKWARD;
auto in_ptr = i.Data();
auto out_ptr = o.Data();

if constexpr (is_fp32_) {
FFTWPlanManager::InitFFTWF();
fftwf_plan_with_nthreads(exec.GetNumThreads());
Expand Down Expand Up @@ -496,6 +495,7 @@ template<typename OutTensorType, typename InTensorType> class matxFFTWPlan_t {
FftFFTWParams_t params_;
plan_type plan_;
};
#endif

template <typename TensorOp>
__MATX_INLINE__ auto getFFTW1DSupportedTensor( const TensorOp &in) {
Expand Down Expand Up @@ -561,6 +561,7 @@ template<typename OutTensorType, typename InTensorType> class matxFFTWPlan_t {
[[maybe_unused]] const FftFFTWParams_t &params,
[[maybe_unused]] detail::FFTDirection dir,
[[maybe_unused]] const HostExecutor<MODE> &exec) {
#if MATX_EN_CPU_FFT
using cache_val_type = detail::matxFFTWPlan_t<OutputTensor, InputTensor>;
detail::GetCache().LookupAndExec<detail::fft_fftw_cache_t>(
detail::GetCacheIdFromType<detail::fft_fftw_cache_t>(),
Expand All @@ -572,6 +573,7 @@ template<typename OutTensorType, typename InTensorType> class matxFFTWPlan_t {
ctype->Exec(o, i);
}
);
#endif
}

template <typename OutputTensor, typename InputTensor, ThreadsMode MODE>
Expand Down Expand Up @@ -758,5 +760,4 @@ template<typename OutTensorType, typename InTensorType> class matxFFTWPlan_t {



}; // end namespace matx
#endif
}; // end namespace matx