Page MenuHomeSolus
Files F11044922

D9641.diff
No OneTemporary
Actions

D9641.diff
View Options

diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : fftw
version : 3.3.8
-release : 9
+release : 10
source :
- http://fftw.org/fftw-3.3.8.tar.gz : 6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303
license : GPL-2.0-or-later
@@ -8,31 +8,57 @@
description: |
FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).
component : programming
+avx2 : yes
builddeps :
- gfortran
- libpth-devel
setup : |
- CONFOPTS="$CONFOPTS --prefix=/usr --libdir=%libdir% --disable-static --enable-shared --enable-openmp --enable-sse2 --enable-threads"
- mkdir .fftw-single
- mv * .fftw-single/ && mv .fftw-single fftw-single
- cp -R fftw-single fftw-double
- cp -R fftw-single fftw-long-double
- # Single precision
- cd fftw-single/
- ./configure $CONFOPTS --enable-float
- # Double precision
- cd ../fftw-double/
- ./configure $CONFOPTS --enable-avx
- # Long double
- cd ../fftw-long-double/
- ./configure ${CONFOPTS/--enable-sse2/} --enable-long-double
+ export CONFOPTS="$CONFOPTS --prefix=/usr --libdir=%libdir% --disable-static --enable-shared --enable-openmp --enable-threads"
+ export avxflags="--libdir=%libdir%/haswell --enable-sse2 --enable-fma --enable-avx2"
+
+ mkdir .fftw && mv * .fftw/
+
+ if [[ ! -z "${AVX2BUILD}" ]]; then
+ mv .fftw fftw-single-avx2
+ cp -R fftw-single-avx2 fftw-double-avx2
+
+ # Single precision AVX2
+ pushd fftw-single-avx2/
+ ./configure $CONFOPTS $avxflags --enable-float
+ popd
+ # Double precision AVX2
+ pushd fftw-double-avx2/
+ ./configure $CONFOPTS $avxflags
+ popd
+ else
+ mv .fftw fftw-single
+ cp -R fftw-single fftw-double
+ cp -R fftw-single fftw-long-double
+
+ # Single precision
+ pushd fftw-single/
+ ./configure $CONFOPTS --enable-sse2 --enable-float
+ popd
+ # Double precision
+ pushd fftw-double/
+ ./configure $CONFOPTS --enable-sse2 --enable-avx
+ popd
+ # Long double
+ pushd fftw-long-double/
+ ./configure $CONFOPTS --enable-long-double
+ popd
+ fi
build : |
- cd $workdir/fftw-single/
- %make
- %make_install
- cd $workdir/fftw-double/
- %make
- %make_install
- cd $workdir/fftw-long-double/
- %make
- %make_install
+ if [[ ! -z "${AVX2BUILD}" ]]; then
+ export CFLAGS="$CFLAGS -mtune=haswell -march=haswell"
+ export TO_BUILD="fftw-single-avx2 fftw-double-avx2"
+ else
+ export TO_BUILD="fftw-single fftw-double fftw-long-double"
+ fi
+
+ for dir in $TO_BUILD; do
+ pushd $dir
+ %make
+ %make_install
+ popd
+ done
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>fftw</Name>
<Packager>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Campbell Jones</Name>
+ <Email>dev@serebit.com</Email>
</Packager>
<License>GPL-2.0-or-later</License>
<PartOf>programming</PartOf>
@@ -23,6 +23,18 @@
<Path fileType="executable">/usr/bin/fftw-wisdom-to-conf</Path>
<Path fileType="executable">/usr/bin/fftwf-wisdom</Path>
<Path fileType="executable">/usr/bin/fftwl-wisdom</Path>
+ <Path fileType="library">/usr/lib64/haswell/libfftw3.so.3</Path>
+ <Path fileType="library">/usr/lib64/haswell/libfftw3.so.3.5.8</Path>
+ <Path fileType="library">/usr/lib64/haswell/libfftw3_omp.so.3</Path>
+ <Path fileType="library">/usr/lib64/haswell/libfftw3_omp.so.3.5.8</Path>
+ <Path fileType="library">/usr/lib64/haswell/libfftw3_threads.so.3</Path>
+ <Path fileType="library">/usr/lib64/haswell/libfftw3_threads.so.3.5.8</Path>
+ <Path fileType="library">/usr/lib64/haswell/libfftw3f.so.3</Path>
+ <Path fileType="library">/usr/lib64/haswell/libfftw3f.so.3.5.8</Path>
+ <Path fileType="library">/usr/lib64/haswell/libfftw3f_omp.so.3</Path>
+ <Path fileType="library">/usr/lib64/haswell/libfftw3f_omp.so.3.5.8</Path>
+ <Path fileType="library">/usr/lib64/haswell/libfftw3f_threads.so.3</Path>
+ <Path fileType="library">/usr/lib64/haswell/libfftw3f_threads.so.3.5.8</Path>
<Path fileType="library">/usr/lib64/libfftw3.so.3</Path>
<Path fileType="library">/usr/lib64/libfftw3.so.3.5.8</Path>
<Path fileType="library">/usr/lib64/libfftw3_omp.so.3</Path>
@@ -57,7 +69,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="9">fftw</Dependency>
+ <Dependency release="10">fftw</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/fftw3.f</Path>
@@ -86,12 +98,12 @@
</Files>
</Package>
<History>
- <Update release="9">
- <Date>2019-08-13</Date>
+ <Update release="10">
+ <Date>2020-09-13</Date>
<Version>3.3.8</Version>
<Comment>Packaging update</Comment>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Campbell Jones</Name>
+ <Email>dev@serebit.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 10:44 AM (6 h, 32 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5815254
Default Alt Text
D9641.diff (5 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.