Skip to content

Fix incorrect FFT_INC_DIR for intelfftw.#2323

Merged
boegel merged 2 commits intoeasybuilders:developfrom
akesandgren:fix-intelfftw-include-dir
Oct 12, 2017
Merged

Fix incorrect FFT_INC_DIR for intelfftw.#2323
boegel merged 2 commits intoeasybuilders:developfrom
akesandgren:fix-intelfftw-include-dir

Conversation

@akesandgren
Copy link
Copy Markdown
Contributor

The fftw include files are in the .../include/fftw directory.

The fftw include files are in the .../include/fftw directory.
@boegel boegel added this to the 3.4.1 milestone Oct 11, 2017
Comment thread easybuild/toolchains/fft/intelfftw.py Outdated

self.FFT_LIB_DIR = self.BLAS_LIB_DIR
self.FFT_INCLUDE_DIR = self.BLAS_INCLUDE_DIR
self.FFT_INCLUDE_DIR = os.path.join(self.BLAS_INCLUDE_DIR, 'fftw')
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@akesandgren Ah, BLAS_INCLUDE_DIR is a list, I overlooked that.

So, should become:

self.FFT_INCLUDE_DIR = [os.path.join(d, 'fftw') for d in self. BLAS_INCLUDE_DIR]

Copy link
Copy Markdown
Member

@boegel boegel left a comment

Choose a reason for hiding this comment

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

lgtm

@boegel
Copy link
Copy Markdown
Member

boegel commented Oct 12, 2017

Thanks for the fix @akesandgren.

I checked which installations may be affected by this, and could only find an old ABINIT easyconfig that uses $FFT_INC_DIR/fftw, which is fixed by easybuilders/easybuild-easyconfigs#5207, so good to go.

@boegel boegel merged commit ae068c4 into easybuilders:develop Oct 12, 2017
@akesandgren akesandgren deleted the fix-intelfftw-include-dir branch October 12, 2017 09:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants