* [PATCH] Fix Ardour and mod-host. @ 2016-11-25 23:28 Ricardo Wurmus 2016-11-25 23:28 ` [PATCH] gnu: Add threaded variants of fftw and fftwf for " Ricardo Wurmus 0 siblings, 1 reply; 5+ messages in thread From: Ricardo Wurmus @ 2016-11-25 23:28 UTC (permalink / raw) To: guix-devel We already have a fix for Ardour and mod-host on the staging branch, but it will be some time till it's merged. This patch adds threaded variants for fftw/fftwf and changes both Ardour and mod-host to use them. This patch can be easily reverted once the staging branch is merged. What do you think? ~~ Ricardo PS: I only built mod-host so far because I don't have enough space at the moment for building Ardour. Ricardo Wurmus (1): gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host. gnu/packages/algebra.scm | 16 ++++++++++++++++ gnu/packages/audio.scm | 4 ++-- gnu/packages/music.scm | 4 ++-- 3 files changed, 20 insertions(+), 4 deletions(-) -- 2.10.2 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host. 2016-11-25 23:28 [PATCH] Fix Ardour and mod-host Ricardo Wurmus @ 2016-11-25 23:28 ` Ricardo Wurmus 2016-11-26 6:14 ` Leo Famulari 0 siblings, 1 reply; 5+ messages in thread From: Ricardo Wurmus @ 2016-11-25 23:28 UTC (permalink / raw) To: guix-devel * gnu/packages/algebra.scm (fftw-with-threads, fftwf-with-threads): New variables. * gnu/packages/audio.scm (ardour)[inputs]: Replace "fftw" and "fftwf" with "fftw-with-threads" and "fftwf-with-threads", respectively. * gnu/packages/music.scm (mod-host)[inputs]: Likewise. --- gnu/packages/algebra.scm | 16 ++++++++++++++++ gnu/packages/audio.scm | 4 ++-- gnu/packages/music.scm | 4 ++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 76f385e..4288913 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -576,6 +576,22 @@ cosine/ sine transforms or DCT/DST).") (string-append (package-description fftw) " Single-precision version.")))) +;; FIXME: These packages are used temporarily by packages like Ardour until +;; "--enable-flags" is added to the fftw and fftwf packages. +(define-public fftw-with-threads + (package (inherit fftw) + (arguments + (substitute-keyword-arguments (package-arguments fftw) + ((#:configure-flags flags) + `(cons "--enable-threads" ,flags)))))) + +(define-public fftwf-with-threads + (package (inherit fftwf) + (arguments + (substitute-keyword-arguments (package-arguments fftwf) + ((#:configure-flags flags) + `(cons "--enable-threads" ,flags)))))) + (define-public fftw-openmpi (package (inherit fftw) (name "fftw-openmpi") diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index b535448..66db4c5 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -238,8 +238,8 @@ namespace ARDOUR { const char* revision = \"5.4\" ; }")))) ("lv2" ,lv2) ("vamp" ,vamp) ("curl" ,curl) - ("fftw" ,fftw) - ("fftwf" ,fftwf) + ("fftw" ,fftw-with-threads) + ("fftwf" ,fftwf-with-threads) ("jack" ,jack-1) ("serd" ,serd) ("sord" ,sord) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 999b0f6..3a3c308 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1817,8 +1817,8 @@ depend on it to run.") #t))))) (inputs `(("lilv" ,lilv) - ("fftw" ,fftw) - ("fftwf" ,fftwf) + ("fftw" ,fftw-with-threads) + ("fftwf" ,fftwf-with-threads) ("lv2" ,lv2) ("jack" ,jack-1) ("readline" ,readline))) -- 2.10.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host. 2016-11-25 23:28 ` [PATCH] gnu: Add threaded variants of fftw and fftwf for " Ricardo Wurmus @ 2016-11-26 6:14 ` Leo Famulari 2016-11-26 8:40 ` Ricardo Wurmus 0 siblings, 1 reply; 5+ messages in thread From: Leo Famulari @ 2016-11-26 6:14 UTC (permalink / raw) To: Ricardo Wurmus; +Cc: guix-devel On Sat, Nov 26, 2016 at 12:28:36AM +0100, Ricardo Wurmus wrote: > * gnu/packages/algebra.scm (fftw-with-threads, fftwf-with-threads): New > variables. > * gnu/packages/audio.scm (ardour)[inputs]: Replace "fftw" and "fftwf" > with "fftw-with-threads" and "fftwf-with-threads", respectively. > * gnu/packages/music.scm (mod-host)[inputs]: Likewise. LGTM. I don't see fftwf-with-threads on staging. Is that intentional? ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host. 2016-11-26 6:14 ` Leo Famulari @ 2016-11-26 8:40 ` Ricardo Wurmus 2016-11-27 10:47 ` Ricardo Wurmus 0 siblings, 1 reply; 5+ messages in thread From: Ricardo Wurmus @ 2016-11-26 8:40 UTC (permalink / raw) To: Leo Famulari; +Cc: guix-devel Leo Famulari <leo@famulari.name> writes: > On Sat, Nov 26, 2016 at 12:28:36AM +0100, Ricardo Wurmus wrote: >> * gnu/packages/algebra.scm (fftw-with-threads, fftwf-with-threads): New >> variables. >> * gnu/packages/audio.scm (ardour)[inputs]: Replace "fftw" and "fftwf" >> with "fftw-with-threads" and "fftwf-with-threads", respectively. >> * gnu/packages/music.scm (mod-host)[inputs]: Likewise. > > LGTM. I don't see fftwf-with-threads on staging. Is that intentional? Yes. On staging we change the flags of “fftw” only. Since “fftwf” inherits from “fftw” and only adds a single configure flag, “fftwf” will be available with threading support as well. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC http://elephly.net ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] gnu: Add threaded variants of fftw and fftwf for Ardour and mod-host. 2016-11-26 8:40 ` Ricardo Wurmus @ 2016-11-27 10:47 ` Ricardo Wurmus 0 siblings, 0 replies; 5+ messages in thread From: Ricardo Wurmus @ 2016-11-27 10:47 UTC (permalink / raw) To: Leo Famulari; +Cc: guix-devel Ricardo Wurmus <rekado@elephly.net> writes: > Leo Famulari <leo@famulari.name> writes: > >> On Sat, Nov 26, 2016 at 12:28:36AM +0100, Ricardo Wurmus wrote: >>> * gnu/packages/algebra.scm (fftw-with-threads, fftwf-with-threads): New >>> variables. >>> * gnu/packages/audio.scm (ardour)[inputs]: Replace "fftw" and "fftwf" >>> with "fftw-with-threads" and "fftwf-with-threads", respectively. >>> * gnu/packages/music.scm (mod-host)[inputs]: Likewise. >> >> LGTM. I don't see fftwf-with-threads on staging. Is that intentional? > > Yes. On staging we change the flags of “fftw” only. Since “fftwf” > inherits from “fftw” and only adds a single configure flag, “fftwf” will > be available with threading support as well. I pushed this as 45591fd7fde1a400a416cb99939f6dd766445f94. When merging “staging” in a couple of days this should be reverted. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC http://elephly.net ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-11-27 10:48 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-11-25 23:28 [PATCH] Fix Ardour and mod-host Ricardo Wurmus 2016-11-25 23:28 ` [PATCH] gnu: Add threaded variants of fftw and fftwf for " Ricardo Wurmus 2016-11-26 6:14 ` Leo Famulari 2016-11-26 8:40 ` Ricardo Wurmus 2016-11-27 10:47 ` Ricardo Wurmus
Code repositories for project(s) associated with this external index https://git.savannah.gnu.org/cgit/guix.git This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.