Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8361de0

Browse files
committed
Use array_converter/ArrayConverter everywhere.
1 parent120d903 commit8361de0

File tree

5 files changed

+36
-36
lines changed

5 files changed

+36
-36
lines changed

‎numpy/_core/code_generators/genapi.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ def get_processor():
4444
join('multiarray','array_assign_array.c'),
4545
join('multiarray','array_assign_scalar.c'),
4646
join('multiarray','array_coercion.c'),
47+
join('multiarray','array_converter.c'),
4748
join('multiarray','array_method.c'),
4849
join('multiarray','arrayobject.c'),
4950
join('multiarray','arraytypes.c.src'),
@@ -53,7 +54,6 @@ def get_processor():
5354
join('multiarray','conversion_utils.c'),
5455
join('multiarray','convert.c'),
5556
join('multiarray','convert_datatype.c'),
56-
join('multiarray','creation_helper.c'),
5757
join('multiarray','ctors.c'),
5858
join('multiarray','datetime.c'),
5959
join('multiarray','datetime_busday.c'),

‎numpy/_core/meson.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,6 +990,7 @@ src_multiarray = multiarray_gen_headers + [
990990
'src/multiarray/alloc.c',
991991
'src/multiarray/arrayobject.c',
992992
'src/multiarray/array_coercion.c',
993+
'src/multiarray/array_converter.c',
993994
'src/multiarray/array_method.c',
994995
'src/multiarray/array_assign_scalar.c',
995996
'src/multiarray/array_assign_array.c',
@@ -1003,7 +1004,6 @@ src_multiarray = multiarray_gen_headers + [
10031004
'src/multiarray/convert.c',
10041005
'src/multiarray/convert_datatype.c',
10051006
'src/multiarray/conversion_utils.c',
1006-
'src/multiarray/creation_helper.c',
10071007
'src/multiarray/ctors.c',
10081008
'src/multiarray/datetime.c',
10091009
'src/multiarray/datetime_strings.c',

numpy/_core/src/multiarray/creation_helper.c renamed to numpy/_core/src/multiarray/array_converter.c

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
#include"numpy/arrayobject.h"
99
#include"arrayobject.h"
10+
#include"array_converter.h"
1011
#include"numpy/arrayscalars.h"
11-
#include"creation_helper.h"
1212
#include"npy_argparse.h"
1313
#include"abstractdtypes.h"
1414
#include"common_dtype.h"
@@ -28,7 +28,7 @@
2828

2929

3030
staticPyObject*
31-
creation_helper_new(
31+
array_converter_new(
3232
PyTypeObject*cls,PyObject*args,PyObject*kwds)
3333
{
3434
if (kwds!=NULL&&PyDict_GET_SIZE(kwds)!=0) {
@@ -46,12 +46,12 @@ creation_helper_new(
4646
returnNULL;
4747
}
4848

49-
PyArrayCreationHelperObject*self=PyObject_NewVar(
50-
PyArrayCreationHelperObject,cls,narrs);
49+
PyArrayArrayConverterObject*self=PyObject_NewVar(
50+
PyArrayArrayConverterObject,cls,narrs);
5151
if (self==NULL) {
5252
returnNULL;
5353
}
54-
PyObject_InitVar((PyVarObject*)self,&PyArrayCreationHelper_Type,narrs);
54+
PyObject_InitVar((PyVarObject*)self,&PyArrayArrayConverter_Type,narrs);
5555

5656
self->narrs=0;
5757
self->flags=0;
@@ -107,7 +107,7 @@ creation_helper_new(
107107

108108

109109
staticPyObject*
110-
creation_helper_get_scalar_input(PyArrayCreationHelperObject*self)
110+
array_converter_get_scalar_input(PyArrayArrayConverterObject*self)
111111
{
112112
PyObject*ret=PyTuple_New(self->narrs);
113113
if (ret==NULL) {
@@ -130,7 +130,7 @@ creation_helper_get_scalar_input(PyArrayCreationHelperObject *self)
130130

131131

132132
staticint
133-
find_wrap(PyArrayCreationHelperObject*self)
133+
find_wrap(PyArrayArrayConverterObject*self)
134134
{
135135
PyObject*wrap=NULL;
136136
PyObject*wrap_type=NULL;
@@ -230,7 +230,7 @@ pyscalar_mode_conv(PyObject *obj, scalar_policy *policy)
230230

231231

232232
staticPyObject*
233-
creation_helper_as_arrays(PyArrayCreationHelperObject*self,
233+
array_converter_as_arrays(PyArrayArrayConverterObject*self,
234234
PyObject*const*args,Py_ssize_tlen_args,PyObject*kwnames)
235235
{
236236
npy_boolsubok=NPY_TRUE;
@@ -288,7 +288,7 @@ creation_helper_as_arrays(PyArrayCreationHelperObject *self,
288288

289289

290290
staticPyObject*
291-
creation_helper_wrap(PyArrayCreationHelperObject*self,
291+
array_converter_wrap(PyArrayArrayConverterObject*self,
292292
PyObject*const*args,Py_ssize_tlen_args,PyObject*kwnames)
293293
{
294294
PyObject*obj;
@@ -373,7 +373,7 @@ creation_helper_wrap(PyArrayCreationHelperObject *self,
373373

374374

375375
staticPyObject*
376-
creation_helper_result_type(PyArrayCreationHelperObject*self,
376+
array_converter_result_type(PyArrayArrayConverterObject*self,
377377
PyObject*const*args,Py_ssize_tlen_args,PyObject*kwnames)
378378
{
379379
PyArray_Descr*result=NULL;
@@ -451,31 +451,31 @@ creation_helper_result_type(PyArrayCreationHelperObject *self,
451451
}
452452

453453

454-
staticPyGetSetDefcreation_helper_getsets[]= {
454+
staticPyGetSetDefarray_converter_getsets[]= {
455455
{"scalar_input",
456-
(getter)creation_helper_get_scalar_input,
456+
(getter)array_converter_get_scalar_input,
457457
NULL,
458458
NULL,NULL},
459459
{NULL,NULL,NULL,NULL,NULL},
460460
};
461461

462462

463-
staticPyMethodDefcreation_helper_methods[]= {
463+
staticPyMethodDefarray_converter_methods[]= {
464464
{"as_arrays",
465-
(PyCFunction)creation_helper_as_arrays,
465+
(PyCFunction)array_converter_as_arrays,
466466
METH_FASTCALL |METH_KEYWORDS,NULL},
467467
{"result_type",
468-
(PyCFunction)creation_helper_result_type,
468+
(PyCFunction)array_converter_result_type,
469469
METH_FASTCALL |METH_KEYWORDS,NULL},
470470
{"wrap",
471-
(PyCFunction)creation_helper_wrap,
471+
(PyCFunction)array_converter_wrap,
472472
METH_FASTCALL |METH_KEYWORDS,NULL},
473473
{NULL,NULL,0,NULL}
474474
};
475475

476476

477477
staticvoid
478-
creation_helper_dealloc(PyArrayCreationHelperObject*self)
478+
array_converter_dealloc(PyArrayArrayConverterObject*self)
479479
{
480480
creation_item*item=self->items;
481481
for (inti=0;i<self->narrs;i++,item++) {
@@ -492,14 +492,14 @@ creation_helper_dealloc(PyArrayCreationHelperObject *self)
492492

493493

494494
staticPy_ssize_t
495-
array_converter_length(PyArrayCreationHelperObject*self)
495+
array_converter_length(PyArrayArrayConverterObject*self)
496496
{
497497
returnself->narrs;
498498
}
499499

500500

501501
staticPyObject*
502-
array_converter_item(PyArrayCreationHelperObject*self,Py_ssize_titem)
502+
array_converter_item(PyArrayArrayConverterObject*self,Py_ssize_titem)
503503
{
504504
/* Python ensures no negative indices (and probably the below also) */
505505
if (item<0||item >=self->narrs) {
@@ -528,15 +528,15 @@ static PySequenceMethods array_converter_as_sequence = {
528528
};
529529

530530

531-
NPY_NO_EXPORTPyTypeObjectPyArrayCreationHelper_Type= {
531+
NPY_NO_EXPORTPyTypeObjectPyArrayArrayConverter_Type= {
532532
PyVarObject_HEAD_INIT(NULL,0)
533533
.tp_name="np.lib.array_utils._array_converter",
534-
.tp_basicsize=sizeof(PyArrayCreationHelperObject),
534+
.tp_basicsize=sizeof(PyArrayArrayConverterObject),
535535
.tp_itemsize=sizeof(creation_item),
536-
.tp_new=creation_helper_new,
537-
.tp_dealloc= (destructor)creation_helper_dealloc,
536+
.tp_new=array_converter_new,
537+
.tp_dealloc= (destructor)array_converter_dealloc,
538538
.tp_flags=Py_TPFLAGS_DEFAULT,
539-
.tp_getset=creation_helper_getsets,
540-
.tp_methods=creation_helper_methods,
539+
.tp_getset=array_converter_getsets,
540+
.tp_methods=array_converter_methods,
541541
.tp_as_sequence=&array_converter_as_sequence,
542542
};

numpy/_core/src/multiarray/creation_helper.h renamed to numpy/_core/src/multiarray/array_converter.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
#ifndefNUMPY_CORE_SRC_MULTIARRAY_CREATION_HELPER_H_
2-
#defineNUMPY_CORE_SRC_MULTIARRAY_CREATION_HELPER_H_
1+
#ifndefNUMPY_CORE_SRC_MULTIARRAY_ARRAY_CONVERTER_H_
2+
#defineNUMPY_CORE_SRC_MULTIARRAY_ARRAY_CONVERTER_H_
33

44

55
#include"numpy/ndarraytypes.h"
6-
externNPY_NO_EXPORTPyTypeObjectPyArrayCreationHelper_Type;
6+
externNPY_NO_EXPORTPyTypeObjectPyArrayArrayConverter_Type;
77

88
typedefenum {
99
NPY_CH_ALL_SCALARS=1 <<0,
1010
NPY_CH_ALL_PYSCALARS=1 <<1,
11-
}npy_creationhelper_flags;
11+
}npy_array_converter_flags;
1212

1313

1414
typedefstruct {
@@ -24,12 +24,12 @@ typedef struct {
2424
PyObject_VAR_HEAD
2525
intnarrs;
2626
/* store if all objects are scalars (unless zero objects) */
27-
npy_creationhelper_flagsflags;
27+
npy_array_converter_flagsflags;
2828
/* __array_wrap__ cache */
2929
PyObject*wrap;
3030
PyObject*wrap_type;
3131
creation_itemitems[];
32-
}PyArrayCreationHelperObject;
32+
}PyArrayArrayConverterObject;
3333

3434

35-
#endif/*NUMPY_CORE_SRC_MULTIARRAY_CREATION_HELPER_H_ */
35+
#endif/*NUMPY_CORE_SRC_MULTIARRAY_ARRAY_CONVERTER_H_ */

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5142,12 +5142,12 @@ PyMODINIT_FUNC PyInit__multiarray_umath(void) {
51425142
d,"_ArrayFunctionDispatcher",
51435143
(PyObject*)&PyArrayFunctionDispatcher_Type);
51445144

5145-
if (PyType_Ready(&PyArrayCreationHelper_Type)<0) {
5145+
if (PyType_Ready(&PyArrayArrayConverter_Type)<0) {
51465146
gotoerr;
51475147
}
51485148
PyDict_SetItemString(
51495149
d,"_array_converter",
5150-
(PyObject*)&PyArrayCreationHelper_Type);
5150+
(PyObject*)&PyArrayArrayConverter_Type);
51515151

51525152
if (PyType_Ready(&PyArrayMethod_Type)<0) {
51535153
gotoerr;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp