diff options
| author | Ralf Gommers <ralf.gommers@googlemail.com> | 2012-06-21 21:44:25 +0200 |
|---|---|---|
| committer | Ralf Gommers <ralf.gommers@googlemail.com> | 2012-06-21 21:44:25 +0200 |
| commit | 699c2f3cca63966bf086c58a59e1b6ee6fa7e090 (patch) | |
| tree | c1e177d888dd39cb3fd99581ab006d64c380a973 /numpy | |
| parent | eee46518b869ae05490c085783fd5b09a40b2273 (diff) | |
| download | numpy-699c2f3cca63966bf086c58a59e1b6ee6fa7e090.tar.gz | |
BLD: fix Bento and Numscons builds, that were broken in b272bc60.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/SConscript | 6 | ||||
| -rw-r--r-- | numpy/core/bscript | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/numpy/core/SConscript b/numpy/core/SConscript index 6f4484b6f..46087610c 100644 --- a/numpy/core/SConscript +++ b/numpy/core/SConscript @@ -381,8 +381,6 @@ 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,7 +444,6 @@ 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'), @@ -456,8 +453,6 @@ if ENABLE_SEPARATE_COMPILATION: pjoin('src', 'multiarray', 'descriptor.c'), pjoin('src', 'multiarray', 'iterators.c'), pjoin('src', 'multiarray', 'mapping.c'), - pjoin('src', 'multiarray', 'na_mask.c'), - pjoin('src', 'multiarray', 'na_object.c'), pjoin('src', 'multiarray', 'number.c'), pjoin('src', 'multiarray', 'getset.c'), pjoin('src', 'multiarray', 'sequence.c'), @@ -483,7 +478,6 @@ 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) else: diff --git a/numpy/core/bscript b/numpy/core/bscript index 3db659529..33493d55b 100644 --- a/numpy/core/bscript +++ b/numpy/core/bscript @@ -425,12 +425,10 @@ def pre_build(context): "src/multiarray/nditer_templ.c.src", "src/multiarray/lowlevel_strided_loops.c.src", "src/multiarray/einsum.c.src", - "src/multiarray/boolean_ops.c.src"] bld(target="multiarray_templates", source=multiarray_templates) if ENABLE_SEPARATE_COMPILATION: sources = [pjoin('src', 'multiarray', 'arrayobject.c'), pjoin('src', 'multiarray', 'arraytypes.c.src'), - pjoin('src', 'multiarray', 'boolean_ops.c.src'), pjoin('src', 'multiarray', 'buffer.c'), pjoin('src', 'multiarray', 'calculation.c'), pjoin('src', 'multiarray', 'common.c'), |