Permalink
Browse files

ENH: missingdata: Make numpy.all follow the NA || True == True rule

  • Loading branch information...
1 parent 6706908 commit a43d255dbc243ea7910e1b92ba83704e1a880c70 @mwiebe mwiebe committed with charris Aug 26, 2011
View
@@ -381,6 +381,8 @@ arraytypes_src = env.GenerateFromTemplate(
pjoin('src', 'multiarray', 'arraytypes.c.src'))
nditer_src = env.GenerateFromTemplate(
pjoin('src', 'multiarray', 'nditer_templ.c.src'))
+boolean_ops_src = env.GenerateFromTemplate(
+ pjoin('src', 'multiarray', 'boolean_ops.c.src'))
lowlevel_strided_loops_src = env.GenerateFromTemplate(
pjoin('src', 'multiarray', 'lowlevel_strided_loops.c.src'))
einsum_src = env.GenerateFromTemplate(pjoin('src', 'multiarray', 'einsum.c.src'))
@@ -446,6 +448,7 @@ if ENABLE_SEPARATE_COMPILATION:
pjoin('src', 'multiarray', 'array_assign.c'),
pjoin('src', 'multiarray', 'array_assign_scalar.c'),
pjoin('src', 'multiarray', 'array_assign_array.c'),
+ pjoin('src', 'multiarray', 'boolean_ops.c'),
pjoin('src', 'multiarray', 'datetime.c'),
pjoin('src', 'multiarray', 'datetime_strings.c'),
pjoin('src', 'multiarray', 'datetime_busday.c'),
@@ -482,6 +485,7 @@ if ENABLE_SEPARATE_COMPILATION:
multiarray_src.extend(arraytypes_src)
multiarray_src.extend(scalartypes_src)
multiarray_src.extend(lowlevel_strided_loops_src)
+ multiarray_src.extend(boolean_ops_src)
multiarray_src.extend(nditer_src)
multiarray_src.extend(einsum_src)
if PYTHON_HAS_UNICODE_WIDE:
View
@@ -688,6 +688,7 @@ def generate_multiarray_templated_sources(ext, build_dir):
join(local_dir, subpath, 'arraytypes.c.src'),
join(local_dir, subpath, 'nditer_templ.c.src'),
join(local_dir, subpath, 'lowlevel_strided_loops.c.src'),
+ join(local_dir, subpath, 'boolean_ops.c.src'),
join(local_dir, subpath, 'einsum.c.src')]
# numpy.distutils generate .c from .c.src in weird directories, we have
@@ -757,6 +758,7 @@ def generate_multiarray_templated_sources(ext, build_dir):
join('src', 'multiarray', 'array_assign.c'),
join('src', 'multiarray', 'array_assign_scalar.c'),
join('src', 'multiarray', 'array_assign_array.c'),
+ join('src', 'multiarray', 'boolean_ops.c.src'),
join('src', 'multiarray', 'buffer.c'),
join('src', 'multiarray', 'calculation.c'),
join('src', 'multiarray', 'common.c'),
Oops, something went wrong.

0 comments on commit a43d255

Please sign in to comment.