Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
fe1913a
specify output_format explicitly in the unravel_coeffs example
grlee77 Feb 27, 2019
088e1b9
add user-friendly error messages related to coefficient format
grlee77 Feb 27, 2019
79ebf0e
remove outdated AttributeError check.
grlee77 Feb 27, 2019
c90cf85
fix docstring example
grlee77 Feb 27, 2019
941a11c
Added suppport for cwt with fft based convolution
alsauve Apr 15, 2019
7590474
added test for fft based cwt
alsauve Apr 15, 2019
c3594b9
fix docstring formatting
grlee77 Apr 16, 2019
c837c6c
PEP8 fixes
grlee77 Apr 16, 2019
a767fc6
minor refactoring of cwt
grlee77 Apr 16, 2019
0e0d413
Updated code (removed method 'auto'/randomstate/removed dtype checks)…
alsauve Apr 17, 2019
5cf1188
Added support for next_fast_len() to improve complexity
alsauve Apr 17, 2019
0ca4240
Merge branch 'fftcwt' of https://github.com/alsauve/pywt into fftcwt
alsauve Apr 17, 2019
e392672
Fix the scipy import by providing a fallback
alsauve Apr 18, 2019
540d250
Minor: typos
alsauve Apr 18, 2019
9790beb
DOC: Update citation info in the documentation
grlee77 May 15, 2019
69b649a
Merge pull request #498 from grlee77/add_new_citation_to_docs
rgommers May 15, 2019
2257f3e
add pytest.ini to MANIFEST.in
grlee77 May 15, 2019
cd5b94d
register pytest.mark.slow
grlee77 May 15, 2019
36843c5
fix docstring's scale2frequency parameter order
lukemcraig Jun 10, 2019
b65662f
Merge pull request #502 from lukemcraig/patch-1
grlee77 Jun 11, 2019
13a4725
Merge pull request #499 from grlee77/pytest_4.5_fix
grlee77 Jul 23, 2019
9c0ff9d
FIX: raise error on attempt to transform along an axis with size 0
grlee77 Jul 23, 2019
1c32578
MAINT: Check for non-zero data size in swt_axis and swt as well.
grlee77 Jul 23, 2019
3a9969e
TST: Add test cases for swt and dwt with zero-sized inputs.
grlee77 Jul 23, 2019
9ce883e
Merge pull request #506 from grlee77/guard_against_size0_axes
rgommers Jul 24, 2019
7b24572
ENH: prefer scipy.fft when available
grlee77 Jul 25, 2019
823a96d
include FFT-based cases in the CWT benchmarks
grlee77 Jul 25, 2019
688e2e6
Add a case with SciPy included on Travis-CI.
grlee77 Jul 25, 2019
923a6bb
DOC: mention optional use of scipy in the README and install docs
grlee77 Jul 25, 2019
297b1df
add trim_approx boolean to swt cython routines
grlee77 Mar 15, 2019
8dec196
add test cases for swt transforms with trim_approx=True
grlee77 Mar 15, 2019
970643b
ENH: add normalization option to swt functions
grlee77 Mar 15, 2019
31b4262
TST: test properties of the swt when norm=True
grlee77 Mar 15, 2019
5776445
add Userwarning for swt with norm=True when wavelet is not orthogonal
grlee77 Mar 15, 2019
179896b
test pywt.ravel_coeffs and pywt.unravel_coeffs with swt functions
grlee77 Mar 15, 2019
6ac0fa3
update docstring of ravel_coeffs and unravel_coeffs
grlee77 Mar 15, 2019
e2d7faa
DOC: mention similarity to the MODWT in the swt docstring
grlee77 Mar 15, 2019
f2a0790
allow list in addition to tuple for waverec2 coefficients
grlee77 Jul 25, 2019
1652e84
DOC: more consistent use of double backticks
grlee77 Jul 25, 2019
ba00fea
Merge pull request #471 from grlee77/unravel_clarification
grlee77 Jul 25, 2019
ac5793f
Merge pull request #490 from alsauve/fftcwt
grlee77 Jul 26, 2019
591dd8a
ENH: cwt runs in single precision for single precision inputs
grlee77 Jul 26, 2019
fb4b030
add float32 cases to cwt benchmarks
grlee77 Jul 26, 2019
9563a43
Merge pull request #507 from grlee77/cwt_dtype_fix
rgommers Jul 26, 2019
f5c4e26
Merge pull request #476 from grlee77/swt_enhancements
grlee77 Jul 31, 2019
9bbed61
ENH: add axis support to cwt
grlee77 Jul 31, 2019
d974834
update cwt docstring
grlee77 Jul 31, 2019
648a4ce
add batch cwt cases to the benchmarks
grlee77 Aug 1, 2019
5b8f1f9
add demo using swt with norm=True to analyze variance across scales
grlee77 Aug 1, 2019
20ab3c1
Merge pull request #510 from grlee77/swt_variance_demo
grlee77 Aug 1, 2019
9ba3a1c
Merge pull request #509 from grlee77/batch_cwt
rgommers Aug 5, 2019
dba769a
MAINT: split bundled license into a separate file
grlee77 Aug 22, 2019
bc7c671
Merge pull request #511 from grlee77/license_fix
grlee77 Aug 22, 2019
f22065a
Create FUNDING.yml
grlee77 Aug 22, 2019
e1791ef
MAINT: add Tidelift links to README.rst [ci skip]
grlee77 Aug 22, 2019
3662167
tweak wording of landing page link
grlee77 Aug 22, 2019
0a8f3f3
Merge pull request #512 from grlee77/tidelift_readme
rgommers Aug 24, 2019
d872ef6
Small typo in the doc (#514)
vallsv Sep 11, 2019
cd2b248
properly point pytest-cov to the .coveragerc
grlee77 Sep 18, 2019
6b120a0
ignore coverage for _pytesttester.py and _pytest.py utilities
grlee77 Sep 18, 2019
ec3b1a6
update files ignored by codecov.yml for consistency with .coveragerc
grlee77 Sep 18, 2019
0d2f196
move .coverage report to the folder where codecov is run
grlee77 Sep 18, 2019
3cb5436
move pad from _doc_utils.py to _dwt.py and add docstring
grlee77 Mar 16, 2019
1ff0132
add n-dimensional support to pad
grlee77 Mar 17, 2019
26579c2
TST: add tests for pywt.pad
grlee77 Mar 17, 2019
41cc925
DOC: add pad to the API documentation
grlee77 Mar 17, 2019
709bf4c
Fix docstrings to avoid sphinx warnings [ci skip][skip ci] (#516)
grlee77 Sep 28, 2019
b904642
Merge pull request #517 from grlee77/coverage_updates
rgommers Sep 28, 2019
bcb7949
DOC: improve docstring style
grlee77 Oct 4, 2019
399196a
Merge pull request #478 from grlee77/pad
rgommers Oct 5, 2019
ed5e03c
fix the phase of CWT when using complex mother wavelets (#439)
pavleb Oct 15, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add batch cwt cases to the benchmarks
  • Loading branch information
grlee77 committed Aug 1, 2019
commit 648a4ce17cb2fbc072f38fd7617ae78fd1494eee
10 changes: 10 additions & 0 deletions benchmarks/benchmarks/cwt_benchmarks.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ def setup(self, n, wavelet, max_scale, dtype, method):
except ImportError:
raise NotImplementedError("cwt not available")
self.data = np.ones(n, dtype=dtype)
self.batch_data = np.ones((5, n), dtype=dtype)
self.scales = np.arange(1, max_scale + 1)


Expand All @@ -33,3 +34,12 @@ def time_cwt(self, n, wavelet, max_scale, dtype, method):
raise NotImplementedError(
"fft-based convolution not available.")
pywt.cwt(self.data, self.scales, wavelet)

def time_cwt_batch(self, n, wavelet, max_scale, dtype, method):
try:
pywt.cwt(self.batch_data, self.scales, wavelet, method=method,
axis=-1)
except TypeError:
# older PyWavelets does not support the axis argument
raise NotImplementedError(
"axis argument not available.")