8000 Auto merge of #7134 - dongjoon-hyun:fix_typos_in_code_comments, r=njs… · numpy/numpy@e280539 · GitHub
[go: up one dir, main page]
Skip to content

Commit e280539

Browse files
homuhomu
committed
Auto merge of #7134 - dongjoon-hyun:fix_typos_in_code_comments, r=njsmith
MAINT: Fix some typos in a code string and comments
2 parents 2b34f4b + 73a2fd1 commit e280539

30 files changed

+38
-38
lines changed

‎numpy/_build_utils/src/apple_sgemv_fix.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ void sgemv_( const char* trans, const int* m, const int* n,
155155
*
156156
* Because Fortran uses column major order and X.T and Y.T are row vectors,
157157
* the leading dimensions of X.T and Y.T in SGEMM become equal to the
158-
* strides of the the column vectors X and Y in SGEMV. */
158+
* strides of the column vectors X and Y in SGEMV. */
159159

160160
switch (*trans) {
161161
case 'T':

‎numpy/core/include/numpy/ndarraytypes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@ typedef int (PyArray_FinalizeFunc)(PyArrayObject *, PyObject *);
781781

782782
/*
783783
* An array never has the next four set; they're only used as parameter
784-
* flags to the the various FromAny functions
784+
* flags to the various FromAny functions
785785
*
786786
* This flag may be requested in constructor functions.
787787
*/

‎numpy/core/info.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
- array - NumPy Array construction
66
- zeros - Return an array of all zeros
7-
- empty - Return an unitialized array
7+
- empty - Return an uninitialized array
88
- shape - Return shape of sequence or array
99
- rank - Return number of dimensions
1010
- size - Return number of elements in entire array or a

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
by
1212
1313
Travis Oliphant, oliphant@ee.byu.edu
14-
Brigham Young Univeristy
14+
Brigham Young University
1515
1616
1717
maintainer email: oliphant.travis@ieee.org

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1049,7 +1049,7 @@ PyArray_NewFromDescr_int(PyTypeObject *subtype, PyArray_Descr *descr, int nd,
10491049
sd = descr->elsize;
10501050
}
10511051
/*
1052-
* It is bad to have unitialized OBJECT pointers
1052+
* It is bad to have uninitialized OBJECT pointers
10531053
* which could also be sub-fields of a VOID array
10541054
*/
10551055
if (zeroed || PyDataType_FLAGCHK(descr, NPY_NEEDS_INIT)) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ qsort_datetime_compare(const void *elem1, const void *elem2)
214214
}
215215

216216
/*
217-
* Sorts the the array of dates provided in place and removes
217+
* Sorts the array of dates provided in place and removes
218218
* NaT, duplicates and any date which is already excluded on account
219219
* of the weekmask.
220220
*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ NPY_NO_EXPORT int
3737
PyArray_WeekMaskConverter(PyObject *weekmask_in, npy_bool *weekmask);
3838

3939
/*
40-
* Sorts the the array of dates provided in place and removes
40+
* Sorts the array of dates provided in place and removes
4141
* NaT, duplicates and any date which is already excluded on account
4242
* of the weekmask.
4343
*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* implemented here.
55
*
66
* Copyright (c) 2010 by Mark Wiebe (mwwiebe@gmail.com)
7-
* The Univerity of British Columbia
7+
* The University of British Columbia
88
*
99
* See LICENSE.txt for the license.
1010

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* which provides an einstein-summation operation.
44
*
55
* Copyright (c) 2011 by Mark Wiebe (mwwiebe@gmail.com)
6-
* The Univerity of British Columbia
6+
* The University of British Columbia
77
*
88
* See LICENSE.txt for the license.
99
*/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ _new_sortlike(PyArrayObject *op, int axis, PyArray_SortFunc *sort,
842842
/*
843843
* For dtype's with objects, copyswapn Py_XINCREF's src
844844
* and Py_XDECREF's dst. This would crash if called on
845-
* an unitialized buffer, or leak a reference to each
845+
* an uninitialized buffer, or leak a reference to each
846846
* object if initialized.
847847
*
848848
* So, first do the copy with no refcounting...
@@ -1003,7 +1003,7 @@ _new_argsortlike(PyArrayObject *op, int axis, PyArray_ArgSortFunc *argsort,
10031003
/*
10041004
* For dtype's with objects, copyswapn Py_XINCREF's src
10051005
* and Py_XDECREF's dst. This would crash if called on
1006-
* an unitialized valbuffer, or leak a reference to
1006+
* an uninitialized valbuffer, or leak a reference to
10071007
* each object item if initialized.
10081008
*
10091009
* So, first do the copy with no refcounting...

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* strided data.
44
*
55
* Copyright (c) 2010 by Mark Wiebe (mwwiebe@gmail.com)
6-
* The Univerity of British Columbia
6+
* The University of British Columbia
77
*
88
* See LICENSE.txt for the license.
99
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3869,7 +3869,7 @@ _PyArray_SigintHandler(int signum)
38693869
{
38703870
PyOS_setsig(signum, SIG_IGN);
38713871
/*
3872-
* jump buffer may be unitialized as SIGINT allowing functions are usually
3872+
* jump buffer may be uninitialized as SIGINT allowing functions are usually
38733873
* run in other threads than the master thread that receives the signal
38743874
*/
38753875
if (sigint_buf_init > 0) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* This excludes functions specialized using the templating system.
44
*
55
* Copyright (c) 2010-2011 by Mark Wiebe (mwwiebe@gmail.com)
6-
* The Univerity of British Columbia
6+
* The University of British Columbia
77
*
88
* Copyright (c) 2011 Enthought, Inc
99
*
@@ -1847,7 +1847,7 @@ npyiter_goto_iterindex(NpyIter *iter, npy_intp iterindex)
18471847
}
18481848

18491849
/*
1850-
* This gets called after the the buffers have been exhausted, and
1850+
* This gets called after the buffers have been exhausted, and
18511851
* their data needs to be written back to the arrays. The multi-index
18521852
* must be positioned for the beginning of the buffer.
18531853
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* aspects of NumPy's nditer.
44
*
55
* Copyright (c) 2010-2011 by Mark Wiebe (mwwiebe@gmail.com)
6-
* The Univerity of British Columbia
6+
* The University of British Columbia
77
*
88
* Copyright (c) 2011 Enthought, Inc
99
*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* This file implements the CPython wrapper of the new NumPy iterator.
33
*
44
* Copyright (c) 2010 by Mark Wiebe (mwwiebe@gmail.com)
5-
* The Univerity of British Columbia
5+
* The University of British Columbia
66
*
77
* See LICENSE.txt for the license.
88
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* are specialized using the templating system.
44
*
55
* Copyright (c) 2010-2011 by Mark Wiebe (mwwiebe@gmail.com)
6-
* The Univerity of British Columbia
6+
* The University of British Columbia
77
*
88
* See LICENSE.txt for the license.
99
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
by
1212
1313
Travis Oliphant, oliphant@ee.byu.edu
14-
Brigham Young Univeristy
14+
Brigham Young University
1515
1616
1717
maintainer email: oliphant.travis@ieee.org

‎numpy/core/src/umath/ufunc_object.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ _is_same_name(const char* s1, const char* s2)
582582
/*
583583
* Sets core_num_dim_ix, core_num_dims, core_dim_ixs, core_offsets,
584584
* and core_signature in PyUFuncObject "ufunc". Returns 0 unless an
585-
* error occured.
585+
* error occurred.
586586
*/
587587
static int
588588
_parse_signature(PyUFuncObject *ufunc, const char *signature)

‎numpy/core/tests/test_einsum.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ def test_einsum_fixedstridebug(self):
581581

582582
def test_einsum_fixed_collapsingbug(self):
583583
# Issue #5147.
584-
# The bug only occured when output argument of einssum was used.
584+
# The bug only occurred when output argument of einssum was used.
585585
x = np.random.normal(0, 1, (5, 5, 5, 5))
586586
y1 = np.zeros((5, 5))
587587
np.einsum('aabb->ab', x, out=y1)

‎numpy/distutils/exec_command.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
2222
Requires: Python 2.x
2323
24-
Succesfully tested on:
24+
Successfully tested on:
2525
2626
======== ============ =================================================
2727
os.name sys.platform comments

‎numpy/distutils/from_template.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
All function and subroutine blocks in a source file with names that
1212
contain '<..>' will be replicated according to the rules in '<..>'.
1313
14-
The number of comma-separeted words in '<..>' will determine the number of
14+
The number of comma-separated words in '<..>' will determine the number of
1515
replicates.
1616
1717
'<..>' may have two different forms, named and short. For example,

‎numpy/doc/byteswapping.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
>>> fixed_end_dtype_arr[0]
109109
1
110110
111-
Note the the array has not changed in memory:
111+
Note the array has not changed in memory:
112112
113113
>>> fixed_end_dtype_arr.tobytes() == big_end_str
114114
True

‎numpy/doc/internals.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
use of the .copy() method if one really wants to make a new and independent
5050
copy of the data buffer.
5151
52-
New views into arrays mean the the object reference counts for the data buffer
52+
New views into arrays mean the object reference counts for the data buffer
5353
increase. Simply doing away with the original array object will not remove the
5454
data buffer if other views of it still exist.
5555

‎numpy/f2py/capi_maps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
else:
212212
errmess("\tIgnoring map {'%s':{'%s':'%s'}}: '%s' must be in %s\n" % (
213213
k, k1, d[k][k1], d[k][k1], list(c2py_map.keys())))
214-
outmess('Succesfully applied user defined changes from .f2py_f2cmap\n')
214+
outmess('Successfully applied user defined changes from .f2py_f2cmap\n')
215215
except Exception as msg:
216216
errmess(
217217
'Failed to apply user defined changes from .f2py_f2cmap: %s. Skipping.\n' % (msg))

‎numpy/f2py/crackfortran.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ def crackline(line, reset=0):
635635
"""
636636
reset=-1 --- initialize
637637
reset=0 --- crack the line
638-
reset=1 --- final check if mismatch of blocks occured
638+
reset=1 --- final check if mismatch of blocks occurred
639639
640640
Cracked data is saved in grouplist[0].
641641
"""

‎numpy/f2py/rules.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
get_b_from_python
1616
if (successful) {
1717
18-
callfortran
19-
if (succesful) {
18+
call_fortran
19+
if (successful) {
2020
2121
put_a_to_python
22-
if (succesful) {
22+
if (successful) {
2323
2424
put_b_to_python
25-
if (succesful) {
25+
if (successful) {
2626
2727
buildvalue = ...
2828

‎numpy/lib/function_base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,7 @@ def select(condlist, choicelist, default=0):
10221022
dtype = np.result_type(*choicelist)
10231023

10241024
# Convert conditions to arrays and broadcast conditions and choices
1025-
# as the shape is needed for the result. Doing it seperatly optimizes
1025+
# as the shape is needed for the result. Doing it separately optimizes
10261026
# for example when all choices are scalars.
10271027
condlist = np.broadcast_arrays(*condlist)
10281028
choicelist = np.broadcast_arrays(*choicelist)
@@ -1244,7 +1244,7 @@ def gradient(f, *varargs, **kwargs):
12441244

12451245
# Convert datetime64 data into ints. Make dummy variable `y`
12461246
# that is a view of ints if the data is datetime64, otherwise
1247-
# just set y equal to the the array `f`.
1247+
# just set y equal to the array `f`.
12481248
if f.dtype.char in ["M", "m"]:
12491249
y = f.view('int64')
12501250
else:

‎numpy/linalg/lapack_lite/dlapack_lite.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22678,7 +22678,7 @@ doublereal clanhs_(char *norm, integer *n, complex *a, integer *lda, real *
2267822678
===============
2267922679

2268022680
The algorithm used in this program is basically backward (forward)
22681-
substitution, with scaling to make the the code robust against
22681+
substitution, with scaling to make the code robust against
2268222682
possible overflow.
2268322683

2268422684
Each eigenvector is normalized so that the element of largest
@@ -61663,7 +61663,7 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__)
6166361663
===============
6166461664

6166561665
The algorithm used in this program is basically backward (forward)
61666-
substitution, with scaling to make the the code robust against
61666+
substitution, with scaling to make the code robust against
6166761667
possible overflow.
6166861668

6166961669
Each eigenvector is normalized so that the element of largest
@@ -99417,7 +99417,7 @@ doublereal slapy3_(real *x, real *y, real *z__)
9941799417
===============
9941899418

9941999419
The algorithm used in this program is basically backward (forward)
99420-
substitution, with scaling to make the the code robust against
99420+
substitution, with scaling to make the code robust against
9942199421
possible overflow.
9942299422

9942399423
Each eigenvector is normalized so that the element of largest

‎numpy/linalg/lapack_lite/zlapack_lite.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22760,7 +22760,7 @@ doublereal zlanhs_(char *norm, integer *n, doublecomplex *a, integer *lda,
2276022760
===============
2276122761

2276222762
The algorithm used in this program is basically backward (forward)
22763-
substitution, with scaling to make the the code robust against
22763+
substitution, with scaling to make the code robust against
2276422764
possible overflow.
2276522765

2276622766
Each eigenvector is normalized so that the element of largest

‎numpy/ma/core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5583,7 +5583,7 @@ def max(self, axis=None, out=None, fill_value=None):
55835583

55845584
def ptp(self, axis=None, out=None, fill_value=None):
55855585
"""
5586-
Return (maximum - minimum) along the the given dimension
5586+
Return (maximum - minimum) along the given dimension
55875587
(i.e. peak-to-peak value).
55885588
55895589
Parameters

0 commit comments

Comments
 (0)
0