Commit390d797

authored

Merge pull request#10479 from eric-wieser/masked-array-out-fix

BUG: Calling ufuncs with a positional output argument causes the result to inherit the output's mask

2 parents9901910 +56848bb commit390d797Copy full SHA for 390d797

File tree

+32

-5

lines changed

+32

-5

lines changed

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -3029,18 +3029,20 @@ def __array_wrap__(self, obj, context=None):`
`3029`	`3029`
`3030`	`3030`	`ifcontextisnotNone:`
`3031`	`3031`	`result._mask=result._mask.copy()`
`3032`		`- (func,args,_)=context`
`3033`		`-m=reduce(mask_or, [getmaskarray(arg)forarginargs])`
	`3032`	`+func,args,out_i=context`
	`3033`	`+# args sometimes contains outputs (gh-10459), which we don't want`
	`3034`	`+input_args=args[:func.nin]`
	`3035`	`+m=reduce(mask_or, [getmaskarray(arg)forargininput_args])`
`3034`	`3036`	`# Get the domain mask`
`3035`	`3037`	`domain=ufunc_domain.get(func,None)`
`3036`	`3038`	`ifdomainisnotNone:`
`3037`	`3039`	`# Take the domain, and make sure it's a ndarray`
`3038`		`-iflen(args)>2:`
	`3040`	`+iflen(input_args)>2:`
`3039`	`3041`	`withnp.errstate(divide='ignore',invalid='ignore'):`
`3040`		`-d=filled(reduce(domain,args),True)`
	`3042`	`+d=filled(reduce(domain,input_args),True)`
`3041`	`3043`	`else:`
`3042`	`3044`	`withnp.errstate(divide='ignore',invalid='ignore'):`
`3043`		`-d=filled(domain(*args),True)`
	`3045`	`+d=filled(domain(*input_args),True)`
`3044`	`3046`
`3045`	`3047`	`ifd.any():`
`3046`	`3048`	`# Fill the result where the domain is wrong`

Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5057,6 +5057,31 @@ def test_ufunc_with_output():`
`5057`	`5057`	`assert_(yisx)`
`5058`	`5058`
`5059`	`5059`
	`5060`	`+deftest_ufunc_with_out_varied():`
	`5061`	`+""" Test that masked arrays are immune to gh-10459 """`
	`5062`	`+# the mask of the output should not affect the result, however it is passed`
	`5063`	`+a=array([1,2,3],mask=[1,0,0])`
	`5064`	`+b=array([10,20,30],mask=[1,0,0])`
	`5065`	`+out=array([0,0,0],mask=[0,0,1])`
	`5066`	`+expected=array([11,22,33],mask=[1,0,0])`
	`5067`	`+`
	`5068`	`+out_pos=out.copy()`
	`5069`	`+res_pos=np.add(a,b,out_pos)`
	`5070`	`+`
	`5071`	`+out_kw=out.copy()`
	`5072`	`+res_kw=np.add(a,b,out=out_kw)`
	`5073`	`+`
	`5074`	`+out_tup=out.copy()`
	`5075`	`+res_tup=np.add(a,b,out=(out_tup,))`
	`5076`	`+`
	`5077`	`+assert_equal(res_kw.mask,expected.mask)`
	`5078`	`+assert_equal(res_kw.data,expected.data)`
	`5079`	`+assert_equal(res_tup.mask,expected.mask)`
	`5080`	`+assert_equal(res_tup.data,expected.data)`
	`5081`	`+assert_equal(res_pos.mask,expected.mask)`
	`5082`	`+assert_equal(res_pos.data,expected.data)`
	`5083`	`+`
	`5084`	`+`
`5060`	`5085`	`deftest_astype():`
`5061`	`5086`	`descr= [('v',int,3), ('x', [('y',float)])]`
`5062`	`5087`	`x=array([`

Comments

(0)