diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/README.md b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/README.md index 02aa7a51da40..675bda4fd939 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/README.md @@ -36,7 +36,7 @@ limitations under the License. var dsnansum = require( '@stdlib/blas/ext/base/dsnansum' ); ``` -#### dsnansum( N, x, stride ) +#### dsnansum( N, x, strideX ) Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values, using extended accumulation, and returning an extended precision result. @@ -44,9 +44,8 @@ Computes the sum of single-precision floating-point strided array elements, igno var Float32Array = require( '@stdlib/array/float32' ); var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] ); -var N = x.length; -var v = dsnansum( N, x, 1 ); +var v = dsnansum( x.length, x, 1 ); // returns 1.0 ``` @@ -54,9 +53,9 @@ The function has the following parameters: - **N**: number of indexed elements. - **x**: input [`Float32Array`][@stdlib/array/float32]. -- **stride**: index increment for `x`. +- **strideX**: stride length for `x`. -The `N` and stride parameters determine which elements in the strided array are accessed at runtime. For example, to compute the sum of every other element in `x`, +The `N` and stride parameters determine which elements in the strided array are accessed at runtime. For example, to compute the sum of every other element: ```javascript var Float32Array = require( '@stdlib/array/float32' ); @@ -81,24 +80,24 @@ var v = dsnansum( 4, x1, 2 ); // returns 5.0 ``` -#### dsnansum.ndarray( N, x, stride, offset ) +#### dsnansum.ndarray( N, x, strideX, offsetX ) -Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values and using extended accumulation and alternative indexing semantics. +Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values, using extended accumulation and alternative indexing semantics, and returning an extended precision result. ```javascript var Float32Array = require( '@stdlib/array/float32' ); var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] ); -var v = dsnansum.ndarray( 4, x, 1, 0 ); +var v = dsnansum.ndarray( x.length, x, 1, 0 ); // returns 1.0 ``` The function has the following additional parameters: -- **offset**: starting index for `x`. +- **offsetX**: starting index for `x`. -While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying `buffer`, the `offset` parameter supports indexing semantics based on a starting index. For example, to calculate the sum of every other value in `x` starting from the second value +While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying buffer, the offset parameter supports indexing semantics based on a starting index. For example, to calculate the sum of every other element starting from the second element: ```javascript var Float32Array = require( '@stdlib/array/float32' ); @@ -136,14 +135,14 @@ var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); var filledarrayBy = require( '@stdlib/array/filled-by' ); var dsnansum = require( '@stdlib/blas/ext/base/dsnansum' ); -function clbk() { +function rand() { if ( bernoulli( 0.7 ) > 0 ) { return discreteUniform( -10, 10 ); } return NaN; } -var x = filledarrayBy( 10, 'float64', clbk ); +var x = filledarrayBy( 10, 'float32', rand ); console.log( x ); var v = dsnansum( x.length, x, 1 ); @@ -154,6 +153,123 @@ console.log( v ); + + +* * * + +
+ +## C APIs + + + +
+ +
+ + + + + +
+ +### Usage + +```c +#include "stdlib/blas/ext/base/dsnansum.h" +``` + +#### stdlib_strided_dsnansum( N, \*X, strideX ) + +Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values, using extended accumulation, and returning an extended precision result. + +```c +const float x[] = { 1.0f, -2.0f, 0.0f/0.0f, 2.0f }; + +double v = stdlib_strided_dsnansum( 4, x, 1 ); +// returns 1.0 +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[in] float*` input array. +- **strideX**: `[in] CBLAS_INT` stride length for `X`. + +```c +double stdlib_strided_dsnansum( const CBLAS_INT N, const float *X, const CBLAS_INT strideX ); +``` + +#### stdlib_strided_dsnansum_ndarray( N, \*X, strideX, offsetX ) + +Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values, using extended accumulation and alternative indexing semantics, and returning an extended precision result. + +```c +const float x[] = { 1.0f, -2.0f, 0.0f/0.0f, 2.0f }; + +double v = stdlib_strided_dsnansum_ndarray( 4, x, 1, 0 ); +// returns 1.0 +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[in] float*` input array. +- **strideX**: `[in] CBLAS_INT` stride length for `X`. +- **offsetX**: `[in] CBLAS_INT` starting index for `X`. + +```c +double stdlib_strided_dsnansum_ndarray( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); +``` + +
+ + + + + +
+ +
+ + + + + +
+ +### Examples + +```c +#include "stdlib/blas/ext/base/dsnansum.h" +#include + +int main( void ) { + // Create a strided array: + const float x[] = { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 0.0f/0.0f, 0.0f/0.0f }; + + // Specify the number of elements: + const int N = 5; + + // Specify the stride length: + const int strideX = 2; + + // Compute the sum: + double v = stdlib_strided_dsnansum( N, x, strideX ); + + // Print the result: + printf( "sum: %lf\n", v ); +} +``` + +
+ + + +
+ + +
diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/benchmark.js index 245dd49a4b27..e5fe244032e9 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/benchmark.js @@ -22,7 +22,7 @@ var bench = require( '@stdlib/bench' ); var bernoulli = require( '@stdlib/random/base/bernoulli' ); -var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var uniform = require( '@stdlib/random/base/uniform' ); var filledarrayBy = require( '@stdlib/array/filled-by' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); @@ -32,6 +32,19 @@ var dsnansum = require( './../lib/dsnansum.js' ); // FUNCTIONS // +/** +* Returns a random number. +* +* @private +* @returns {number} random number +*/ +function rand() { + if ( bernoulli( 0.7 ) > 0 ) { + return NaN; + } + return uniform( -10, 10 ); +} + /** * Creates a benchmark function. * @@ -43,13 +56,6 @@ function createBenchmark( len ) { var x = filledarrayBy( len, 'float32', rand ); return benchmark; - function rand() { - if ( bernoulli( 0.7 ) > 0 ) { - return discreteUniform( -10, 10 ); - } - return NaN; - } - function benchmark( b ) { var v; var i; diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/benchmark.native.js index 4517b40cfc88..3fdc2892ae3c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/benchmark.native.js @@ -23,7 +23,7 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); var bernoulli = require( '@stdlib/random/base/bernoulli' ); -var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var uniform = require( '@stdlib/random/base/uniform' ); var filledarrayBy = require( '@stdlib/array/filled-by' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); @@ -41,6 +41,19 @@ var opts = { // FUNCTIONS // +/** +* Returns a random number. +* +* @private +* @returns {number} random number +*/ +function rand() { + if ( bernoulli( 0.7 ) > 0 ) { + return NaN; + } + return uniform( -10, 10 ); +} + /** * Creates a benchmark function. * @@ -52,13 +65,6 @@ function createBenchmark( len ) { var x = filledarrayBy( len, 'float32', rand ); return benchmark; - function rand() { - if ( bernoulli( 0.7 ) > 0 ) { - return discreteUniform( -10, 10 ); - } - return NaN; - } - function benchmark( b ) { var v; var i; diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/benchmark.ndarray.js index 6a29605b8cb7..2f5d12597059 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/benchmark.ndarray.js @@ -22,7 +22,7 @@ var bench = require( '@stdlib/bench' ); var bernoulli = require( '@stdlib/random/base/bernoulli' ); -var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var uniform = require( '@stdlib/random/base/uniform' ); var filledarrayBy = require( '@stdlib/array/filled-by' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); @@ -32,6 +32,19 @@ var dsnansum = require( './../lib/ndarray.js' ); // FUNCTIONS // +/** +* Returns a random number. +* +* @private +* @returns {number} random number +*/ +function rand() { + if ( bernoulli( 0.7 ) > 0 ) { + return NaN; + } + return uniform( -10, 10 ); +} + /** * Creates a benchmark function. * @@ -43,13 +56,6 @@ function createBenchmark( len ) { var x = filledarrayBy( len, 'float32', rand ); return benchmark; - function rand() { - if ( bernoulli( 0.7 ) > 0 ) { - return discreteUniform( -10, 10 ); - } - return NaN; - } - function benchmark( b ) { var v; var i; diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/benchmark.ndarray.native.js index 6f3cc8496bde..39f6fbe54ee5 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/benchmark.ndarray.native.js @@ -23,7 +23,7 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); var bernoulli = require( '@stdlib/random/base/bernoulli' ); -var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); +var uniform = require( '@stdlib/random/base/uniform' ); var filledarrayBy = require( '@stdlib/array/filled-by' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); @@ -41,6 +41,19 @@ var opts = { // FUNCTIONS // +/** +* Returns a random number. +* +* @private +* @returns {number} random number +*/ +function rand() { + if ( bernoulli( 0.7 ) > 0 ) { + return NaN; + } + return uniform( -10, 10 ); +} + /** * Creates a benchmark function. * @@ -52,13 +65,6 @@ function createBenchmark( len ) { var x = filledarrayBy( len, 'float32', rand ); return benchmark; - function rand() { - if ( bernoulli( 0.7 ) > 0 ) { - return discreteUniform( -10, 10 ); - } - return NaN; - } - function benchmark( b ) { var v; var i; diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/c/benchmark.length.c b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/c/benchmark.length.c index 6b08f1592609..37e27bd67c90 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/c/benchmark.length.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/benchmark/c/benchmark.length.c @@ -94,7 +94,7 @@ static float rand_float( void ) { * @param len array length * @return elapsed time in seconds */ -static double benchmark( int iterations, int len ) { +static double benchmark1( int iterations, int len ) { double elapsed; float x[ len ]; double v; @@ -111,6 +111,7 @@ static double benchmark( int iterations, int len ) { v = 0.0; t = tic(); for ( i = 0; i < iterations; i++ ) { + // cppcheck-suppress uninitvar v = stdlib_strided_dsnansum( len, x, 1 ); if ( v != v ) { printf( "should not return NaN\n" ); @@ -124,6 +125,44 @@ static double benchmark( int iterations, int len ) { return elapsed; } +/** +* Runs a benchmark. +* +* @param iterations number of iterations +* @param len array length +* @return elapsed time in seconds +*/ +static double benchmark2( int iterations, int len ) { + double elapsed; + float x[ len ]; + double v; + double t; + int i; + + for ( i = 0; i < len; i++ ) { + if ( rand_float() < 0.2f ) { + x[ i ] = 0.0f / 0.0f; // NaN + } else { + x[ i ] = ( rand_float()*20000.0f ) - 10000.0f; + } + } + v = 0.0; + t = tic(); + for ( i = 0; i < iterations; i++ ) { + // cppcheck-suppress uninitvar + v = stdlib_strided_dsnansum_ndarray( len, x, 1, 0 ); + if ( v != v ) { + printf( "should not return NaN\n" ); + break; + } + } + elapsed = tic() - t; + if ( v != v ) { + printf( "should not return NaN\n" ); + } + return elapsed; +} + /** * Main execution sequence. */ @@ -146,7 +185,18 @@ int main( void ) { for ( j = 0; j < REPEATS; j++ ) { count += 1; printf( "# c::%s:len=%d\n", NAME, len ); - elapsed = benchmark( iter, len ); + elapsed = benchmark1( iter, len ); + print_results( iter, elapsed ); + printf( "ok %d benchmark finished\n", count ); + } + } + for ( i = MIN; i <= MAX; i++ ) { + len = pow( 10, i ); + iter = ITERATIONS / pow( 10, i-1 ); + for ( j = 0; j < REPEATS; j++ ) { + count += 1; + printf( "# c::%s:ndarray:len=%d\n", NAME, len ); + elapsed = benchmark2( iter, len ); print_results( iter, elapsed ); printf( "ok %d benchmark finished\n", count ); } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/docs/repl.txt index d1129a045969..aea91b1dc230 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/docs/repl.txt @@ -1,11 +1,11 @@ -{{alias}}( N, x, stride ) +{{alias}}( N, x, strideX ) Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values, using extended accumulation, and returning an extended precision result. - The `N` and `stride` parameters determine which elements in the strided - array are accessed at runtime. + The `N` and stride parameters determine which elements in the strided array + are accessed at runtime. Indexing is relative to the first index. To introduce an offset, use a typed array view. @@ -20,8 +20,8 @@ x: Float32Array Input array. - stride: integer - Index increment. + strideX: integer + Stride length. Returns ------- @@ -35,7 +35,7 @@ > {{alias}}( x.length, x, 1 ) 1.0 - // Using `N` and `stride` parameters: + // Using `N` and stride parameters: > x = new {{alias:@stdlib/array/float32}}( [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0, NaN, NaN ] ); > {{alias}}( 4, x, 2 ) 1.0 @@ -47,13 +47,13 @@ -1.0 -{{alias}}.ndarray( N, x, stride, offset ) +{{alias}}.ndarray( N, x, strideX, offsetX ) Computes the sum of single-precision floating-point strided array elements, - ignoring `NaN` values and using extended accumulation and alternative - indexing semantics. + ignoring `NaN` values, using extended accumulation and alternative + indexing semantics, and returning an extended precision result. While typed array views mandate a view offset based on the underlying - buffer, the `offset` parameter supports indexing semantics based on a + buffer, the offset parameter supports indexing semantics based on a starting index. Parameters @@ -64,10 +64,10 @@ x: Float32Array Input array. - stride: integer - Index increment. + strideX: integer + Stride length. - offset: integer + offsetX: integer Starting index. Returns diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/docs/types/index.d.ts b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/docs/types/index.d.ts index 2cc0640dc417..c4fbd8d45f07 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/docs/types/index.d.ts +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/docs/types/index.d.ts @@ -27,7 +27,7 @@ interface Routine { * * @param N - number of indexed elements * @param x - input array - * @param stride - stride length + * @param strideX - stride length * @returns sum * * @example @@ -38,15 +38,15 @@ interface Routine { * var v = dsnansum( x.length, x, 1 ); * // returns 1.0 */ - ( N: number, x: Float32Array, stride: number ): number; + ( N: number, x: Float32Array, strideX: number ): number; /** - * Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values and using extended accumulation and alternative indexing semantics. + * Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values, using extended accumulation and alternative indexing semantics, and returning an extended precision result. * * @param N - number of indexed elements * @param x - input array - * @param stride - stride length - * @param offset - starting index + * @param strideX - stride length + * @param offsetX - starting index * @returns sum * * @example @@ -57,7 +57,7 @@ interface Routine { * var v = dsnansum.ndarray( x.length, x, 1, 0 ); * // returns 1.0 */ - ndarray( N: number, x: Float32Array, stride: number, offset: number ): number; + ndarray( N: number, x: Float32Array, strideX: number, offsetX: number ): number; } /** @@ -65,7 +65,7 @@ interface Routine { * * @param N - number of indexed elements * @param x - input array -* @param stride - stride length +* @param strideX - stride length * @returns sum * * @example diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/examples/c/example.c b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/examples/c/example.c index 2648426d80d2..87b7bb87d16a 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/examples/c/example.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/examples/c/example.c @@ -17,21 +17,20 @@ */ #include "stdlib/blas/ext/base/dsnansum.h" -#include #include int main( void ) { // Create a strided array: - const float x[] = { 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 0.0/0.0, 0.0/0.0 }; + const float x[] = { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 0.0f/0.0f, 0.0f/0.0f }; // Specify the number of elements: - const int64_t N = 5; + const int N = 5; // Specify the stride length: - const int64_t stride = 2; + const int strideX = 2; // Compute the sum: - double v = stdlib_strided_dsnansum( N, x, stride ); + double v = stdlib_strided_dsnansum( N, x, strideX ); // Print the result: printf( "sum: %lf\n", v ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/examples/index.js index a9e076d9640e..72c71cc8994f 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/examples/index.js @@ -23,8 +23,6 @@ var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); var filledarrayBy = require( '@stdlib/array/filled-by' ); var dsnansum = require( './../lib' ); -var x; - function rand() { if ( bernoulli( 0.7 ) > 0 ) { return discreteUniform( -100, 100 ); @@ -32,7 +30,7 @@ function rand() { return NaN; } -x = filledarrayBy( 10, 'float64', rand ); +var x = filledarrayBy( 10, 'float32', rand ); console.log( x ); var v = dsnansum( x.length, x, 1 ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/include/stdlib/blas/ext/base/dsnansum.h b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/include/stdlib/blas/ext/base/dsnansum.h index 6feddad41722..835f72ee5ce9 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/include/stdlib/blas/ext/base/dsnansum.h +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/include/stdlib/blas/ext/base/dsnansum.h @@ -19,7 +19,7 @@ #ifndef STDLIB_BLAS_EXT_BASE_DSNANSUM_H #define STDLIB_BLAS_EXT_BASE_DSNANSUM_H -#include +#include "stdlib/blas/base/shared.h" /* * If C++, prevent name mangling so that the compiler emits a binary file having undecorated names, thus mirroring the behavior of a C compiler. @@ -29,9 +29,14 @@ extern "C" { #endif /** -* Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values, using extended summation, and returning an extended precision result. +* Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values, using extended accumulation, and returning an extended precision result. */ -double stdlib_strided_dsnansum( const int64_t N, const float *X, const int64_t stride ); +double API_SUFFIX(stdlib_strided_dsnansum)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX ); + +/** +* Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values, using extended accumulation and alternative indexing semantics, and returning an extended precision result. +*/ +double API_SUFFIX(stdlib_strided_dsnansum_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); #ifdef __cplusplus } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/dsnansum.js b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/dsnansum.js index 1cfe4ee6e45a..7b01a9a9d08f 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/dsnansum.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/dsnansum.js @@ -20,7 +20,8 @@ // MODULES // -var dsnansumpw = require( '@stdlib/blas/ext/base/dsnansumpw' ); +var stride2offset = require( '@stdlib/strided/base/stride2offset' ); +var ndarray = require( './ndarray.js' ); // MAIN // @@ -30,20 +31,19 @@ var dsnansumpw = require( '@stdlib/blas/ext/base/dsnansumpw' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float32Array} x - input array -* @param {integer} stride - stride length +* @param {integer} strideX - stride length * @returns {number} sum * * @example * var Float32Array = require( '@stdlib/array/float32' ); * * var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] ); -* var N = x.length; -* -* var v = dsnansum( N, x, 1 ); + +* var v = dsnansum( x.length, x, 1 ); * // returns 1.0 */ -function dsnansum( N, x, stride ) { - return dsnansumpw( N, x, stride ); +function dsnansum( N, x, strideX ) { + return ndarray( N, x, strideX, stride2offset( N, strideX) ); } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/dsnansum.native.js b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/dsnansum.native.js index 652e2cecd43f..fc1976294008 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/dsnansum.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/dsnansum.native.js @@ -30,20 +30,19 @@ var addon = require( './../src/addon.node' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float32Array} x - input array -* @param {integer} stride - stride length +* @param {integer} strideX - stride length * @returns {number} sum * * @example * var Float32Array = require( '@stdlib/array/float32' ); * * var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] ); -* var N = x.length; -* -* var v = dsnansum( N, x, 1 ); + +* var v = dsnansum( x.length, x, 1 ); * // returns 1.0 */ -function dsnansum( N, x, stride ) { - return addon( N, x, stride ); +function dsnansum( N, x, strideX ) { + return addon( N, x, strideX ); } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/index.js b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/index.js index d68429122246..406e12900fcd 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/index.js @@ -28,9 +28,8 @@ * var dsnansum = require( '@stdlib/blas/ext/base/dsnansum' ); * * var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] ); -* var N = x.length; * -* var v = dsnansum( N, x, 1 ); +* var v = dsnansum( x.length, x, 1 ); * // returns 1.0 * * @example diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/ndarray.js index 4c0c95d0df1e..3fc72adb6988 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/ndarray.js @@ -30,8 +30,8 @@ var dsnansumpw = require( '@stdlib/blas/ext/base/dsnansumpw' ).ndarray; * * @param {PositiveInteger} N - number of indexed elements * @param {Float32Array} x - input array -* @param {integer} stride - stride length -* @param {NonNegativeInteger} offset - starting index +* @param {integer} strideX - stride length +* @param {NonNegativeInteger} offsetX - starting index * @returns {number} sum * * @example @@ -42,8 +42,8 @@ var dsnansumpw = require( '@stdlib/blas/ext/base/dsnansumpw' ).ndarray; * var v = dsnansum( 5, x, 2, 1 ); * // returns 5.0 */ -function dsnansum( N, x, stride, offset ) { - return dsnansumpw( N, x, stride, offset ); +function dsnansum( N, x, strideX, offsetX ) { + return dsnansumpw( N, x, strideX, offsetX ); } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/ndarray.native.js index 83d8b0e2d809..089e6427bb32 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/lib/ndarray.native.js @@ -20,9 +20,7 @@ // MODULES // -var minViewBufferIndex = require( '@stdlib/strided/base/min-view-buffer-index' ); -var offsetView = require( '@stdlib/strided/base/offset-view' ); -var addon = require( './dsnansum.native.js' ); +var addon = require( './../src/addon.node' ); // MAIN // @@ -32,8 +30,8 @@ var addon = require( './dsnansum.native.js' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float32Array} x - input array -* @param {integer} stride - stride length -* @param {NonNegativeInteger} offset - starting index +* @param {integer} strideX - stride length +* @param {NonNegativeInteger} offsetX - starting index * @returns {number} sum * * @example @@ -44,11 +42,8 @@ var addon = require( './dsnansum.native.js' ); * var v = dsnansum( 5, x, 2, 1 ); * // returns 5.0 */ -function dsnansum( N, x, stride, offset ) { - var view; - offset = minViewBufferIndex( N, stride, offset ); - view = offsetView( x, offset ); - return addon( N, view, stride ); +function dsnansum( N, x, strideX, offsetX ) { + return addon.ndarray( N, x, strideX, offsetX ); } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/manifest.json index 912c4d6e8192..a339d9204e93 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/manifest.json @@ -28,53 +28,54 @@ { "task": "build", "src": [ - "./src/dsnansum.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], "dependencies": [ "@stdlib/blas/ext/base/dsnansumpw", "@stdlib/napi/export", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", - "@stdlib/napi/argv-strided-float32array" + "@stdlib/napi/argv-strided-float32array", + "@stdlib/napi/create-double", + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" ] }, { "task": "benchmark", "src": [ - "./src/dsnansum.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], "dependencies": [ - "@stdlib/blas/ext/base/dsnansumpw" + "@stdlib/blas/ext/base/dsnansumpw", + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" ] }, { "task": "examples", "src": [ - "./src/dsnansum.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], "dependencies": [ - "@stdlib/blas/ext/base/dsnansumpw" + "@stdlib/blas/ext/base/dsnansumpw", + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" ] } ] diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/src/addon.c index 546fc7a7294e..3128867e643b 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/src/addon.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/src/addon.c @@ -17,10 +17,12 @@ */ #include "stdlib/blas/ext/base/dsnansum.h" +#include "stdlib/blas/base/shared.h" #include "stdlib/napi/export.h" #include "stdlib/napi/argv.h" #include "stdlib/napi/argv_int64.h" #include "stdlib/napi/argv_strided_float32array.h" +#include "stdlib/napi/create_double.h" #include /** @@ -33,13 +35,27 @@ static napi_value addon( napi_env env, napi_callback_info info ) { STDLIB_NAPI_ARGV( env, info, argv, argc, 3 ); STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); - STDLIB_NAPI_ARGV_INT64( env, stride, argv, 2 ); - STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, stride, argv, 1 ); + STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 2 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, strideX, argv, 1 ); + STDLIB_NAPI_CREATE_DOUBLE( env, API_SUFFIX(stdlib_strided_dsnansum)( N, X, strideX ), v ); + return v; +} - napi_value v; - napi_status status = napi_create_double( env, stdlib_strided_dsnansum( N, X, stride ), &v ); - assert( status == napi_ok ); +/** +* Receives JavaScript callback invocation data. +* +* @param env environment under which the function is invoked +* @param info callback data +* @return Node-API value +*/ +static napi_value addon_method( napi_env env, napi_callback_info info ) { + STDLIB_NAPI_ARGV( env, info, argv, argc, 4 ); + STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); + STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 2 ); + STDLIB_NAPI_ARGV_INT64( env, offsetX, argv, 3 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, strideX, argv, 1 ); + STDLIB_NAPI_CREATE_DOUBLE( env, API_SUFFIX(stdlib_strided_dsnansum_ndarray)( N, X, strideX, offsetX ), v ); return v; } -STDLIB_NAPI_MODULE_EXPORT_FCN( addon ) +STDLIB_NAPI_MODULE_EXPORT_FCN_WITH_METHOD( addon, "ndarray", addon_method ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/src/dsnansum.c b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/src/dsnansum.c deleted file mode 100644 index 9408f2f6f36b..000000000000 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/src/dsnansum.c +++ /dev/null @@ -1,33 +0,0 @@ -/** -* @license Apache-2.0 -* -* Copyright (c) 2020 The Stdlib Authors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -#include "stdlib/blas/ext/base/dsnansum.h" -#include "stdlib/blas/ext/base/dsnansumpw.h" -#include - -/** -* Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values, using extended accumulation, and returning an extended precision result. -* -* @param N number of indexed elements -* @param X input array -* @param stride stride length -* @return output value -*/ -double stdlib_strided_dsnansum( const int64_t N, const float *X, const int64_t stride ) { - return stdlib_strided_dsnansumpw( N, X, stride ); -} diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/src/main.c b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/src/main.c new file mode 100644 index 000000000000..09356ce5f5fc --- /dev/null +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/src/main.c @@ -0,0 +1,48 @@ +/** +* @license Apache-2.0 +* +* Copyright (c) 2024 The Stdlib Authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +#include "stdlib/blas/ext/base/dsnansum.h" +#include "stdlib/blas/ext/base/dsnansumpw.h" +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/stride2offset.h" + +/** +* Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values, using extended accumulation, and returning an extended precision result. +* +* @param N number of indexed elements +* @param X input array +* @param strideX stride length +* @return output value +*/ +double API_SUFFIX(stdlib_strided_dsnansum)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX ) { + CBLAS_INT ox = stdlib_strided_stride2offset( N, strideX ); + return API_SUFFIX(stdlib_strided_dsnansum_ndarray)( N, X, strideX, ox ); +} + +/** +* Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values, using extended accumulation and alternative indexing semantics, and returning an extended precision result. +* +* @param N number of indexed elements +* @param X input array +* @param strideX stride length +* @param offsetX starting index +* @return output value +*/ +double API_SUFFIX(stdlib_strided_dsnansum_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ) { + return API_SUFFIX(stdlib_strided_dsnansumpw_ndarray)( N, X, strideX, offsetX ); +} diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/test/test.dsnansum.js b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/test/test.dsnansum.js index e4c0f7195688..0720b33b7644 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/test/test.dsnansum.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/test/test.dsnansum.js @@ -178,14 +178,14 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) t.end(); }); -tape( 'if provided a `stride` parameter equal to `0`, the function returns the first element', function test( t ) { +tape( 'if provided a `stride` parameter equal to `0`, the function returns the sum of the first element repeated N times', function test( t ) { var x; var v; x = new Float32Array( [ 1.0, -2.0, -4.0, 5.0, 3.0 ] ); v = dsnansum( x.length, x, 0 ); - t.strictEqual( v, 1.0, 'returns expected value' ); + t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); }); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/test/test.dsnansum.native.js b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/test/test.dsnansum.native.js index 735ee1a032f4..b091e9500b41 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/test/test.dsnansum.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/test/test.dsnansum.native.js @@ -269,14 +269,14 @@ tape( 'the function supports a negative `stride` parameter', opts, function test t.end(); }); -tape( 'if provided a `stride` parameter equal to `0`, the function returns the first element', opts, function test( t ) { +tape( 'if provided a `stride` parameter equal to `0`, the function returns the sum of the first element repeated N times', opts, function test( t ) { var x; var v; x = new Float32Array( [ 1.0, -2.0, -4.0, 5.0, 3.0 ] ); v = dsnansum( x.length, x, 0 ); - t.strictEqual( v, 1.0, 'returns expected value' ); + t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); }); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/test/test.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/test/test.ndarray.js index 67f8fbd7f6f9..05659c28cc40 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/test/test.ndarray.js @@ -178,14 +178,14 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) t.end(); }); -tape( 'if provided a `stride` parameter equal to `0`, the function returns the first indexed element', function test( t ) { +tape( 'if provided a `stride` parameter equal to `0`, the function returns the sum of the first element repeated N times', function test( t ) { var x; var v; x = new Float32Array( [ 1.0, -2.0, -4.0, 5.0, 3.0 ] ); v = dsnansum( x.length, x, 0, 0 ); - t.strictEqual( v, 1.0, 'returns expected value' ); + t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); }); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/test/test.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/test/test.ndarray.native.js index 25015984bec8..e4aee7369267 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dsnansum/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dsnansum/test/test.ndarray.native.js @@ -187,14 +187,14 @@ tape( 'the function supports a negative `stride` parameter', opts, function test t.end(); }); -tape( 'if provided a `stride` parameter equal to `0`, the function returns the first indexed element', opts, function test( t ) { +tape( 'if provided a `stride` parameter equal to `0`, the function returns the sum of the first element repeated N times', opts, function test( t ) { var x; var v; x = new Float32Array( [ 1.0, -2.0, -4.0, 5.0, 3.0 ] ); v = dsnansum( x.length, x, 0, 0 ); - t.strictEqual( v, 1.0, 'returns expected value' ); + t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); });