Skip to content

Commit 7047afd

Browse files
officiallyaneeofficiallyanee
authored
Merge branch 'develop' into fix/typo
2 parents 0d1efd6 + 8c9a3b3 commit 7047afd

142 files changed

Lines changed: 5041 additions & 605 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/markdown_equations.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,8 @@ jobs:
174174
env:
175175
GH_TOKEN: ${{ secrets.STDLIB_BOT_PAT_REPO_WRITE }}
176176
run: |
177+
# Fetch the branch first so that --force-with-lease in the subsequent push has a local tracking reference and can verify the remote state:
178+
git fetch origin markdown-insert-equations 2>/dev/null || true
177179
gh api -X DELETE repos/stdlib-js/stdlib/git/refs/heads/markdown-insert-equations 2>/dev/null || true
178180
timeout-minutes: 5
179181

‎lib/node_modules/@stdlib/blas/base/cgemv/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ float y[] = { 1.0f, 1.0f, 2.0f, 2.0f, 3.0f, 3.0f, 4.0f, 4.0f };
309309
const stdlib_complex64_t alpha = stdlib_complex64( 0.5f, 0.5f );
310310
const stdlib_complex64_t beta = stdlib_complex64( 0.5f, -0.5f );
311311

312-
c_cgemv( CblasNoTrans, 4, 2, alpha, (void *)A, 1, 4, (void *)x, 1, 0, beta, (void *)y, 1, 0 );
312+
c_cgemv_ndarray( CblasNoTrans, 4, 2, alpha, (void *)A, 1, 4, 0, (void *)x, 1, 0, beta, (void *)y, 1, 0 );
313313
```
314314
315315
The function accepts the following arguments:

‎lib/node_modules/@stdlib/blas/base/dtrmv/lib/dtrmv.js‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
// MODULES //
2222

2323
var max = require( '@stdlib/math/base/special/fast/max' );
24-
var isLayout = require( '@stdlib/blas/base/assert/is-layout' );
25-
var isMatrixTriangle = require( '@stdlib/blas/base/assert/is-matrix-triangle' );
26-
var isTransposeOperation = require( '@stdlib/blas/base/assert/is-transpose-operation' );
27-
var isDiagonal = require( '@stdlib/blas/base/assert/is-diagonal-type' );
24+
var resolveLayout = require( '@stdlib/blas/base/layout-resolve-str' );
25+
var resolveTriangle = require( '@stdlib/blas/base/matrix-triangle-resolve-str' );
26+
var resolveTranspose = require( '@stdlib/blas/base/transpose-operation-resolve-str' );
27+
var resolveDiagonal = require( '@stdlib/blas/base/diagonal-type-resolve-str' );
2828
var isColumnMajor = require( '@stdlib/ndarray/base/assert/is-column-major-string' );
2929
var stride2offset = require( '@stdlib/strided/base/stride2offset' );
3030
var format = require( '@stdlib/string/format' );
@@ -36,10 +36,10 @@ var base = require( './base.js' );
3636
/**
3737
* Performs one of the matrix-vector operations `x = A*x` or `x = A^T*x`, where `x` is an `N` element vector and `A` is an `N` by `N` unit, or non-unit, upper or lower triangular matrix.
3838
*
39-
* @param {string} order - storage layout
40-
* @param {string} uplo - specifies whether `A` is an upper or lower triangular matrix
41-
* @param {string} trans - specifies whether `A` should be transposed, conjugate-transposed, or not transposed
42-
* @param {string} diag - specifies whether `A` has a unit diagonal
39+
* @param {(integer|string)} order - storage layout
40+
* @param {(integer|string)} uplo - specifies whether `A` is an upper or lower triangular matrix
41+
* @param {(integer|string)} trans - specifies whether `A` should be transposed, conjugate-transposed, or not transposed
42+
* @param {(integer|string)} diag - specifies whether `A` has a unit diagonal
4343
* @param {NonNegativeInteger} N - number of elements along each dimension of `A`
4444
* @param {Float64Array} A - input matrix
4545
* @param {integer} LDA - stride of the first dimension of `A` (a.k.a., leading dimension of the matrix `A`)
@@ -67,17 +67,25 @@ function dtrmv( order, uplo, trans, diag, N, A, LDA, x, strideX ) {
6767
var sa1;
6868
var sa2;
6969
var ox;
70+
var l;
71+
var u;
72+
var t;
73+
var d;
7074

71-
if ( !isLayout( order ) ) {
75+
l = resolveLayout( order );
76+
if ( l === null ) {
7277
throw new TypeError( format( 'invalid argument. First argument must be a valid order. Value: `%s`.', order ) );
7378
}
74-
if ( !isMatrixTriangle( uplo ) ) {
79+
u = resolveTriangle( uplo );
80+
if ( u === null ) {
7581
throw new TypeError( format( 'invalid argument. Second argument must specify whether the lower or upper triangular matrix is supplied. Value: `%s`.', uplo ) );
7682
}
77-
if ( !isTransposeOperation( trans ) ) {
83+
t = resolveTranspose( trans );
84+
if ( t === null ) {
7885
throw new TypeError( format( 'invalid argument. Third argument must be a valid transpose operation. Value: `%s`.', trans ) );
7986
}
80-
if ( !isDiagonal( diag ) ) {
87+
d = resolveDiagonal( diag );
88+
if ( d === null ) {
8189
throw new TypeError( format( 'invalid argument. Fourth argument must be a valid diagonal type. Value: `%s`.', diag ) );
8290
}
8391
if ( N < 0 ) {
@@ -92,15 +100,15 @@ function dtrmv( order, uplo, trans, diag, N, A, LDA, x, strideX ) {
92100
if ( N === 0 ) {
93101
return x;
94102
}
95-
if ( isColumnMajor( order ) ) {
103+
if ( isColumnMajor( l ) ) {
96104
sa1 = 1;
97105
sa2 = LDA;
98106
} else { // order === 'row-major'
99107
sa1 = LDA;
100108
sa2 = 1;
101109
}
102110
ox = stride2offset( N, strideX );
103-
return base( uplo, trans, diag, N, A, sa1, sa2, 0, x, strideX, ox );
111+
return base( u, t, d, N, A, sa1, sa2, 0, x, strideX, ox );
104112
}
105113

106114

‎lib/node_modules/@stdlib/blas/base/dtrmv/lib/ndarray.js‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
// MODULES //
2222

23-
var isMatrixTriangle = require( '@stdlib/blas/base/assert/is-matrix-triangle' );
24-
var isTransposeOperation = require( '@stdlib/blas/base/assert/is-transpose-operation' );
25-
var isDiagonal = require( '@stdlib/blas/base/assert/is-diagonal-type' );
23+
var resolveTriangle = require( '@stdlib/blas/base/matrix-triangle-resolve-str' );
24+
var resolveTranspose = require( '@stdlib/blas/base/transpose-operation-resolve-str' );
25+
var resolveDiagonal = require( '@stdlib/blas/base/diagonal-type-resolve-str' );
2626
var format = require( '@stdlib/string/format' );
2727
var base = require( './base.js' );
2828

@@ -32,9 +32,9 @@ var base = require( './base.js' );
3232
/**
3333
* Performs one of the matrix-vector operations `x = A*x` or `x = A^T*x`, where `x` is an `N` element vector and `A` is an `N` by `N` unit, or non-unit, upper or lower triangular matrix.
3434
*
35-
* @param {string} uplo - specifies whether `A` is an upper or lower triangular matrix
36-
* @param {string} trans - specifies whether `A` should be transposed, conjugate-transposed, or not transposed
37-
* @param {string} diag - specifies whether `A` has a unit diagonal
35+
* @param {(integer|string)} uplo - specifies whether `A` is an upper or lower triangular matrix
36+
* @param {(integer|string)} trans - specifies whether `A` should be transposed, conjugate-transposed, or not transposed
37+
* @param {(integer|string)} diag - specifies whether `A` has a unit diagonal
3838
* @param {NonNegativeInteger} N - number of elements along each dimension of `A`
3939
* @param {Float64Array} A - input matrix
4040
* @param {integer} strideA1 - stride of the first dimension of `A`
@@ -62,13 +62,20 @@ var base = require( './base.js' );
6262
* // x => <Float64Array>[ 14.0, 8.0, 3.0 ]
6363
*/
6464
function dtrmv( uplo, trans, diag, N, A, strideA1, strideA2, offsetA, x, strideX, offsetX ) { // eslint-disable-line max-params, max-len
65-
if ( !isMatrixTriangle( uplo ) ) {
65+
var u;
66+
var t;
67+
var d;
68+
69+
u = resolveTriangle( uplo );
70+
if ( u === null ) {
6671
throw new TypeError( format( 'invalid argument. First argument must specify whether the lower or upper triangular matrix is supplied. Value: `%s`.', uplo ) );
6772
}
68-
if ( !isTransposeOperation( trans ) ) {
73+
t = resolveTranspose( trans );
74+
if ( t === null ) {
6975
throw new TypeError( format( 'invalid argument. Second argument must be a valid transpose operation. Value: `%s`.', trans ) );
7076
}
71-
if ( !isDiagonal( diag ) ) {
77+
d = resolveDiagonal( diag );
78+
if ( d === null ) {
7279
throw new TypeError( format( 'invalid argument. Third argument must be a valid diagonal type. Value: `%s`.', diag ) );
7380
}
7481
if ( N < 0 ) {
@@ -86,7 +93,7 @@ function dtrmv( uplo, trans, diag, N, A, strideA1, strideA2, offsetA, x, strideX
8693
if ( N === 0 ) {
8794
return x;
8895
}
89-
return base( uplo, trans, diag, N, A, strideA1, strideA2, offsetA, x, strideX, offsetX ); // eslint-disable-line max-len
96+
return base( u, t, d, N, A, strideA1, strideA2, offsetA, x, strideX, offsetX ); // eslint-disable-line max-len
9097
}
9198

9299

‎lib/node_modules/@stdlib/blas/ext/base/dnancount/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ console.log( v );
177177
Computes the number of non-`NaN` elements in a double-precision floating-point strided array.
178178

179179
```c
180-
const double x[] = { 1.0, 2.0, NaN, 4.0, 5.0, 6.0, NaN, 8.0 };
180+
const double x[] = { 1.0, 2.0, 0.0/0.0, 4.0, 5.0, 6.0, 0.0/0.0, 8.0 };
181181

