From 2939b9c206e99dffdd7cf7b4c7f9ee6a2ce92987 Mon Sep 17 00:00:00 2001 From: John Stilley Date: Sat, 22 Mar 2025 17:21:37 -0700 Subject: [PATCH 1/8] Fixing various spelling errors --- doc/changelog/1.16.0-changelog.rst | 4 +-- doc/changelog/1.18.0-changelog.rst | 4 +-- doc/changelog/1.21.0-changelog.rst | 10 +++--- doc/changelog/1.22.0-changelog.rst | 12 +++---- doc/changelog/1.25.0-changelog.rst | 4 +-- doc/changelog/1.25.2-changelog.rst | 2 +- doc/changelog/2.1.0-changelog.rst | 6 ++-- doc/neps/nep-0021-advanced-indexing.rst | 2 +- .../upcoming_changes/28254.expired.rst | 2 +- doc/source/release/1.22.0-notes.rst | 4 +-- numpy/_core/src/multiarray/dragon4.c | 8 ++--- numpy/_core/tests/test_scalarprint.py | 6 ++-- numpy/linalg/lapack_lite/f2c_blas.c | 8 ++--- numpy/linalg/lapack_lite/f2c_c_lapack.c | 22 ++++++------ numpy/linalg/lapack_lite/f2c_d_lapack.c | 34 +++++++++---------- numpy/linalg/lapack_lite/f2c_lapack.c | 2 +- numpy/linalg/lapack_lite/f2c_s_lapack.c | 34 +++++++++---------- numpy/linalg/lapack_lite/f2c_z_lapack.c | 22 ++++++------ 18 files changed, 93 insertions(+), 93 deletions(-) diff --git a/doc/changelog/1.16.0-changelog.rst b/doc/changelog/1.16.0-changelog.rst index 8f7afac899e0..551083facbd6 100644 --- a/doc/changelog/1.16.0-changelog.rst +++ b/doc/changelog/1.16.0-changelog.rst @@ -374,7 +374,7 @@ A total of 490 pull requests were merged for this release. * `#11953 `__: TST: codecov.yml improvements * `#11957 `__: ENH: mark that large allocations can use huge pages * `#11958 `__: TST: Add a test for np.pad where constant_values is an object -* `#11959 `__: MAINT: Explicitely cause pagefaults to happen before starting... +* `#11959 `__: MAINT: Explicitly cause pagefaults to happen before starting... * `#11961 `__: TST: Add more tests for np.pad * `#11962 `__: ENH: maximum lines of content to be read from numpy.loadtxt * `#11965 `__: BENCH: Add a benchmark comparing block to copy in the 3D case @@ -567,7 +567,7 @@ A total of 490 pull requests were merged for this release. * `#12437 `__: MAINT: refactor datetime.c_metadata creation * `#12439 `__: BUG: test, fix NPY_VISIBILITY_HIDDEN on gcc, which becomes NPY_NO_EXPORT * `#12440 `__: BUG: don't override original errors when casting inside np.dot()... -* `#12443 `__: MAINT Use set litterals +* `#12443 `__: MAINT Use set literals * `#12445 `__: MAINT: Use list and dict comprehension when possible * `#12446 `__: MAINT: Fixups to new functions in np.lib.recfunctions * `#12447 `__: ENH: add back the multifield copy->view change diff --git a/doc/changelog/1.18.0-changelog.rst b/doc/changelog/1.18.0-changelog.rst index 266ff08077ac..982b14921738 100644 --- a/doc/changelog/1.18.0-changelog.rst +++ b/doc/changelog/1.18.0-changelog.rst @@ -153,7 +153,7 @@ A total of 413 pull requests were merged for this release. * `#13871 `__: MAINT: Ensure array_dealloc does not modify refcount of self * `#13874 `__: MAINT: Prepare master for 1.18.0 development. * `#13876 `__: MAINT,BUG,DOC: Fix errors in _add_newdocs -* `#13880 `__: MAINT: Remove an unnessary backslash between two string literals +* `#13880 `__: MAINT: Remove an unnecessary backslash between two string literals * `#13881 `__: MAINT: Update pavement to use python3 in shell commands. * `#13882 `__: MAINT: Remove unnecessary backslashes (and replace others by... * `#13883 `__: MAINT: Replace integers in places where booleans are expected @@ -485,7 +485,7 @@ A total of 413 pull requests were merged for this release. * `#14845 `__: MAINT: revert gh-14800, which gave precedence to OO->O over OO->? * `#14874 `__: REL: Update master after 1.17.4 release. * `#14878 `__: BUILD: remove SSE2 flag from numpy.random builds -* `#14879 `__: DOC: Update NEP29 with Python3.8 informations. +* `#14879 `__: DOC: Update NEP29 with Python3.8 information. * `#14881 `__: BUG: Remove builtins from __all__ * `#14898 `__: MAINT: Delete and ignore generated files * `#14899 `__: Update FUNDING.yml diff --git a/doc/changelog/1.21.0-changelog.rst b/doc/changelog/1.21.0-changelog.rst index 158c5a8cfa56..4b7d248d82b9 100644 --- a/doc/changelog/1.21.0-changelog.rst +++ b/doc/changelog/1.21.0-changelog.rst @@ -341,7 +341,7 @@ A total of 581 pull requests were merged for this release. * `#18148 `__: MAINT: Bump sphinx from 3.4.1 to 3.4.3 * `#18149 `__: MAINT: Bump hypothesis from 5.46.0 to 6.0.0 * `#18150 `__: BUG: Ensure too many advanced indices raises an exception -* `#18152 `__: BUG: Promotion between strings and objects was assymetric +* `#18152 `__: BUG: Promotion between strings and objects was asymmetric * `#18156 `__: MAINT: Remove redundant null check before free * `#18157 `__: BUG: Initialize value of no_castable_output used in ufunc_loop_matches * `#18161 `__: MAINT: Make keyword arrays static @@ -564,7 +564,7 @@ A total of 581 pull requests were merged for this release. * `#18670 `__: BUG: Fix small issues found with pytest-leaks * `#18676 `__: MAINT: Implement new style promotion for `np.result_type`, etc. * `#18679 `__: BUG: Changed METH_VARARGS to METH_NOARGS -* `#18680 `__: Docs: simd-optimizations.rst: fix typo (basline ~> baseline) +* `#18680 `__: Docs: simd-optimizations.rst: fix typo (baseline ~> baseline) * `#18685 `__: REL: Update main after 1.20.2 release. * `#18686 `__: BUG: Fix test_ccompiler_opt when path contains dots * `#18689 `__: DOC: Change matrix size in absolute beginners doc. @@ -607,7 +607,7 @@ A total of 581 pull requests were merged for this release. * `#18773 `__: CI: Fixing typo in Azure job run * `#18777 `__: DOC: update random and asserts in test guidelines * `#18778 `__: MAINT: Relax the integer-type-constraint of `npt._ShapeLike` -* `#18779 `__: DOC: fix spelling of "reccomended" ("recommended") +* `#18779 `__: DOC: fix spelling of "recommended" ("recommended") * `#18780 `__: ENH: Improve the placeholder annotations for the main numpy namespace... * `#18781 `__: ENH: Add `__all__` to a number of public modules * `#18785 `__: DOC: change `dec.parametrize` to `pytest.mark.parametrize` @@ -647,7 +647,7 @@ A total of 581 pull requests were merged for this release. * `#18851 `__: MAINT: Disable pip version check for azure lint check. * `#18853 `__: ENH: Improve the placeholder annotations within sub-modules (part... * `#18855 `__: STY: change CRLF line terminators to Unix -* `#18856 `__: MAINT: Fix the typo "implment" +* `#18856 `__: MAINT: Fix the typo "implement" * `#18862 `__: TST: Skip f2py TestSharedMemory for LONGDOUBLE on macos/arm64 * `#18863 `__: ENH: Add max values comparison for floating point * `#18864 `__: MAINT: Remove dead codepath in generalized ufuncs @@ -659,7 +659,7 @@ A total of 581 pull requests were merged for this release. * `#18880 `__: API: Ensure that casting does not affect ufunc loop * `#18882 `__: ENH: Add min values comparison for floating point * `#18885 `__: MAINT: Remove unsafe unions and ABCs from return-annotations -* `#18889 `__: ENH: Add SIMD operations for min and max value comparision +* `#18889 `__: ENH: Add SIMD operations for min and max value comparison * `#18890 `__: MAINT: ssize_t -> Py_ssize_t and other fixes for Python v3.10.0 * `#18891 `__: MAINT: Bump typing-extensions from 3.7.4.3 to 3.10.0.0 * `#18893 `__: DOC: Add a set of standard replies. diff --git a/doc/changelog/1.22.0-changelog.rst b/doc/changelog/1.22.0-changelog.rst index c7a49bc13376..0f83b69607de 100644 --- a/doc/changelog/1.22.0-changelog.rst +++ b/doc/changelog/1.22.0-changelog.rst @@ -23,7 +23,7 @@ names contributed a patch for the first time. * Anirudh Dagar + * Ankit Dwivedi + * Antony Lee -* Arfy Slowy + +* Arfy Slowly + * Arryan Singh + * Arun Palaniappen + * Arushi Sharma + @@ -220,7 +220,7 @@ A total of 609 pull requests were merged for this release. * `#19142 `__: BUG: expose ``short_version`` as previously in version.py * `#19151 `__: ENH: Vectorising np.linalg.qr * `#19165 `__: DOC: Explicitly mention that ``searchsorted`` returns an integer... -* `#19167 `__: ENH: Improve readibility of error message in terminal. +* `#19167 `__: ENH: Improve readability of error message in terminal. * `#19170 `__: API: Delay string and number promotion deprecation/future warning * `#19172 `__: BUG: Fixed an issue wherein ``_GenericAlias`` could raise for non-iterable... * `#19173 `__: ENH: Add support for copy modes to NumPy @@ -251,7 +251,7 @@ A total of 609 pull requests were merged for this release. * `#19237 `__: ENH: Add annotations to ``np.core.multiarray`` part 3/4 * `#19241 `__: MAINT: Bump hypothesis from 6.13.14 to 6.14.0 * `#19242 `__: MAINT: Bump mypy from 0.812 to 0.902 -* `#19244 `__: BUG: Fix an issue wherein assigment to ``np.ma.masked_array`` ignores... +* `#19244 `__: BUG: Fix an issue wherein assignment to ``np.ma.masked_array`` ignores... * `#19245 `__: ENH: Add dtype-support to the ``np.core.shape_base`` annotations * `#19251 `__: BUG: revise string_from_pyobj/try_pyarr_from_string with respect... * `#19254 `__: MAINT: Refactor output ufunc wrapping logic @@ -286,7 +286,7 @@ A total of 609 pull requests were merged for this release. * `#19322 `__: BUG: Fix cast safety and comparisons for zero sized voids * `#19323 `__: BUG: Correct Cython declaration in random * `#19326 `__: BUG: protect against accessing base attribute of a NULL subarray -* `#19328 `__: MAINT: Replace ``"dtype[Any]"`` with ``dtype`` in the definiton of... +* `#19328 `__: MAINT: Replace ``"dtype[Any]"`` with ``dtype`` in the definition of... * `#19329 `__: ENH Add a conda-based CI job on azure. * `#19338 `__: DOC: Removed duplicate instructions for building docs from ``dev/index``... * `#19344 `__: MAINT: Annotate missing attributes of ``np.number`` subclasses @@ -378,7 +378,7 @@ A total of 609 pull requests were merged for this release. * `#19560 `__: TST: Bump the GitHub actions python 3.10 version * `#19561 `__: DOC: Remove explicit parameter sparse=False in meshgrid() indexing... * `#19563 `__: MAINT: Bump hypothesis from 6.14.3 to 6.14.4 -* `#19564 `__: TST: Add "Scaled float" custom DType for testng +* `#19564 `__: TST: Add "Scaled float" custom DType for testing * `#19565 `__: DOC: Fix sphinx warnings in c-info.beyond-basics.rst * `#19566 `__: DOC: Remove ``dot`` docstring in numpy/core/_add_newdocs.py * `#19567 `__: DOC: Fix Unknown section warning when building docs @@ -527,7 +527,7 @@ A total of 609 pull requests were merged for this release. * `#19918 `__: MAINT: Override the modules of ``np.char`` and ``np.rec`` functions * `#19919 `__: ENH: Create an experimental export of the new DType API * `#19920 `__: DOC: Fix typos in NEPs, found by codespell -* `#19921 `__: DEP: Use ``delimiter`` rather than ``delimitor`` as kwarg in mrecords +* `#19921 `__: DEP: Use ``delimiter`` rather than ``delimiter`` as kwarg in mrecords * `#19925 `__: BUG: ufunc: Fix potential memory leak. * `#19926 `__: BUG: Resolve Divide by Zero on Apple silicon + test failures * `#19927 `__: BUG: Only call the get_versions() function once on import diff --git a/doc/changelog/1.25.0-changelog.rst b/doc/changelog/1.25.0-changelog.rst index d9a6963b74f8..226b0aab36a5 100644 --- a/doc/changelog/1.25.0-changelog.rst +++ b/doc/changelog/1.25.0-changelog.rst @@ -378,7 +378,7 @@ A total of 530 pull requests were merged for this release. * `#23130 `__: MAINT, BLD: Update wheel and GitPython versions. * `#23136 `__: ENH: create and use indexed inner loops * `#23141 `__: CI: reduce CI load - two fewer Azure Windows jobs, and no GHA... -* `#23142 `__: NEP: add a paragraph about accredidation for sponsored work +* `#23142 `__: NEP: add a paragraph about accreditation for sponsored work * `#23143 `__: ENH: Allow trivial pickling of user DType (classes) * `#23144 `__: TYP,MAINT: Add a missing explicit ``Any`` parameter to the ``npt.ArrayLike``... * `#23145 `__: TYP,MAINT: Remove typing-related Python <3.9 leftovers @@ -662,7 +662,7 @@ A total of 530 pull requests were merged for this release. * `#23770 `__: MAINT: do not use copyswap in where internals * `#23772 `__: DOC: added note for git tagging * `#23774 `__: BUG: Fix median and quantile NaT handling -* `#23776 `__: ENH: replace depcrecated distutils use in convenience function +* `#23776 `__: ENH: replace deprecated distutils use in convenience function * `#23777 `__: Speed up _string_helpers init. * `#23779 `__: DOC: Fix link from mtrand.randint -> Generator.integers. * `#23790 `__: DOC: used a more readable if/else form than old-style ternary... diff --git a/doc/changelog/1.25.2-changelog.rst b/doc/changelog/1.25.2-changelog.rst index cd5b7f2e83e2..21dbbd7dddda 100644 --- a/doc/changelog/1.25.2-changelog.rst +++ b/doc/changelog/1.25.2-changelog.rst @@ -35,7 +35,7 @@ A total of 19 pull requests were merged for this release. * `#24234 `__: MAINT: exclude min, max and round from ``np.__all__`` * `#24241 `__: MAINT: Dependabot updates * `#24242 `__: BUG: Fix the signature for np.array_api.take -* `#24243 `__: BLD: update OpenBLAS to an intermeidate commit +* `#24243 `__: BLD: update OpenBLAS to an intermediate commit * `#24244 `__: BUG: Fix reference count leak in str(scalar). * `#24245 `__: BUG: fix invalid function pointer conversion error * `#24255 `__: BUG: Factor out slow ``getenv`` call used for memory policy warning diff --git a/doc/changelog/2.1.0-changelog.rst b/doc/changelog/2.1.0-changelog.rst index af7f5a3b07c7..dfa20c2f3a47 100644 --- a/doc/changelog/2.1.0-changelog.rst +++ b/doc/changelog/2.1.0-changelog.rst @@ -180,7 +180,7 @@ A total of 469 pull requests were merged for this release. * `#26113 `__: BLD: Do not use -O3 flag when building in debug mode * `#26116 `__: ENH: inherit numerical dtypes from abstract ones. * `#26119 `__: BUG: fix reference counting error in stringdtype setup -* `#26123 `__: BUG: update pocketfft to unconditionaly disable use of aligned_alloc +* `#26123 `__: BUG: update pocketfft to unconditionally disable use of aligned_alloc * `#26125 `__: DOC: Bump pydata-sphinx-theme version * `#26128 `__: DOC: Update absolute_beginners.rst * `#26129 `__: MAINT: add missing noexcept clauses @@ -362,7 +362,7 @@ A total of 469 pull requests were merged for this release. * `#26604 `__: refguide-check with pytest as a runner * `#26605 `__: DOC: fix typos in numpy v2.0 documentation * `#26606 `__: DOC: Update randn() to use rng.standard_normal() -* `#26607 `__: MNT: Reorganize non-constant global statics into structs +* `#26607 `__: MNT: Reorganize non-constant global statistics into structs * `#26609 `__: DOC: Updated notes and examples for np.insert. * `#26610 `__: BUG: np.take handle 64-bit indices on 32-bit platforms * `#26611 `__: MNT: Remove ``set_string_function`` @@ -495,7 +495,7 @@ A total of 469 pull requests were merged for this release. * `#26937 `__: TYP,BUG: Remove ``numpy.cast`` and ``numpy.disp`` from the typing... * `#26938 `__: TYP,BUG: Fix ``dtype`` type alias specialization issue in ``__init__.pyi`` * `#26942 `__: TYP: Improved ``numpy.generic`` rich comparison operator type... -* `#26943 `__: TYP,BUG: Remove non-existant ``numpy.__git_version__`` in the... +* `#26943 `__: TYP,BUG: Remove non-existent ``numpy.__git_version__`` in the... * `#26946 `__: TYP: Add missing typecodes in ``numpy._core.numerictypes.typecodes`` * `#26950 `__: MAINT: add freethreading_compatible directive to cython build * `#26953 `__: TYP: Replace ``typing.Union`` with ``|`` in ``numpy._typing`` diff --git a/doc/neps/nep-0021-advanced-indexing.rst b/doc/neps/nep-0021-advanced-indexing.rst index 311ec7dc0cc4..badd41875af2 100644 --- a/doc/neps/nep-0021-advanced-indexing.rst +++ b/doc/neps/nep-0021-advanced-indexing.rst @@ -219,7 +219,7 @@ be deduced: no transposing should be done. The axes created by the integer array indices are always inserted at the front, even for a single index. -4. Boolean indexing is conceptionally outer indexing. Broadcasting +4. Boolean indexing is conceptually outer indexing. Broadcasting together with other advanced indices in the manner of legacy indexing is generally not helpful or well defined. A user who wishes the "``nonzero``" plus broadcast behaviour can thus diff --git a/doc/release/upcoming_changes/28254.expired.rst b/doc/release/upcoming_changes/28254.expired.rst index 54d82303a506..5f391eb6cbe2 100644 --- a/doc/release/upcoming_changes/28254.expired.rst +++ b/doc/release/upcoming_changes/28254.expired.rst @@ -3,7 +3,7 @@ * Remove alias ``generate_divbyzero_error`` to ``npy_set_floatstatus_divbyzero`` and ``generate_overflow_error`` to ``npy_set_floatstatus_overflow`` (deprecated since 1.10) * Remove ``np.tostring`` (deprecated since 1.19) * Raise on ``np.conjugate`` of non-numeric types (deprecated since 1.13) -* Raise when using ``np.bincount(...minlength=None)``, use 0 intead (deprecated since 1.14) +* Raise when using ``np.bincount(...minlength=None)``, use 0 instead (deprecated since 1.14) * Passing ``shape=None`` to functions with a non-optional shape argument errors, use ``()`` instead (deprecated since 1.20) * Inexact matches for ``mode`` and ``searchside`` raise (deprecated since 1.20) * Setting ``__array_finalize__ = None`` errors (deprecated since 1.23) diff --git a/doc/source/release/1.22.0-notes.rst b/doc/source/release/1.22.0-notes.rst index 69ca83a4d15d..020f546b0e89 100644 --- a/doc/source/release/1.22.0-notes.rst +++ b/doc/source/release/1.22.0-notes.rst @@ -59,9 +59,9 @@ value for the ``usemask`` parameter. Deprecations ============ -Use delimiter rather than delimitor as kwarg in mrecords +Use delimiter rather than delimiter as kwarg in mrecords -------------------------------------------------------- -The misspelled keyword argument ``delimitor`` of +The misspelled keyword argument ``delimiter`` of ``numpy.ma.mrecords.fromtextfile()`` has been changed to ``delimiter``, using it will emit a deprecation warning. diff --git a/numpy/_core/src/multiarray/dragon4.c b/numpy/_core/src/multiarray/dragon4.c index b936f4dc213e..8783ec71e4af 100644 --- a/numpy/_core/src/multiarray/dragon4.c +++ b/numpy/_core/src/multiarray/dragon4.c @@ -1665,7 +1665,7 @@ FormatPositional(char *buffer, npy_uint32 bufferSize, BigInt *mantissa, pos += numDigits; if (count > maxPrintLen - pos) { - PyErr_SetString(PyExc_RuntimeError, "Float formating result too large"); + PyErr_SetString(PyExc_RuntimeError, "Float formatting result too large"); return -1; } @@ -1772,7 +1772,7 @@ FormatPositional(char *buffer, npy_uint32 bufferSize, BigInt *mantissa, npy_int32 count = desiredFractionalDigits - numFractionDigits; if (count > maxPrintLen - pos) { - PyErr_SetString(PyExc_RuntimeError, "Float formating result too large"); + PyErr_SetString(PyExc_RuntimeError, "Float formatting result too large"); return -1; } numFractionDigits += count; @@ -1816,7 +1816,7 @@ FormatPositional(char *buffer, npy_uint32 bufferSize, BigInt *mantissa, } if (count > maxPrintLen - pos) { - PyErr_SetString(PyExc_RuntimeError, "Float formating result too large"); + PyErr_SetString(PyExc_RuntimeError, "Float formatting result too large"); return -1; } @@ -1830,7 +1830,7 @@ FormatPositional(char *buffer, npy_uint32 bufferSize, BigInt *mantissa, npy_int32 count = pos; if (count > maxPrintLen - shift) { - PyErr_SetString(PyExc_RuntimeError, "Float formating result too large"); + PyErr_SetString(PyExc_RuntimeError, "Float formatting result too large"); return -1; } diff --git a/numpy/_core/tests/test_scalarprint.py b/numpy/_core/tests/test_scalarprint.py index 30073256d5bb..d9e35ab90ce1 100644 --- a/numpy/_core/tests/test_scalarprint.py +++ b/numpy/_core/tests/test_scalarprint.py @@ -277,15 +277,15 @@ def test_dragon4_positional_interface_overflow(self, tp, pad_val): #gh-28068 with pytest.raises(RuntimeError, - match="Float formating result too large"): + match="Float formatting result too large"): fpos(tp('1.047'), unique=False, precision=pad_val) with pytest.raises(RuntimeError, - match="Float formating result too large"): + match="Float formatting result too large"): fpos(tp('1.047'), precision=2, pad_left=pad_val) with pytest.raises(RuntimeError, - match="Float formating result too large"): + match="Float formatting result too large"): fpos(tp('1.047'), precision=2, pad_right=pad_val) @pytest.mark.parametrize("tp", available_float_dtypes) diff --git a/numpy/linalg/lapack_lite/f2c_blas.c b/numpy/linalg/lapack_lite/f2c_blas.c index c2c9abb3ec20..de80fe4c7817 100644 --- a/numpy/linalg/lapack_lite/f2c_blas.c +++ b/numpy/linalg/lapack_lite/f2c_blas.c @@ -4909,7 +4909,7 @@ static doublecomplex c_b1078 = {1.,0.}; ( 1 + ( n - 1 )*abs( INCX ) ). Before entry, the incremented array X must contain the n element vector x. On exit, X is overwritten with the - tranformed vector x. + transformed vector x. INCX - INTEGER. On entry, INCX specifies the increment for the elements of @@ -9801,7 +9801,7 @@ doublereal dnrm2_(integer *n, doublereal *x, integer *incx) ( 1 + ( n - 1 )*abs( INCX ) ). Before entry, the incremented array X must contain the n element vector x. On exit, X is overwritten with the - tranformed vector x. + transformed vector x. INCX - INTEGER. On entry, INCX specifies the increment for the elements of @@ -14401,7 +14401,7 @@ doublereal snrm2_(integer *n, real *x, integer *incx) ( 1 + ( n - 1 )*abs( INCX ) ). Before entry, the incremented array X must contain the n element vector x. On exit, X is overwritten with the - tranformed vector x. + transformed vector x. INCX - INTEGER. On entry, INCX specifies the increment for the elements of @@ -19986,7 +19986,7 @@ doublereal snrm2_(integer *n, real *x, integer *incx) ( 1 + ( n - 1 )*abs( INCX ) ). Before entry, the incremented array X must contain the n element vector x. On exit, X is overwritten with the - tranformed vector x. + transformed vector x. INCX - INTEGER. On entry, INCX specifies the increment for the elements of diff --git a/numpy/linalg/lapack_lite/f2c_c_lapack.c b/numpy/linalg/lapack_lite/f2c_c_lapack.c index 9e58eec3cc25..35b4591966a1 100644 --- a/numpy/linalg/lapack_lite/f2c_c_lapack.c +++ b/numpy/linalg/lapack_lite/f2c_c_lapack.c @@ -2759,10 +2759,10 @@ static real c_b2435 = .5f; The problem is solved in three steps: (1) Reduce the coefficient matrix A to bidiagonal form with - Householder tranformations, reducing the original problem + Householder transformations, reducing the original problem into a "bidiagonal least squares problem" (BLS) (2) Solve the BLS using a divide and conquer approach. - (3) Apply back all the Householder tranformations to solve + (3) Apply back all the Householder transformations to solve the original least squares problem. The effective rank of A is determined by treating as zero those @@ -8065,7 +8065,7 @@ static real c_b2435 = .5f; LDZ (input) INTEGER The leading dimension of the array Z. if COMPZ = 'I' or - COMPZ = 'V', then LDZ.GE.MAX(1,N). Otherwize, LDZ.GE.1. + COMPZ = 'V', then LDZ.GE.MAX(1,N). Otherwise, LDZ.GE.1. WORK (workspace/output) COMPLEX array, dimension (LWORK) On exit, if INFO = 0, WORK(1) returns an estimate of @@ -9768,7 +9768,7 @@ static real c_b2435 = .5f; The first stage consists of deflating the size of the problem when there are multiple eigenvalues or if there is a zero in - the Z vector. For each such occurence the dimension of the + the Z vector. For each such occurrence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine SLAED2. @@ -9995,7 +9995,7 @@ static real c_b2435 = .5f; return 0; } -/* Prepare the INDXQ sorting premutation. */ +/* Prepare the INDXQ sorting permutation. */ n1 = k; n2 = *n - k; @@ -10558,12 +10558,12 @@ static real c_b2435 = .5f; If INFO .GT. 0 and WANTT is .FALSE., then on exit, the remaining unconverged eigenvalues are the eigenvalues of the upper Hessenberg matrix - rows and columns ILO thorugh INFO of the final, + rows and columns ILO through INFO of the final, output value of H. If INFO .GT. 0 and WANTT is .TRUE., then on exit (*) (initial value of H)*U = U*(final value of H) - where U is an orthognal matrix. The final + where U is an orthogonal matrix. The final value of H is upper Hessenberg and triangular in rows and columns INFO+1 through IHI. @@ -13925,7 +13925,7 @@ doublereal clanhe_(char *norm, char *uplo, integer *n, singlecomplex *a, integer LDZ (input) INTEGER The leading dimension of the array Z. if WANTZ is .TRUE. - then LDZ.GE.MAX(1,IHIZ). Otherwize, LDZ.GE.1. + then LDZ.GE.MAX(1,IHIZ). Otherwise, LDZ.GE.1. WORK (workspace/output) COMPLEX array, dimension LWORK On exit, if LWORK = -1, WORK(1) returns an estimate of @@ -14509,7 +14509,7 @@ doublereal clanhe_(char *norm, char *uplo, integer *n, singlecomplex *a, integer } /* - ==== Use up to NS of the smallest magnatiude + ==== Use up to NS of the smallest magnitude . shifts. If there aren't NS shifts available, . then use them all, possibly dropping one to . make the number of shifts even. ==== @@ -16046,7 +16046,7 @@ doublereal clanhe_(char *norm, char *uplo, integer *n, singlecomplex *a, integer LDZ (input) INTEGER The leading dimension of the array Z. if WANTZ is .TRUE. - then LDZ.GE.MAX(1,IHIZ). Otherwize, LDZ.GE.1. + then LDZ.GE.MAX(1,IHIZ). Otherwise, LDZ.GE.1. WORK (workspace/output) COMPLEX array, dimension LWORK On exit, if LWORK = -1, WORK(1) returns an estimate of @@ -16624,7 +16624,7 @@ doublereal clanhe_(char *norm, char *uplo, integer *n, singlecomplex *a, integer } /* - ==== Use up to NS of the smallest magnatiude + ==== Use up to NS of the smallest magnitude . shifts. If there aren't NS shifts available, . then use them all, possibly dropping one to . make the number of shifts even. ==== diff --git a/numpy/linalg/lapack_lite/f2c_d_lapack.c b/numpy/linalg/lapack_lite/f2c_d_lapack.c index 10e22ff1ba01..5169fa54eb8b 100644 --- a/numpy/linalg/lapack_lite/f2c_d_lapack.c +++ b/numpy/linalg/lapack_lite/f2c_d_lapack.c @@ -4127,7 +4127,7 @@ static doublereal c_b3192 = 2.; Householder transformations, reducing the original problem into a "bidiagonal least squares problem" (BLS) (2) Solve the BLS using a divide and conquer approach. - (3) Apply back all the Householder tranformations to solve + (3) Apply back all the Householder transformations to solve the original least squares problem. The effective rank of A is determined by treating as zero those @@ -7595,7 +7595,7 @@ static doublereal c_b3192 = 2.; LDZ (input) INTEGER The leading dimension of the array Z. if COMPZ = 'I' or - COMPZ = 'V', then LDZ.GE.MAX(1,N). Otherwize, LDZ.GE.1. + COMPZ = 'V', then LDZ.GE.MAX(1,N). Otherwise, LDZ.GE.1. WORK (workspace/output) DOUBLE PRECISION array, dimension (LWORK) On exit, if INFO = 0, WORK(1) returns an estimate of @@ -9176,7 +9176,7 @@ logical disnan_(doublereal *din) The first stage consists of deflating the size of the problem when there are multiple eigenvalues or if there is a zero in - the Z vector. For each such occurence the dimension of the + the Z vector. For each such occurrence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine DLAED2. @@ -11646,7 +11646,7 @@ logical disnan_(doublereal *din) The first stage consists of deflating the size of the problem when there are multiple eigenvalues or if there is a zero in - the Z vector. For each such occurence the dimension of the + the Z vector. For each such occurrence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine DLAED8. @@ -12172,7 +12172,7 @@ logical disnan_(doublereal *din) /* L40: */ } -/* Calculate the allowable deflation tolerence */ +/* Calculate the allowable deflation tolerance */ imax = idamax_(n, &z__[1], &c__1); jmax = idamax_(n, &d__[1], &c__1); @@ -13097,7 +13097,7 @@ logical disnan_(doublereal *din) T must be in Schur canonical form, that is, block upper triangular with 1-by-1 and 2-by-2 diagonal blocks; each 2-by-2 diagonal block - has its diagonal elemnts equal and its off-diagonal elements of + has its diagonal elements equal and its off-diagonal elements of opposite sign. Arguments @@ -13604,12 +13604,12 @@ logical disnan_(doublereal *din) If INFO .GT. 0 and WANTT is .FALSE., then on exit, the remaining unconverged eigenvalues are the eigenvalues of the upper Hessenberg matrix rows - and columns ILO thorugh INFO of the final, output + and columns ILO through INFO of the final, output value of H. If INFO .GT. 0 and WANTT is .TRUE., then on exit (*) (initial value of H)*U = U*(final value of H) - where U is an orthognal matrix. The final + where U is an orthogonal matrix. The final value of H is upper Hessenberg and triangular in rows and columns INFO+1 through IHI. @@ -17485,7 +17485,7 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__) LDZ (input) INTEGER The leading dimension of the array Z. if WANTZ is .TRUE. - then LDZ.GE.MAX(1,IHIZ). Otherwize, LDZ.GE.1. + then LDZ.GE.MAX(1,IHIZ). Otherwise, LDZ.GE.1. WORK (workspace/output) DOUBLE PRECISION array, dimension LWORK On exit, if LWORK = -1, WORK(1) returns an estimate of @@ -18032,7 +18032,7 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__) } /* - ==== Use up to NS of the smallest magnatiude + ==== Use up to NS of the smallest magnitude . shifts. If there aren't NS shifts available, . then use them all, possibly dropping one to . make the number of shifts even. ==== @@ -19731,7 +19731,7 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__) LDZ (input) INTEGER The leading dimension of the array Z. if WANTZ is .TRUE. - then LDZ.GE.MAX(1,IHIZ). Otherwize, LDZ.GE.1. + then LDZ.GE.MAX(1,IHIZ). Otherwise, LDZ.GE.1. WORK (workspace/output) DOUBLE PRECISION array, dimension LWORK On exit, if LWORK = -1, WORK(1) returns an estimate of @@ -20271,7 +20271,7 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__) } /* - ==== Use up to NS of the smallest magnatiude + ==== Use up to NS of the smallest magnitude . shifts. If there aren't NS shifts available, . then use them all, possibly dropping one to . make the number of shifts even. ==== @@ -24434,7 +24434,7 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__) The first stage consists of deflating the size of the problem when there are multiple singular values or when there are zeros in - the Z vector. For each such occurence the dimension of the + the Z vector. For each such occurrence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine DLASD2. @@ -26902,7 +26902,7 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__) The first stage consists of deflating the size of the problem when there are multiple singular values or if there is a zero - in the Z vector. For each such occurence the dimension of the + in the Z vector. For each such occurrence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine DLASD7. @@ -27460,7 +27460,7 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__) /* L50: */ } -/* Calculate the allowable deflation tolerence */ +/* Calculate the allowable deflation tolerance */ eps = EPSILON; /* Computing MAX */ @@ -28481,7 +28481,7 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__) UPLO (input) CHARACTER*1 On entry, UPLO specifies whether the input bidiagonal matrix - is upper or lower bidiagonal, and wether it is square are + is upper or lower bidiagonal, and whether it is square are not. UPLO = 'U' or 'u' B is upper bidiagonal. UPLO = 'L' or 'l' B is lower bidiagonal. @@ -31388,7 +31388,7 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__) ===================================================================== - Test the input paramters. + Test the input parameters. */ /* Parameter adjustments */ diff --git a/numpy/linalg/lapack_lite/f2c_lapack.c b/numpy/linalg/lapack_lite/f2c_lapack.c index 47540b37edc0..ed2aaae7f09d 100644 --- a/numpy/linalg/lapack_lite/f2c_lapack.c +++ b/numpy/linalg/lapack_lite/f2c_lapack.c @@ -61,7 +61,7 @@ integer ieeeck_(integer *ispec, real *zero, real *one) ========= ISPEC (input) INTEGER - Specifies whether to test just for inifinity arithmetic + Specifies whether to test just for infinity arithmetic or whether to test for infinity and NaN arithmetic. = 0: Verify infinity arithmetic only. = 1: Verify infinity and NaN arithmetic. diff --git a/numpy/linalg/lapack_lite/f2c_s_lapack.c b/numpy/linalg/lapack_lite/f2c_s_lapack.c index 26e7c18ac97a..ae6b6a910e94 100644 --- a/numpy/linalg/lapack_lite/f2c_s_lapack.c +++ b/numpy/linalg/lapack_lite/f2c_s_lapack.c @@ -4102,7 +4102,7 @@ static real c_b3178 = 2.f; Householder transformations, reducing the original problem into a "bidiagonal least squares problem" (BLS) (2) Solve the BLS using a divide and conquer approach. - (3) Apply back all the Householder tranformations to solve + (3) Apply back all the Householder transformations to solve the original least squares problem. The effective rank of A is determined by treating as zero those @@ -7575,7 +7575,7 @@ static real c_b3178 = 2.f; LDZ (input) INTEGER The leading dimension of the array Z. if COMPZ = 'I' or - COMPZ = 'V', then LDZ.GE.MAX(1,N). Otherwize, LDZ.GE.1. + COMPZ = 'V', then LDZ.GE.MAX(1,N). Otherwise, LDZ.GE.1. WORK (workspace/output) REAL array, dimension (LWORK) On exit, if INFO = 0, WORK(1) returns an estimate of @@ -9145,7 +9145,7 @@ logical sisnan_(real *sin__) The first stage consists of deflating the size of the problem when there are multiple eigenvalues or if there is a zero in - the Z vector. For each such occurence the dimension of the + the Z vector. For each such occurrence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine SLAED2. @@ -11610,7 +11610,7 @@ logical sisnan_(real *sin__) The first stage consists of deflating the size of the problem when there are multiple eigenvalues or if there is a zero in - the Z vector. For each such occurence the dimension of the + the Z vector. For each such occurrence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine SLAED8. @@ -12136,7 +12136,7 @@ logical sisnan_(real *sin__) /* L40: */ } -/* Calculate the allowable deflation tolerence */ +/* Calculate the allowable deflation tolerance */ imax = isamax_(n, &z__[1], &c__1); jmax = isamax_(n, &d__[1], &c__1); @@ -13055,7 +13055,7 @@ logical sisnan_(real *sin__) T must be in Schur canonical form, that is, block upper triangular with 1-by-1 and 2-by-2 diagonal blocks; each 2-by-2 diagonal block - has its diagonal elemnts equal and its off-diagonal elements of + has its diagonal elements equal and its off-diagonal elements of opposite sign. Arguments @@ -13561,12 +13561,12 @@ logical sisnan_(real *sin__) If INFO .GT. 0 and WANTT is .FALSE., then on exit, the remaining unconverged eigenvalues are the eigenvalues of the upper Hessenberg matrix rows - and columns ILO thorugh INFO of the final, output + and columns ILO through INFO of the final, output value of H. If INFO .GT. 0 and WANTT is .TRUE., then on exit (*) (initial value of H)*U = U*(final value of H) - where U is an orthognal matrix. The final + where U is an orthogonal matrix. The final value of H is upper Hessenberg and triangular in rows and columns INFO+1 through IHI. @@ -17421,7 +17421,7 @@ doublereal slapy3_(real *x, real *y, real *z__) LDZ (input) INTEGER The leading dimension of the array Z. if WANTZ is .TRUE. - then LDZ.GE.MAX(1,IHIZ). Otherwize, LDZ.GE.1. + then LDZ.GE.MAX(1,IHIZ). Otherwise, LDZ.GE.1. WORK (workspace/output) REAL array, dimension LWORK On exit, if LWORK = -1, WORK(1) returns an estimate of @@ -17968,7 +17968,7 @@ doublereal slapy3_(real *x, real *y, real *z__) } /* - ==== Use up to NS of the smallest magnatiude + ==== Use up to NS of the smallest magnitude . shifts. If there aren't NS shifts available, . then use them all, possibly dropping one to . make the number of shifts even. ==== @@ -19654,7 +19654,7 @@ doublereal slapy3_(real *x, real *y, real *z__) LDZ (input) INTEGER The leading dimension of the array Z. if WANTZ is .TRUE. - then LDZ.GE.MAX(1,IHIZ). Otherwize, LDZ.GE.1. + then LDZ.GE.MAX(1,IHIZ). Otherwise, LDZ.GE.1. WORK (workspace/output) REAL array, dimension LWORK On exit, if LWORK = -1, WORK(1) returns an estimate of @@ -20194,7 +20194,7 @@ doublereal slapy3_(real *x, real *y, real *z__) } /* - ==== Use up to NS of the smallest magnatiude + ==== Use up to NS of the smallest magnitude . shifts. If there aren't NS shifts available, . then use them all, possibly dropping one to . make the number of shifts even. ==== @@ -24345,7 +24345,7 @@ doublereal slapy3_(real *x, real *y, real *z__) The first stage consists of deflating the size of the problem when there are multiple singular values or when there are zeros in - the Z vector. For each such occurence the dimension of the + the Z vector. For each such occurrence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine SLASD2. @@ -26805,7 +26805,7 @@ doublereal slapy3_(real *x, real *y, real *z__) The first stage consists of deflating the size of the problem when there are multiple singular values or if there is a zero - in the Z vector. For each such occurence the dimension of the + in the Z vector. For each such occurrence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine SLASD7. @@ -27361,7 +27361,7 @@ doublereal slapy3_(real *x, real *y, real *z__) /* L50: */ } -/* Calculate the allowable deflation tolerence */ +/* Calculate the allowable deflation tolerance */ eps = slamch_("Epsilon"); /* Computing MAX */ @@ -28373,7 +28373,7 @@ doublereal slapy3_(real *x, real *y, real *z__) UPLO (input) CHARACTER*1 On entry, UPLO specifies whether the input bidiagonal matrix - is upper or lower bidiagonal, and wether it is square are + is upper or lower bidiagonal, and whether it is square are not. UPLO = 'U' or 'u' B is upper bidiagonal. UPLO = 'L' or 'l' B is lower bidiagonal. @@ -31271,7 +31271,7 @@ doublereal slapy3_(real *x, real *y, real *z__) ===================================================================== - Test the input paramters. + Test the input parameters. */ /* Parameter adjustments */ diff --git a/numpy/linalg/lapack_lite/f2c_z_lapack.c b/numpy/linalg/lapack_lite/f2c_z_lapack.c index 64e41d082f10..1d61aad6ea82 100644 --- a/numpy/linalg/lapack_lite/f2c_z_lapack.c +++ b/numpy/linalg/lapack_lite/f2c_z_lapack.c @@ -2781,10 +2781,10 @@ static doublereal c_b2435 = .5; The problem is solved in three steps: (1) Reduce the coefficient matrix A to bidiagonal form with - Householder tranformations, reducing the original problem + Householder transformations, reducing the original problem into a "bidiagonal least squares problem" (BLS) (2) Solve the BLS using a divide and conquer approach. - (3) Apply back all the Householder tranformations to solve + (3) Apply back all the Householder transformations to solve the original least squares problem. The effective rank of A is determined by treating as zero those @@ -8118,7 +8118,7 @@ static doublereal c_b2435 = .5; LDZ (input) INTEGER The leading dimension of the array Z. if COMPZ = 'I' or - COMPZ = 'V', then LDZ.GE.MAX(1,N). Otherwize, LDZ.GE.1. + COMPZ = 'V', then LDZ.GE.MAX(1,N). Otherwise, LDZ.GE.1. WORK (workspace/output) COMPLEX*16 array, dimension (LWORK) On exit, if INFO = 0, WORK(1) returns an estimate of @@ -9826,7 +9826,7 @@ static doublereal c_b2435 = .5; The first stage consists of deflating the size of the problem when there are multiple eigenvalues or if there is a zero in - the Z vector. For each such occurence the dimension of the + the Z vector. For each such occurrence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine DLAED2. @@ -10053,7 +10053,7 @@ static doublereal c_b2435 = .5; return 0; } -/* Prepare the INDXQ sorting premutation. */ +/* Prepare the INDXQ sorting permutation. */ n1 = k; n2 = *n - k; @@ -10619,12 +10619,12 @@ static doublereal c_b2435 = .5; If INFO .GT. 0 and WANTT is .FALSE., then on exit, the remaining unconverged eigenvalues are the eigenvalues of the upper Hessenberg matrix - rows and columns ILO thorugh INFO of the final, + rows and columns ILO through INFO of the final, output value of H. If INFO .GT. 0 and WANTT is .TRUE., then on exit (*) (initial value of H)*U = U*(final value of H) - where U is an orthognal matrix. The final + where U is an orthogonal matrix. The final value of H is upper Hessenberg and triangular in rows and columns INFO+1 through IHI. @@ -13998,7 +13998,7 @@ doublereal zlanhe_(char *norm, char *uplo, integer *n, doublecomplex *a, LDZ (input) INTEGER The leading dimension of the array Z. if WANTZ is .TRUE. - then LDZ.GE.MAX(1,IHIZ). Otherwize, LDZ.GE.1. + then LDZ.GE.MAX(1,IHIZ). Otherwise, LDZ.GE.1. WORK (workspace/output) COMPLEX*16 array, dimension LWORK On exit, if LWORK = -1, WORK(1) returns an estimate of @@ -14582,7 +14582,7 @@ doublereal zlanhe_(char *norm, char *uplo, integer *n, doublecomplex *a, } /* - ==== Use up to NS of the smallest magnatiude + ==== Use up to NS of the smallest magnitude . shifts. If there aren't NS shifts available, . then use them all, possibly dropping one to . make the number of shifts even. ==== @@ -16140,7 +16140,7 @@ doublereal zlanhe_(char *norm, char *uplo, integer *n, doublecomplex *a, LDZ (input) INTEGER The leading dimension of the array Z. if WANTZ is .TRUE. - then LDZ.GE.MAX(1,IHIZ). Otherwize, LDZ.GE.1. + then LDZ.GE.MAX(1,IHIZ). Otherwise, LDZ.GE.1. WORK (workspace/output) COMPLEX*16 array, dimension LWORK On exit, if LWORK = -1, WORK(1) returns an estimate of @@ -16718,7 +16718,7 @@ doublereal zlanhe_(char *norm, char *uplo, integer *n, doublecomplex *a, } /* - ==== Use up to NS of the smallest magnatiude + ==== Use up to NS of the smallest magnitude . shifts. If there aren't NS shifts available, . then use them all, possibly dropping one to . make the number of shifts even. ==== From 893cd65283e08f55394c6679df94dff3c3c598fd Mon Sep 17 00:00:00 2001 From: John Stilley <1831479+john-science@users.noreply.github.com> Date: Sun, 23 Mar 2025 07:47:18 -0700 Subject: [PATCH 2/8] Sorry for the hassle --- doc/changelog/1.21.0-changelog.rst | 4 ++-- doc/changelog/1.22.0-changelog.rst | 2 +- doc/source/release/1.22.0-notes.rst | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/changelog/1.21.0-changelog.rst b/doc/changelog/1.21.0-changelog.rst index 4b7d248d82b9..60039c16b24c 100644 --- a/doc/changelog/1.21.0-changelog.rst +++ b/doc/changelog/1.21.0-changelog.rst @@ -564,7 +564,7 @@ A total of 581 pull requests were merged for this release. * `#18670 `__: BUG: Fix small issues found with pytest-leaks * `#18676 `__: MAINT: Implement new style promotion for `np.result_type`, etc. * `#18679 `__: BUG: Changed METH_VARARGS to METH_NOARGS -* `#18680 `__: Docs: simd-optimizations.rst: fix typo (baseline ~> baseline) +* `#18680 `__: Docs: simd-optimizations.rst: fix typo (basline ~> baseline) * `#18685 `__: REL: Update main after 1.20.2 release. * `#18686 `__: BUG: Fix test_ccompiler_opt when path contains dots * `#18689 `__: DOC: Change matrix size in absolute beginners doc. @@ -607,7 +607,7 @@ A total of 581 pull requests were merged for this release. * `#18773 `__: CI: Fixing typo in Azure job run * `#18777 `__: DOC: update random and asserts in test guidelines * `#18778 `__: MAINT: Relax the integer-type-constraint of `npt._ShapeLike` -* `#18779 `__: DOC: fix spelling of "recommended" ("recommended") +* `#18779 `__: DOC: fix spelling of "reccomended" ("recommended") * `#18780 `__: ENH: Improve the placeholder annotations for the main numpy namespace... * `#18781 `__: ENH: Add `__all__` to a number of public modules * `#18785 `__: DOC: change `dec.parametrize` to `pytest.mark.parametrize` diff --git a/doc/changelog/1.22.0-changelog.rst b/doc/changelog/1.22.0-changelog.rst index 0f83b69607de..a4d03568a2bb 100644 --- a/doc/changelog/1.22.0-changelog.rst +++ b/doc/changelog/1.22.0-changelog.rst @@ -23,7 +23,7 @@ names contributed a patch for the first time. * Anirudh Dagar + * Ankit Dwivedi + * Antony Lee -* Arfy Slowly + +* Arfy Slowy + * Arryan Singh + * Arun Palaniappen + * Arushi Sharma + diff --git a/doc/source/release/1.22.0-notes.rst b/doc/source/release/1.22.0-notes.rst index 020f546b0e89..49f769bbe872 100644 --- a/doc/source/release/1.22.0-notes.rst +++ b/doc/source/release/1.22.0-notes.rst @@ -61,7 +61,7 @@ Deprecations Use delimiter rather than delimiter as kwarg in mrecords -------------------------------------------------------- -The misspelled keyword argument ``delimiter`` of +The misspelled keyword argument ``delimitor`` of ``numpy.ma.mrecords.fromtextfile()`` has been changed to ``delimiter``, using it will emit a deprecation warning. From a8eed57befd974b80d840fa8794611c90e4c8bf2 Mon Sep 17 00:00:00 2001 From: John Stilley Date: Sun, 23 Mar 2025 07:48:44 -0700 Subject: [PATCH 3/8] Reverting changelog changes --- doc/changelog/1.16.0-changelog.rst | 4 ++-- doc/changelog/1.18.0-changelog.rst | 4 ++-- doc/changelog/1.21.0-changelog.rst | 6 +++--- doc/changelog/1.22.0-changelog.rst | 10 +++++----- doc/changelog/1.25.0-changelog.rst | 4 ++-- doc/changelog/1.25.2-changelog.rst | 2 +- doc/changelog/2.1.0-changelog.rst | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/doc/changelog/1.16.0-changelog.rst b/doc/changelog/1.16.0-changelog.rst index 551083facbd6..8f7afac899e0 100644 --- a/doc/changelog/1.16.0-changelog.rst +++ b/doc/changelog/1.16.0-changelog.rst @@ -374,7 +374,7 @@ A total of 490 pull requests were merged for this release. * `#11953 `__: TST: codecov.yml improvements * `#11957 `__: ENH: mark that large allocations can use huge pages * `#11958 `__: TST: Add a test for np.pad where constant_values is an object -* `#11959 `__: MAINT: Explicitly cause pagefaults to happen before starting... +* `#11959 `__: MAINT: Explicitely cause pagefaults to happen before starting... * `#11961 `__: TST: Add more tests for np.pad * `#11962 `__: ENH: maximum lines of content to be read from numpy.loadtxt * `#11965 `__: BENCH: Add a benchmark comparing block to copy in the 3D case @@ -567,7 +567,7 @@ A total of 490 pull requests were merged for this release. * `#12437 `__: MAINT: refactor datetime.c_metadata creation * `#12439 `__: BUG: test, fix NPY_VISIBILITY_HIDDEN on gcc, which becomes NPY_NO_EXPORT * `#12440 `__: BUG: don't override original errors when casting inside np.dot()... -* `#12443 `__: MAINT Use set literals +* `#12443 `__: MAINT Use set litterals * `#12445 `__: MAINT: Use list and dict comprehension when possible * `#12446 `__: MAINT: Fixups to new functions in np.lib.recfunctions * `#12447 `__: ENH: add back the multifield copy->view change diff --git a/doc/changelog/1.18.0-changelog.rst b/doc/changelog/1.18.0-changelog.rst index 982b14921738..266ff08077ac 100644 --- a/doc/changelog/1.18.0-changelog.rst +++ b/doc/changelog/1.18.0-changelog.rst @@ -153,7 +153,7 @@ A total of 413 pull requests were merged for this release. * `#13871 `__: MAINT: Ensure array_dealloc does not modify refcount of self * `#13874 `__: MAINT: Prepare master for 1.18.0 development. * `#13876 `__: MAINT,BUG,DOC: Fix errors in _add_newdocs -* `#13880 `__: MAINT: Remove an unnecessary backslash between two string literals +* `#13880 `__: MAINT: Remove an unnessary backslash between two string literals * `#13881 `__: MAINT: Update pavement to use python3 in shell commands. * `#13882 `__: MAINT: Remove unnecessary backslashes (and replace others by... * `#13883 `__: MAINT: Replace integers in places where booleans are expected @@ -485,7 +485,7 @@ A total of 413 pull requests were merged for this release. * `#14845 `__: MAINT: revert gh-14800, which gave precedence to OO->O over OO->? * `#14874 `__: REL: Update master after 1.17.4 release. * `#14878 `__: BUILD: remove SSE2 flag from numpy.random builds -* `#14879 `__: DOC: Update NEP29 with Python3.8 information. +* `#14879 `__: DOC: Update NEP29 with Python3.8 informations. * `#14881 `__: BUG: Remove builtins from __all__ * `#14898 `__: MAINT: Delete and ignore generated files * `#14899 `__: Update FUNDING.yml diff --git a/doc/changelog/1.21.0-changelog.rst b/doc/changelog/1.21.0-changelog.rst index 60039c16b24c..158c5a8cfa56 100644 --- a/doc/changelog/1.21.0-changelog.rst +++ b/doc/changelog/1.21.0-changelog.rst @@ -341,7 +341,7 @@ A total of 581 pull requests were merged for this release. * `#18148 `__: MAINT: Bump sphinx from 3.4.1 to 3.4.3 * `#18149 `__: MAINT: Bump hypothesis from 5.46.0 to 6.0.0 * `#18150 `__: BUG: Ensure too many advanced indices raises an exception -* `#18152 `__: BUG: Promotion between strings and objects was asymmetric +* `#18152 `__: BUG: Promotion between strings and objects was assymetric * `#18156 `__: MAINT: Remove redundant null check before free * `#18157 `__: BUG: Initialize value of no_castable_output used in ufunc_loop_matches * `#18161 `__: MAINT: Make keyword arrays static @@ -647,7 +647,7 @@ A total of 581 pull requests were merged for this release. * `#18851 `__: MAINT: Disable pip version check for azure lint check. * `#18853 `__: ENH: Improve the placeholder annotations within sub-modules (part... * `#18855 `__: STY: change CRLF line terminators to Unix -* `#18856 `__: MAINT: Fix the typo "implement" +* `#18856 `__: MAINT: Fix the typo "implment" * `#18862 `__: TST: Skip f2py TestSharedMemory for LONGDOUBLE on macos/arm64 * `#18863 `__: ENH: Add max values comparison for floating point * `#18864 `__: MAINT: Remove dead codepath in generalized ufuncs @@ -659,7 +659,7 @@ A total of 581 pull requests were merged for this release. * `#18880 `__: API: Ensure that casting does not affect ufunc loop * `#18882 `__: ENH: Add min values comparison for floating point * `#18885 `__: MAINT: Remove unsafe unions and ABCs from return-annotations -* `#18889 `__: ENH: Add SIMD operations for min and max value comparison +* `#18889 `__: ENH: Add SIMD operations for min and max value comparision * `#18890 `__: MAINT: ssize_t -> Py_ssize_t and other fixes for Python v3.10.0 * `#18891 `__: MAINT: Bump typing-extensions from 3.7.4.3 to 3.10.0.0 * `#18893 `__: DOC: Add a set of standard replies. diff --git a/doc/changelog/1.22.0-changelog.rst b/doc/changelog/1.22.0-changelog.rst index a4d03568a2bb..c7a49bc13376 100644 --- a/doc/changelog/1.22.0-changelog.rst +++ b/doc/changelog/1.22.0-changelog.rst @@ -220,7 +220,7 @@ A total of 609 pull requests were merged for this release. * `#19142 `__: BUG: expose ``short_version`` as previously in version.py * `#19151 `__: ENH: Vectorising np.linalg.qr * `#19165 `__: DOC: Explicitly mention that ``searchsorted`` returns an integer... -* `#19167 `__: ENH: Improve readability of error message in terminal. +* `#19167 `__: ENH: Improve readibility of error message in terminal. * `#19170 `__: API: Delay string and number promotion deprecation/future warning * `#19172 `__: BUG: Fixed an issue wherein ``_GenericAlias`` could raise for non-iterable... * `#19173 `__: ENH: Add support for copy modes to NumPy @@ -251,7 +251,7 @@ A total of 609 pull requests were merged for this release. * `#19237 `__: ENH: Add annotations to ``np.core.multiarray`` part 3/4 * `#19241 `__: MAINT: Bump hypothesis from 6.13.14 to 6.14.0 * `#19242 `__: MAINT: Bump mypy from 0.812 to 0.902 -* `#19244 `__: BUG: Fix an issue wherein assignment to ``np.ma.masked_array`` ignores... +* `#19244 `__: BUG: Fix an issue wherein assigment to ``np.ma.masked_array`` ignores... * `#19245 `__: ENH: Add dtype-support to the ``np.core.shape_base`` annotations * `#19251 `__: BUG: revise string_from_pyobj/try_pyarr_from_string with respect... * `#19254 `__: MAINT: Refactor output ufunc wrapping logic @@ -286,7 +286,7 @@ A total of 609 pull requests were merged for this release. * `#19322 `__: BUG: Fix cast safety and comparisons for zero sized voids * `#19323 `__: BUG: Correct Cython declaration in random * `#19326 `__: BUG: protect against accessing base attribute of a NULL subarray -* `#19328 `__: MAINT: Replace ``"dtype[Any]"`` with ``dtype`` in the definition of... +* `#19328 `__: MAINT: Replace ``"dtype[Any]"`` with ``dtype`` in the definiton of... * `#19329 `__: ENH Add a conda-based CI job on azure. * `#19338 `__: DOC: Removed duplicate instructions for building docs from ``dev/index``... * `#19344 `__: MAINT: Annotate missing attributes of ``np.number`` subclasses @@ -378,7 +378,7 @@ A total of 609 pull requests were merged for this release. * `#19560 `__: TST: Bump the GitHub actions python 3.10 version * `#19561 `__: DOC: Remove explicit parameter sparse=False in meshgrid() indexing... * `#19563 `__: MAINT: Bump hypothesis from 6.14.3 to 6.14.4 -* `#19564 `__: TST: Add "Scaled float" custom DType for testing +* `#19564 `__: TST: Add "Scaled float" custom DType for testng * `#19565 `__: DOC: Fix sphinx warnings in c-info.beyond-basics.rst * `#19566 `__: DOC: Remove ``dot`` docstring in numpy/core/_add_newdocs.py * `#19567 `__: DOC: Fix Unknown section warning when building docs @@ -527,7 +527,7 @@ A total of 609 pull requests were merged for this release. * `#19918 `__: MAINT: Override the modules of ``np.char`` and ``np.rec`` functions * `#19919 `__: ENH: Create an experimental export of the new DType API * `#19920 `__: DOC: Fix typos in NEPs, found by codespell -* `#19921 `__: DEP: Use ``delimiter`` rather than ``delimiter`` as kwarg in mrecords +* `#19921 `__: DEP: Use ``delimiter`` rather than ``delimitor`` as kwarg in mrecords * `#19925 `__: BUG: ufunc: Fix potential memory leak. * `#19926 `__: BUG: Resolve Divide by Zero on Apple silicon + test failures * `#19927 `__: BUG: Only call the get_versions() function once on import diff --git a/doc/changelog/1.25.0-changelog.rst b/doc/changelog/1.25.0-changelog.rst index 226b0aab36a5..d9a6963b74f8 100644 --- a/doc/changelog/1.25.0-changelog.rst +++ b/doc/changelog/1.25.0-changelog.rst @@ -378,7 +378,7 @@ A total of 530 pull requests were merged for this release. * `#23130 `__: MAINT, BLD: Update wheel and GitPython versions. * `#23136 `__: ENH: create and use indexed inner loops * `#23141 `__: CI: reduce CI load - two fewer Azure Windows jobs, and no GHA... -* `#23142 `__: NEP: add a paragraph about accreditation for sponsored work +* `#23142 `__: NEP: add a paragraph about accredidation for sponsored work * `#23143 `__: ENH: Allow trivial pickling of user DType (classes) * `#23144 `__: TYP,MAINT: Add a missing explicit ``Any`` parameter to the ``npt.ArrayLike``... * `#23145 `__: TYP,MAINT: Remove typing-related Python <3.9 leftovers @@ -662,7 +662,7 @@ A total of 530 pull requests were merged for this release. * `#23770 `__: MAINT: do not use copyswap in where internals * `#23772 `__: DOC: added note for git tagging * `#23774 `__: BUG: Fix median and quantile NaT handling -* `#23776 `__: ENH: replace deprecated distutils use in convenience function +* `#23776 `__: ENH: replace depcrecated distutils use in convenience function * `#23777 `__: Speed up _string_helpers init. * `#23779 `__: DOC: Fix link from mtrand.randint -> Generator.integers. * `#23790 `__: DOC: used a more readable if/else form than old-style ternary... diff --git a/doc/changelog/1.25.2-changelog.rst b/doc/changelog/1.25.2-changelog.rst index 21dbbd7dddda..cd5b7f2e83e2 100644 --- a/doc/changelog/1.25.2-changelog.rst +++ b/doc/changelog/1.25.2-changelog.rst @@ -35,7 +35,7 @@ A total of 19 pull requests were merged for this release. * `#24234 `__: MAINT: exclude min, max and round from ``np.__all__`` * `#24241 `__: MAINT: Dependabot updates * `#24242 `__: BUG: Fix the signature for np.array_api.take -* `#24243 `__: BLD: update OpenBLAS to an intermediate commit +* `#24243 `__: BLD: update OpenBLAS to an intermeidate commit * `#24244 `__: BUG: Fix reference count leak in str(scalar). * `#24245 `__: BUG: fix invalid function pointer conversion error * `#24255 `__: BUG: Factor out slow ``getenv`` call used for memory policy warning diff --git a/doc/changelog/2.1.0-changelog.rst b/doc/changelog/2.1.0-changelog.rst index dfa20c2f3a47..af7f5a3b07c7 100644 --- a/doc/changelog/2.1.0-changelog.rst +++ b/doc/changelog/2.1.0-changelog.rst @@ -180,7 +180,7 @@ A total of 469 pull requests were merged for this release. * `#26113 `__: BLD: Do not use -O3 flag when building in debug mode * `#26116 `__: ENH: inherit numerical dtypes from abstract ones. * `#26119 `__: BUG: fix reference counting error in stringdtype setup -* `#26123 `__: BUG: update pocketfft to unconditionally disable use of aligned_alloc +* `#26123 `__: BUG: update pocketfft to unconditionaly disable use of aligned_alloc * `#26125 `__: DOC: Bump pydata-sphinx-theme version * `#26128 `__: DOC: Update absolute_beginners.rst * `#26129 `__: MAINT: add missing noexcept clauses @@ -362,7 +362,7 @@ A total of 469 pull requests were merged for this release. * `#26604 `__: refguide-check with pytest as a runner * `#26605 `__: DOC: fix typos in numpy v2.0 documentation * `#26606 `__: DOC: Update randn() to use rng.standard_normal() -* `#26607 `__: MNT: Reorganize non-constant global statistics into structs +* `#26607 `__: MNT: Reorganize non-constant global statics into structs * `#26609 `__: DOC: Updated notes and examples for np.insert. * `#26610 `__: BUG: np.take handle 64-bit indices on 32-bit platforms * `#26611 `__: MNT: Remove ``set_string_function`` @@ -495,7 +495,7 @@ A total of 469 pull requests were merged for this release. * `#26937 `__: TYP,BUG: Remove ``numpy.cast`` and ``numpy.disp`` from the typing... * `#26938 `__: TYP,BUG: Fix ``dtype`` type alias specialization issue in ``__init__.pyi`` * `#26942 `__: TYP: Improved ``numpy.generic`` rich comparison operator type... -* `#26943 `__: TYP,BUG: Remove non-existent ``numpy.__git_version__`` in the... +* `#26943 `__: TYP,BUG: Remove non-existant ``numpy.__git_version__`` in the... * `#26946 `__: TYP: Add missing typecodes in ``numpy._core.numerictypes.typecodes`` * `#26950 `__: MAINT: add freethreading_compatible directive to cython build * `#26953 `__: TYP: Replace ``typing.Union`` with ``|`` in ``numpy._typing`` From 5b4ab62315d48f7ce8792b055f0452dcf4bbc369 Mon Sep 17 00:00:00 2001 From: John Stilley Date: Sun, 23 Mar 2025 07:50:57 -0700 Subject: [PATCH 4/8] Reverting changes to generated code --- numpy/linalg/lapack_lite/f2c_blas.c | 8 +++--- numpy/linalg/lapack_lite/f2c_c_lapack.c | 22 ++++++++-------- numpy/linalg/lapack_lite/f2c_d_lapack.c | 34 ++++++++++++------------- numpy/linalg/lapack_lite/f2c_lapack.c | 2 +- numpy/linalg/lapack_lite/f2c_s_lapack.c | 34 ++++++++++++------------- numpy/linalg/lapack_lite/f2c_z_lapack.c | 22 ++++++++-------- 6 files changed, 61 insertions(+), 61 deletions(-) diff --git a/numpy/linalg/lapack_lite/f2c_blas.c b/numpy/linalg/lapack_lite/f2c_blas.c index de80fe4c7817..c2c9abb3ec20 100644 --- a/numpy/linalg/lapack_lite/f2c_blas.c +++ b/numpy/linalg/lapack_lite/f2c_blas.c @@ -4909,7 +4909,7 @@ static doublecomplex c_b1078 = {1.,0.}; ( 1 + ( n - 1 )*abs( INCX ) ). Before entry, the incremented array X must contain the n element vector x. On exit, X is overwritten with the - transformed vector x. + tranformed vector x. INCX - INTEGER. On entry, INCX specifies the increment for the elements of @@ -9801,7 +9801,7 @@ doublereal dnrm2_(integer *n, doublereal *x, integer *incx) ( 1 + ( n - 1 )*abs( INCX ) ). Before entry, the incremented array X must contain the n element vector x. On exit, X is overwritten with the - transformed vector x. + tranformed vector x. INCX - INTEGER. On entry, INCX specifies the increment for the elements of @@ -14401,7 +14401,7 @@ doublereal snrm2_(integer *n, real *x, integer *incx) ( 1 + ( n - 1 )*abs( INCX ) ). Before entry, the incremented array X must contain the n element vector x. On exit, X is overwritten with the - transformed vector x. + tranformed vector x. INCX - INTEGER. On entry, INCX specifies the increment for the elements of @@ -19986,7 +19986,7 @@ doublereal snrm2_(integer *n, real *x, integer *incx) ( 1 + ( n - 1 )*abs( INCX ) ). Before entry, the incremented array X must contain the n element vector x. On exit, X is overwritten with the - transformed vector x. + tranformed vector x. INCX - INTEGER. On entry, INCX specifies the increment for the elements of diff --git a/numpy/linalg/lapack_lite/f2c_c_lapack.c b/numpy/linalg/lapack_lite/f2c_c_lapack.c index 35b4591966a1..9e58eec3cc25 100644 --- a/numpy/linalg/lapack_lite/f2c_c_lapack.c +++ b/numpy/linalg/lapack_lite/f2c_c_lapack.c @@ -2759,10 +2759,10 @@ static real c_b2435 = .5f; The problem is solved in three steps: (1) Reduce the coefficient matrix A to bidiagonal form with - Householder transformations, reducing the original problem + Householder tranformations, reducing the original problem into a "bidiagonal least squares problem" (BLS) (2) Solve the BLS using a divide and conquer approach. - (3) Apply back all the Householder transformations to solve + (3) Apply back all the Householder tranformations to solve the original least squares problem. The effective rank of A is determined by treating as zero those @@ -8065,7 +8065,7 @@ static real c_b2435 = .5f; LDZ (input) INTEGER The leading dimension of the array Z. if COMPZ = 'I' or - COMPZ = 'V', then LDZ.GE.MAX(1,N). Otherwise, LDZ.GE.1. + COMPZ = 'V', then LDZ.GE.MAX(1,N). Otherwize, LDZ.GE.1. WORK (workspace/output) COMPLEX array, dimension (LWORK) On exit, if INFO = 0, WORK(1) returns an estimate of @@ -9768,7 +9768,7 @@ static real c_b2435 = .5f; The first stage consists of deflating the size of the problem when there are multiple eigenvalues or if there is a zero in - the Z vector. For each such occurrence the dimension of the + the Z vector. For each such occurence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine SLAED2. @@ -9995,7 +9995,7 @@ static real c_b2435 = .5f; return 0; } -/* Prepare the INDXQ sorting permutation. */ +/* Prepare the INDXQ sorting premutation. */ n1 = k; n2 = *n - k; @@ -10558,12 +10558,12 @@ static real c_b2435 = .5f; If INFO .GT. 0 and WANTT is .FALSE., then on exit, the remaining unconverged eigenvalues are the eigenvalues of the upper Hessenberg matrix - rows and columns ILO through INFO of the final, + rows and columns ILO thorugh INFO of the final, output value of H. If INFO .GT. 0 and WANTT is .TRUE., then on exit (*) (initial value of H)*U = U*(final value of H) - where U is an orthogonal matrix. The final + where U is an orthognal matrix. The final value of H is upper Hessenberg and triangular in rows and columns INFO+1 through IHI. @@ -13925,7 +13925,7 @@ doublereal clanhe_(char *norm, char *uplo, integer *n, singlecomplex *a, integer LDZ (input) INTEGER The leading dimension of the array Z. if WANTZ is .TRUE. - then LDZ.GE.MAX(1,IHIZ). Otherwise, LDZ.GE.1. + then LDZ.GE.MAX(1,IHIZ). Otherwize, LDZ.GE.1. WORK (workspace/output) COMPLEX array, dimension LWORK On exit, if LWORK = -1, WORK(1) returns an estimate of @@ -14509,7 +14509,7 @@ doublereal clanhe_(char *norm, char *uplo, integer *n, singlecomplex *a, integer } /* - ==== Use up to NS of the smallest magnitude + ==== Use up to NS of the smallest magnatiude . shifts. If there aren't NS shifts available, . then use them all, possibly dropping one to . make the number of shifts even. ==== @@ -16046,7 +16046,7 @@ doublereal clanhe_(char *norm, char *uplo, integer *n, singlecomplex *a, integer LDZ (input) INTEGER The leading dimension of the array Z. if WANTZ is .TRUE. - then LDZ.GE.MAX(1,IHIZ). Otherwise, LDZ.GE.1. + then LDZ.GE.MAX(1,IHIZ). Otherwize, LDZ.GE.1. WORK (workspace/output) COMPLEX array, dimension LWORK On exit, if LWORK = -1, WORK(1) returns an estimate of @@ -16624,7 +16624,7 @@ doublereal clanhe_(char *norm, char *uplo, integer *n, singlecomplex *a, integer } /* - ==== Use up to NS of the smallest magnitude + ==== Use up to NS of the smallest magnatiude . shifts. If there aren't NS shifts available, . then use them all, possibly dropping one to . make the number of shifts even. ==== diff --git a/numpy/linalg/lapack_lite/f2c_d_lapack.c b/numpy/linalg/lapack_lite/f2c_d_lapack.c index 5169fa54eb8b..10e22ff1ba01 100644 --- a/numpy/linalg/lapack_lite/f2c_d_lapack.c +++ b/numpy/linalg/lapack_lite/f2c_d_lapack.c @@ -4127,7 +4127,7 @@ static doublereal c_b3192 = 2.; Householder transformations, reducing the original problem into a "bidiagonal least squares problem" (BLS) (2) Solve the BLS using a divide and conquer approach. - (3) Apply back all the Householder transformations to solve + (3) Apply back all the Householder tranformations to solve the original least squares problem. The effective rank of A is determined by treating as zero those @@ -7595,7 +7595,7 @@ static doublereal c_b3192 = 2.; LDZ (input) INTEGER The leading dimension of the array Z. if COMPZ = 'I' or - COMPZ = 'V', then LDZ.GE.MAX(1,N). Otherwise, LDZ.GE.1. + COMPZ = 'V', then LDZ.GE.MAX(1,N). Otherwize, LDZ.GE.1. WORK (workspace/output) DOUBLE PRECISION array, dimension (LWORK) On exit, if INFO = 0, WORK(1) returns an estimate of @@ -9176,7 +9176,7 @@ logical disnan_(doublereal *din) The first stage consists of deflating the size of the problem when there are multiple eigenvalues or if there is a zero in - the Z vector. For each such occurrence the dimension of the + the Z vector. For each such occurence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine DLAED2. @@ -11646,7 +11646,7 @@ logical disnan_(doublereal *din) The first stage consists of deflating the size of the problem when there are multiple eigenvalues or if there is a zero in - the Z vector. For each such occurrence the dimension of the + the Z vector. For each such occurence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine DLAED8. @@ -12172,7 +12172,7 @@ logical disnan_(doublereal *din) /* L40: */ } -/* Calculate the allowable deflation tolerance */ +/* Calculate the allowable deflation tolerence */ imax = idamax_(n, &z__[1], &c__1); jmax = idamax_(n, &d__[1], &c__1); @@ -13097,7 +13097,7 @@ logical disnan_(doublereal *din) T must be in Schur canonical form, that is, block upper triangular with 1-by-1 and 2-by-2 diagonal blocks; each 2-by-2 diagonal block - has its diagonal elements equal and its off-diagonal elements of + has its diagonal elemnts equal and its off-diagonal elements of opposite sign. Arguments @@ -13604,12 +13604,12 @@ logical disnan_(doublereal *din) If INFO .GT. 0 and WANTT is .FALSE., then on exit, the remaining unconverged eigenvalues are the eigenvalues of the upper Hessenberg matrix rows - and columns ILO through INFO of the final, output + and columns ILO thorugh INFO of the final, output value of H. If INFO .GT. 0 and WANTT is .TRUE., then on exit (*) (initial value of H)*U = U*(final value of H) - where U is an orthogonal matrix. The final + where U is an orthognal matrix. The final value of H is upper Hessenberg and triangular in rows and columns INFO+1 through IHI. @@ -17485,7 +17485,7 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__) LDZ (input) INTEGER The leading dimension of the array Z. if WANTZ is .TRUE. - then LDZ.GE.MAX(1,IHIZ). Otherwise, LDZ.GE.1. + then LDZ.GE.MAX(1,IHIZ). Otherwize, LDZ.GE.1. WORK (workspace/output) DOUBLE PRECISION array, dimension LWORK On exit, if LWORK = -1, WORK(1) returns an estimate of @@ -18032,7 +18032,7 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__) } /* - ==== Use up to NS of the smallest magnitude + ==== Use up to NS of the smallest magnatiude . shifts. If there aren't NS shifts available, . then use them all, possibly dropping one to . make the number of shifts even. ==== @@ -19731,7 +19731,7 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__) LDZ (input) INTEGER The leading dimension of the array Z. if WANTZ is .TRUE. - then LDZ.GE.MAX(1,IHIZ). Otherwise, LDZ.GE.1. + then LDZ.GE.MAX(1,IHIZ). Otherwize, LDZ.GE.1. WORK (workspace/output) DOUBLE PRECISION array, dimension LWORK On exit, if LWORK = -1, WORK(1) returns an estimate of @@ -20271,7 +20271,7 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__) } /* - ==== Use up to NS of the smallest magnitude + ==== Use up to NS of the smallest magnatiude . shifts. If there aren't NS shifts available, . then use them all, possibly dropping one to . make the number of shifts even. ==== @@ -24434,7 +24434,7 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__) The first stage consists of deflating the size of the problem when there are multiple singular values or when there are zeros in - the Z vector. For each such occurrence the dimension of the + the Z vector. For each such occurence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine DLASD2. @@ -26902,7 +26902,7 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__) The first stage consists of deflating the size of the problem when there are multiple singular values or if there is a zero - in the Z vector. For each such occurrence the dimension of the + in the Z vector. For each such occurence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine DLASD7. @@ -27460,7 +27460,7 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__) /* L50: */ } -/* Calculate the allowable deflation tolerance */ +/* Calculate the allowable deflation tolerence */ eps = EPSILON; /* Computing MAX */ @@ -28481,7 +28481,7 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__) UPLO (input) CHARACTER*1 On entry, UPLO specifies whether the input bidiagonal matrix - is upper or lower bidiagonal, and whether it is square are + is upper or lower bidiagonal, and wether it is square are not. UPLO = 'U' or 'u' B is upper bidiagonal. UPLO = 'L' or 'l' B is lower bidiagonal. @@ -31388,7 +31388,7 @@ doublereal dlapy3_(doublereal *x, doublereal *y, doublereal *z__) ===================================================================== - Test the input parameters. + Test the input paramters. */ /* Parameter adjustments */ diff --git a/numpy/linalg/lapack_lite/f2c_lapack.c b/numpy/linalg/lapack_lite/f2c_lapack.c index ed2aaae7f09d..47540b37edc0 100644 --- a/numpy/linalg/lapack_lite/f2c_lapack.c +++ b/numpy/linalg/lapack_lite/f2c_lapack.c @@ -61,7 +61,7 @@ integer ieeeck_(integer *ispec, real *zero, real *one) ========= ISPEC (input) INTEGER - Specifies whether to test just for infinity arithmetic + Specifies whether to test just for inifinity arithmetic or whether to test for infinity and NaN arithmetic. = 0: Verify infinity arithmetic only. = 1: Verify infinity and NaN arithmetic. diff --git a/numpy/linalg/lapack_lite/f2c_s_lapack.c b/numpy/linalg/lapack_lite/f2c_s_lapack.c index ae6b6a910e94..26e7c18ac97a 100644 --- a/numpy/linalg/lapack_lite/f2c_s_lapack.c +++ b/numpy/linalg/lapack_lite/f2c_s_lapack.c @@ -4102,7 +4102,7 @@ static real c_b3178 = 2.f; Householder transformations, reducing the original problem into a "bidiagonal least squares problem" (BLS) (2) Solve the BLS using a divide and conquer approach. - (3) Apply back all the Householder transformations to solve + (3) Apply back all the Householder tranformations to solve the original least squares problem. The effective rank of A is determined by treating as zero those @@ -7575,7 +7575,7 @@ static real c_b3178 = 2.f; LDZ (input) INTEGER The leading dimension of the array Z. if COMPZ = 'I' or - COMPZ = 'V', then LDZ.GE.MAX(1,N). Otherwise, LDZ.GE.1. + COMPZ = 'V', then LDZ.GE.MAX(1,N). Otherwize, LDZ.GE.1. WORK (workspace/output) REAL array, dimension (LWORK) On exit, if INFO = 0, WORK(1) returns an estimate of @@ -9145,7 +9145,7 @@ logical sisnan_(real *sin__) The first stage consists of deflating the size of the problem when there are multiple eigenvalues or if there is a zero in - the Z vector. For each such occurrence the dimension of the + the Z vector. For each such occurence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine SLAED2. @@ -11610,7 +11610,7 @@ logical sisnan_(real *sin__) The first stage consists of deflating the size of the problem when there are multiple eigenvalues or if there is a zero in - the Z vector. For each such occurrence the dimension of the + the Z vector. For each such occurence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine SLAED8. @@ -12136,7 +12136,7 @@ logical sisnan_(real *sin__) /* L40: */ } -/* Calculate the allowable deflation tolerance */ +/* Calculate the allowable deflation tolerence */ imax = isamax_(n, &z__[1], &c__1); jmax = isamax_(n, &d__[1], &c__1); @@ -13055,7 +13055,7 @@ logical sisnan_(real *sin__) T must be in Schur canonical form, that is, block upper triangular with 1-by-1 and 2-by-2 diagonal blocks; each 2-by-2 diagonal block - has its diagonal elements equal and its off-diagonal elements of + has its diagonal elemnts equal and its off-diagonal elements of opposite sign. Arguments @@ -13561,12 +13561,12 @@ logical sisnan_(real *sin__) If INFO .GT. 0 and WANTT is .FALSE., then on exit, the remaining unconverged eigenvalues are the eigenvalues of the upper Hessenberg matrix rows - and columns ILO through INFO of the final, output + and columns ILO thorugh INFO of the final, output value of H. If INFO .GT. 0 and WANTT is .TRUE., then on exit (*) (initial value of H)*U = U*(final value of H) - where U is an orthogonal matrix. The final + where U is an orthognal matrix. The final value of H is upper Hessenberg and triangular in rows and columns INFO+1 through IHI. @@ -17421,7 +17421,7 @@ doublereal slapy3_(real *x, real *y, real *z__) LDZ (input) INTEGER The leading dimension of the array Z. if WANTZ is .TRUE. - then LDZ.GE.MAX(1,IHIZ). Otherwise, LDZ.GE.1. + then LDZ.GE.MAX(1,IHIZ). Otherwize, LDZ.GE.1. WORK (workspace/output) REAL array, dimension LWORK On exit, if LWORK = -1, WORK(1) returns an estimate of @@ -17968,7 +17968,7 @@ doublereal slapy3_(real *x, real *y, real *z__) } /* - ==== Use up to NS of the smallest magnitude + ==== Use up to NS of the smallest magnatiude . shifts. If there aren't NS shifts available, . then use them all, possibly dropping one to . make the number of shifts even. ==== @@ -19654,7 +19654,7 @@ doublereal slapy3_(real *x, real *y, real *z__) LDZ (input) INTEGER The leading dimension of the array Z. if WANTZ is .TRUE. - then LDZ.GE.MAX(1,IHIZ). Otherwise, LDZ.GE.1. + then LDZ.GE.MAX(1,IHIZ). Otherwize, LDZ.GE.1. WORK (workspace/output) REAL array, dimension LWORK On exit, if LWORK = -1, WORK(1) returns an estimate of @@ -20194,7 +20194,7 @@ doublereal slapy3_(real *x, real *y, real *z__) } /* - ==== Use up to NS of the smallest magnitude + ==== Use up to NS of the smallest magnatiude . shifts. If there aren't NS shifts available, . then use them all, possibly dropping one to . make the number of shifts even. ==== @@ -24345,7 +24345,7 @@ doublereal slapy3_(real *x, real *y, real *z__) The first stage consists of deflating the size of the problem when there are multiple singular values or when there are zeros in - the Z vector. For each such occurrence the dimension of the + the Z vector. For each such occurence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine SLASD2. @@ -26805,7 +26805,7 @@ doublereal slapy3_(real *x, real *y, real *z__) The first stage consists of deflating the size of the problem when there are multiple singular values or if there is a zero - in the Z vector. For each such occurrence the dimension of the + in the Z vector. For each such occurence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine SLASD7. @@ -27361,7 +27361,7 @@ doublereal slapy3_(real *x, real *y, real *z__) /* L50: */ } -/* Calculate the allowable deflation tolerance */ +/* Calculate the allowable deflation tolerence */ eps = slamch_("Epsilon"); /* Computing MAX */ @@ -28373,7 +28373,7 @@ doublereal slapy3_(real *x, real *y, real *z__) UPLO (input) CHARACTER*1 On entry, UPLO specifies whether the input bidiagonal matrix - is upper or lower bidiagonal, and whether it is square are + is upper or lower bidiagonal, and wether it is square are not. UPLO = 'U' or 'u' B is upper bidiagonal. UPLO = 'L' or 'l' B is lower bidiagonal. @@ -31271,7 +31271,7 @@ doublereal slapy3_(real *x, real *y, real *z__) ===================================================================== - Test the input parameters. + Test the input paramters. */ /* Parameter adjustments */ diff --git a/numpy/linalg/lapack_lite/f2c_z_lapack.c b/numpy/linalg/lapack_lite/f2c_z_lapack.c index 1d61aad6ea82..64e41d082f10 100644 --- a/numpy/linalg/lapack_lite/f2c_z_lapack.c +++ b/numpy/linalg/lapack_lite/f2c_z_lapack.c @@ -2781,10 +2781,10 @@ static doublereal c_b2435 = .5; The problem is solved in three steps: (1) Reduce the coefficient matrix A to bidiagonal form with - Householder transformations, reducing the original problem + Householder tranformations, reducing the original problem into a "bidiagonal least squares problem" (BLS) (2) Solve the BLS using a divide and conquer approach. - (3) Apply back all the Householder transformations to solve + (3) Apply back all the Householder tranformations to solve the original least squares problem. The effective rank of A is determined by treating as zero those @@ -8118,7 +8118,7 @@ static doublereal c_b2435 = .5; LDZ (input) INTEGER The leading dimension of the array Z. if COMPZ = 'I' or - COMPZ = 'V', then LDZ.GE.MAX(1,N). Otherwise, LDZ.GE.1. + COMPZ = 'V', then LDZ.GE.MAX(1,N). Otherwize, LDZ.GE.1. WORK (workspace/output) COMPLEX*16 array, dimension (LWORK) On exit, if INFO = 0, WORK(1) returns an estimate of @@ -9826,7 +9826,7 @@ static doublereal c_b2435 = .5; The first stage consists of deflating the size of the problem when there are multiple eigenvalues or if there is a zero in - the Z vector. For each such occurrence the dimension of the + the Z vector. For each such occurence the dimension of the secular equation problem is reduced by one. This stage is performed by the routine DLAED2. @@ -10053,7 +10053,7 @@ static doublereal c_b2435 = .5; return 0; } -/* Prepare the INDXQ sorting permutation. */ +/* Prepare the INDXQ sorting premutation. */ n1 = k; n2 = *n - k; @@ -10619,12 +10619,12 @@ static doublereal c_b2435 = .5; If INFO .GT. 0 and WANTT is .FALSE., then on exit, the remaining unconverged eigenvalues are the eigenvalues of the upper Hessenberg matrix - rows and columns ILO through INFO of the final, + rows and columns ILO thorugh INFO of the final, output value of H. If INFO .GT. 0 and WANTT is .TRUE., then on exit (*) (initial value of H)*U = U*(final value of H) - where U is an orthogonal matrix. The final + where U is an orthognal matrix. The final value of H is upper Hessenberg and triangular in rows and columns INFO+1 through IHI. @@ -13998,7 +13998,7 @@ doublereal zlanhe_(char *norm, char *uplo, integer *n, doublecomplex *a, LDZ (input) INTEGER The leading dimension of the array Z. if WANTZ is .TRUE. - then LDZ.GE.MAX(1,IHIZ). Otherwise, LDZ.GE.1. + then LDZ.GE.MAX(1,IHIZ). Otherwize, LDZ.GE.1. WORK (workspace/output) COMPLEX*16 array, dimension LWORK On exit, if LWORK = -1, WORK(1) returns an estimate of @@ -14582,7 +14582,7 @@ doublereal zlanhe_(char *norm, char *uplo, integer *n, doublecomplex *a, } /* - ==== Use up to NS of the smallest magnitude + ==== Use up to NS of the smallest magnatiude . shifts. If there aren't NS shifts available, . then use them all, possibly dropping one to . make the number of shifts even. ==== @@ -16140,7 +16140,7 @@ doublereal zlanhe_(char *norm, char *uplo, integer *n, doublecomplex *a, LDZ (input) INTEGER The leading dimension of the array Z. if WANTZ is .TRUE. - then LDZ.GE.MAX(1,IHIZ). Otherwise, LDZ.GE.1. + then LDZ.GE.MAX(1,IHIZ). Otherwize, LDZ.GE.1. WORK (workspace/output) COMPLEX*16 array, dimension LWORK On exit, if LWORK = -1, WORK(1) returns an estimate of @@ -16718,7 +16718,7 @@ doublereal zlanhe_(char *norm, char *uplo, integer *n, doublecomplex *a, } /* - ==== Use up to NS of the smallest magnitude + ==== Use up to NS of the smallest magnatiude . shifts. If there aren't NS shifts available, . then use them all, possibly dropping one to . make the number of shifts even. ==== From 0faf10068e63de2b87e52af28588b544bdfaefe5 Mon Sep 17 00:00:00 2001 From: John Stilley Date: Mon, 24 Mar 2025 16:36:30 -0700 Subject: [PATCH 5/8] Adding release note --- doc/release/upcoming_changes/28569.change.rst | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/release/upcoming_changes/28569.change.rst diff --git a/doc/release/upcoming_changes/28569.change.rst b/doc/release/upcoming_changes/28569.change.rst new file mode 100644 index 000000000000..14342c5f7991 --- /dev/null +++ b/doc/release/upcoming_changes/28569.change.rst @@ -0,0 +1,5 @@ +Rewording eError messages when converting strings to floats +----------------------------------------------------------- +The error messages returned when converting a string to a float with the +method ``np.format_float_positional`` have been slightly reworded. There +was a spelling fix from "formating" to "formatting". From 34cdd5015ece860f1d44d9cb291f4881902b1565 Mon Sep 17 00:00:00 2001 From: Nathan Goldbaum Date: Tue, 25 Mar 2025 10:34:59 -0600 Subject: [PATCH 6/8] Update doc/release/upcoming_changes/28569.change.rst --- doc/release/upcoming_changes/28569.change.rst | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/doc/release/upcoming_changes/28569.change.rst b/doc/release/upcoming_changes/28569.change.rst index 14342c5f7991..5cf81faa6f59 100644 --- a/doc/release/upcoming_changes/28569.change.rst +++ b/doc/release/upcoming_changes/28569.change.rst @@ -1,5 +1,2 @@ -Rewording eError messages when converting strings to floats ------------------------------------------------------------ -The error messages returned when converting a string to a float with the -method ``np.format_float_positional`` have been slightly reworded. There -was a spelling fix from "formating" to "formatting". +* A spelling error in the error message returned when converting a string to a float with the +method ``np.format_float_positional`` has been fixed. From 41a130a1e9dbf4c1174c4fd34e3b473fb7ee1a66 Mon Sep 17 00:00:00 2001 From: Nathan Goldbaum Date: Tue, 25 Mar 2025 10:58:34 -0600 Subject: [PATCH 7/8] Update doc/release/upcoming_changes/28569.change.rst --- doc/release/upcoming_changes/28569.change.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/release/upcoming_changes/28569.change.rst b/doc/release/upcoming_changes/28569.change.rst index 5cf81faa6f59..f9d26fda0484 100644 --- a/doc/release/upcoming_changes/28569.change.rst +++ b/doc/release/upcoming_changes/28569.change.rst @@ -1,2 +1,2 @@ * A spelling error in the error message returned when converting a string to a float with the -method ``np.format_float_positional`` has been fixed. + method ``np.format_float_positional`` has been fixed. From 017809bca3d7d0725a3c7c7a7cea44ed063d329b Mon Sep 17 00:00:00 2001 From: Nathan Goldbaum Date: Tue, 25 Mar 2025 11:55:41 -0600 Subject: [PATCH 8/8] Update doc/source/release/1.22.0-notes.rst --- doc/source/release/1.22.0-notes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/release/1.22.0-notes.rst b/doc/source/release/1.22.0-notes.rst index 49f769bbe872..69ca83a4d15d 100644 --- a/doc/source/release/1.22.0-notes.rst +++ b/doc/source/release/1.22.0-notes.rst @@ -59,7 +59,7 @@ value for the ``usemask`` parameter. Deprecations ============ -Use delimiter rather than delimiter as kwarg in mrecords +Use delimiter rather than delimitor as kwarg in mrecords -------------------------------------------------------- The misspelled keyword argument ``delimitor`` of ``numpy.ma.mrecords.fromtextfile()`` has been changed to ``delimiter``, using