[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 11/14: fft: defined a setting for the FFTW
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 11/14: fft: defined a setting for the FFTW plan options if android or not. |
Date: |
Thu, 12 Mar 2015 19:38:14 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch android
in repository gnuradio.
commit ae225372f9e9229f070e3a15dc8a291ad02ef1b1
Author: Tom Rondeau <address@hidden>
Date: Fri Jan 2 12:59:09 2015 -0500
fft: defined a setting for the FFTW plan options if android or not.
---
gr-fft/lib/fft.cc | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/gr-fft/lib/fft.cc b/gr-fft/lib/fft.cc
index 13ef12a..30d9999 100644
--- a/gr-fft/lib/fft.cc
+++ b/gr-fft/lib/fft.cc
@@ -47,6 +47,13 @@ static int my_fftw_read_char(void *f) { return fgetc((FILE
*) f); }
#include <boost/filesystem/path.hpp>
namespace fs = boost::filesystem;
+
+#ifdef ANDROID
+#define FFTW_PLAN_OPTS FFTW_ESTIMATE
+#else
+#define FFTW_PLAN_OPTS FFTW_MEASURE
+#endif
+
namespace gr {
namespace fft {
@@ -166,8 +173,7 @@ namespace gr {
reinterpret_cast<fftwf_complex *>(d_inbuf),
reinterpret_cast<fftwf_complex *>(d_outbuf),
forward ? FFTW_FORWARD : FFTW_BACKWARD,
- FFTW_ESTIMATE);
- //FFTW_MEASURE);
+ FFTW_PLAN_OPTS);
if (d_plan == NULL) {
fprintf(stderr, "gr::fft: error creating plan\n");
@@ -234,8 +240,7 @@ namespace gr {
d_plan = fftwf_plan_dft_r2c_1d (fft_size,
d_inbuf,
reinterpret_cast<fftwf_complex
*>(d_outbuf),
- FFTW_ESTIMATE);
- //FFTW_MEASURE);
+ FFTW_PLAN_OPTS);
if (d_plan == NULL) {
fprintf(stderr, "gr::fft::fft_real_fwd: error creating plan\n");
@@ -305,8 +310,7 @@ namespace gr {
d_plan = fftwf_plan_dft_c2r_1d (fft_size,
reinterpret_cast<fftwf_complex
*>(d_inbuf),
d_outbuf,
- FFTW_ESTIMATE);
- //FFTW_MEASURE);
+ FFTW_PLAN_OPTS);
if (d_plan == NULL) {
fprintf(stderr, "gr::fft::fft_real_rev: error creating plan\n");
- [Commit-gnuradio] [gnuradio] branch android created (now 1e31c64), git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 08/14: volk: Using C checks for Volk C FLags instead of CXX., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 05/14: fft: android: problems with wisdom files and MEASURE version of FFTW. Defaulting to suboptimal ESTIMATE until we figure it out., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 04/14: runtime: android: issues related to vmcircbuf; only mmap_tmpfile version working currently., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 09/14: runtime: trying to use ANDROID to define certain behavior, git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 11/14: fft: defined a setting for the FFTW plan options if android or not.,
git <=
- [Commit-gnuradio] [gnuradio] 02/14: logger: android: adding Android log functions for different logging levels., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 13/14: runtime: android: more conversion of statics vars to static functions., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 12/14: runtime: android: need to use a usable, writable location for android apps, so use the tmp path that we set up to point to the app's home directory., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 06/14: volk: using hypot instead of cabsf., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 10/14: cmake: changed to using C checks for headers instead of C++., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 01/14: cmake: android: adding exceptions and atomic to Boost deps; ordering in this patch is important., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 03/14: runtime: android: Android does not support pthread_setaffinity_np; turned this into a nop call., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 07/14: volk: force some support required for android builds; boost unit tests not working yet., git, 2015/03/12
- [Commit-gnuradio] [gnuradio] 14/14: cmake: android: adding toolchain file for building., git, 2015/03/12