Commit 8f2a620

committed

Fix mlab fallback for 32-bit systems

Unfortunately, I applied the change from matplotlib#29115 (comment) directly without noticing the typo, or running full tests. So fix the swapped condition, and add a test (for `csd` only, which should be enough since everything goes though `_spectral_helper`.)

1 parent 4c345b4 commit 8f2a620Copy full SHA for 8f2a620

File tree

2 files changed

+14

-6

lines changed

lib/matplotlib
- mlab.py
- tests
  - test_mlab.py

2 files changed

+14

-6

lines changed

`‎lib/matplotlib/mlab.py`

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -215,12 +215,9 @@ def _stride_windows(x, n, noverlap=0):`
`215`	`215`	`x = np.asarray(x)`
`216`	`216`
`217`	`217`	`_api.check_isinstance(Integral, n=n, noverlap=noverlap)`
`218`		`- if not (1 <= n <= x.size and n < noverlap):`
	`218`	`+ if not (1 <= n <= x.size and noverlap < n):`
`219`	`219`	`raise ValueError(f'n ({n}) and noverlap ({noverlap}) must be positive integers '`
`220`		`- f'with n < noverlap and n <= x.size ({x.size})')`
`221`		`-`
`222`		`- if n == 1 and noverlap == 0:`
`223`		`- return x[np.newaxis]`
	`220`	`+ f'with noverlap < n and n <= x.size ({x.size})')`
`224`	`221`
`225`	`222`	`step = n - noverlap`
`226`	`223`	`shape = (n, (x.shape[-1]-noverlap)//step)`

`‎lib/matplotlib/tests/test_mlab.py`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+import sys`
	`2`	`+`
`1`	`3`	`from numpy.testing import (assert_allclose, assert_almost_equal,`
`2`	`4`	`assert_array_equal, assert_array_almost_equal_nulp)`
`3`	`5`	`import numpy as np`
`@@ -429,7 +431,16 @@ def test_spectral_helper_psd(self, mode, case):`
`429`	`431`	`assert spec.shape[0] == freqs.shape[0]`
`430`	`432`	`assert spec.shape[1] == getattr(self, f"t_{case}").shape[0]`
`431`	`433`
`432`		`- def test_csd(self):`
	`434`	`+ @pytest.mark.parametrize('bitsize', [`
	`435`	`+ pytest.param(None, id='default'),`
	`436`	`+ pytest.param(32,`
	`437`	`+ marks=pytest.mark.skipif(sys.maxsize <= 2**32,`
	`438`	`+ reason='System is already 32-bit'),`
	`439`	`+ id='32-bit')`
	`440`	`+ ])`
	`441`	`+ def test_csd(self, bitsize, monkeypatch):`
	`442`	`+ if bitsize is not None:`
	`443`	`+ monkeypatch.setattr(sys, 'maxsize', 2**bitsize)`
`433`	`444`	`freqs = self.freqs_density`
`434`	`445`	`spec, fsp = mlab.csd(x=self.y, y=self.y+1,`
`435`	`446`	`NFFT=self.NFFT_density,`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 8f2a620

File tree

2 files changed

2 files changed

`‎lib/matplotlib/mlab.py`

`‎lib/matplotlib/tests/test_mlab.py`

0 commit comments