Skip to content
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.

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

DM-8146: fix fftw failure when using MKL based conda stack #194

Merged
merged 1 commit into from Oct 12, 2021

Conversation

mwittgen
Copy link
Contributor

@mwittgen mwittgen commented Oct 3, 2021

No description provided.

Copy link

@rmjarvis rmjarvis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks right to me. The one suggestion I might make is to check the timing to see if this is significantly slower than the r2r version. It might be worth using #ifdef __INTEL_MKL__ statements to use the r2r code when it's available.

@@ -447,11 +449,11 @@ std::shared_ptr<afw::image::Image<PixelT>> calcImageKSpaceReal(double const rad1
double const airy1 = (rad1 > 0 ? rad1 * J1(twoPiRad1 * k) : 0.0) / k;
double const airy2 = rad2 * J1(twoPiRad2 * k) / k;
double const airy = airy2 - airy1;
c[fY * wid + fX] = airy;
c[fY * wid + fX] = {airy, 0.};

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is required. IMO, this and the one below are more readable having the rhs just be the real value. But YMMV.

@mwittgen mwittgen merged commit 126824a into master Oct 12, 2021
@mwittgen mwittgen deleted the tickets/DM-8146 branch October 12, 2021 05:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants