Skip to content

Commit 31b94e8

Browse files
charrischarris
committed
Merge pull request numpy#5162 from juliantaylor/scalarmath-merge
MAINT: merge scalarmathmodule into umath module
2 parents fb037eb + 261de3f commit 31b94e8

13 files changed

+39
-314
lines changed

‎numpy/core/__init__.py

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
from .records import *
3131
from .memmap import *
3232
from .defchararray import chararray
33-
from . import scalarmath
3433
from . import function_base
3534
from .function_base import *
3635
from . import machar

‎numpy/core/bento.info

-4
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ Library:
2929
Extension: umath_tests
3030
Sources:
3131
src/umath/umath_tests.c.src
32-
Extension: scalarmath
33-
Sources:
34-
src/private/scalarmathmodule.h.src,
35-
src/scalarmathmodule.c.src
3632
Extension: test_rational
3733
Sources:
3834
src/umath/test_rational.c.src

‎numpy/core/bscript

+4-3
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ def pre_build(context):
426426
"src/multiarray/arraytypes.c.src",
427427
"src/multiarray/nditer_templ.c.src",
428428
"src/multiarray/lowlevel_strided_loops.c.src",
429-
"src/multiarray/templ_common.h.src",
429+
"src/private/templ_common.h.src",
430430
"src/multiarray/einsum.c.src"]
431431
bld(target="multiarray_templates", source=multiarray_templates)
432432
if ENABLE_SEPARATE_COMPILATION:
@@ -440,7 +440,6 @@ def pre_build(context):
440440
pjoin('src', 'multiarray', 'buffer.c'),
441441
pjoin('src', 'multiarray', 'calculation.c'),
442442
pjoin('src', 'multiarray', 'common.c'),
443-
pjoin('src', 'multiarray', 'templ_common.h.src'),
444443
pjoin('src', 'multiarray', 'conversion_utils.c'),
445444
pjoin('src', 'multiarray', 'convert.c'),
446445
pjoin('src', 'multiarray', 'convert_datatype.c'),
@@ -476,6 +475,7 @@ def pre_build(context):
476475
pjoin('src', 'multiarray', 'ucsnarrow.c'),
477476
pjoin('src', 'multiarray', 'usertypes.c'),
478477
pjoin('src', 'multiarray', 'vdot.c'),
478+
pjoin('src', 'private', 'templ_common.h.src'),
479479
]
480480

481481
if bld.env.HAS_CBLAS:
@@ -508,6 +508,7 @@ def pre_build(context):
508508
name="ufunc_api")
509509

510510
ufunc_templates = [
511+
"src/umath/scalarmath.c.src",
511512
"src/umath/loops.h.src",
512513
"src/umath/loops.c.src",
513514
"src/umath/funcs.inc.src",
@@ -521,6 +522,7 @@ def pre_build(context):
521522
includes = ["src/umath", "src/multiarray", "src/private"]
522523
if ENABLE_SEPARATE_COMPILATION:
523524
sources = [
525+
pjoin("src", "umath", "scalarmath.c.src"),
524526
pjoin("src", "umath", "loops.h.src"),
525527
pjoin("src", "umath", "loops.c.src"),
526528
pjoin('src', 'umath', 'reduction.c'),
@@ -536,6 +538,5 @@ def pre_build(context):
536538
use="npymath")
537539
context.register_builder("umath", build_ufunc)
538540

539-
context.tweak_extension("scalarmath", use="npymath", includes=["src/private"])
540541
context.tweak_extension("multiarray_tests", use="npymath", includes=["src/private"])
541542
context.tweak_extension("umath_tests", use="npymath", includes=["src/private"])

‎numpy/core/setup.py

+7-19
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,8 @@ def generate_multiarray_templated_sources(ext, build_dir):
725725
join(local_dir, subpath, 'arraytypes.c.src'),
726726
join(local_dir, subpath, 'nditer_templ.c.src'),
727727
join(local_dir, subpath, 'lowlevel_strided_loops.c.src'),
728-
join(local_dir, subpath, 'einsum.c.src')]
728+
join(local_dir, subpath, 'einsum.c.src'),
729+
join(local_dir, 'src', 'private', 'templ_common.h.src')]
729730

