summaryrefslogtreecommitdiff
path: root/numpy/core/src
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2018-01-05 11:37:16 -0700
committerGitHub <noreply@github.com>2018-01-05 11:37:16 -0700
commit2bacec9ecb0fc665117a22027b73812509a99f56 (patch)
tree9ed1f2dd375136c1c41cc5d218c5794f8d9963f6 /numpy/core/src
parentba9991e0900f38568c5e3d326e2ce88c6b73e907 (diff)
parent61dc72a1dcc0136c45375beacab23728f8339538 (diff)
downloadnumpy-2bacec9ecb0fc665117a22027b73812509a99f56.tar.gz
Merge pull request #10327 from luzpaz/more-misc-typos
MAINT: Fix misc. typos
Diffstat (limited to 'numpy/core/src')
-rw-r--r--numpy/core/src/multiarray/ctors.c2
-rw-r--r--numpy/core/src/multiarray/dragon4.c4
-rw-r--r--numpy/core/src/multiarray/einsum.c.src2
-rw-r--r--numpy/core/src/npymath/halffloat.c4
-rw-r--r--numpy/core/src/npysort/quicksort.c.src2
-rw-r--r--numpy/core/src/umath/ufunc_object.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c
index 31457704e..3d6b161b1 100644
--- a/numpy/core/src/multiarray/ctors.c
+++ b/numpy/core/src/multiarray/ctors.c
@@ -1843,7 +1843,7 @@ PyArray_FromAny(PyObject *op, PyArray_Descr *newtype, int min_depth,
* NPY_ARRAY_WRITEBACKIFCOPY flag sets this flag in the returned
* array if a copy is made and the base argument points to the (possibly)
* misbehaved array. Before returning to python, PyArray_ResolveWritebackIfCopy
- * must be called to update the contents of the orignal array from the copy.
+ * must be called to update the contents of the original array from the copy.
*
* NPY_ARRAY_FORCECAST will cause a cast to occur regardless of whether or not
* it is safe.
diff --git a/numpy/core/src/multiarray/dragon4.c b/numpy/core/src/multiarray/dragon4.c
index 8606adf99..5f4e38e9f 100644
--- a/numpy/core/src/multiarray/dragon4.c
+++ b/numpy/core/src/multiarray/dragon4.c
@@ -1002,7 +1002,7 @@ BigInt_ShiftLeft(BigInt *result, npy_uint32 shift)
* * exponent - value exponent in base 2
* * mantissaBit - index of the highest set mantissa bit
* * hasUnequalMargins - is the high margin twice as large as the low margin
- * * cutoffMode - how to intepret cutoffNumber: fractional or total digits?
+ * * cutoffMode - how to interpret cutoffNumber: fractional or total digits?
* * cutoffNumber - cut off printing after this many digits. -1 for no cutoff
* * pOutBuffer - buffer to output into
* * bufferSize - maximum characters that can be printed to pOutBuffer
@@ -1381,7 +1381,7 @@ Dragon4(const npy_uint64 mantissa, const npy_int32 exponent,
/*
* if we are directly in the middle, round towards the even digit (i.e.
- * IEEE rouding rules)
+ * IEEE rounding rules)
*/
if (compare == 0) {
roundDown = (outputDigit & 1) == 0;
diff --git a/numpy/core/src/multiarray/einsum.c.src b/numpy/core/src/multiarray/einsum.c.src
index 943b8aecf..7db606194 100644
--- a/numpy/core/src/multiarray/einsum.c.src
+++ b/numpy/core/src/multiarray/einsum.c.src
@@ -1905,7 +1905,7 @@ parse_operand_subscripts(char *subscripts, int length,
/*
* Find any labels duplicated for this operand, and turn them
- * into negative offets to the axis to merge with.
+ * into negative offsets to the axis to merge with.
*
* In C, the char type may be signed or unsigned, but with
* twos complement arithmetic the char is ok either way here, and
diff --git a/numpy/core/src/npymath/halffloat.c b/numpy/core/src/npymath/halffloat.c
index 951768256..c2bd28d60 100644
--- a/numpy/core/src/npymath/halffloat.c
+++ b/numpy/core/src/npymath/halffloat.c
@@ -281,7 +281,7 @@ npy_uint16 npy_floatbits_to_halfbits(npy_uint32 f)
if (f_exp <= 0x38000000u) {
/*
* Signed zeros, subnormal floats, and floats with small
- * exponents all convert to signed zero halfs.
+ * exponents all convert to signed zero half-floats.
*/
if (f_exp < 0x33000000u) {
#if NPY_HALF_GENERATE_UNDERFLOW
@@ -396,7 +396,7 @@ npy_uint16 npy_doublebits_to_halfbits(npy_uint64 d)
if (d_exp <= 0x3f00000000000000ULL) {
/*
* Signed zeros, subnormal floats, and floats with small
- * exponents all convert to signed zero halfs.
+ * exponents all convert to signed zero half-floats.
*/
if (d_exp < 0x3e60000000000000ULL) {
#if NPY_HALF_GENERATE_UNDERFLOW
diff --git a/numpy/core/src/npysort/quicksort.c.src b/numpy/core/src/npysort/quicksort.c.src
index ff0e8a149..49a2c4906 100644
--- a/numpy/core/src/npysort/quicksort.c.src
+++ b/numpy/core/src/npysort/quicksort.c.src
@@ -482,7 +482,7 @@ npy_quicksort(void *start, npy_intp num, void *varr)
pj = pr - elsize;
GENERIC_SWAP(pm, pj, elsize);
/*
- * Generic comparisons may be buggy, so don't rely on the sentinals
+ * Generic comparisons may be buggy, so don't rely on the sentinels
* to keep the pointers from going out of bounds.
*/
for (;;) {
diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c
index 304b4fc27..1cd16d122 100644
--- a/numpy/core/src/umath/ufunc_object.c
+++ b/numpy/core/src/umath/ufunc_object.c
@@ -1256,7 +1256,7 @@ iterator_loop(PyUFuncObject *ufunc,
arr_prep[i], arr_prep_args, i) < 0) {
for(iop = 0; iop < nin+i; ++iop) {
if (op_it[iop] != op[iop]) {
- /* ignore errrors */
+ /* ignore errors */
PyArray_ResolveWritebackIfCopy(op_it[iop]);
}
}