Commit b19a68a

authored

Merge pull request matplotlib#30273 from QuLogic/mlab32

Fix mlab fallback for 32-bit systems

2 parents 784dcb9 + f5b6029 commit b19a68aCopy full SHA for b19a68a

File tree

+14

-11

lines changed

+14

-11

lines changed

Lines changed: 2 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -212,16 +212,8 @@ def detrend_linear(y):`
`212`	`212`
`213`	`213`
`214`	`214`	`def _stride_windows(x, n, noverlap=0):`
`215`		`- x = np.asarray(x)`
`216`		`-`
`217`	`215`	`_api.check_isinstance(Integral, n=n, noverlap=noverlap)`
`218`		`- if not (1 <= n <= x.size and n < noverlap):`
`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]`
`224`		`-`
	`216`	`+ x = np.asarray(x)`
`225`	`217`	`step = n - noverlap`
`226`	`218`	`shape = (n, (x.shape[-1]-noverlap)//step)`
`227`	`219`	`strides = (x.strides[0], step*x.strides[0])`
`@@ -257,7 +249,7 @@ def _spectral_helper(x, y=None, NFFT=None, Fs=None, detrend_func=None,`
`257`	`249`	`if NFFT is None:`
`258`	`250`	`NFFT = 256`
`259`	`251`
`260`		`- if noverlap>=NFFT:`
	`252`	`+ if not (0<=noverlap<NFFT):`
`261`	`253`	`raise ValueError('noverlap must be less than NFFT')`
`262`	`254`
`263`	`255`	`if mode is None or mode == 'default':`

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,`

Comments

(0)