730731
# numpy.distutils generate .c from .c.src in weird directories, we have
731732
# to add them there as they depend on the build_dir
@@ -741,7 +742,6 @@ def generate_multiarray_templated_sources(ext, build_dir):
741742
join('src', 'multiarray', 'buffer.h'),
742743
join('src', 'multiarray', 'calculation.h'),
743744
join('src', 'multiarray', 'common.h'),
744-
join('src', 'multiarray', 'templ_common.h.src'),
745745
join('src', 'multiarray', 'convert_datatype.h'),
746746
join('src', 'multiarray', 'convert.h'),
747747
join('src', 'multiarray', 'conversion_utils.h'),
@@ -764,6 +764,7 @@ def generate_multiarray_templated_sources(ext, build_dir):
764764
join('src', 'multiarray', 'ucsnarrow.h'),
765765
join('src', 'multiarray', 'usertypes.h'),
766766
join('src', 'multiarray', 'vdot.h'),
767+
join('src', 'private', 'templ_common.h.src'),
767768
join('src', 'private', 'lowlevel_strided_loops.h'),
768769
join('include', 'numpy', 'arrayobject.h'),
769770
join('include', 'numpy', '_neighborhood_iterator_imp.h'),
@@ -817,7 +818,6 @@ def generate_multiarray_templated_sources(ext, build_dir):
817818
join('src', 'multiarray', 'mapping.c'),
818819
join('src', 'multiarray', 'methods.c'),
819820
join('src', 'multiarray', 'multiarraymodule.c'),
820-
join('src', 'multiarray', 'templ_common.h.src'),
821821
join('src', 'multiarray', 'nditer_templ.c.src'),
822822
join('src', 'multiarray', 'nditer_api.c'),
823823
join('src', 'multiarray', 'nditer_constr.c'),
@@ -833,6 +833,7 @@ def generate_multiarray_templated_sources(ext, build_dir):
833833
join('src', 'multiarray', 'usertypes.c'),
834834
join('src', 'multiarray', 'ucsnarrow.c'),
835835
join('src', 'multiarray', 'vdot.c'),
836+
join('src', 'private', 'templ_common.h.src'),
836837
]
837838

838839
blas_info = get_info('blas_opt', 0)
@@ -846,7 +847,6 @@ def generate_multiarray_templated_sources(ext, build_dir):
846847
multiarray_deps.extend(multiarray_src)
847848
multiarray_src = [join('src', 'multiarray', 'multiarraymodule_onefile.c')]
848849
multiarray_src.append(generate_multiarray_templated_sources)
849-
multiarray_src.append(join('src', 'multiarray', 'templ_common.h.src'))
850850

851851

852852
config.add_extension('multiarray',
@@ -874,6 +874,7 @@ def generate_umath_templated_sources(ext, build_dir):
874874
sources = [
875875
join(local_dir, subpath, 'loops.h.src'),
876876
join(local_dir, subpath, 'loops.c.src'),
877+
join(local_dir, subpath, 'scalarmath.c.src'),
877878
join(local_dir, subpath, 'simd.inc.src')]
878879

879880
# numpy.distutils generate .c from .c.src in weird directories, we have
@@ -905,11 +906,13 @@ def generate_umath_c(ext, build_dir):
905906
join('src', 'umath', 'loops.h.src'),
906907
join('src', 'umath', 'loops.c.src'),
907908
join('src', 'umath', 'ufunc_object.c'),
909+
join('src', 'umath', 'scalarmath.c.src'),
908910
join('src', 'umath', 'ufunc_type_resolution.c')]
909911