182182
int v = stdlib_strided_dnancount( 4, x, 2 );
183183
// returns 2
@@ -198,7 +198,7 @@ CBLAS_INT stdlib_strided_dnancount( const CBLAS_INT N, const double *X, const CB
198198
Computes the number of non-`NaN` elements in a double-precision floating-point strided array using alternative indexing semantics.
199199

200200
```c
201-
const double x[] = { 2.0, 1.0, NaN, -2.0, 3.0, 4.0, NaN, NaN };
201+
const double x[] = { 2.0, 1.0, 0.0/0.0, -2.0, 3.0, 4.0, 0.0/0.0, 0.0/0.0 };
202202

203203
int v = stdlib_strided_dnancount_ndarray( 4, x, 2, 1 );
204204
// returns 3

‎lib/node_modules/@stdlib/blas/ext/base/gaxpby/docs/types/index.d.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ interface Routine {
5050
* gaxpby( x.length, 5.0, x, 1, 2.0, y, 1 );
5151
* // y => [ 9.0, 16.0, 23.0, 30.0, 37.0 ]
5252
*/
53-
<T extends InputArray, U extends InputArray>( N: number, alpha: number, x: T, strideX: number, beta: number, y: U, strideY: number ): U;
53+
<T extends InputArray = InputArray>( N: number, alpha: number, x: InputArray, strideX: number, beta: number, y: T, strideY: number ): T;
5454

5555
/**
5656
* Multiplies a strided array `x` by a constant and adds the result to a strided array `y` multiplied by a constant using alternative indexing semantics.
@@ -73,7 +73,7 @@ interface Routine {
7373
* gaxpby.ndarray( x.length, 5.0, x, 1, 0, 2.0, y, 1, 0 );
7474
* // y => [ 9.0, 16.0, 23.0, 30.0, 37.0 ]
7575
*/
76-
ndarray<T extends InputArray, U extends InputArray>( N: number, alpha: number, x: T, strideX: number, offsetX: number, beta: number, y: U, strideY: number, offsetY: number ): U;
76+
ndarray<T extends InputArray = InputArray>( N: number, alpha: number, x: InputArray, strideX: number, offsetX: number, beta: number, y: T, strideY: number, offsetY: number ): T;
7777
}
7878

7979
/**

‎lib/node_modules/@stdlib/blas/ext/base/gwapx/docs/types/index.d.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ interface Routine {
4949
* gwapx( x.length, 5.0, x, 1, w, 1 );
5050
* // w => [ 3.0, 6.0, 8.0, 0.0, 9.0, 5.0, 4.0, 2.0 ]
5151
*/
52-
<T extends InputArray, U extends InputArray>( N: number, alpha: number, x: T, strideX: number, w: U, strideW: number ): U;
52+
<T extends InputArray = InputArray>( N: number, alpha: number, x: InputArray, strideX: number, w: T, strideW: number ): T;
5353

5454
/**
5555
* Adds a scalar constant to each element in a strided array `x` and assigns the results to a strided array `w` using alternative indexing semantics.
@@ -71,7 +71,7 @@ interface Routine {
7171
* gwapx.ndarray( x.length, 5.0, x, 1, 0, w, 1, 0 );
7272
* // w => [ 3.0, 6.0, 8.0, 0.0, 9.0, 5.0, 4.0, 2.0 ]
7373
*/
74-
ndarray<T extends InputArray, U extends InputArray>( N: number, alpha: number, x: T, strideX: number, offsetX: number, w: U, strideW: number, offsetW: number ): U;
74+
ndarray<T extends InputArray = InputArray>( N: number, alpha: number, x: InputArray, strideX: number, offsetX: number, w: T, strideW: number, offsetW: number ): T;
7575
}
7676

7777
/**

‎lib/node_modules/@stdlib/blas/ext/base/gwax/docs/types/index.d.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ interface Routine {
4949
* gwax( x.length, 5.0, x, 1, w, 1 );
5050
* // w => [ -10.0, 5.0, 15.0, -25.0, 20.0, 0.0, -5.0, -15.0 ]
5151
*/
52-
<T extends InputArray, U extends InputArray>( N: number, alpha: number, x: T, strideX: number, w: U, strideW: number ): U;
52+
<T extends InputArray = InputArray>( N: number, alpha: number, x: InputArray, strideX: number, w: T, strideW: number ): T;
5353

5454
/**
5555
* Multiplies each element in a strided array `x` by a scalar constant and assigns the results to elements in a strided array `w` using alternative indexing semantics.
@@ -71,7 +71,7 @@ interface Routine {
7171
* gwax.ndarray( x.length, 5.0, x, 1, 0, w, 1, 0 );
7272
* // w => [ -10.0, 5.0, 15.0, -25.0, 20.0, 0.0, -5.0, -15.0 ]
7373
*/
74-
ndarray<T extends InputArray, U extends InputArray>( N: number, alpha: number, x: T, strideX: number, offsetX: number, w: U, strideW: number, offsetW: number ): U;
74+
ndarray<T extends InputArray = InputArray>( N: number, alpha: number, x: InputArray, strideX: number, offsetX: number, w: T, strideW: number, offsetW: number ): T;
7575
}
7676

7777
/**

‎lib/node_modules/@stdlib/blas/ext/base/gwxpy/docs/types/index.d.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ interface Routine {
5151
* gwxpy( x.length, x, 1, y, 1, w, 1 );
5252
* // w => [ 3.0, 5.0, 7.0, 9.0, 11.0 ]
5353
*/
54-
<T extends InputArray, U extends InputArray, V extends InputArray>( N: number, x: T, strideX: number, y: U, strideY: number, w: V, strideW: number ): V;
54+
<T extends InputArray = InputArray>( N: number, x: InputArray, strideX: number, y: InputArray, strideY: number, w: T, strideW: number ): T;
5555

5656
/**
5757
* Adds elements of a strided array `x` to the corresponding elements of a strided array `y` and assigns the results to elements in a strided array `w` using alternative indexing semantics.
@@ -76,7 +76,7 @@ interface Routine {
7676
* gwxpy.ndarray( x.length, x, 1, 0, y, 1, 0, w, 1, 0 );
7777
* // w => [ 3.0, 5.0, 7.0, 9.0, 11.0 ]
7878
*/
79-
ndarray<T extends InputArray, U extends InputArray, V extends InputArray>( N: number, x: T, strideX: number, offsetX: number, y: U, strideY: number, offsetY: number, w: V, strideW: number, offsetW: number ): V;
79+
ndarray<T extends InputArray = InputArray>( N: number, x: InputArray, strideX: number, offsetX: number, y: InputArray, strideY: number, offsetY: number, w: T, strideW: number, offsetW: number ): T;
8080
}
8181

8282
/**

‎lib/node_modules/@stdlib/blas/ext/base/gwxsa/docs/types/index.d.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ interface Routine {
4949
* gwxsa( x.length, 5.0, x, 1, w, 1 );
5050
* // w => [ -7.0, -4.0, -2.0, -10.0, -1.0, -5.0, -6.0, -8.0 ]
5151
*/
52-
<T extends InputArray, U extends InputArray>( N: number, alpha: number, x: T, strideX: number, w: U, strideW: number ): U;
52+
<T extends InputArray = InputArray>( N: number, alpha: number, x: InputArray, strideX: number, w: T, strideW: number ): T;
5353

5454
/**
5555
* Subtracts a scalar constant from each element in a strided array `x` and assigns the results to a strided array `w` using alternative indexing semantics.
@@ -71,7 +71,7 @@ interface Routine {
7171
* gwxsa.ndarray( x.length, 5.0, x, 1, 0, w, 1, 0 );
7272
* // w => [ -7.0, -4.0, -2.0, -10.0, -1.0, -5.0, -6.0, -8.0 ]
7373
*/
74-
ndarray<T extends InputArray, U extends InputArray>( N: number, alpha: number, x: T, strideX: number, offsetX: number, w: U, strideW: number, offsetW: number ): U;
74+
ndarray<T extends InputArray = InputArray>( N: number, alpha: number, x: InputArray, strideX: number, offsetX: number, w: T, strideW: number, offsetW: number ): T;
7575
}
7676

7777
/**

0 commit comments

Comments
 (0)