8000 MAINT: Fix some typos in a code string and comments by dongjoon-hyun · Pull Request #7134 · numpy/numpy · GitHub
[go: up one dir, main page]

Skip to content

MAINT: Fix some typos in a code string and comments #7134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 28, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion numpy/_build_utils/src/apple_sgemv_fix.c
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ void sgemv_( const char* trans, const int* m, const int* n,
*
* Because Fortran uses column major order and X.T and Y.T are row vectors,
* the leading dimensions of X.T and Y.T in SGEMM become equal to the
* strides of the the column vectors X and Y in SGEMV. */
* strides of the column vectors X and Y in SGEMV. */

switch (*trans) {
case 'T':
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/include/numpy/ndarraytypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ typedef int (PyArray_FinalizeFunc)(PyArrayObject *, PyObject *);

/*
* An array never has the next four set; they're only used as parameter
* flags to the the various FromAny functions
* flags to the various FromAny functions
*
* This flag may be requested in constructor functions.
*/
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

- array - NumPy Array construction
- zeros - Return an array of all zeros
- empty - Return an unitialized array
- empty - Return an uninitialized array
- shape - Return shape of sequence or array
- rank - Return number of dimensions
- size - Return number of elements in entire array or a
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/arrayobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
by

Travis Oliphant, oliphant@ee.byu.edu
Brigham Young Univeristy
Brigham Young University


maintainer email: oliphant.travis@ieee.org
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/ctors.c
Original file line number Diff line number Diff line change
Expand Up @@ -1049,7 +1049,7 @@ PyArray_NewFromDescr_int(PyTypeObject *subtype, PyArray_Descr *descr, int nd,
sd = descr->elsize;
}
/*
* It is bad to have unitialized OBJECT pointers
* It is bad to have uninitialized OBJECT pointers
* which could also be sub-fields of a VOID array
*/
if (zeroed || PyDataType_FLAGCHK(descr, NPY_NEEDS_INIT)) {
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/datetime_busdaycal.c
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ qsort_datetime_compare(const void *elem1, const void *elem2)
}

/*
* Sorts the the array of dates provided in place and removes
* Sorts the array of dates provided in place and removes
* NaT, duplicates and any date which is already excluded on account
* of the weekmask.
*
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/datetime_busdaycal.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ NPY_NO_EXPORT int
PyArray_WeekMaskConverter(PyObject *weekmask_in, npy_bool *weekmask);

/*
* Sorts the the array of dates provided in place and removes
* Sorts the array of dates provided in place and removes
* NaT, duplicates and any date which is already excluded on account
* of the weekmask.
*
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/dtype_transfer.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* implemented here.
*
* Copyright (c) 2010 by Mark Wiebe (mwwiebe@gmail.com)
* The Univerity of British Columbia
* The University of British Columbia
*
* See LICENSE.txt for the license.

Expand Down
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/einsum.c.src
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* which provides an einstein-summation operation.
*
* Copyright (c) 2011 by Mark Wiebe (mwwiebe@gmail.com)
* The Univerity of British Columbia
* The University of British Columbia
*
* See LICENSE.txt for the license.
*/
Expand Down
4 changes: 2 additions & 2 deletions numpy/core/src/multiarray/item_selection.c
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ _new_sortlike(PyArrayObject *op, int axis, PyArray_SortFunc *sort,
/*
* For dtype's with objects, copyswapn Py_XINCREF's src
* and Py_XDECREF's dst. This would crash if called on
* an unitialized buffer, or leak a reference to each
* an uninitialized buffer, or leak a reference to each
* object if initialized.
*
* So, first do the copy with no refcounting...
Expand Down Expand Up @@ -1003,7 +1003,7 @@ _new_argsortlike(PyArrayObject *op, int axis, PyArray_ArgSortFunc *argsort,
/*
* For dtype's with objects, copyswapn Py_XINCREF's src
* and Py_XDECREF's dst. This would crash if called on
* an unitialized valbuffer, or leak a reference to
* an uninitialized valbuffer, or leak a reference to
* each object item if initialized.
*
* So, first do the copy with no refcounting...
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/lowlevel_strided_loops.c.src
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* strided data.
*
* Copyright (c) 2010 by Mark Wiebe (mwwiebe@gmail.com)
* The Univerity of British Columbia
* The University of British Columbia
*
* See LICENSE.txt for the license.
*/
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/multiarraymodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -3869,7 +3869,7 @@ _PyArray_SigintHandler(int signum)
{
PyOS_setsig(signum, SIG_IGN);
/*
* jump buffer may be unitialized as SIGINT allowing functions are usually
* jump buffer may be uninitialized as SIGINT allowing functions are usually
* run in other threads than the master thread that receives the signal
*/
if (sigint_buf_init > 0) {
Expand Down
4 changes: 2 additions & 2 deletions numpy/core/src/multiarray/nditer_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This excludes functions specialized using the templating system.
*
* Copyright (c) 2010-2011 by Mark Wiebe (mwwiebe@gmail.com)
* The Univerity of British Columbia
* The University of British Columbia
*
* Copyright (c) 2011 Enthought, Inc
*
Expand Down Expand Up @@ -1847,7 +1847,7 @@ npyiter_goto_iterindex(NpyIter *iter, npy_intp iterindex)
}

/*
* This gets called after the the buffers have been exhausted, and
* This gets called after the buffers have been exhausted, and
* their data needs to be written back to the arrays. The multi-index
* must be positioned for the beginning of the buffer.
*/
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/nditer_constr.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* aspects of NumPy's nditer.
*
* Copyright (c) 2010-2011 by Mark Wiebe (mwwiebe@gmail.com)
* The Univerity of British Columbia
* The University of British Columbia
*
* Copyright (c) 2011 Enthought, Inc
*
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/nditer_pywrap.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* This file implements the CPython wrapper of the new NumPy iterator.
*
* Copyright (c) 2010 by Mark Wiebe (mwwiebe@gmail.com)
* The Univerity of British Columbia
* The University of British Columbia
*
* See LICENSE.txt for the license.
*/
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/nditer_templ.c.src
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* are specialized using the templating system.
*
* Copyright (c) 2010-2011 by Mark Wiebe (mwwiebe@gmail.com)
* The Univerity of British Columbia
* The University of British Columbia
*
* See LICENSE.txt for the license.
*/
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/usertypes.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
by

Travis Oliphant, oliphant@ee.byu.edu
Brigham Young Univeristy
Brigham Young University


maintainer email: oliphant.travis@ieee.org
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/src/umath/ufunc_object.c
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ _is_same_name(const char* s1, const char* s2)
/*
* Sets core_num_dim_ix, core_num_dims, core_dim_ixs, core_offsets,
* and core_signature in PyUFuncObject "ufunc". Returns 0 unless an
* error occured.
* error occurred.
*/
static int
_parse_signature(PyUFuncObject *ufunc, const char *signature)
Expand Down
2 changes: 1 addition & 1 deletion numpy/core/tests/test_einsum.py
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ def test_einsum_fixedstridebug(self):

def test_einsum_fixed_collapsingbug(self):
# Issue #5147.
# The bug only occured when output argument of einssum was used.
# The bug only occurred when output argument of einssum was used.
x = np.random.normal(0, 1, (5, 5, 5, 5))
y1 = np.zeros((5, 5))
np.einsum('aabb->ab', x, out=y1)
Expand Down
2 changes: 1 addition & 1 deletion numpy/distutils/exec_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

Requires: Python 2.x

Succesfully tested on:
Successfully tested on:

======== ============ =================================================
os.name sys.platform comments
Expand Down
2 changes: 1 addition & 1 deletion numpy/distutils/from_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
All function and subroutine blocks in a source file with names that
contain '<..>' will be replicated according to the rules in '<..>'.

The number of comma-separeted words in '<..>' will determine the number of
The number of comma-separated words in '<..>' will determine the number of
replicates.

'<..>' may have two different forms, named and short. For example,
Expand Down
2 changes: 1 addition & 1 deletion numpy/doc/byteswapping.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
>>> fixed_end_dtype_arr[0]
1

Note the the array has not changed in memory:
Note the array has not changed in memory:

>>> fixed_end_dtype_arr.tobytes() == big_end_str
True
Expand Down
2 changes: 1 addition & 1 deletion numpy/doc/internals.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
use of the .copy() method if one really wants to make a new and independent
copy of the data buffer.

New views into arrays mean the the object reference counts for the data buffer
New views into arrays mean the object reference counts for the data buffer
increase. Simply doing away with the original array object will not remove the
data buffer if other views of it still exist.

Expand Down
2 changes: 1 addition & 1 deletion numpy/f2py/capi_maps.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
else:
errmess("\tIgnoring map {'%s':{'%s':'%s'}}: '%s' must be in %s\n" % (
k, k1, d[k][k1], d[k][k1], list(c2py_map.keys())))
outmess('Succesfully applied user defined changes from .f2py_f2cmap\n')
outmess('Successfully applied user defined changes from .f2py_f2cmap\n')
except Exception as msg:
errmess(
'Failed to apply user defined changes from .f2py_f2cmap: %s. Skipping.\n' % (msg))
Expand Down
2 changes: 1 addition & 1 deletion numpy/f2py/crackfortran.py
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ def crackline(line, reset=0):
"""
reset=-1 --- initialize
reset=0 --- crack the line
reset=1 --- final check if mismatch of blocks occured
reset=1 --- final check if mismatch of blocks occurred

Cracked data is saved in grouplist[0].
"""
Expand Down
8 changes: 4 additions & 4 deletions numpy/f2py/rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
get_b_from_python
if (successful) {

callfortran
if (succesful) {
call_fortran
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one shouldn't be changed I think - callfortran is used a lot in the rest of this file.

if (successful) {

put_a_to_python
if (succesful) {
if (successful) {

put_b_to_python
if (succesful) {
if (successful) {

buildvalue = ...

Expand Down
4 changes: 2 additions & 2 deletions numpy/lib/function_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1022,7 +1022,7 @@ def select(condlist, choicelist, default=0):
dtype = np.result_type(*choicelist)

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

# Convert datetime64 data into ints. Make dummy variable `y`
# that is a view of ints if the data is datetime64, otherwise
# just set y equal to the the array `f`.
# just set y equal to the array `f`.
if f.dtype.char in ["M", "m"]:
y = f.view('int64')
else:
Expand Down
6 changes: 3 additions & 3 deletions numpy/linalg/lapack_lite/dlapack_lite.c
Original file line number Diff line number Diff line change
Expand Up @@ -22678,7 +22678,7 @@ doublereal clanhs_(char *norm, integer *n, complex *a, integer *lda, real *
===============

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

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

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

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

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

Each eigenvector is normalized so that the element of largest
Expand Down
2 changes: 1 addition & 1 deletion numpy/linalg/lapack_lite/zlapack_lite.c
Original file line number Diff line number Diff line change
Expand Up @@ -22760,7 +22760,7 @@ doublereal zlanhs_(char *norm, integer *n, doublecomplex *a, integer *lda,
===============

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

Each eigenvector is normalized so that the element of largest
Expand Down
2 changes: 1 addition & 1 deletion numpy/ma/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -5583,7 +5583,7 @@ def max(self, axis=None, out=None, fill_value=None):

def ptp(self, axis=None, out=None, fill_value=None):
"""
Return (maximum - minimum) along the the given dimension
Return (maximum - minimum) along the given dimension
(i.e. peak-to-peak value).

Parameters
Expand Down
0