910912
umath_deps = [
911913
generate_umath_py,
912914
join('src', 'multiarray', 'common.h'),
915+
join('src', 'private', 'templ_common.h.src'),
913916
join('src', 'umath', 'simd.inc.src'),
914917
join(codegen_dir, 'generate_ufunc_api.py'),
915918
join('src', 'private', 'ufunc_override.h')] + npymath_sources
@@ -931,21 +934,6 @@ def generate_umath_c(ext, build_dir):
931934
libraries = ['npymath'],
932935
)
933936

934-
#######################################################################
935-
# scalarmath module #
936-
#######################################################################
937-
938-
config.add_extension('scalarmath',
939-
sources = [join('src', 'scalarmathmodule.c.src'),
940-
join('src', 'private', 'scalarmathmodule.h.src'),
941-
generate_config_h,
942-
generate_numpyconfig_h,
943-
generate_numpy_api,
944-
generate_ufunc_api],
945-
depends = deps + npymath_sources,
946-
libraries = ['npymath'],
947-
)
948-
949937

950938
#######################################################################
951939
# umath_tests module #

‎numpy/core/src/multiarray/ctors.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "datetime_strings.h"
2727
#include "array_assign.h"
2828
#include "mapping.h" /* for array_item_asarray */
29-
#include "scalarmathmodule.h" /* for npy_mul_with_overflow_intp */
29+
#include "templ_common.h" /* for npy_mul_with_overflow_intp */
3030
#include "alloc.h"
3131
#include <assert.h>
3232

‎numpy/core/src/multiarray/multiarraymodule.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,10 @@ NPY_NO_EXPORT int NPY_NUMUSERTYPES = 0;
5555
#include "array_assign.h"
5656
#include "common.h"
5757
#include "ufunc_override.h"
58-
#include "scalarmathmodule.h" /* for npy_mul_with_overflow_intp */
5958
#include "multiarraymodule.h"
6059
#include "cblasfuncs.h"
6160
#include "vdot.h"
62-
#include "templ_common.h"
61+
#include "templ_common.h" /* for npy_mul_with_overflow_intp */
6362

6463
/* Only here for API compatibility */
6564
NPY_NO_EXPORT PyTypeObject PyBigArray_Type;
@@ -4449,7 +4448,6 @@ PyMODINIT_FUNC initmultiarray(void) {
44494448
Py_INCREF(&NpyBusDayCalendar_Type);
44504449
PyDict_SetItemString(d, "busdaycalendar",
44514450
(PyObject *)&NpyBusDayCalendar_Type);
4452-
44534451
set_flaginfo(d);
44544452

44554453
if (!intern_strings()) {

‎numpy/core/src/multiarray/nditer_api.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/* Indicate that this .c file is allowed to include the header */
1515
#define NPY_ITERATOR_IMPLEMENTATION_CODE
1616
#include "nditer_impl.h"
17-
#include "scalarmathmodule.h"
17+
#include "templ_common.h"
1818

1919
/* Internal helper functions private to this file */
2020
static npy_intp

‎numpy/core/src/multiarray/nditer_constr.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "nditer_impl.h"
1717

1818
#include "arrayobject.h"
19-
#include "scalarmathmodule.h"
19+
#include "templ_common.h"
2020

2121
/* Internal helper functions private to this file */
2222
static int

‎numpy/core/src/multiarray/templ_common.h.src

-9
This file was deleted.

‎numpy/core/src/private/scalarmathmodule.h.src renamed to ‎numpy/core/src/private/templ_common.h.src

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
/*
2-
* some overflow checking integer arithmetic
3-
*/
4-
#include <numpy/npy_common.h>
1+
#ifndef __NPY_TYPED_COMMON_INC
2+
#define __NPY_TYPED_COMMON_INC
3+
4+
/* utility functions that profit from templates */
55

6-
#ifndef __NPY_SCALARMATHMODULE_H__
7-
#define __NPY_SCALARMATHMODULE_H__
6+
#include "numpy/npy_common.h"
87

98
/**begin repeat
109
* #name = int, uint, long, ulong,

0 commit comments

Comments
 (0)