From cbf1f0eed19118cf4701145a45bb6c564ebd28c3 Mon Sep 17 00:00:00 2001 From: Mark Borgerding <(none)> Date: Fri, 1 Feb 2019 07:40:39 -0500 Subject: [PATCH] removed unused and unmaintained mk_test.py --- Makefile | 1 + test/Makefile | 9 +--- test/mk_test.py | 122 ------------------------------------------------ 3 files changed, 2 insertions(+), 130 deletions(-) delete mode 100755 test/mk_test.py diff --git a/Makefile b/Makefile index d11c51a..4c0c38a 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,7 @@ doc: testall: # The simd and int32_t types may or may not work on your machine + make -C test testcpp && test/testcpp make -C test DATATYPE=simd CFLAGADD="$(CFLAGADD)" test make -C test DATATYPE=int32_t CFLAGADD="$(CFLAGADD)" test make -C test DATATYPE=int16_t CFLAGADD="$(CFLAGADD)" test diff --git a/test/Makefile b/test/Makefile index c204511..5de5e56 100644 --- a/test/Makefile +++ b/test/Makefile @@ -93,16 +93,9 @@ test: all @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 +CXXFLAGS=-O3 -ffast-math -fomit-frame-pointer -I.. -I../tools -W -Wall -march=native -mtune=native 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 diff --git a/test/mk_test.py b/test/mk_test.py deleted file mode 100755 index ab6acdf..0000000 --- a/test/mk_test.py +++ /dev/null @@ -1,122 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2003-2010, Mark Borgerding. All rights reserved. -# This file is part of KISS FFT - https://github.com/mborgerding/kissfft -# -# SPDX-License-Identifier: BSD-3-Clause -# See COPYING file for more information. - -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