Mercurial > hg > qm-dsp
changeset 216:0307327a3869
Merge from branch msvc
| author | Chris Cannam |
|---|---|
| date | Thu, 08 Feb 2018 15:41:27 +0000 |
| parents | f11ec82227d5 (current diff) eee235c4f962 (diff) |
| children | 852c5ba16bb0 |
| files | dsp/transforms/FFT.cpp ext/kissfft/test/Makefile ext/kissfft/test/benchfftw.c ext/kissfft/test/benchkiss.c ext/kissfft/test/compfft.py ext/kissfft/test/doit.c ext/kissfft/test/fastfir.py ext/kissfft/test/fft.py ext/kissfft/test/mk_test.py ext/kissfft/test/pstats.c ext/kissfft/test/pstats.h ext/kissfft/test/tailscrap.m ext/kissfft/test/test_real.c ext/kissfft/test/test_vs_dft.c ext/kissfft/test/testcpp.cc ext/kissfft/test/testkiss.py ext/kissfft/test/twotonetest.c ext/kissfft/tools/Makefile ext/kissfft/tools/fftutil.c ext/kissfft/tools/kfc.c ext/kissfft/tools/kfc.h ext/kissfft/tools/kiss_fastfir.c ext/kissfft/tools/kiss_fftnd.c ext/kissfft/tools/kiss_fftnd.h ext/kissfft/tools/kiss_fftndr.c ext/kissfft/tools/kiss_fftndr.h ext/kissfft/tools/psdpng.c |
| diffstat | 35 files changed, 287 insertions(+), 3138 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Tue Mar 14 13:40:50 2017 +0000 +++ b/.hgignore Thu Feb 08 15:41:27 2018 +0000 @@ -9,3 +9,6 @@ *.rej ext/uncertain/ +*.obj +re:^build/msvc/Debug/ +re:^build/msvc/x64/Release/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/base/Restrict.h Thu Feb 08 15:41:27 2018 +0000 @@ -0,0 +1,17 @@ + +#ifndef QM_DSP_RESTRICT_H +#define QM_DSP_RESTRICT_H + +#ifdef _MSC_VER +#define QM_R__ __restrict +#endif + +#ifdef __GNUC__ +#define QM_R__ __restrict__ +#endif + +#ifndef QM_R__ +#define QM_R__ +#endif + +#endif
--- a/build/linux/Makefile.linux64 Tue Mar 14 13:40:50 2017 +0000 +++ b/build/linux/Makefile.linux64 Thu Feb 08 15:41:27 2018 +0000 @@ -2,7 +2,7 @@ CFLAGS := -DNDEBUG -Wall -Wextra -Werror=implicit-function-declaration -O3 -fPIC -ffast-math -msse -msse2 -mfpmath=sse -ftree-vectorize -DUSE_PTHREADS #CFLAGS := -DDEBUG -g -Wall -Wextra -Werror=implicit-function-declaration -fPIC -ffast-math -DUSE_PTHREADS -CXXFLAGS := $(CFLAGS) -Werror +CXXFLAGS := $(CFLAGS) include build/general/Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/build/msvc/QMDSP.vcxproj Thu Feb 08 15:41:27 2018 +0000 @@ -0,0 +1,254 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{5B452691-B096-4129-972B-612BD29C92DF}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + <TargetName>qm-dsp</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>true</LinkIncremental> + <TargetName>qm-dsp</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <TargetName>qm-dsp</TargetName> + <TargetExt>.lib</TargetExt> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;NOMINMAX;ADD_;kiss_fft_scalar=double;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>$(ProjectDir)\..\..\ext\clapack\include;$(ProjectDir)\..\..\ext\kissfft;$(ProjectDir)\..\..\ext\cblas\include;$(ProjectDir)\..\..;$(ProjectDir)\..\..\ext\kissfft\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <TargetMachine>MachineX86</TargetMachine> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PreprocessorDefinitions>WIN32;_WINDOWS;_USE_MATH_DEFINES;NOMINMAX;ADD_;kiss_fft_scalar=double;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <AdditionalIncludeDirectories>$(ProjectDir)\..\..\ext\clapack\include;$(ProjectDir)\..\..\ext\kissfft;$(ProjectDir)\..\..\ext\cblas\include;$(ProjectDir)\..\..;$(ProjectDir)\..\..\ext\kissfft\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <TargetMachine>MachineX86</TargetMachine> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PreprocessorDefinitions>WIN32;_WINDOWS;_USE_MATH_DEFINES;NOMINMAX;ADD_;kiss_fft_scalar=double;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>$(ProjectDir)\..\..\ext\clapack\include;$(ProjectDir)\..\..\ext\kissfft;$(ProjectDir)\..\..\ext\cblas\include;$(ProjectDir)\..\..;$(ProjectDir)\..\..\ext\kissfft\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\base\KaiserWindow.cpp" /> + <ClCompile Include="..\..\base\Pitch.cpp" /> + <ClCompile Include="..\..\base\SincWindow.cpp" /> + <ClCompile Include="..\..\dsp\chromagram\Chromagram.cpp" /> + <ClCompile Include="..\..\dsp\chromagram\ConstantQ.cpp" /> + <ClCompile Include="..\..\dsp\chromagram\CQprecalc.cpp" /> + <ClCompile Include="..\..\dsp\keydetection\GetKeyMode.cpp" /> + <ClCompile Include="..\..\dsp\mfcc\MFCC.cpp" /> + <ClCompile Include="..\..\dsp\onsets\DetectionFunction.cpp" /> + <ClCompile Include="..\..\dsp\onsets\PeakPicking.cpp" /> + <ClCompile Include="..\..\dsp\phasevocoder\PhaseVocoder.cpp" /> + <ClCompile Include="..\..\dsp\rateconversion\Decimator.cpp" /> + <ClCompile Include="..\..\dsp\rateconversion\DecimatorB.cpp" /> + <ClCompile Include="..\..\dsp\rateconversion\Resampler.cpp" /> + <ClCompile Include="..\..\dsp\rhythm\BeatSpectrum.cpp" /> + <ClCompile Include="..\..\dsp\segmentation\ClusterMeltSegmenter.cpp" /> + <ClCompile Include="..\..\dsp\segmentation\cluster_melt.c" /> + <ClCompile Include="..\..\dsp\segmentation\cluster_segmenter.c" /> + <ClCompile Include="..\..\dsp\segmentation\Segmenter.cpp" /> + <ClCompile Include="..\..\dsp\signalconditioning\DFProcess.cpp" /> + <ClCompile Include="..\..\dsp\signalconditioning\Filter.cpp" /> + <ClCompile Include="..\..\dsp\signalconditioning\FiltFilt.cpp" /> + <ClCompile Include="..\..\dsp\signalconditioning\Framer.cpp" /> + <ClCompile Include="..\..\dsp\tempotracking\DownBeat.cpp" /> + <ClCompile Include="..\..\dsp\tempotracking\TempoTrack.cpp" /> + <ClCompile Include="..\..\dsp\tempotracking\TempoTrackV2.cpp" /> + <ClCompile Include="..\..\dsp\tonal\ChangeDetectionFunction.cpp" /> + <ClCompile Include="..\..\dsp\tonal\TCSgram.cpp" /> + <ClCompile Include="..\..\dsp\tonal\TonalEstimator.cpp" /> + <ClCompile Include="..\..\dsp\transforms\DCT.cpp" /> + <ClCompile Include="..\..\dsp\transforms\FFT.cpp" /> + <ClCompile Include="..\..\dsp\wavelet\Wavelet.cpp" /> + <ClCompile Include="..\..\ext\cblas\src\cblas_ddot.c" /> + <ClCompile Include="..\..\ext\cblas\src\cblas_dgemm.c" /> + <ClCompile Include="..\..\ext\cblas\src\cblas_globals.c" /> + <ClCompile Include="..\..\ext\cblas\src\cblas_xerbla.c" /> + <ClCompile Include="..\..\ext\cblas\src\ddot.c" /> + <ClCompile Include="..\..\ext\cblas\src\dgemm.c" /> + <ClCompile Include="..\..\ext\cblas\src\dgemv.c" /> + <ClCompile Include="..\..\ext\cblas\src\dger.c" /> + <ClCompile Include="..\..\ext\cblas\src\dscal.c" /> + <ClCompile Include="..\..\ext\cblas\src\dswap.c" /> + <ClCompile Include="..\..\ext\cblas\src\dtrmm.c" /> + <ClCompile Include="..\..\ext\cblas\src\dtrmv.c" /> + <ClCompile Include="..\..\ext\cblas\src\dtrsm.c" /> + <ClCompile Include="..\..\ext\cblas\src\idamax.c" /> + <ClCompile Include="..\..\ext\cblas\src\lsame.c" /> + <ClCompile Include="..\..\ext\clapack\src\dgetf2.c" /> + <ClCompile Include="..\..\ext\clapack\src\dgetrf.c" /> + <ClCompile Include="..\..\ext\clapack\src\dgetri.c" /> + <ClCompile Include="..\..\ext\clapack\src\dlaswp.c" /> + <ClCompile Include="..\..\ext\clapack\src\dtrti2.c" /> + <ClCompile Include="..\..\ext\clapack\src\dtrtri.c" /> + <ClCompile Include="..\..\ext\clapack\src\exit_.c" /> + <ClCompile Include="..\..\ext\clapack\src\f77_aloc.c" /> + <ClCompile Include="..\..\ext\clapack\src\ieeeck.c" /> + <ClCompile Include="..\..\ext\clapack\src\ilaenv.c" /> + <ClCompile Include="..\..\ext\clapack\src\iparmq.c" /> + <ClCompile Include="..\..\ext\clapack\src\i_nint.c" /> + <ClCompile Include="..\..\ext\clapack\src\pow_di.c" /> + <ClCompile Include="..\..\ext\clapack\src\s_cat.c" /> + <ClCompile Include="..\..\ext\clapack\src\s_cmp.c" /> + <ClCompile Include="..\..\ext\clapack\src\s_copy.c" /> + <ClCompile Include="..\..\ext\clapack\src\xerbla.c" /> + <ClCompile Include="..\..\ext\kissfft\kiss_fft.c" /> + <ClCompile Include="..\..\ext\kissfft\tools\kiss_fftr.c" /> + <ClCompile Include="..\..\hmm\hmm.c" /> + <ClCompile Include="..\..\maths\Correlation.cpp" /> + <ClCompile Include="..\..\maths\CosineDistance.cpp" /> + <ClCompile Include="..\..\maths\KLDivergence.cpp" /> + <ClCompile Include="..\..\maths\MathUtilities.cpp" /> + <ClCompile Include="..\..\maths\pca\pca.c" /> + <ClCompile Include="..\..\thread\Thread.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\base\KaiserWindow.h" /> + <ClInclude Include="..\..\base\Pitch.h" /> + <ClInclude Include="..\..\base\Restrict.h" /> + <ClInclude Include="..\..\base\SincWindow.h" /> + <ClInclude Include="..\..\base\Window.h" /> + <ClInclude Include="..\..\dsp\chromagram\Chromagram.h" /> + <ClInclude Include="..\..\dsp\chromagram\ConstantQ.h" /> + <ClInclude Include="..\..\dsp\keydetection\GetKeyMode.h" /> + <ClInclude Include="..\..\dsp\mfcc\MFCC.h" /> + <ClInclude Include="..\..\dsp\onsets\DetectionFunction.h" /> + <ClInclude Include="..\..\dsp\onsets\PeakPicking.h" /> + <ClInclude Include="..\..\dsp\phasevocoder\PhaseVocoder.h" /> + <ClInclude Include="..\..\dsp\rateconversion\Decimator.h" /> + <ClInclude Include="..\..\dsp\rateconversion\DecimatorB.h" /> + <ClInclude Include="..\..\dsp\rateconversion\Resampler.h" /> + <ClInclude Include="..\..\dsp\rhythm\BeatSpectrum.h" /> + <ClInclude Include="..\..\dsp\segmentation\ClusterMeltSegmenter.h" /> + <ClInclude Include="..\..\dsp\segmentation\cluster_melt.h" /> + <ClInclude Include="..\..\dsp\segmentation\cluster_segmenter.h" /> + <ClInclude Include="..\..\dsp\segmentation\segment.h" /> + <ClInclude Include="..\..\dsp\segmentation\Segmenter.h" /> + <ClInclude Include="..\..\dsp\signalconditioning\DFProcess.h" /> + <ClInclude Include="..\..\dsp\signalconditioning\Filter.h" /> + <ClInclude Include="..\..\dsp\signalconditioning\FiltFilt.h" /> + <ClInclude Include="..\..\dsp\signalconditioning\Framer.h" /> + <ClInclude Include="..\..\dsp\tempotracking\DownBeat.h" /> + <ClInclude Include="..\..\dsp\tempotracking\TempoTrack.h" /> + <ClInclude Include="..\..\dsp\tempotracking\TempoTrackV2.h" /> + <ClInclude Include="..\..\dsp\tonal\ChangeDetectionFunction.h" /> + <ClInclude Include="..\..\dsp\tonal\TCSgram.h" /> + <ClInclude Include="..\..\dsp\tonal\TonalEstimator.h" /> + <ClInclude Include="..\..\dsp\transforms\DCT.h" /> + <ClInclude Include="..\..\dsp\transforms\FFT.h" /> + <ClInclude Include="..\..\dsp\wavelet\Wavelet.h" /> + <ClInclude Include="..\..\ext\cblas\include\cblas_f77.h" /> + <ClInclude Include="..\..\ext\clapack\include\blaswrap.h" /> + <ClInclude Include="..\..\ext\clapack\include\f2c.h" /> + <ClInclude Include="..\..\ext\kissfft\kiss_fft.h" /> + <ClInclude Include="..\..\ext\kissfft\tools\kiss_fftr.h" /> + <ClInclude Include="..\..\ext\kissfft\_kiss_fft_guts.h" /> + <ClInclude Include="..\..\hmm\hmm.h" /> + <ClInclude Include="..\..\include\cblas.h" /> + <ClInclude Include="..\..\include\clapack.h" /> + <ClInclude Include="..\..\maths\Correlation.h" /> + <ClInclude Include="..\..\maths\CosineDistance.h" /> + <ClInclude Include="..\..\maths\KLDivergence.h" /> + <ClInclude Include="..\..\maths\MathAliases.h" /> + <ClInclude Include="..\..\maths\MathUtilities.h" /> + <ClInclude Include="..\..\maths\MedianFilter.h" /> + <ClInclude Include="..\..\maths\nan-inf.h" /> + <ClInclude Include="..\..\maths\pca\pca.h" /> + <ClInclude Include="..\..\maths\Polyfit.h" /> + <ClInclude Include="..\..\thread\AsynchronousTask.h" /> + <ClInclude Include="..\..\thread\BlockAllocator.h" /> + <ClInclude Include="..\..\thread\Thread.h" /> + <ClInclude Include="..\mingw32\mkspecs\win32-x-g++\qplatformdefs.h" /> + </ItemGroup> + <ItemGroup> + <None Include="..\general\Makefile.inc" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file
--- a/dsp/signalconditioning/DFProcess.cpp Tue Mar 14 13:40:50 2017 +0000 +++ b/dsp/signalconditioning/DFProcess.cpp Thu Feb 08 15:41:27 2018 +0000 @@ -25,6 +25,8 @@ #include "maths/MathUtilities.h" #include <cstring> +#include <algorithm> + ////////////////////////////////////////////////////////////////////// // Construction/Destruction
--- a/dsp/signalconditioning/Filter.cpp Tue Mar 14 13:40:50 2017 +0000 +++ b/dsp/signalconditioning/Filter.cpp Thu Feb 08 15:41:27 2018 +0000 @@ -74,8 +74,8 @@ } void -Filter::process(const double *const __restrict__ in, - double *const __restrict__ out, +Filter::process(const double *const QM_R__ in, + double *const QM_R__ out, const int n) { for (int s = 0; s < n; ++s) {
--- a/dsp/signalconditioning/Filter.h Tue Mar 14 13:40:50 2017 +0000 +++ b/dsp/signalconditioning/Filter.h Thu Feb 08 15:41:27 2018 +0000 @@ -15,6 +15,8 @@ #ifndef FILTER_H #define FILTER_H +#include "base/Restrict.h" + #include <vector> class Filter @@ -42,8 +44,8 @@ * write the resulting \arg n samples into \arg out. There must be * enough room in \arg out for \arg n samples to be written. */ - void process(const double *const __restrict__ in, - double *const __restrict__ out, + void process(const double *const QM_R__ in, + double *const QM_R__ out, const int n); int getOrder() const { return m_order; }
--- a/dsp/wavelet/Wavelet.cpp Tue Mar 14 13:40:50 2017 +0000 +++ b/dsp/wavelet/Wavelet.cpp Thu Feb 08 15:41:27 2018 +0000 @@ -71,8 +71,8 @@ void Wavelet::createDecompositionFilters(Type wavelet, - std::vector<float> &lpd, - std::vector<float> &hpd) + std::vector<double> &lpd, + std::vector<double> &hpd) { lpd.clear(); hpd.clear();
--- a/dsp/wavelet/Wavelet.h Tue Mar 14 13:40:50 2017 +0000 +++ b/dsp/wavelet/Wavelet.h Thu Feb 08 15:41:27 2018 +0000 @@ -73,8 +73,8 @@ static std::string getWaveletName(Type); static void createDecompositionFilters(Type, - std::vector<float> &lpd, - std::vector<float> &hpd); + std::vector<double> &lpd, + std::vector<double> &hpd); }; #endif
--- a/ext/kissfft/test/Makefile Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,108 +0,0 @@ - -WARNINGS=-W -Wall -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return \ - -Wcast-align -Wcast-qual -Wnested-externs -Wshadow -Wbad-function-cast \ - -Wwrite-strings - -CFLAGS=-O3 -I.. -I../tools $(WARNINGS) -CFLAGS+=-ffast-math -fomit-frame-pointer -#CFLAGS+=-funroll-loops -#CFLAGS+=-march=prescott -#CFLAGS+= -mtune=native -# TIP: try adding -openmp or -fopenmp to enable OPENMP directives and use of multiple cores -#CFLAGS+=-fopenmp -CFLAGS+= $(CFLAGADD) - - -ifeq "$(NFFT)" "" - NFFT=1800 -endif -ifeq "$(NUMFFTS)" "" - NUMFFTS=10000 -endif - -ifeq "$(DATATYPE)" "" - DATATYPE=float -endif - -BENCHKISS=bm_kiss_$(DATATYPE) -BENCHFFTW=bm_fftw_$(DATATYPE) -SELFTEST=st_$(DATATYPE) -TESTREAL=tr_$(DATATYPE) -TESTKFC=tkfc_$(DATATYPE) -FASTFILTREAL=ffr_$(DATATYPE) -SELFTESTSRC=twotonetest.c - - -TYPEFLAGS=-Dkiss_fft_scalar=$(DATATYPE) - -ifeq "$(DATATYPE)" "int16_t" - TYPEFLAGS=-DFIXED_POINT=16 -endif - -ifeq "$(DATATYPE)" "int32_t" - TYPEFLAGS=-DFIXED_POINT=32 -endif - -ifeq "$(DATATYPE)" "simd" - TYPEFLAGS=-DUSE_SIMD=1 -msse -endif - - -ifeq "$(DATATYPE)" "float" - # fftw needs to be built with --enable-float to build this lib - FFTWLIB=-lfftw3f -else - FFTWLIB=-lfftw3 -endif - -FFTWLIBDIR=-L/usr/local/lib/ - -SRCFILES=../kiss_fft.c ../tools/kiss_fftnd.c ../tools/kiss_fftr.c pstats.c ../tools/kfc.c ../tools/kiss_fftndr.c - -all: tools $(BENCHKISS) $(SELFTEST) $(BENCHFFTW) $(TESTREAL) $(TESTKFC) - -tools: - cd ../tools && make all - - -$(SELFTEST): $(SELFTESTSRC) $(SRCFILES) - $(CC) -o $@ $(CFLAGS) $(TYPEFLAGS) $+ -lm - -$(TESTKFC): $(SRCFILES) - $(CC) -o $@ $(CFLAGS) -DKFC_TEST $(TYPEFLAGS) $+ -lm - -$(TESTREAL): test_real.c $(SRCFILES) - $(CC) -o $@ $(CFLAGS) $(TYPEFLAGS) $+ -lm - -$(BENCHKISS): benchkiss.c $(SRCFILES) - $(CC) -o $@ $(CFLAGS) $(TYPEFLAGS) $+ -lm - -$(BENCHFFTW): benchfftw.c pstats.c - @echo "======attempting to build FFTW benchmark" - @$(CC) -o $@ $(CFLAGS) -DDATATYPE$(DATATYPE) $+ $(FFTWLIB) $(FFTWLIBDIR) -lm || echo "FFTW not available for comparison" - -test: all - @./$(TESTKFC) - @echo "======1d & 2-d complex fft self test (type= $(DATATYPE) )" - @./$(SELFTEST) - @echo "======real FFT (type= $(DATATYPE) )" - @./$(TESTREAL) - @echo "======timing test (type=$(DATATYPE))" - @./$(BENCHKISS) -x $(NUMFFTS) -n $(NFFT) - @[ -x ./$(BENCHFFTW) ] && ./$(BENCHFFTW) -x $(NUMFFTS) -n $(NFFT) ||true - @echo "======higher dimensions type=$(DATATYPE))" - @./testkiss.py - -selftest.c: - ./mk_test.py 10 12 14 > selftest.c -selftest_short.c: - ./mk_test.py -s 10 12 14 > selftest_short.c - - -CXXFLAGS=-O3 -ffast-math -fomit-frame-pointer -I.. -I../tools -W -Wall -testcpp: testcpp.cc ../kissfft.hh - $(CXX) -o $@ $(CXXFLAGS) testcpp.cc -lm - - -clean: - rm -f *~ bm_* st_* tr_* kf_* tkfc_* ff_* ffr_* *.pyc *.pyo *.dat testcpp
--- a/ext/kissfft/test/benchfftw.c Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,94 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <fftw3.h> -#include <unistd.h> -#include "pstats.h" - -#ifdef DATATYPEdouble - -#define CPXTYPE fftw_complex -#define PLAN fftw_plan -#define FFTMALLOC fftw_malloc -#define MAKEPLAN fftw_plan_dft_1d -#define DOFFT fftw_execute -#define DESTROYPLAN fftw_destroy_plan -#define FFTFREE fftw_free - -#elif defined(DATATYPEfloat) - -#define CPXTYPE fftwf_complex -#define PLAN fftwf_plan -#define FFTMALLOC fftwf_malloc -#define MAKEPLAN fftwf_plan_dft_1d -#define DOFFT fftwf_execute -#define DESTROYPLAN fftwf_destroy_plan -#define FFTFREE fftwf_free - -#endif - -#ifndef CPXTYPE -int main(void) -{ - fprintf(stderr,"Datatype not available in FFTW\n" ); - return 0; -} -#else -int main(int argc,char ** argv) -{ - int nfft=1024; - int isinverse=0; - int numffts=1000,i; - - CPXTYPE * in=NULL; - CPXTYPE * out=NULL; - PLAN p; - - pstats_init(); - - while (1) { - int c = getopt (argc, argv, "n:ix:h"); - if (c == -1) - break; - switch (c) { - case 'n': - nfft = atoi (optarg); - break; - case 'x': - numffts = atoi (optarg); - break; - case 'i': - isinverse = 1; - break; - case 'h': - case '?': - default: - fprintf(stderr,"options:\n-n N: complex fft length\n-i: inverse\n-x N: number of ffts to compute\n" - ""); - } - } - - in=FFTMALLOC(sizeof(CPXTYPE) * nfft); - out=FFTMALLOC(sizeof(CPXTYPE) * nfft); - for (i=0;i<nfft;++i ) { - in[i][0] = rand() - RAND_MAX/2; - in[i][1] = rand() - RAND_MAX/2; - } - - if ( isinverse ) - p = MAKEPLAN(nfft, in, out, FFTW_BACKWARD, FFTW_ESTIMATE); - else - p = MAKEPLAN(nfft, in, out, FFTW_FORWARD, FFTW_ESTIMATE); - - for (i=0;i<numffts;++i) - DOFFT(p); - - DESTROYPLAN(p); - - FFTFREE(in); FFTFREE(out); - - fprintf(stderr,"fftw\tnfft=%d\tnumffts=%d\n", nfft,numffts); - pstats_report(); - - return 0; -} -#endif
--- a/ext/kissfft/test/benchkiss.c Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,122 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <sys/times.h> -#include <unistd.h> -#include "kiss_fft.h" -#include "kiss_fftr.h" -#include "kiss_fftnd.h" -#include "kiss_fftndr.h" - -#include "pstats.h" - -static -int getdims(int * dims, char * arg) -{ - char *s; - int ndims=0; - while ( (s=strtok( arg , ",") ) ) { - dims[ndims++] = atoi(s); - //printf("%s=%d\n",s,dims[ndims-1]); - arg=NULL; - } - return ndims; -} - -int main(int argc,char ** argv) -{ - int k; - int nfft[32]; - int ndims = 1; - int isinverse=0; - int numffts=1000,i; - kiss_fft_cpx * buf; - kiss_fft_cpx * bufout; - int real = 0; - - nfft[0] = 1024;// default - - while (1) { - int c = getopt (argc, argv, "n:ix:r"); - if (c == -1) - break; - switch (c) { - case 'r': - real = 1; - break; - case 'n': - ndims = getdims(nfft, optarg ); - if (nfft[0] != kiss_fft_next_fast_size(nfft[0]) ) { - int ng = kiss_fft_next_fast_size(nfft[0]); - fprintf(stderr,"warning: %d might be a better choice for speed than %d\n",ng,nfft[0]); - } - break; - case 'x': - numffts = atoi (optarg); - break; - case 'i': - isinverse = 1; - break; - } - } - int nbytes = sizeof(kiss_fft_cpx); - for (k=0;k<ndims;++k) - nbytes *= nfft[k]; - -#ifdef USE_SIMD - numffts /= 4; - fprintf(stderr,"since SIMD implementation does 4 ffts at a time, numffts is being reduced to %d\n",numffts); -#endif - - buf=(kiss_fft_cpx*)KISS_FFT_MALLOC(nbytes); - bufout=(kiss_fft_cpx*)KISS_FFT_MALLOC(nbytes); - memset(buf,0,nbytes); - - pstats_init(); - - if (ndims==1) { - if (real) { - kiss_fftr_cfg st = kiss_fftr_alloc( nfft[0] ,isinverse ,0,0); - if (isinverse) - for (i=0;i<numffts;++i) - kiss_fftri( st ,(kiss_fft_cpx*)buf,(kiss_fft_scalar*)bufout ); - else - for (i=0;i<numffts;++i) - kiss_fftr( st ,(kiss_fft_scalar*)buf,(kiss_fft_cpx*)bufout ); - free(st); - }else{ - kiss_fft_cfg st = kiss_fft_alloc( nfft[0] ,isinverse ,0,0); - for (i=0;i<numffts;++i) - kiss_fft( st ,buf,bufout ); - free(st); - } - }else{ - if (real) { - kiss_fftndr_cfg st = kiss_fftndr_alloc( nfft,ndims ,isinverse ,0,0); - if (isinverse) - for (i=0;i<numffts;++i) - kiss_fftndri( st ,(kiss_fft_cpx*)buf,(kiss_fft_scalar*)bufout ); - else - for (i=0;i<numffts;++i) - kiss_fftndr( st ,(kiss_fft_scalar*)buf,(kiss_fft_cpx*)bufout ); - free(st); - }else{ - kiss_fftnd_cfg st= kiss_fftnd_alloc(nfft,ndims,isinverse ,0,0); - for (i=0;i<numffts;++i) - kiss_fftnd( st ,buf,bufout ); - free(st); - } - } - - free(buf); free(bufout); - - fprintf(stderr,"KISS\tnfft="); - for (k=0;k<ndims;++k) - fprintf(stderr, "%d,",nfft[k]); - fprintf(stderr,"\tnumffts=%d\n" ,numffts); - pstats_report(); - - kiss_fft_cleanup(); - - return 0; -} -
--- a/ext/kissfft/test/compfft.py Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,92 +0,0 @@ -#!/usr/bin/env python - -# use FFTPACK as a baseline -import FFT -from Numeric import * -import math -import random -import sys -import struct -import fft - -pi=math.pi -e=math.e -j=complex(0,1) -lims=(-32768,32767) - -def randbuf(n,cpx=1): - res = array( [ random.uniform( lims[0],lims[1] ) for i in range(n) ] ) - if cpx: - res = res + j*randbuf(n,0) - return res - -def main(): - from getopt import getopt - import popen2 - opts,args = getopt( sys.argv[1:],'u:n:Rt:' ) - opts=dict(opts) - exitcode=0 - - util = opts.get('-u','./kf_float') - - try: - dims = [ int(d) for d in opts['-n'].split(',')] - cpx = opts.get('-R') is None - fmt=opts.get('-t','f') - except KeyError: - sys.stderr.write(""" - usage: compfft.py - -n d1[,d2,d3...] : FFT dimension(s) - -u utilname : see sample_code/fftutil.c, default = ./kf_float - -R : real-optimized version\n""") - sys.exit(1) - - x = fft.make_random( dims ) - - cmd = '%s -n %s ' % ( util, ','.join([ str(d) for d in dims]) ) - if cpx: - xout = FFT.fftnd(x) - xout = reshape(xout,(size(xout),)) - else: - cmd += '-R ' - xout = FFT.real_fft(x) - - proc = popen2.Popen3( cmd , bufsize=len(x) ) - - proc.tochild.write( dopack( x , fmt ,cpx ) ) - proc.tochild.close() - xoutcomp = dounpack( proc.fromchild.read( ) , fmt ,1 ) - #xoutcomp = reshape( xoutcomp , dims ) - - sig = xout * conjugate(xout) - sigpow = sum( sig ) - - diff = xout-xoutcomp - noisepow = sum( diff * conjugate(diff) ) - - snr = 10 * math.log10(abs( sigpow / noisepow ) ) - if snr<100: - print xout - print xoutcomp - exitcode=1 - print 'NFFT=%s,SNR = %f dB' % (str(dims),snr) - sys.exit(exitcode) - -def dopack(x,fmt,cpx): - x = reshape( x, ( size(x),) ) - if cpx: - s = ''.join( [ struct.pack('ff',c.real,c.imag) for c in x ] ) - else: - s = ''.join( [ struct.pack('f',c) for c in x ] ) - return s - -def dounpack(x,fmt,cpx): - uf = fmt * ( len(x) / 4 ) - s = struct.unpack(uf,x) - if cpx: - return array(s[::2]) + array( s[1::2] )*j - else: - return array(s ) - -if __name__ == "__main__": - main()
--- a/ext/kissfft/test/doit.c Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,129 +0,0 @@ -/* this program is in the public domain - A program that helps the authors of the fine fftw library benchmark kiss -*/ - -#include "bench-user.h" -#include <math.h> - -#include "kiss_fft.h" -#include "kiss_fftnd.h" -#include "kiss_fftr.h" - -BEGIN_BENCH_DOC -BENCH_DOC("name", "kissfft") -BENCH_DOC("version", "1.0.1") -BENCH_DOC("year", "2004") -BENCH_DOC("author", "Mark Borgerding") -BENCH_DOC("language", "C") -BENCH_DOC("url", "http://sourceforge.net/projects/kissfft/") -BENCH_DOC("copyright", -"Copyright (c) 2003,4 Mark Borgerding\n" -"\n" -"All rights reserved.\n" -"\n" -"Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n" -"\n" -" * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n" -" * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n" -" * Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission.\n" -"\n" - "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n") -END_BENCH_DOC - -int can_do(struct problem *p) -{ - if (p->rank == 1) { - if (p->kind == PROBLEM_REAL) { - return (p->n[0] & 1) == 0; /* only even real is okay */ - } else { - return 1; - } - } else { - return p->kind == PROBLEM_COMPLEX; - } -} - -static kiss_fft_cfg cfg=NULL; -static kiss_fftr_cfg cfgr=NULL; -static kiss_fftnd_cfg cfgnd=NULL; - -#define FAILIF( c ) \ - if ( c ) do {\ - fprintf(stderr,\ - "kissfft: " #c " (file=%s:%d errno=%d %s)\n",\ - __FILE__,__LINE__ , errno,strerror( errno ) ) ;\ - exit(1);\ - }while(0) - - - -void setup(struct problem *p) -{ - size_t i; - - /* - fprintf(stderr,"%s %s %d-d ", - (p->sign == 1)?"Inverse":"Forward", - p->kind == PROBLEM_COMPLEX?"Complex":"Real", - p->rank); - */ - if (p->rank == 1) { - if (p->kind == PROBLEM_COMPLEX) { - cfg = kiss_fft_alloc (p->n[0], (p->sign == 1), 0, 0); - FAILIF(cfg==NULL); - }else{ - cfgr = kiss_fftr_alloc (p->n[0], (p->sign == 1), 0, 0); - FAILIF(cfgr==NULL); - } - }else{ - int dims[5]; - for (i=0;i<p->rank;++i){ - dims[i] = p->n[i]; - } - /* multi-dimensional */ - if (p->kind == PROBLEM_COMPLEX) { - cfgnd = kiss_fftnd_alloc( dims , p->rank, (p->sign == 1), 0, 0 ); - FAILIF(cfgnd==NULL); - } - } -} - -void doit(int iter, struct problem *p) -{ - int i; - void *in = p->in; - void *out = p->out; - - if (p->in_place) - out = p->in; - - if (p->rank == 1) { - if (p->kind == PROBLEM_COMPLEX){ - for (i = 0; i < iter; ++i) - kiss_fft (cfg, in, out); - } else { - /* PROBLEM_REAL */ - if (p->sign == -1) /* FORWARD */ - for (i = 0; i < iter; ++i) - kiss_fftr (cfgr, in, out); - else - for (i = 0; i < iter; ++i) - kiss_fftri (cfgr, in, out); - } - }else{ - /* multi-dimensional */ - for (i = 0; i < iter; ++i) - kiss_fftnd(cfgnd,in,out); - } -} - -void done(struct problem *p) -{ - free(cfg); - cfg=NULL; - free(cfgr); - cfgr=NULL; - free(cfgnd); - cfgnd=NULL; - UNUSED(p); -}
--- a/ext/kissfft/test/fastfir.py Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,102 +0,0 @@ -#!/usr/bin/env python - -from Numeric import * -from FFT import * - -def make_random(len): - import random - res=[] - for i in range(int(len)): - r=random.uniform(-1,1) - i=random.uniform(-1,1) - res.append( complex(r,i) ) - return res - -def slowfilter(sig,h): - translen = len(h)-1 - return convolve(sig,h)[translen:-translen] - -def nextpow2(x): - return 2 ** math.ceil(math.log(x)/math.log(2)) - -def fastfilter(sig,h,nfft=None): - if nfft is None: - nfft = int( nextpow2( 2*len(h) ) ) - H = fft( h , nfft ) - scraplen = len(h)-1 - keeplen = nfft-scraplen - res=[] - isdone = 0 - lastidx = nfft - idx0 = 0 - while not isdone: - idx1 = idx0 + nfft - if idx1 >= len(sig): - idx1 = len(sig) - lastidx = idx1-idx0 - if lastidx <= scraplen: - break - isdone = 1 - Fss = fft(sig[idx0:idx1],nfft) - fm = Fss * H - m = inverse_fft(fm) - res.append( m[scraplen:lastidx] ) - idx0 += keeplen - return concatenate( res ) - -def main(): - import sys - from getopt import getopt - opts,args = getopt(sys.argv[1:],'rn:l:') - opts=dict(opts) - - siglen = int(opts.get('-l',1e4 ) ) - hlen =50 - - nfft = int(opts.get('-n',128) ) - usereal = opts.has_key('-r') - - print 'nfft=%d'%nfft - # make a signal - sig = make_random( siglen ) - # make an impulse response - h = make_random( hlen ) - #h=[1]*2+[0]*3 - if usereal: - sig=[c.real for c in sig] - h=[c.real for c in h] - - # perform MAC filtering - yslow = slowfilter(sig,h) - #print '<YSLOW>',yslow,'</YSLOW>' - #yfast = fastfilter(sig,h,nfft) - yfast = utilfastfilter(sig,h,nfft,usereal) - #print yfast - print 'len(yslow)=%d'%len(yslow) - print 'len(yfast)=%d'%len(yfast) - diff = yslow-yfast - snr = 10*log10( abs( vdot(yslow,yslow) / vdot(diff,diff) ) ) - print 'snr=%s' % snr - if snr < 10.0: - print 'h=',h - print 'sig=',sig[:5],'...' - print 'yslow=',yslow[:5],'...' - print 'yfast=',yfast[:5],'...' - -def utilfastfilter(sig,h,nfft,usereal): - import compfft - import os - open( 'sig.dat','w').write( compfft.dopack(sig,'f',not usereal) ) - open( 'h.dat','w').write( compfft.dopack(h,'f',not usereal) ) - if usereal: - util = './fastconvr' - else: - util = './fastconv' - cmd = 'time %s -n %d -i sig.dat -h h.dat -o out.dat' % (util, nfft) - print cmd - ec = os.system(cmd) - print 'exited->',ec - return compfft.dounpack(open('out.dat').read(),'f',not usereal) - -if __name__ == "__main__": - main()
--- a/ext/kissfft/test/fft.py Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,196 +0,0 @@ -#!/usr/bin/env python - -import math -import sys -import random - -pi=math.pi -e=math.e -j=complex(0,1) - -def fft(f,inv): - n=len(f) - if n==1: - return f - - for p in 2,3,5: - if n%p==0: - break - else: - raise Exception('%s not factorable ' % n) - - m = n/p - Fout=[] - for q in range(p): # 0,1 - fp = f[q::p] # every p'th time sample - Fp = fft( fp ,inv) - Fout.extend( Fp ) - - for u in range(m): - scratch = Fout[u::m] # u to end in strides of m - for q1 in range(p): - k = q1*m + u # indices to Fout above that became scratch - Fout[ k ] = scratch[0] # cuz e**0==1 in loop below - for q in range(1,p): - if inv: - t = e ** ( j*2*pi*k*q/n ) - else: - t = e ** ( -j*2*pi*k*q/n ) - Fout[ k ] += scratch[q] * t - - return Fout - -def rifft(F): - N = len(F) - 1 - Z = [0] * (N) - for k in range(N): - Fek = ( F[k] + F[-k-1].conjugate() ) - Fok = ( F[k] - F[-k-1].conjugate() ) * e ** (j*pi*k/N) - Z[k] = Fek + j*Fok - - fp = fft(Z , 1) - - f = [] - for c in fp: - f.append(c.real) - f.append(c.imag) - return f - -def real_fft( f,inv ): - if inv: - return rifft(f) - - N = len(f) / 2 - - res = f[::2] - ims = f[1::2] - - fp = [ complex(r,i) for r,i in zip(res,ims) ] - print 'fft input ', fp - Fp = fft( fp ,0 ) - print 'fft output ', Fp - - F = [ complex(0,0) ] * ( N+1 ) - - F[0] = complex( Fp[0].real + Fp[0].imag , 0 ) - - for k in range(1,N/2+1): - tw = e ** ( -j*pi*(.5+float(k)/N ) ) - - F1k = Fp[k] + Fp[N-k].conjugate() - F2k = Fp[k] - Fp[N-k].conjugate() - F2k *= tw - F[k] = ( F1k + F2k ) * .5 - F[N-k] = ( F1k - F2k ).conjugate() * .5 - #F[N-k] = ( F1kp + e ** ( -j*pi*(.5+float(N-k)/N ) ) * F2kp ) * .5 - #F[N-k] = ( F1k.conjugate() - tw.conjugate() * F2k.conjugate() ) * .5 - - F[N] = complex( Fp[0].real - Fp[0].imag , 0 ) - return F - -def main(): - #fft_func = fft - fft_func = real_fft - - tvec = [0.309655,0.815653,0.768570,0.591841,0.404767,0.637617,0.007803,0.012665] - Ftvec = [ complex(r,i) for r,i in zip( - [3.548571,-0.378761,-0.061950,0.188537,-0.566981,0.188537,-0.061950,-0.378761], - [0.000000,-1.296198,-0.848764,0.225337,0.000000,-0.225337,0.848764,1.296198] ) ] - - F = fft_func( tvec,0 ) - - nerrs= 0 - for i in range(len(Ftvec)/2 + 1): - if abs( F[i] - Ftvec[i] )> 1e-5: - print 'F[%d]: %s != %s' % (i,F[i],Ftvec[i]) - nerrs += 1 - - print '%d errors in forward fft' % nerrs - if nerrs: - return - - trec = fft_func( F , 1 ) - - for i in range(len(trec) ): - trec[i] /= len(trec) - - for i in range(len(tvec) ): - if abs( trec[i] - tvec[i] )> 1e-5: - print 't[%d]: %s != %s' % (i,tvec[i],trec[i]) - nerrs += 1 - - print '%d errors in reverse fft' % nerrs - - -def make_random(dims=[1]): - import Numeric - res = [] - for i in range(dims[0]): - if len(dims)==1: - r=random.uniform(-1,1) - i=random.uniform(-1,1) - res.append( complex(r,i) ) - else: - res.append( make_random( dims[1:] ) ) - return Numeric.array(res) - -def flatten(x): - import Numeric - ntotal = Numeric.product(Numeric.shape(x)) - return Numeric.reshape(x,(ntotal,)) - -def randmat( ndims ): - dims=[] - for i in range( ndims ): - curdim = int( random.uniform(2,4) ) - dims.append( curdim ) - return make_random(dims ) - -def test_fftnd(ndims=3): - import FFT - import Numeric - - x=randmat( ndims ) - print 'dimensions=%s' % str( Numeric.shape(x) ) - #print 'x=%s' %str(x) - xver = FFT.fftnd(x) - x2=myfftnd(x) - err = xver - x2 - errf = flatten(err) - xverf = flatten(xver) - errpow = Numeric.vdot(errf,errf)+1e-10 - sigpow = Numeric.vdot(xverf,xverf)+1e-10 - snr = 10*math.log10(abs(sigpow/errpow) ) - if snr<80: - print xver - print x2 - print 'SNR=%sdB' % str( snr ) - -def myfftnd(x): - import Numeric - xf = flatten(x) - Xf = fftndwork( xf , Numeric.shape(x) ) - return Numeric.reshape(Xf,Numeric.shape(x) ) - -def fftndwork(x,dims): - import Numeric - dimprod=Numeric.product( dims ) - - for k in range( len(dims) ): - cur_dim=dims[ k ] - stride=dimprod/cur_dim - next_x = [complex(0,0)]*len(x) - for i in range(stride): - next_x[i*cur_dim:(i+1)*cur_dim] = fft(x[i:(i+cur_dim)*stride:stride],0) - x = next_x - return x - -if __name__ == "__main__": - try: - nd = int(sys.argv[1]) - except: - nd=None - if nd: - test_fftnd( nd ) - else: - sys.exit(0)
--- a/ext/kissfft/test/mk_test.py Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,117 +0,0 @@ -#!/usr/bin/env python - -import FFT -import sys -import random -import re -j=complex(0,1) - -def randvec(n,iscomplex): - if iscomplex: - return [ - int(random.uniform(-32768,32767) ) + j*int(random.uniform(-32768,32767) ) - for i in range(n) ] - else: - return [ int(random.uniform(-32768,32767) ) for i in range(n) ] - -def c_format(v,round=0): - if round: - return ','.join( [ '{%d,%d}' %(int(c.real),int(c.imag) ) for c in v ] ) - else: - s= ','.join( [ '{%.60f ,%.60f }' %(c.real,c.imag) for c in v ] ) - return re.sub(r'\.?0+ ',' ',s) - -def test_cpx( n,inverse ,short): - v = randvec(n,1) - scale = 1 - if short: - minsnr=30 - else: - minsnr=100 - - if inverse: - tvecout = FFT.inverse_fft(v) - if short: - scale = 1 - else: - scale = len(v) - else: - tvecout = FFT.fft(v) - if short: - scale = 1.0/len(v) - - tvecout = [ c * scale for c in tvecout ] - - - s="""#define NFFT %d""" % len(v) + """ - { - double snr; - kiss_fft_cpx test_vec_in[NFFT] = { """ + c_format(v) + """}; - kiss_fft_cpx test_vec_out[NFFT] = {""" + c_format( tvecout ) + """}; - kiss_fft_cpx testbuf[NFFT]; - void * cfg = kiss_fft_alloc(NFFT,%d,0,0);""" % inverse + """ - - kiss_fft(cfg,test_vec_in,testbuf); - snr = snr_compare(test_vec_out,testbuf,NFFT); - printf("DATATYPE=" xstr(kiss_fft_scalar) ", FFT n=%d, inverse=%d, snr = %g dB\\n",NFFT,""" + str(inverse) + """,snr); - if (snr<""" + str(minsnr) + """) - exit_code++; - free(cfg); - } -#undef NFFT -""" - return s - -def compare_func(): - s=""" -#define xstr(s) str(s) -#define str(s) #s -double snr_compare( kiss_fft_cpx * test_vec_out,kiss_fft_cpx * testbuf, int n) -{ - int k; - double sigpow,noisepow,err,snr,scale=0; - kiss_fft_cpx err; - sigpow = noisepow = .000000000000000000000000000001; - - for (k=0;k<n;++k) { - sigpow += test_vec_out[k].r * test_vec_out[k].r + - test_vec_out[k].i * test_vec_out[k].i; - C_SUB(err,test_vec_out[k],testbuf[k].r); - noisepow += err.r * err.r + err.i + err.i; - - if (test_vec_out[k].r) - scale += testbuf[k].r / test_vec_out[k].r; - } - snr = 10*log10( sigpow / noisepow ); - scale /= n; - if (snr<10) - printf( "\\npoor snr, try a scaling factor %f\\n" , scale ); - return snr; -} -""" - return s - -def main(): - - from getopt import getopt - opts,args = getopt(sys.argv[1:],'s') - opts = dict(opts) - short = int( opts.has_key('-s') ) - - fftsizes = args - if not fftsizes: - fftsizes = [ 1800 ] - print '#include "kiss_fft.h"' - print compare_func() - print "int main() { int exit_code=0;\n" - for n in fftsizes: - n = int(n) - print test_cpx(n,0,short) - print test_cpx(n,1,short) - print """ - return exit_code; -} -""" - -if __name__ == "__main__": - main()
--- a/ext/kissfft/test/pstats.c Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <sys/times.h> -#include <sys/types.h> -#include <unistd.h> - -#include "pstats.h" - -static struct tms tms_beg; -static struct tms tms_end; -static int has_times = 0; - - -void pstats_init(void) -{ - has_times = times(&tms_beg) != -1; -} - -static void tms_report(void) -{ - double cputime; - if (! has_times ) - return; - times(&tms_end); - cputime = ( ((float)tms_end.tms_utime + tms_end.tms_stime + tms_end.tms_cutime + tms_end.tms_cstime ) - - ((float)tms_beg.tms_utime + tms_beg.tms_stime + tms_beg.tms_cutime + tms_beg.tms_cstime ) ) - / sysconf(_SC_CLK_TCK); - fprintf(stderr,"\tcputime=%.3f\n" , cputime); -} - -static void ps_report(void) -{ - char buf[1024]; -#ifdef __APPLE__ /* MAC OS X */ - sprintf(buf,"ps -o command,majflt,minflt,rss,pagein,vsz -p %d 1>&2",getpid() ); -#else /* GNU/Linux */ - sprintf(buf,"ps -o comm,majflt,minflt,rss,drs,pagein,sz,trs,vsz %d 1>&2",getpid() ); -#endif - if (system( buf )==-1) { - perror("system call to ps failed"); - } -} - -void pstats_report() -{ - ps_report(); - tms_report(); -} -
--- a/ext/kissfft/test/pstats.h Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -#ifndef PSTATS_H -#define PSTATS_H - -void pstats_init(void); -void pstats_report(void); - -#endif
--- a/ext/kissfft/test/tailscrap.m Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -function maxabsdiff=tailscrap() -% test code for circular convolution with the scrapped portion -% at the tail of the buffer, rather than the front -% -% The idea is to rotate the zero-padded h (impulse response) buffer -% to the left nh-1 samples, rotating the junk samples as well. -% This could be very handy in avoiding buffer copies during fast filtering. -nh=10; -nfft=256; - -h=rand(1,nh); -x=rand(1,nfft); - -hpad=[ h(nh) zeros(1,nfft-nh) h(1:nh-1) ]; - -% baseline comparison -y1 = filter(h,1,x); -y1_notrans = y1(nh:nfft); - -% fast convolution -y2 = ifft( fft(hpad) .* fft(x) ); -y2_notrans=y2(1:nfft-nh+1); - -maxabsdiff = max(abs(y2_notrans - y1_notrans)) - -end
--- a/ext/kissfft/test/test_real.c Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,172 +0,0 @@ -#include "kiss_fftr.h" -#include "_kiss_fft_guts.h" -#include <sys/times.h> -#include <time.h> -#include <unistd.h> - -static double cputime(void) -{ - struct tms t; - times(&t); - return (double)(t.tms_utime + t.tms_stime)/ sysconf(_SC_CLK_TCK) ; -} - -static -kiss_fft_scalar rand_scalar(void) -{ -#ifdef USE_SIMD - return _mm_set1_ps(rand()-RAND_MAX/2); -#else - kiss_fft_scalar s = (kiss_fft_scalar)(rand() -RAND_MAX/2); - return s/2; -#endif -} - -static -double snr_compare( kiss_fft_cpx * vec1,kiss_fft_cpx * vec2, int n) -{ - int k; - double sigpow=1e-10,noisepow=1e-10,err,snr,scale=0; - -#ifdef USE_SIMD - float *fv1 = (float*)vec1; - float *fv2 = (float*)vec2; - for (k=0;k<8*n;++k) { - sigpow += *fv1 * *fv1; - err = *fv1 - *fv2; - noisepow += err*err; - ++fv1; - ++fv2; - } -#else - for (k=0;k<n;++k) { - sigpow += (double)vec1[k].r * (double)vec1[k].r + - (double)vec1[k].i * (double)vec1[k].i; - err = (double)vec1[k].r - (double)vec2[k].r; - noisepow += err * err; - err = (double)vec1[k].i - (double)vec2[k].i; - noisepow += err * err; - - if (vec1[k].r) - scale +=(double) vec2[k].r / (double)vec1[k].r; - } -#endif - snr = 10*log10( sigpow / noisepow ); - scale /= n; - if (snr<10) { - printf( "\npoor snr, try a scaling factor %f\n" , scale ); - exit(1); - } - return snr; -} - -#ifndef NUMFFTS -#define NUMFFTS 10000 -#endif - - -int main(int argc,char ** argv) -{ - int nfft = 8*3*5; - double ts,tfft,trfft; - int i; - if (argc>1) - nfft = atoi(argv[1]); - kiss_fft_cpx cin[nfft]; - kiss_fft_cpx cout[nfft]; - kiss_fft_cpx sout[nfft]; - kiss_fft_cfg kiss_fft_state; - kiss_fftr_cfg kiss_fftr_state; - - kiss_fft_scalar rin[nfft+2]; - kiss_fft_scalar rout[nfft+2]; - kiss_fft_scalar zero; - memset(&zero,0,sizeof(zero) ); // ugly way of setting short,int,float,double, or __m128 to zero - - srand(time(0)); - - for (i=0;i<nfft;++i) { - rin[i] = rand_scalar(); - cin[i].r = rin[i]; - cin[i].i = zero; - } - - kiss_fft_state = kiss_fft_alloc(nfft,0,0,0); - kiss_fftr_state = kiss_fftr_alloc(nfft,0,0,0); - kiss_fft(kiss_fft_state,cin,cout); - kiss_fftr(kiss_fftr_state,rin,sout); - /* - printf(" results from kiss_fft : (%f,%f), (%f,%f), (%f,%f) ...\n " - , (float)cout[0].r , (float)cout[0].i - , (float)cout[1].r , (float)cout[1].i - , (float)cout[2].r , (float)cout[2].i); - printf(" results from kiss_fftr: (%f,%f), (%f,%f), (%f,%f) ...\n " - , (float)sout[0].r , (float)sout[0].i - , (float)sout[1].r , (float)sout[1].i - , (float)sout[2].r , (float)sout[2].i); - */ - - printf( "nfft=%d, inverse=%d, snr=%g\n", - nfft,0, snr_compare(cout,sout,(nfft/2)+1) ); - ts = cputime(); - for (i=0;i<NUMFFTS;++i) { - kiss_fft(kiss_fft_state,cin,cout); - } - tfft = cputime() - ts; - - ts = cputime(); - for (i=0;i<NUMFFTS;++i) { - kiss_fftr( kiss_fftr_state, rin, cout ); - /* kiss_fftri(kiss_fftr_state,cout,rin); */ - } - trfft = cputime() - ts; - - printf("%d complex ffts took %gs, real took %gs\n",NUMFFTS,tfft,trfft); - - free(kiss_fft_state); - free(kiss_fftr_state); - - kiss_fft_state = kiss_fft_alloc(nfft,1,0,0); - kiss_fftr_state = kiss_fftr_alloc(nfft,1,0,0); - - memset(cin,0,sizeof(cin)); -#if 1 - for (i=1;i< nfft/2;++i) { - //cin[i].r = (kiss_fft_scalar)(rand()-RAND_MAX/2); - cin[i].r = rand_scalar(); - cin[i].i = rand_scalar(); - } -#else - cin[0].r = 12000; - cin[3].r = 12000; - cin[nfft/2].r = 12000; -#endif - - // conjugate symmetry of real signal - for (i=1;i< nfft/2;++i) { - cin[nfft-i].r = cin[i].r; - cin[nfft-i].i = - cin[i].i; - } - - kiss_fft(kiss_fft_state,cin,cout); - kiss_fftri(kiss_fftr_state,cin,rout); - /* - printf(" results from inverse kiss_fft : (%f,%f), (%f,%f), (%f,%f), (%f,%f), (%f,%f) ...\n " - , (float)cout[0].r , (float)cout[0].i , (float)cout[1].r , (float)cout[1].i , (float)cout[2].r , (float)cout[2].i , (float)cout[3].r , (float)cout[3].i , (float)cout[4].r , (float)cout[4].i - ); - - printf(" results from inverse kiss_fftr: %f,%f,%f,%f,%f ... \n" - ,(float)rout[0] ,(float)rout[1] ,(float)rout[2] ,(float)rout[3] ,(float)rout[4]); -*/ - for (i=0;i<nfft;++i) { - sout[i].r = rout[i]; - sout[i].i = zero; - } - - printf( "nfft=%d, inverse=%d, snr=%g\n", - nfft,1, snr_compare(cout,sout,nfft/2) ); - free(kiss_fft_state); - free(kiss_fftr_state); - - return 0; -}
--- a/ext/kissfft/test/test_vs_dft.c Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,74 +0,0 @@ -#include "kiss_fft.h" - - -void check(kiss_fft_cpx * in,kiss_fft_cpx * out,int nfft,int isinverse) -{ - int bin,k; - double errpow=0,sigpow=0; - - for (bin=0;bin<nfft;++bin) { - double ansr = 0; - double ansi = 0; - double difr; - double difi; - - for (k=0;k<nfft;++k) { - double phase = -2*M_PI*bin*k/nfft; - double re = cos(phase); - double im = sin(phase); - if (isinverse) - im = -im; - -#ifdef FIXED_POINT - re /= nfft; - im /= nfft; -#endif - - ansr += in[k].r * re - in[k].i * im; - ansi += in[k].r * im + in[k].i * re; - } - difr = ansr - out[bin].r; - difi = ansi - out[bin].i; - errpow += difr*difr + difi*difi; - sigpow += ansr*ansr+ansi*ansi; - } - printf("nfft=%d inverse=%d,snr = %f\n",nfft,isinverse,10*log10(sigpow/errpow) ); -} - -void test1d(int nfft,int isinverse) -{ - size_t buflen = sizeof(kiss_fft_cpx)*nfft; - - kiss_fft_cpx * in = (kiss_fft_cpx*)malloc(buflen); - kiss_fft_cpx * out= (kiss_fft_cpx*)malloc(buflen); - kiss_fft_cfg cfg = kiss_fft_alloc(nfft,isinverse,0,0); - int k; - - for (k=0;k<nfft;++k) { - in[k].r = (rand() % 65536) - 32768; - in[k].i = (rand() % 65536) - 32768; - } - - kiss_fft(cfg,in,out); - - check(in,out,nfft,isinverse); - - free(in); - free(out); - free(cfg); -} - -int main(int argc,char ** argv) -{ - if (argc>1) { - int k; - for (k=1;k<argc;++k) { - test1d(atoi(argv[k]),0); - test1d(atoi(argv[k]),1); - } - }else{ - test1d(32,0); - test1d(32,1); - } - return 0; -}
--- a/ext/kissfft/test/testcpp.cc Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,73 +0,0 @@ -#include "kissfft.hh" -#include <iostream> -#include <cstdlib> -#include <typeinfo> - -#include <sys/time.h> -static inline -double curtime(void) -{ - struct timeval tv; - gettimeofday(&tv, NULL); - return (double)tv.tv_sec + (double)tv.tv_usec*.000001; -} - -using namespace std; - -template <class T> -void dotest(int nfft) -{ - typedef kissfft<T> FFT; - typedef std::complex<T> cpx_type; - - cout << "type:" << typeid(T).name() << " nfft:" << nfft; - - FFT fft(nfft,false); - - vector<cpx_type> inbuf(nfft); - vector<cpx_type> outbuf(nfft); - for (int k=0;k<nfft;++k) - inbuf[k]= cpx_type( - (T)(rand()/(double)RAND_MAX - .5), - (T)(rand()/(double)RAND_MAX - .5) ); - fft.transform( &inbuf[0] , &outbuf[0] ); - - long double totalpower=0; - long double difpower=0; - for (int k0=0;k0<nfft;++k0) { - complex<long double> acc = 0; - long double phinc = 2*k0* M_PIl / nfft; - for (int k1=0;k1<nfft;++k1) { - complex<long double> x(inbuf[k1].real(),inbuf[k1].imag()); - acc += x * exp( complex<long double>(0,-k1*phinc) ); - } - totalpower += norm(acc); - complex<long double> x(outbuf[k0].real(),outbuf[k0].imag()); - complex<long double> dif = acc - x; - difpower += norm(dif); - } - cout << " RMSE:" << sqrt(difpower/totalpower) << "\t"; - - double t0 = curtime(); - int nits=20e6/nfft; - for (int k=0;k<nits;++k) { - fft.transform( &inbuf[0] , &outbuf[0] ); - } - double t1 = curtime(); - cout << " MSPS:" << ( (nits*nfft)*1e-6/ (t1-t0) ) << endl; -} - -int main(int argc,char ** argv) -{ - if (argc>1) { - for (int k=1;k<argc;++k) { - int nfft = atoi(argv[k]); - dotest<float>(nfft); dotest<double>(nfft); dotest<long double>(nfft); - } - }else{ - dotest<float>(32); dotest<double>(32); dotest<long double>(32); - dotest<float>(1024); dotest<double>(1024); dotest<long double>(1024); - dotest<float>(840); dotest<double>(840); dotest<long double>(840); - } - return 0; -}
--- a/ext/kissfft/test/testkiss.py Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,162 +0,0 @@ -#!/usr/bin/env python - -import math -import sys -import os -import random -import struct -import popen2 -import getopt -import numpy - -pi=math.pi -e=math.e -j=complex(0,1) - -doreal=0 - -datatype = os.environ.get('DATATYPE','float') - -util = '../tools/fft_' + datatype -minsnr=90 -if datatype == 'double': - fmt='d' -elif datatype=='int16_t': - fmt='h' - minsnr=10 -elif datatype=='int32_t': - fmt='i' -elif datatype=='simd': - fmt='4f' - sys.stderr.write('testkiss.py does not yet test simd') - sys.exit(0) -elif datatype=='float': - fmt='f' -else: - sys.stderr.write('unrecognized datatype %s\n' % datatype) - sys.exit(1) - - -def dopack(x,cpx=1): - x = numpy.reshape( x, ( numpy.size(x),) ) - - if cpx: - s = ''.join( [ struct.pack(fmt*2,c.real,c.imag) for c in x ] ) - else: - s = ''.join( [ struct.pack(fmt,c.real) for c in x ] ) - return s - -def dounpack(x,cpx): - uf = fmt * ( len(x) / struct.calcsize(fmt) ) - s = struct.unpack(uf,x) - if cpx: - return numpy.array(s[::2]) + numpy.array( s[1::2] )*j - else: - return numpy.array(s ) - -def make_random(dims=[1]): - res = [] - for i in range(dims[0]): - if len(dims)==1: - r=random.uniform(-1,1) - if doreal: - res.append( r ) - else: - i=random.uniform(-1,1) - res.append( complex(r,i) ) - else: - res.append( make_random( dims[1:] ) ) - return numpy.array(res) - -def flatten(x): - ntotal = numpy.size(x) - return numpy.reshape(x,(ntotal,)) - -def randmat( ndims ): - dims=[] - for i in range( ndims ): - curdim = int( random.uniform(2,5) ) - if doreal and i==(ndims-1): - curdim = int(curdim/2)*2 # force even last dimension if real - dims.append( curdim ) - return make_random(dims ) - -def test_fft(ndims): - x=randmat( ndims ) - - - if doreal: - xver = numpy.fft.rfftn(x) - else: - xver = numpy.fft.fftn(x) - - open('/tmp/fftexp.dat','w').write(dopack( flatten(xver) , True ) ) - - x2=dofft(x,doreal) - err = xver - x2 - errf = flatten(err) - xverf = flatten(xver) - errpow = numpy.vdot(errf,errf)+1e-10 - sigpow = numpy.vdot(xverf,xverf)+1e-10 - snr = 10*math.log10(abs(sigpow/errpow) ) - print 'SNR (compared to NumPy) : %.1fdB' % float(snr) - - if snr<minsnr: - print 'xver=',xver - print 'x2=',x2 - print 'err',err - sys.exit(1) - -def dofft(x,isreal): - dims=list( numpy.shape(x) ) - x = flatten(x) - - scale=1 - if datatype=='int16_t': - x = 32767 * x - scale = len(x) / 32767.0 - elif datatype=='int32_t': - x = 2147483647.0 * x - scale = len(x) / 2147483647.0 - - cmd='%s -n ' % util - cmd += ','.join([str(d) for d in dims]) - if doreal: - cmd += ' -R ' - - print cmd - p = popen2.Popen3(cmd ) - - open('/tmp/fftin.dat','w').write(dopack( x , isreal==False ) ) - - p.tochild.write( dopack( x , isreal==False ) ) - p.tochild.close() - - res = dounpack( p.fromchild.read() , 1 ) - open('/tmp/fftout.dat','w').write(dopack( flatten(res) , True ) ) - if doreal: - dims[-1] = int( dims[-1]/2 ) + 1 - - res = scale * res - - p.wait() - return numpy.reshape(res,dims) - -def main(): - opts,args = getopt.getopt(sys.argv[1:],'r') - opts=dict(opts) - - global doreal - doreal = opts.has_key('-r') - - if doreal: - print 'Testing multi-dimensional real FFTs' - else: - print 'Testing multi-dimensional FFTs' - - for dim in range(1,4): - test_fft( dim ) - -if __name__ == "__main__": - main() -
--- a/ext/kissfft/test/twotonetest.c Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,94 +0,0 @@ -#include <stdlib.h> -#include <string.h> -#include <stdio.h> -#include "kiss_fft.h" -#include "kiss_fftr.h" -#include <limits.h> - - -static -double two_tone_test( int nfft, int bin1,int bin2) -{ - kiss_fftr_cfg cfg = NULL; - kiss_fft_cpx *kout = NULL; - kiss_fft_scalar *tbuf = NULL; - - int i; - double f1 = bin1*2*M_PI/nfft; - double f2 = bin2*2*M_PI/nfft; - double sigpow=0; - double noisepow=0; -#if FIXED_POINT==32 - long maxrange = LONG_MAX; -#else - long maxrange = SHRT_MAX;/* works fine for float too*/ -#endif - - cfg = kiss_fftr_alloc(nfft , 0, NULL, NULL); - tbuf = KISS_FFT_MALLOC(nfft * sizeof(kiss_fft_scalar)); - kout = KISS_FFT_MALLOC(nfft * sizeof(kiss_fft_cpx)); - - /* generate a signal with two tones*/ - for (i = 0; i < nfft; i++) { -#ifdef USE_SIMD - tbuf[i] = _mm_set1_ps( (maxrange>>1)*cos(f1*i) - + (maxrange>>1)*cos(f2*i) ); -#else - tbuf[i] = (maxrange>>1)*cos(f1*i) - + (maxrange>>1)*cos(f2*i); -#endif - } - - kiss_fftr(cfg, tbuf, kout); - - for (i=0;i < (nfft/2+1);++i) { -#ifdef USE_SIMD - double tmpr = (double)*(float*)&kout[i].r / (double)maxrange; - double tmpi = (double)*(float*)&kout[i].i / (double)maxrange; -#else - double tmpr = (double)kout[i].r / (double)maxrange; - double tmpi = (double)kout[i].i / (double)maxrange; -#endif - double mag2 = tmpr*tmpr + tmpi*tmpi; - if (i!=0 && i!= nfft/2) - mag2 *= 2; /* all bins except DC and Nyquist have symmetric counterparts implied*/ - - /* if there is power in one of the expected bins, it is signal, otherwise noise*/ - if ( i!=bin1 && i != bin2 ) - noisepow += mag2; - else - sigpow += mag2; - } - kiss_fft_cleanup(); - /*printf("TEST %d,%d,%d noise @ %fdB\n",nfft,bin1,bin2,10*log10(noisepow/sigpow +1e-30) );*/ - return 10*log10(sigpow/(noisepow+1e-50) ); -} - -int main(int argc,char ** argv) -{ - int nfft = 4*2*2*3*5; - if (argc>1) nfft = atoi(argv[1]); - - int i,j; - double minsnr = 500; - double maxsnr = -500; - double snr; - for (i=0;i<nfft/2;i+= (nfft>>4)+1) { - for (j=i;j<nfft/2;j+=(nfft>>4)+7) { - snr = two_tone_test(nfft,i,j); - if (snr<minsnr) { - minsnr=snr; - } - if (snr>maxsnr) { - maxsnr=snr; - } - } - } - snr = two_tone_test(nfft,nfft/2,nfft/2); - if (snr<minsnr) minsnr=snr; - if (snr>maxsnr) maxsnr=snr; - - printf("TwoToneTest: snr ranges from %ddB to %ddB\n",(int)minsnr,(int)maxsnr); - printf("sizeof(kiss_fft_scalar) = %d\n",(int)sizeof(kiss_fft_scalar) ); - return 0; -}
--- a/ext/kissfft/tools/Makefile Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,62 +0,0 @@ -WARNINGS=-W -Wall -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return \ - -Wcast-align -Wcast-qual -Wnested-externs -Wshadow -Wbad-function-cast \ - -Wwrite-strings - -ifeq "$(DATATYPE)" "" - DATATYPE=float -endif - -ifeq "$(DATATYPE)" "int32_t" - TYPEFLAGS=-DFIXED_POINT=32 -endif - -ifeq "$(DATATYPE)" "int16_t" - TYPEFLAGS=-DFIXED_POINT=16 -endif - -ifeq "$(DATATYPE)" "simd" - TYPEFLAGS=-DUSE_SIMD=1 -msse -endif - -ifeq "$(TYPEFLAGS)" "" - TYPEFLAGS=-Dkiss_fft_scalar=$(DATATYPE) -endif - -ifneq ("$(KISS_FFT_USE_ALLOCA)","") - CFLAGS+= -DKISS_FFT_USE_ALLOCA=1 -endif -CFLAGS+= $(CFLAGADD) - - -FFTUTIL=fft_$(DATATYPE) -FASTFILT=fastconv_$(DATATYPE) -FASTFILTREAL=fastconvr_$(DATATYPE) -PSDPNG=psdpng_$(DATATYPE) -DUMPHDR=dumphdr_$(DATATYPE) - -all: $(FFTUTIL) $(FASTFILT) $(FASTFILTREAL) -# $(PSDPNG) -# $(DUMPHDR) - -#CFLAGS=-Wall -O3 -pedantic -march=pentiumpro -ffast-math -fomit-frame-pointer $(WARNINGS) -# If the above flags do not work, try the following -CFLAGS=-Wall -O3 $(WARNINGS) -# tip: try -openmp or -fopenmp to use multiple cores - -$(FASTFILTREAL): ../kiss_fft.c kiss_fastfir.c kiss_fftr.c - $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -DREAL_FASTFIR $+ -DFAST_FILT_UTIL -lm - -$(FASTFILT): ../kiss_fft.c kiss_fastfir.c - $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+ -DFAST_FILT_UTIL -lm - -$(FFTUTIL): ../kiss_fft.c fftutil.c kiss_fftnd.c kiss_fftr.c kiss_fftndr.c - $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+ -lm - -$(PSDPNG): ../kiss_fft.c psdpng.c kiss_fftr.c - $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+ -lpng -lm - -$(DUMPHDR): ../kiss_fft.c dumphdr.c - $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+ -lm - -clean: - rm -f *~ fft fft_* fastconv fastconv_* fastconvr fastconvr_* psdpng psdpng_*
--- a/ext/kissfft/tools/fftutil.c Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,208 +0,0 @@ -/* -Copyright (c) 2003-2004, Mark Borgerding - -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#include <stdlib.h> -#include <math.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> - -#include "kiss_fft.h" -#include "kiss_fftndr.h" - -static -void fft_file(FILE * fin,FILE * fout,int nfft,int isinverse) -{ - kiss_fft_cfg st; - kiss_fft_cpx * buf; - kiss_fft_cpx * bufout; - - buf = (kiss_fft_cpx*)malloc(sizeof(kiss_fft_cpx) * nfft ); - bufout = (kiss_fft_cpx*)malloc(sizeof(kiss_fft_cpx) * nfft ); - st = kiss_fft_alloc( nfft ,isinverse ,0,0); - - while ( fread( buf , sizeof(kiss_fft_cpx) * nfft ,1, fin ) > 0 ) { - kiss_fft( st , buf ,bufout); - fwrite( bufout , sizeof(kiss_fft_cpx) , nfft , fout ); - } - free(st); - free(buf); - free(bufout); -} - -static -void fft_filend(FILE * fin,FILE * fout,int *dims,int ndims,int isinverse) -{ - kiss_fftnd_cfg st; - kiss_fft_cpx *buf; - int dimprod=1,i; - for (i=0;i<ndims;++i) - dimprod *= dims[i]; - - buf = (kiss_fft_cpx *) malloc (sizeof (kiss_fft_cpx) * dimprod); - st = kiss_fftnd_alloc (dims, ndims, isinverse, 0, 0); - - while (fread (buf, sizeof (kiss_fft_cpx) * dimprod, 1, fin) > 0) { - kiss_fftnd (st, buf, buf); - fwrite (buf, sizeof (kiss_fft_cpx), dimprod, fout); - } - free (st); - free (buf); -} - - - -static -void fft_filend_real(FILE * fin,FILE * fout,int *dims,int ndims,int isinverse) -{ - int dimprod=1,i; - kiss_fftndr_cfg st; - void *ibuf; - void *obuf; - int insize,outsize; // size in bytes - - for (i=0;i<ndims;++i) - dimprod *= dims[i]; - insize = outsize = dimprod; - int rdim = dims[ndims-1]; - - if (isinverse) - insize = insize*2*(rdim/2+1)/rdim; - else - outsize = outsize*2*(rdim/2+1)/rdim; - - ibuf = malloc(insize*sizeof(kiss_fft_scalar)); - obuf = malloc(outsize*sizeof(kiss_fft_scalar)); - - st = kiss_fftndr_alloc(dims, ndims, isinverse, 0, 0); - - while ( fread (ibuf, sizeof(kiss_fft_scalar), insize, fin) > 0) { - if (isinverse) { - kiss_fftndri(st, - (kiss_fft_cpx*)ibuf, - (kiss_fft_scalar*)obuf); - }else{ - kiss_fftndr(st, - (kiss_fft_scalar*)ibuf, - (kiss_fft_cpx*)obuf); - } - fwrite (obuf, sizeof(kiss_fft_scalar), outsize,fout); - } - free(st); - free(ibuf); - free(obuf); -} - -static -void fft_file_real(FILE * fin,FILE * fout,int nfft,int isinverse) -{ - kiss_fftr_cfg st; - kiss_fft_scalar * rbuf; - kiss_fft_cpx * cbuf; - - rbuf = (kiss_fft_scalar*)malloc(sizeof(kiss_fft_scalar) * nfft ); - cbuf = (kiss_fft_cpx*)malloc(sizeof(kiss_fft_cpx) * (nfft/2+1) ); - st = kiss_fftr_alloc( nfft ,isinverse ,0,0); - - if (isinverse==0) { - while ( fread( rbuf , sizeof(kiss_fft_scalar) * nfft ,1, fin ) > 0 ) { - kiss_fftr( st , rbuf ,cbuf); - fwrite( cbuf , sizeof(kiss_fft_cpx) , (nfft/2 + 1) , fout ); - } - }else{ - while ( fread( cbuf , sizeof(kiss_fft_cpx) * (nfft/2+1) ,1, fin ) > 0 ) { - kiss_fftri( st , cbuf ,rbuf); - fwrite( rbuf , sizeof(kiss_fft_scalar) , nfft , fout ); - } - } - free(st); - free(rbuf); - free(cbuf); -} - -static -int get_dims(char * arg,int * dims) -{ - char *p0; - int ndims=0; - - do{ - p0 = strchr(arg,','); - if (p0) - *p0++ = '\0'; - dims[ndims++] = atoi(arg); -// fprintf(stderr,"dims[%d] = %d\n",ndims-1,dims[ndims-1]); - arg = p0; - }while (p0); - return ndims; -} - -int main(int argc,char ** argv) -{ - int isinverse=0; - int isreal=0; - FILE *fin=stdin; - FILE *fout=stdout; - int ndims=1; - int dims[32]; - dims[0] = 1024; /*default fft size*/ - - while (1) { - int c=getopt(argc,argv,"n:iR"); - if (c==-1) break; - switch (c) { - case 'n': - ndims = get_dims(optarg,dims); - break; - case 'i':isinverse=1;break; - case 'R':isreal=1;break; - case '?': - fprintf(stderr,"usage options:\n" - "\t-n d1[,d2,d3...]: fft dimension(s)\n" - "\t-i : inverse\n" - "\t-R : real input samples, not complex\n"); - exit (1); - default:fprintf(stderr,"bad %c\n",c);break; - } - } - - if ( optind < argc ) { - if (strcmp("-",argv[optind]) !=0) - fin = fopen(argv[optind],"rb"); - ++optind; - } - - if ( optind < argc ) { - if ( strcmp("-",argv[optind]) !=0 ) - fout = fopen(argv[optind],"wb"); - ++optind; - } - - if (ndims==1) { - if (isreal) - fft_file_real(fin,fout,dims[0],isinverse); - else - fft_file(fin,fout,dims[0],isinverse); - }else{ - if (isreal) - fft_filend_real(fin,fout,dims,ndims,isinverse); - else - fft_filend(fin,fout,dims,ndims,isinverse); - } - - if (fout!=stdout) fclose(fout); - if (fin!=stdin) fclose(fin); - - return 0; -}
--- a/ext/kissfft/tools/kfc.c Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,116 +0,0 @@ -#include "kfc.h" - -/* -Copyright (c) 2003-2004, Mark Borgerding - -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - - -typedef struct cached_fft *kfc_cfg; - -struct cached_fft -{ - int nfft; - int inverse; - kiss_fft_cfg cfg; - kfc_cfg next; -}; - -static kfc_cfg cache_root=NULL; -static int ncached=0; - -static kiss_fft_cfg find_cached_fft(int nfft,int inverse) -{ - size_t len; - kfc_cfg cur=cache_root; - kfc_cfg prev=NULL; - while ( cur ) { - if ( cur->nfft == nfft && inverse == cur->inverse ) - break;/*found the right node*/ - prev = cur; - cur = prev->next; - } - if (cur== NULL) { - /* no cached node found, need to create a new one*/ - kiss_fft_alloc(nfft,inverse,0,&len); -#ifdef USE_SIMD - int padding = (16-sizeof(struct cached_fft)) & 15; - // make sure the cfg aligns on a 16 byte boundary - len += padding; -#endif - cur = (kfc_cfg)KISS_FFT_MALLOC((sizeof(struct cached_fft) + len )); - if (cur == NULL) - return NULL; - cur->cfg = (kiss_fft_cfg)(cur+1); -#ifdef USE_SIMD - cur->cfg = (kiss_fft_cfg) ((char*)(cur+1)+padding); -#endif - kiss_fft_alloc(nfft,inverse,cur->cfg,&len); - cur->nfft=nfft; - cur->inverse=inverse; - cur->next = NULL; - if ( prev ) - prev->next = cur; - else - cache_root = cur; - ++ncached; - } - return cur->cfg; -} - -void kfc_cleanup(void) -{ - kfc_cfg cur=cache_root; - kfc_cfg next=NULL; - while (cur){ - next = cur->next; - free(cur); - cur=next; - } - ncached=0; - cache_root = NULL; -} -void kfc_fft(int nfft, const kiss_fft_cpx * fin,kiss_fft_cpx * fout) -{ - kiss_fft( find_cached_fft(nfft,0),fin,fout ); -} - -void kfc_ifft(int nfft, const kiss_fft_cpx * fin,kiss_fft_cpx * fout) -{ - kiss_fft( find_cached_fft(nfft,1),fin,fout ); -} - -#ifdef KFC_TEST -static void check(int nc) -{ - if (ncached != nc) { - fprintf(stderr,"ncached should be %d,but it is %d\n",nc,ncached); - exit(1); - } -} - -int main(void) -{ - kiss_fft_cpx buf1[1024],buf2[1024]; - memset(buf1,0,sizeof(buf1)); - check(0); - kfc_fft(512,buf1,buf2); - check(1); - kfc_fft(512,buf1,buf2); - check(1); - kfc_ifft(512,buf1,buf2); - check(2); - kfc_cleanup(); - check(0); - return 0; -} -#endif
--- a/ext/kissfft/tools/kfc.h Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -#ifndef KFC_H -#define KFC_H -#include "kiss_fft.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/* -KFC -- Kiss FFT Cache - -Not needing to deal with kiss_fft_alloc and a config -object may be handy for a lot of programs. - -KFC uses the underlying KISS FFT functions, but caches the config object. -The first time kfc_fft or kfc_ifft for a given FFT size, the cfg -object is created for it. All subsequent calls use the cached -configuration object. - -NOTE: -You should probably not use this if your program will be using a lot -of various sizes of FFTs. There is a linear search through the -cached objects. If you are only using one or two FFT sizes, this -will be negligible. Otherwise, you may want to use another method -of managing the cfg objects. - - There is no automated cleanup of the cached objects. This could lead -to large memory usage in a program that uses a lot of *DIFFERENT* -sized FFTs. If you want to force all cached cfg objects to be freed, -call kfc_cleanup. - - */ - -/*forward complex FFT */ -void kfc_fft(int nfft, const kiss_fft_cpx * fin,kiss_fft_cpx * fout); -/*reverse complex FFT */ -void kfc_ifft(int nfft, const kiss_fft_cpx * fin,kiss_fft_cpx * fout); - -/*free all cached objects*/ -void kfc_cleanup(void); - -#ifdef __cplusplus -} -#endif - -#endif
--- a/ext/kissfft/tools/kiss_fastfir.c Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,470 +0,0 @@ -/* -Copyright (c) 2003-2004, Mark Borgerding - -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#include "_kiss_fft_guts.h" - - -/* - Some definitions that allow real or complex filtering -*/ -#ifdef REAL_FASTFIR -#define MIN_FFT_LEN 2048 -#include "kiss_fftr.h" -typedef kiss_fft_scalar kffsamp_t; -typedef kiss_fftr_cfg kfcfg_t; -#define FFT_ALLOC kiss_fftr_alloc -#define FFTFWD kiss_fftr -#define FFTINV kiss_fftri -#else -#define MIN_FFT_LEN 1024 -typedef kiss_fft_cpx kffsamp_t; -typedef kiss_fft_cfg kfcfg_t; -#define FFT_ALLOC kiss_fft_alloc -#define FFTFWD kiss_fft -#define FFTINV kiss_fft -#endif - -typedef struct kiss_fastfir_state *kiss_fastfir_cfg; - - - -kiss_fastfir_cfg kiss_fastfir_alloc(const kffsamp_t * imp_resp,size_t n_imp_resp, - size_t * nfft,void * mem,size_t*lenmem); - -/* see do_file_filter for usage */ -size_t kiss_fastfir( kiss_fastfir_cfg cfg, kffsamp_t * inbuf, kffsamp_t * outbuf, size_t n, size_t *offset); - - - -static int verbose=0; - - -struct kiss_fastfir_state{ - size_t nfft; - size_t ngood; - kfcfg_t fftcfg; - kfcfg_t ifftcfg; - kiss_fft_cpx * fir_freq_resp; - kiss_fft_cpx * freqbuf; - size_t n_freq_bins; - kffsamp_t * tmpbuf; -}; - - -kiss_fastfir_cfg kiss_fastfir_alloc( - const kffsamp_t * imp_resp,size_t n_imp_resp, - size_t *pnfft, /* if <= 0, an appropriate size will be chosen */ - void * mem,size_t*lenmem) -{ - kiss_fastfir_cfg st = NULL; - size_t len_fftcfg,len_ifftcfg; - size_t memneeded = sizeof(struct kiss_fastfir_state); - char * ptr; - size_t i; - size_t nfft=0; - float scale; - int n_freq_bins; - if (pnfft) - nfft=*pnfft; - - if (nfft<=0) { - /* determine fft size as next power of two at least 2x - the impulse response length*/ - i=n_imp_resp-1; - nfft=2; - do{ - nfft<<=1; - }while (i>>=1); -#ifdef MIN_FFT_LEN - if ( nfft < MIN_FFT_LEN ) - nfft=MIN_FFT_LEN; -#endif - } - if (pnfft) - *pnfft = nfft; - -#ifdef REAL_FASTFIR - n_freq_bins = nfft/2 + 1; -#else - n_freq_bins = nfft; -#endif - /*fftcfg*/ - FFT_ALLOC (nfft, 0, NULL, &len_fftcfg); - memneeded += len_fftcfg; - /*ifftcfg*/ - FFT_ALLOC (nfft, 1, NULL, &len_ifftcfg); - memneeded += len_ifftcfg; - /* tmpbuf */ - memneeded += sizeof(kffsamp_t) * nfft; - /* fir_freq_resp */ - memneeded += sizeof(kiss_fft_cpx) * n_freq_bins; - /* freqbuf */ - memneeded += sizeof(kiss_fft_cpx) * n_freq_bins; - - if (lenmem == NULL) { - st = (kiss_fastfir_cfg) malloc (memneeded); - } else { - if (*lenmem >= memneeded) - st = (kiss_fastfir_cfg) mem; - *lenmem = memneeded; - } - if (!st) - return NULL; - - st->nfft = nfft; - st->ngood = nfft - n_imp_resp + 1; - st->n_freq_bins = n_freq_bins; - ptr=(char*)(st+1); - - st->fftcfg = (kfcfg_t)ptr; - ptr += len_fftcfg; - - st->ifftcfg = (kfcfg_t)ptr; - ptr += len_ifftcfg; - - st->tmpbuf = (kffsamp_t*)ptr; - ptr += sizeof(kffsamp_t) * nfft; - - st->freqbuf = (kiss_fft_cpx*)ptr; - ptr += sizeof(kiss_fft_cpx) * n_freq_bins; - - st->fir_freq_resp = (kiss_fft_cpx*)ptr; - ptr += sizeof(kiss_fft_cpx) * n_freq_bins; - - FFT_ALLOC (nfft,0,st->fftcfg , &len_fftcfg); - FFT_ALLOC (nfft,1,st->ifftcfg , &len_ifftcfg); - - memset(st->tmpbuf,0,sizeof(kffsamp_t)*nfft); - /*zero pad in the middle to left-rotate the impulse response - This puts the scrap samples at the end of the inverse fft'd buffer */ - st->tmpbuf[0] = imp_resp[ n_imp_resp - 1 ]; - for (i=0;i<n_imp_resp - 1; ++i) { - st->tmpbuf[ nfft - n_imp_resp + 1 + i ] = imp_resp[ i ]; - } - - FFTFWD(st->fftcfg,st->tmpbuf,st->fir_freq_resp); - - /* TODO: this won't work for fixed point */ - scale = 1.0 / st->nfft; - - for ( i=0; i < st->n_freq_bins; ++i ) { -#ifdef USE_SIMD - st->fir_freq_resp[i].r *= _mm_set1_ps(scale); - st->fir_freq_resp[i].i *= _mm_set1_ps(scale); -#else - st->fir_freq_resp[i].r *= scale; - st->fir_freq_resp[i].i *= scale; -#endif - } - return st; -} - -static void fastconv1buf(const kiss_fastfir_cfg st,const kffsamp_t * in,kffsamp_t * out) -{ - size_t i; - /* multiply the frequency response of the input signal by - that of the fir filter*/ - FFTFWD( st->fftcfg, in , st->freqbuf ); - for ( i=0; i<st->n_freq_bins; ++i ) { - kiss_fft_cpx tmpsamp; - C_MUL(tmpsamp,st->freqbuf[i],st->fir_freq_resp[i]); - st->freqbuf[i] = tmpsamp; - } - - /* perform the inverse fft*/ - FFTINV(st->ifftcfg,st->freqbuf,out); -} - -/* n : the size of inbuf and outbuf in samples - return value: the number of samples completely processed - n-retval samples should be copied to the front of the next input buffer */ -static size_t kff_nocopy( - kiss_fastfir_cfg st, - const kffsamp_t * inbuf, - kffsamp_t * outbuf, - size_t n) -{ - size_t norig=n; - while (n >= st->nfft ) { - fastconv1buf(st,inbuf,outbuf); - inbuf += st->ngood; - outbuf += st->ngood; - n -= st->ngood; - } - return norig - n; -} - -static -size_t kff_flush(kiss_fastfir_cfg st,const kffsamp_t * inbuf,kffsamp_t * outbuf,size_t n) -{ - size_t zpad=0,ntmp; - - ntmp = kff_nocopy(st,inbuf,outbuf,n); - n -= ntmp; - inbuf += ntmp; - outbuf += ntmp; - - zpad = st->nfft - n; - memset(st->tmpbuf,0,sizeof(kffsamp_t)*st->nfft ); - memcpy(st->tmpbuf,inbuf,sizeof(kffsamp_t)*n ); - - fastconv1buf(st,st->tmpbuf,st->tmpbuf); - - memcpy(outbuf,st->tmpbuf,sizeof(kffsamp_t)*( st->ngood - zpad )); - return ntmp + st->ngood - zpad; -} - -size_t kiss_fastfir( - kiss_fastfir_cfg vst, - kffsamp_t * inbuf, - kffsamp_t * outbuf, - size_t n_new, - size_t *offset) -{ - size_t ntot = n_new + *offset; - if (n_new==0) { - return kff_flush(vst,inbuf,outbuf,ntot); - }else{ - size_t nwritten = kff_nocopy(vst,inbuf,outbuf,ntot); - *offset = ntot - nwritten; - /*save the unused or underused samples at the front of the input buffer */ - memcpy( inbuf , inbuf+nwritten , *offset * sizeof(kffsamp_t) ); - return nwritten; - } -} - -#ifdef FAST_FILT_UTIL -#include <unistd.h> -#include <sys/types.h> -#include <sys/mman.h> -#include <assert.h> - -static -void direct_file_filter( - FILE * fin, - FILE * fout, - const kffsamp_t * imp_resp, - size_t n_imp_resp) -{ - size_t nlag = n_imp_resp - 1; - - const kffsamp_t *tmph; - kffsamp_t *buf, *circbuf; - kffsamp_t outval; - size_t nread; - size_t nbuf; - size_t oldestlag = 0; - size_t k, tap; -#ifndef REAL_FASTFIR - kffsamp_t tmp; -#endif - - nbuf = 4096; - buf = (kffsamp_t *) malloc ( sizeof (kffsamp_t) * nbuf); - circbuf = (kffsamp_t *) malloc (sizeof (kffsamp_t) * nlag); - if (!circbuf || !buf) { - perror("circbuf allocation"); - exit(1); - } - - if ( fread (circbuf, sizeof (kffsamp_t), nlag, fin) != nlag ) { - perror ("insufficient data to overcome transient"); - exit (1); - } - - do { - nread = fread (buf, sizeof (kffsamp_t), nbuf, fin); - if (nread <= 0) - break; - - for (k = 0; k < nread; ++k) { - tmph = imp_resp+nlag; -#ifdef REAL_FASTFIR -# ifdef USE_SIMD - outval = _mm_set1_ps(0); -#else - outval = 0; -#endif - for (tap = oldestlag; tap < nlag; ++tap) - outval += circbuf[tap] * *tmph--; - for (tap = 0; tap < oldestlag; ++tap) - outval += circbuf[tap] * *tmph--; - outval += buf[k] * *tmph; -#else -# ifdef USE_SIMD - outval.r = outval.i = _mm_set1_ps(0); -#else - outval.r = outval.i = 0; -#endif - for (tap = oldestlag; tap < nlag; ++tap){ - C_MUL(tmp,circbuf[tap],*tmph); - --tmph; - C_ADDTO(outval,tmp); - } - - for (tap = 0; tap < oldestlag; ++tap) { - C_MUL(tmp,circbuf[tap],*tmph); - --tmph; - C_ADDTO(outval,tmp); - } - C_MUL(tmp,buf[k],*tmph); - C_ADDTO(outval,tmp); -#endif - - circbuf[oldestlag++] = buf[k]; - buf[k] = outval; - - if (oldestlag == nlag) - oldestlag = 0; - } - - if (fwrite (buf, sizeof (buf[0]), nread, fout) != nread) { - perror ("short write"); - exit (1); - } - } while (nread); - free (buf); - free (circbuf); -} - -static -void do_file_filter( - FILE * fin, - FILE * fout, - const kffsamp_t * imp_resp, - size_t n_imp_resp, - size_t nfft ) -{ - int fdout; - size_t n_samps_buf; - - kiss_fastfir_cfg cfg; - kffsamp_t *inbuf,*outbuf; - int nread,nwrite; - size_t idx_inbuf; - - fdout = fileno(fout); - - cfg=kiss_fastfir_alloc(imp_resp,n_imp_resp,&nfft,0,0); - - /* use length to minimize buffer shift*/ - n_samps_buf = 8*4096/sizeof(kffsamp_t); - n_samps_buf = nfft + 4*(nfft-n_imp_resp+1); - - if (verbose) fprintf(stderr,"bufsize=%d\n",(int)(sizeof(kffsamp_t)*n_samps_buf) ); - - - /*allocate space and initialize pointers */ - inbuf = (kffsamp_t*)malloc(sizeof(kffsamp_t)*n_samps_buf); - outbuf = (kffsamp_t*)malloc(sizeof(kffsamp_t)*n_samps_buf); - - idx_inbuf=0; - do{ - /* start reading at inbuf[idx_inbuf] */ - nread = fread( inbuf + idx_inbuf, sizeof(kffsamp_t), n_samps_buf - idx_inbuf,fin ); - - /* If nread==0, then this is a flush. - The total number of samples in input is idx_inbuf + nread . */ - nwrite = kiss_fastfir(cfg, inbuf, outbuf,nread,&idx_inbuf) * sizeof(kffsamp_t); - /* kiss_fastfir moved any unused samples to the front of inbuf and updated idx_inbuf */ - - if ( write(fdout, outbuf, nwrite) != nwrite ) { - perror("short write"); - exit(1); - } - }while ( nread ); - free(cfg); - free(inbuf); - free(outbuf); -} - -int main(int argc,char**argv) -{ - kffsamp_t * h; - int use_direct=0; - size_t nh,nfft=0; - FILE *fin=stdin; - FILE *fout=stdout; - FILE *filtfile=NULL; - while (1) { - int c=getopt(argc,argv,"n:h:i:o:vd"); - if (c==-1) break; - switch (c) { - case 'v': - verbose=1; - break; - case 'n': - nfft=atoi(optarg); - break; - case 'i': - fin = fopen(optarg,"rb"); - if (fin==NULL) { - perror(optarg); - exit(1); - } - break; - case 'o': - fout = fopen(optarg,"w+b"); - if (fout==NULL) { - perror(optarg); - exit(1); - } - break; - case 'h': - filtfile = fopen(optarg,"rb"); - if (filtfile==NULL) { - perror(optarg); - exit(1); - } - break; - case 'd': - use_direct=1; - break; - case '?': - fprintf(stderr,"usage options:\n" - "\t-n nfft: fft size to use\n" - "\t-d : use direct FIR filtering, not fast convolution\n" - "\t-i filename: input file\n" - "\t-o filename: output(filtered) file\n" - "\t-n nfft: fft size to use\n" - "\t-h filename: impulse response\n"); - exit (1); - default:fprintf(stderr,"bad %c\n",c);break; - } - } - if (filtfile==NULL) { - fprintf(stderr,"You must supply the FIR coeffs via -h\n"); - exit(1); - } - fseek(filtfile,0,SEEK_END); - nh = ftell(filtfile) / sizeof(kffsamp_t); - if (verbose) fprintf(stderr,"%d samples in FIR filter\n",(int)nh); - h = (kffsamp_t*)malloc(sizeof(kffsamp_t)*nh); - fseek(filtfile,0,SEEK_SET); - if (fread(h,sizeof(kffsamp_t),nh,filtfile) != nh) - fprintf(stderr,"short read on filter file\n"); - - fclose(filtfile); - - if (use_direct) - direct_file_filter( fin, fout, h,nh); - else - do_file_filter( fin, fout, h,nh,nfft); - - if (fout!=stdout) fclose(fout); - if (fin!=stdin) fclose(fin); - - return 0; -} -#endif
--- a/ext/kissfft/tools/kiss_fftnd.c Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,193 +0,0 @@ - - -/* -Copyright (c) 2003-2004, Mark Borgerding - -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#include "kiss_fftnd.h" -#include "_kiss_fft_guts.h" - -struct kiss_fftnd_state{ - int dimprod; /* dimsum would be mighty tasty right now */ - int ndims; - int *dims; - kiss_fft_cfg *states; /* cfg states for each dimension */ - kiss_fft_cpx * tmpbuf; /*buffer capable of hold the entire input */ -}; - -kiss_fftnd_cfg kiss_fftnd_alloc(const int *dims,int ndims,int inverse_fft,void*mem,size_t*lenmem) -{ - kiss_fftnd_cfg st = NULL; - int i; - int dimprod=1; - size_t memneeded = sizeof(struct kiss_fftnd_state); - char * ptr; - - for (i=0;i<ndims;++i) { - size_t sublen=0; - kiss_fft_alloc (dims[i], inverse_fft, NULL, &sublen); - memneeded += sublen; /* st->states[i] */ - dimprod *= dims[i]; - } - memneeded += sizeof(int) * ndims;/* st->dims */ - memneeded += sizeof(void*) * ndims;/* st->states */ - memneeded += sizeof(kiss_fft_cpx) * dimprod; /* st->tmpbuf */ - - if (lenmem == NULL) {/* allocate for the caller*/ - st = (kiss_fftnd_cfg) malloc (memneeded); - } else { /* initialize supplied buffer if big enough */ - if (*lenmem >= memneeded) - st = (kiss_fftnd_cfg) mem; - *lenmem = memneeded; /*tell caller how big struct is (or would be) */ - } - if (!st) - return NULL; /*malloc failed or buffer too small */ - - st->dimprod = dimprod; - st->ndims = ndims; - ptr=(char*)(st+1); - - st->states = (kiss_fft_cfg *)ptr; - ptr += sizeof(void*) * ndims; - - st->dims = (int*)ptr; - ptr += sizeof(int) * ndims; - - st->tmpbuf = (kiss_fft_cpx*)ptr; - ptr += sizeof(kiss_fft_cpx) * dimprod; - - for (i=0;i<ndims;++i) { - size_t len; - st->dims[i] = dims[i]; - kiss_fft_alloc (st->dims[i], inverse_fft, NULL, &len); - st->states[i] = kiss_fft_alloc (st->dims[i], inverse_fft, ptr,&len); - ptr += len; - } - /* -Hi there! - -If you're looking at this particular code, it probably means you've got a brain-dead bounds checker -that thinks the above code overwrites the end of the array. - -It doesn't. - --- Mark - -P.S. -The below code might give you some warm fuzzies and help convince you. - */ - if ( ptr - (char*)st != (int)memneeded ) { - fprintf(stderr, - "################################################################################\n" - "Internal error! Memory allocation miscalculation\n" - "################################################################################\n" - ); - } - return st; -} - -/* - This works by tackling one dimension at a time. - - In effect, - Each stage starts out by reshaping the matrix into a DixSi 2d matrix. - A Di-sized fft is taken of each column, transposing the matrix as it goes. - -Here's a 3-d example: -Take a 2x3x4 matrix, laid out in memory as a contiguous buffer - [ [ [ a b c d ] [ e f g h ] [ i j k l ] ] - [ [ m n o p ] [ q r s t ] [ u v w x ] ] ] - -Stage 0 ( D=2): treat the buffer as a 2x12 matrix - [ [a b ... k l] - [m n ... w x] ] - - FFT each column with size 2. - Transpose the matrix at the same time using kiss_fft_stride. - - [ [ a+m a-m ] - [ b+n b-n] - ... - [ k+w k-w ] - [ l+x l-x ] ] - - Note fft([x y]) == [x+y x-y] - -Stage 1 ( D=3) treats the buffer (the output of stage D=2) as an 3x8 matrix, - [ [ a+m a-m b+n b-n c+o c-o d+p d-p ] - [ e+q e-q f+r f-r g+s g-s h+t h-t ] - [ i+u i-u j+v j-v k+w k-w l+x l-x ] ] - - And perform FFTs (size=3) on each of the columns as above, transposing - the matrix as it goes. The output of stage 1 is - (Legend: ap = [ a+m e+q i+u ] - am = [ a-m e-q i-u ] ) - - [ [ sum(ap) fft(ap)[0] fft(ap)[1] ] - [ sum(am) fft(am)[0] fft(am)[1] ] - [ sum(bp) fft(bp)[0] fft(bp)[1] ] - [ sum(bm) fft(bm)[0] fft(bm)[1] ] - [ sum(cp) fft(cp)[0] fft(cp)[1] ] - [ sum(cm) fft(cm)[0] fft(cm)[1] ] - [ sum(dp) fft(dp)[0] fft(dp)[1] ] - [ sum(dm) fft(dm)[0] fft(dm)[1] ] ] - -Stage 2 ( D=4) treats this buffer as a 4*6 matrix, - [ [ sum(ap) fft(ap)[0] fft(ap)[1] sum(am) fft(am)[0] fft(am)[1] ] - [ sum(bp) fft(bp)[0] fft(bp)[1] sum(bm) fft(bm)[0] fft(bm)[1] ] - [ sum(cp) fft(cp)[0] fft(cp)[1] sum(cm) fft(cm)[0] fft(cm)[1] ] - [ sum(dp) fft(dp)[0] fft(dp)[1] sum(dm) fft(dm)[0] fft(dm)[1] ] ] - - Then FFTs each column, transposing as it goes. - - The resulting matrix is the 3d FFT of the 2x3x4 input matrix. - - Note as a sanity check that the first element of the final - stage's output (DC term) is - sum( [ sum(ap) sum(bp) sum(cp) sum(dp) ] ) - , i.e. the summation of all 24 input elements. - -*/ -void kiss_fftnd(kiss_fftnd_cfg st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout) -{ - int i,k; - const kiss_fft_cpx * bufin=fin; - kiss_fft_cpx * bufout; - - /*arrange it so the last bufout == fout*/ - if ( st->ndims & 1 ) { - bufout = fout; - if (fin==fout) { - memcpy( st->tmpbuf, fin, sizeof(kiss_fft_cpx) * st->dimprod ); - bufin = st->tmpbuf; - } - }else - bufout = st->tmpbuf; - - for ( k=0; k < st->ndims; ++k) { - int curdim = st->dims[k]; - int stride = st->dimprod / curdim; - - for ( i=0 ; i<stride ; ++i ) - kiss_fft_stride( st->states[k], bufin+i , bufout+i*curdim, stride ); - - /*toggle back and forth between the two buffers*/ - if (bufout == st->tmpbuf){ - bufout = fout; - bufin = st->tmpbuf; - }else{ - bufout = st->tmpbuf; - bufin = fout; - } - } -}
--- a/ext/kissfft/tools/kiss_fftnd.h Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -#ifndef KISS_FFTND_H -#define KISS_FFTND_H - -#include "kiss_fft.h" - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct kiss_fftnd_state * kiss_fftnd_cfg; - -kiss_fftnd_cfg kiss_fftnd_alloc(const int *dims,int ndims,int inverse_fft,void*mem,size_t*lenmem); -void kiss_fftnd(kiss_fftnd_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout); - -#ifdef __cplusplus -} -#endif -#endif
--- a/ext/kissfft/tools/kiss_fftndr.c Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,118 +0,0 @@ -/* -Copyright (c) 2003-2004, Mark Borgerding - -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#include "kiss_fftndr.h" -#include "_kiss_fft_guts.h" -#define MAX(x,y) ( ( (x)<(y) )?(y):(x) ) - -struct kiss_fftndr_state -{ - int dimReal; - int dimOther; - kiss_fftr_cfg cfg_r; - kiss_fftnd_cfg cfg_nd; - void * tmpbuf; -}; - -static int prod(const int *dims, int ndims) -{ - int x=1; - while (ndims--) - x *= *dims++; - return x; -} - -kiss_fftndr_cfg kiss_fftndr_alloc(const int *dims,int ndims,int inverse_fft,void*mem,size_t*lenmem) -{ - kiss_fftndr_cfg st = NULL; - size_t nr=0 , nd=0,ntmp=0; - int dimReal = dims[ndims-1]; - int dimOther = prod(dims,ndims-1); - size_t memneeded; - - (void)kiss_fftr_alloc(dimReal,inverse_fft,NULL,&nr); - (void)kiss_fftnd_alloc(dims,ndims-1,inverse_fft,NULL,&nd); - ntmp = - MAX( 2*dimOther , dimReal+2) * sizeof(kiss_fft_scalar) // freq buffer for one pass - + dimOther*(dimReal+2) * sizeof(kiss_fft_scalar); // large enough to hold entire input in case of in-place - - memneeded = sizeof( struct kiss_fftndr_state ) + nr + nd + ntmp; - - if (lenmem==NULL) { - st = (kiss_fftndr_cfg) malloc(memneeded); - }else{ - if (*lenmem >= memneeded) - st = (kiss_fftndr_cfg)mem; - *lenmem = memneeded; - } - if (st==NULL) - return NULL; - memset( st , 0 , memneeded); - - st->dimReal = dimReal; - st->dimOther = dimOther; - st->cfg_r = kiss_fftr_alloc( dimReal,inverse_fft,st+1,&nr); - st->cfg_nd = kiss_fftnd_alloc(dims,ndims-1,inverse_fft, ((char*) st->cfg_r)+nr,&nd); - st->tmpbuf = (char*)st->cfg_nd + nd; - - return st; -} - -void kiss_fftndr(kiss_fftndr_cfg st,const kiss_fft_scalar *timedata,kiss_fft_cpx *freqdata) -{ - int k1,k2; - int dimReal = st->dimReal; - int dimOther = st->dimOther; - int nrbins = dimReal/2+1; - - kiss_fft_cpx * tmp1 = (kiss_fft_cpx*)st->tmpbuf; - kiss_fft_cpx * tmp2 = tmp1 + MAX(nrbins,dimOther); - - // timedata is N0 x N1 x ... x Nk real - - // take a real chunk of data, fft it and place the output at correct intervals - for (k1=0;k1<dimOther;++k1) { - kiss_fftr( st->cfg_r, timedata + k1*dimReal , tmp1 ); // tmp1 now holds nrbins complex points - for (k2=0;k2<nrbins;++k2) - tmp2[ k2*dimOther+k1 ] = tmp1[k2]; - } - - for (k2=0;k2<nrbins;++k2) { - kiss_fftnd(st->cfg_nd, tmp2+k2*dimOther, tmp1); // tmp1 now holds dimOther complex points - for (k1=0;k1<dimOther;++k1) - freqdata[ k1*(nrbins) + k2] = tmp1[k1]; - } -} - -void kiss_fftndri(kiss_fftndr_cfg st,const kiss_fft_cpx *freqdata,kiss_fft_scalar *timedata) -{ - int k1,k2; - int dimReal = st->dimReal; - int dimOther = st->dimOther; - int nrbins = dimReal/2+1; - kiss_fft_cpx * tmp1 = (kiss_fft_cpx*)st->tmpbuf; - kiss_fft_cpx * tmp2 = tmp1 + MAX(nrbins,dimOther); - - for (k2=0;k2<nrbins;++k2) { - for (k1=0;k1<dimOther;++k1) - tmp1[k1] = freqdata[ k1*(nrbins) + k2 ]; - kiss_fftnd(st->cfg_nd, tmp1, tmp2+k2*dimOther); - } - - for (k1=0;k1<dimOther;++k1) { - for (k2=0;k2<nrbins;++k2) - tmp1[k2] = tmp2[ k2*dimOther+k1 ]; - kiss_fftri( st->cfg_r,tmp1,timedata + k1*dimReal); - } -}
--- a/ext/kissfft/tools/kiss_fftndr.h Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -#ifndef KISS_NDR_H -#define KISS_NDR_H - -#include "kiss_fft.h" -#include "kiss_fftr.h" -#include "kiss_fftnd.h" - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct kiss_fftndr_state *kiss_fftndr_cfg; - - -kiss_fftndr_cfg kiss_fftndr_alloc(const int *dims,int ndims,int inverse_fft,void*mem,size_t*lenmem); -/* - dims[0] must be even - - If you don't care to allocate space, use mem = lenmem = NULL -*/ - - -void kiss_fftndr( - kiss_fftndr_cfg cfg, - const kiss_fft_scalar *timedata, - kiss_fft_cpx *freqdata); -/* - input timedata has dims[0] X dims[1] X ... X dims[ndims-1] scalar points - output freqdata has dims[0] X dims[1] X ... X dims[ndims-1]/2+1 complex points -*/ - -void kiss_fftndri( - kiss_fftndr_cfg cfg, - const kiss_fft_cpx *freqdata, - kiss_fft_scalar *timedata); -/* - input and output dimensions are the exact opposite of kiss_fftndr -*/ - - -#define kiss_fftr_free free - -#ifdef __cplusplus -} -#endif - -#endif
--- a/ext/kissfft/tools/psdpng.c Tue Mar 14 13:40:50 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,235 +0,0 @@ -/* -Copyright (c) 2003-2004, Mark Borgerding - -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#include <stdlib.h> -#include <math.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <png.h> - -#include "kiss_fft.h" -#include "kiss_fftr.h" - -int nfft=1024; -FILE * fin=NULL; -FILE * fout=NULL; - -int navg=20; -int remove_dc=0; -int nrows=0; -float * vals=NULL; -int stereo=0; - -static -void config(int argc,char** argv) -{ - while (1) { - int c = getopt (argc, argv, "n:r:as"); - if (c == -1) - break; - switch (c) { - case 'n': nfft=(int)atoi(optarg);break; - case 'r': navg=(int)atoi(optarg);break; - case 'a': remove_dc=1;break; - case 's': stereo=1;break; - case '?': - fprintf (stderr, "usage options:\n" - "\t-n d: fft dimension(s) [1024]\n" - "\t-r d: number of rows to average [20]\n" - "\t-a : remove average from each fft buffer\n" - "\t-s : input is stereo, channels will be combined before fft\n" - "16 bit machine format real input is assumed\n" - ); - default: - fprintf (stderr, "bad %c\n", c); - exit (1); - break; - } - } - if ( optind < argc ) { - if (strcmp("-",argv[optind]) !=0) - fin = fopen(argv[optind],"rb"); - ++optind; - } - - if ( optind < argc ) { - if ( strcmp("-",argv[optind]) !=0 ) - fout = fopen(argv[optind],"wb"); - ++optind; - } - if (fin==NULL) - fin=stdin; - if (fout==NULL) - fout=stdout; -} - -#define CHECKNULL(p) if ( (p)==NULL ) do { fprintf(stderr,"CHECKNULL failed @ %s(%d): %s\n",__FILE__,__LINE__,#p );exit(1);} while(0) - -typedef struct -{ - png_byte r; - png_byte g; - png_byte b; -} rgb_t; - -static -void val2rgb(float x,rgb_t *p) -{ - const double pi = 3.14159265358979; - p->g = (int)(255*sin(x*pi)); - p->r = (int)(255*abs(sin(x*pi*3/2))); - p->b = (int)(255*abs(sin(x*pi*5/2))); - //fprintf(stderr,"%.2f : %d,%d,%d\n",x,(int)p->r,(int)p->g,(int)p->b); -} - -static -void cpx2pixels(rgb_t * res,const float * fbuf,size_t n) -{ - size_t i; - float minval,maxval,valrange; - minval=maxval=fbuf[0]; - - for (i = 0; i < n; ++i) { - if (fbuf[i] > maxval) maxval = fbuf[i]; - if (fbuf[i] < minval) minval = fbuf[i]; - } - - fprintf(stderr,"min ==%f,max=%f\n",minval,maxval); - valrange = maxval-minval; - if (valrange == 0) { - fprintf(stderr,"min == max == %f\n",minval); - exit (1); - } - - for (i = 0; i < n; ++i) - val2rgb( (fbuf[i] - minval)/valrange , res+i ); -} - -static -void transform_signal(void) -{ - short *inbuf; - kiss_fftr_cfg cfg=NULL; - kiss_fft_scalar *tbuf; - kiss_fft_cpx *fbuf; - float *mag2buf; - int i; - int n; - int avgctr=0; - - int nfreqs=nfft/2+1; - - CHECKNULL( cfg=kiss_fftr_alloc(nfft,0,0,0) ); - CHECKNULL( inbuf=(short*)malloc(sizeof(short)*2*nfft ) ); - CHECKNULL( tbuf=(kiss_fft_scalar*)malloc(sizeof(kiss_fft_scalar)*nfft ) ); - CHECKNULL( fbuf=(kiss_fft_cpx*)malloc(sizeof(kiss_fft_cpx)*nfreqs ) ); - CHECKNULL( mag2buf=(float*)malloc(sizeof(float)*nfreqs ) ); - - memset(mag2buf,0,sizeof(mag2buf)*nfreqs); - - while (1) { - if (stereo) { - n = fread(inbuf,sizeof(short)*2,nfft,fin); - if (n != nfft ) - break; - for (i=0;i<nfft;++i) - tbuf[i] = inbuf[2*i] + inbuf[2*i+1]; - }else{ - n = fread(inbuf,sizeof(short),nfft,fin); - if (n != nfft ) - break; - for (i=0;i<nfft;++i) - tbuf[i] = inbuf[i]; - } - - if (remove_dc) { - float avg = 0; - for (i=0;i<nfft;++i) avg += tbuf[i]; - avg /= nfft; - for (i=0;i<nfft;++i) tbuf[i] -= (kiss_fft_scalar)avg; - } - - /* do FFT */ - kiss_fftr(cfg,tbuf,fbuf); - - for (i=0;i<nfreqs;++i) - mag2buf[i] += fbuf[i].r * fbuf[i].r + fbuf[i].i * fbuf[i].i; - - if (++avgctr == navg) { - avgctr=0; - ++nrows; - vals = (float*)realloc(vals,sizeof(float)*nrows*nfreqs); - float eps = 1; - for (i=0;i<nfreqs;++i) - vals[(nrows - 1) * nfreqs + i] = 10 * log10 ( mag2buf[i] / navg + eps ); - memset(mag2buf,0,sizeof(mag2buf[0])*nfreqs); - } - } - - free(cfg); - free(inbuf); - free(tbuf); - free(fbuf); - free(mag2buf); -} - -static -void make_png(void) -{ - png_bytepp row_pointers=NULL; - rgb_t * row_data=NULL; - int i; - int nfreqs = nfft/2+1; - - png_structp png_ptr=NULL; - png_infop info_ptr=NULL; - - CHECKNULL( png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING,0,0,0) ); - CHECKNULL( info_ptr = png_create_info_struct(png_ptr) ); - - - png_init_io(png_ptr, fout ); - png_set_IHDR(png_ptr, info_ptr ,nfreqs,nrows,8,PNG_COLOR_TYPE_RGB,PNG_INTERLACE_NONE,PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT ); - - - row_data = (rgb_t*)malloc(sizeof(rgb_t) * nrows * nfreqs) ; - cpx2pixels(row_data, vals, nfreqs*nrows ); - - row_pointers = realloc(row_pointers, nrows*sizeof(png_bytep)); - for (i=0;i<nrows;++i) { - row_pointers[i] = (png_bytep)(row_data + i*nfreqs); - } - png_set_rows(png_ptr, info_ptr, row_pointers); - - - fprintf(stderr,"creating %dx%d png\n",nfreqs,nrows); - fprintf(stderr,"bitdepth %d \n",png_get_bit_depth(png_ptr,info_ptr ) ); - - png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY , NULL); - -} - -int main(int argc,char ** argv) -{ - config(argc,argv); - - transform_signal(); - - make_png(); - - if (fout!=stdout) fclose(fout); - if (fin!=stdin) fclose(fin); - return 0; -}