diff --git a/lib/node_modules/@stdlib/blas/ext/base/snansum/README.md b/lib/node_modules/@stdlib/blas/ext/base/snansum/README.md index 1fa67a830175..d9c7993d9324 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/README.md @@ -36,7 +36,7 @@ limitations under the License. var snansum = require( '@stdlib/blas/ext/base/snansum' ); ``` -#### snansum( N, x, stride ) +#### snansum( N, x, strideX ) Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values. @@ -53,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. -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' ); @@ -80,7 +80,7 @@ var v = snansum( 4, x1, 2 ); // returns 5.0 ``` -#### snansum.ndarray( N, x, stride, offset ) +#### snansum.ndarray( N, x, strideX, offsetX ) Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values and using alternative indexing semantics. @@ -95,9 +95,9 @@ var v = snansum.ndarray( 4, x, 1, 0 ); The function has the following additional parameters: -- **offset**: starting index for `x`. +- **offsetX**: starting index. -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' ); @@ -135,7 +135,7 @@ var filledarrayBy = require( '@stdlib/array/filled-by' ); var snansum = require( '@stdlib/blas/ext/base/snansum' ); function rand() { - if ( bernoulli( 0.8 ) > 0 ) { + if ( bernoulli( 0.5 ) < 1 ) { return discreteUniform( 0, 100 ); } return NaN; @@ -152,6 +152,123 @@ console.log( v ); + + +* * * + +
+ +## C APIs + + + +
+ +
+ + + + + +
+ +### Usage + +```c +#include "stdlib/blas/ext/base/snansum.h" +``` + +#### stdlib_strided_snansum( N, \*X, strideX ) + +Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values. + +```c +const float x[] = { 1.0f, 2.0f, 0.0f/0.0f, 4.0f }; + +float v = stdlib_strided_snansum( 4, x, 1 ); +// returns 7.0f +``` + +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. + +```c +float stdlib_strided_snansum( const CBLAS_INT N, const float *X, const CBLAS_INT strideX ); +``` + +#### stdlib_strided_snansum_ndarray( N, \*X, strideX, offsetX ) + +Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values and using alternative indexing semantics. + +```c +const float x[] = { 1.0f, 2.0f, 0.0f/0.0f, 4.0f }; + +float v = stdlib_strided_snansum_ndarray( 4, x, 1, 0 ); +// returns 7.0f +``` + +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. +- **offsetX**: `[in] CBLAS_INT` starting index. + +```c +float stdlib_strided_snansum_ndarray( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); +``` + +
+ + + + + +
+ +
+ + + + + +
+ +### Examples + +```c +#include "stdlib/blas/ext/base/snansum.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: + float v = stdlib_strided_snansum( N, x, strideX ); + + // Print the result: + printf( "Sum: %f\n", v ); +} +``` + +
+ + + +
+ + +
diff --git a/lib/node_modules/@stdlib/blas/ext/base/snansum/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/snansum/benchmark/benchmark.js index 4d13cb68e3fa..5b7791b525cd 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/benchmark/benchmark.js @@ -32,6 +32,19 @@ var snansum = require( './../lib/snansum.js' ); // FUNCTIONS // +/** +* Returns a random number. +* +* @private +* @returns {number} random number +*/ +function rand() { + if ( bernoulli( 0.5 ) < 1 ) { + return uniform( -10.0, 10.0 ); + } + return NaN; +} + /** * Creates a benchmark function. * @@ -43,13 +56,6 @@ function createBenchmark( len ) { var x = filledarrayBy( len, 'float32', rand ); return benchmark; - function rand() { - if ( bernoulli( 0.8 ) > 0 ) { - return uniform( -10.0, 10.0 ); - } - return NaN; - } - function benchmark( b ) { var v; var i; diff --git a/lib/node_modules/@stdlib/blas/ext/base/snansum/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/snansum/benchmark/benchmark.native.js index b019937bf528..b96ad380b58b 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/benchmark/benchmark.native.js @@ -41,6 +41,19 @@ var opts = { // FUNCTIONS // +/** +* Returns a random number. +* +* @private +* @returns {number} random number +*/ +function rand() { + if ( bernoulli( 0.5 ) < 1 ) { + return uniform( -10.0, 10.0 ); + } + return NaN; +} + /** * Creates a benchmark function. * @@ -52,13 +65,6 @@ function createBenchmark( len ) { var x = filledarrayBy( len, 'float32', rand ); return benchmark; - function rand() { - if ( bernoulli( 0.8 ) > 0 ) { - return uniform( -10.0, 10.0 ); - } - return NaN; - } - function benchmark( b ) { var v; var i; diff --git a/lib/node_modules/@stdlib/blas/ext/base/snansum/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/snansum/benchmark/benchmark.ndarray.js index 37d57f147452..3a529c26c6cf 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/benchmark/benchmark.ndarray.js @@ -32,6 +32,19 @@ var snansum = require( './../lib/ndarray.js' ); // FUNCTIONS // +/** +* Returns a random number. +* +* @private +* @returns {number} random number +*/ +function rand() { + if ( bernoulli( 0.5 ) < 1 ) { + return uniform( -10.0, 10.0 ); + } + return NaN; +} + /** * Creates a benchmark function. * @@ -43,13 +56,6 @@ function createBenchmark( len ) { var x = filledarrayBy( len, 'float32', rand ); return benchmark; - function rand() { - if ( bernoulli( 0.8 ) > 0 ) { - return uniform( -10.0, 10.0 ); - } - return NaN; - } - function benchmark( b ) { var v; var i; diff --git a/lib/node_modules/@stdlib/blas/ext/base/snansum/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/snansum/benchmark/benchmark.ndarray.native.js index f93ad089afc7..9c2e1a45abd5 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/benchmark/benchmark.ndarray.native.js @@ -41,6 +41,19 @@ var opts = { // FUNCTIONS // +/** +* Returns a random number. +* +* @private +* @returns {number} random number +*/ +function rand() { + if ( bernoulli( 0.5 ) < 1 ) { + return uniform( -10.0, 10.0 ); + } + return NaN; +} + /** * Creates a benchmark function. * @@ -52,13 +65,6 @@ function createBenchmark( len ) { var x = filledarrayBy( len, 'float32', rand ); return benchmark; - function rand() { - if ( bernoulli( 0.8 ) > 0 ) { - return uniform( -10.0, 10.0 ); - } - return NaN; - } - function benchmark( b ) { var v; var i; diff --git a/lib/node_modules/@stdlib/blas/ext/base/snansum/benchmark/c/benchmark.length.c b/lib/node_modules/@stdlib/blas/ext/base/snansum/benchmark/c/benchmark.length.c index 78b7afeda86f..634ed2deea8a 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/benchmark/c/benchmark.length.c +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/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 ]; float v; @@ -111,6 +111,7 @@ static double benchmark( int iterations, int len ) { v = 0.0f; t = tic(); for ( i = 0; i < iterations; i++ ) { + // cppcheck-suppress uninitvar v = stdlib_strided_snansum( 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 ]; + float 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.0f; + t = tic(); + for ( i = 0; i < iterations; i++ ) { + // cppcheck-suppress uninitvar + v = stdlib_strided_snansum_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/snansum/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/snansum/docs/repl.txt index 166dd1e2607c..d71b1f88145b 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/docs/repl.txt @@ -1,5 +1,5 @@ -{{alias}}( N, x, stride ) +{{alias}}( N, x, strideX ) Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values. @@ -19,8 +19,8 @@ x: Float32Array Input array. - stride: integer - Index increment. + strideX: integer + Stride length. Returns ------- @@ -34,7 +34,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 @@ -46,13 +46,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 alternative indexing semantics. While typed array views mandate a view offset based on the underlying - buffer, the `offset` parameter supports indexing semantics based on a - starting index. + buffer, the offset parameter supports indexing semantics based on a starting + index. Parameters ---------- @@ -62,10 +62,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/snansum/docs/types/index.d.ts b/lib/node_modules/@stdlib/blas/ext/base/snansum/docs/types/index.d.ts index de8645c6106c..e50c8778ec32 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/docs/types/index.d.ts +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/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 = snansum( 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 alternative indexing semantics. * * @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 = snansum.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/snansum/examples/c/example.c b/lib/node_modules/@stdlib/blas/ext/base/snansum/examples/c/example.c index ee31e57ce1ee..ef6440fa5245 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/examples/c/example.c +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/examples/c/example.c @@ -17,22 +17,21 @@ */ #include "stdlib/blas/ext/base/snansum.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: - float v = stdlib_strided_snansum( N, x, stride ); + float v = stdlib_strided_snansum( N, x, strideX ); // Print the result: - printf( "sum: %f\n", v ); + printf( "Sum: %f\n", v ); } diff --git a/lib/node_modules/@stdlib/blas/ext/base/snansum/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/snansum/examples/index.js index 47fa75dec887..3416021e337a 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/examples/index.js @@ -24,13 +24,14 @@ var filledarrayBy = require( '@stdlib/array/filled-by' ); var snansum = require( './../lib' ); function rand() { - if ( bernoulli( 0.8 ) > 0 ) { + if ( bernoulli( 0.5 ) < 1 ) { return discreteUniform( 0, 100 ); } return NaN; } var x = filledarrayBy( 10, 'float32', rand ); +console.log( x ); var v = snansum( x.length, x, 1 ); console.log( v ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/snansum/include/stdlib/blas/ext/base/snansum.h b/lib/node_modules/@stdlib/blas/ext/base/snansum/include/stdlib/blas/ext/base/snansum.h index b5fa779b1ed2..939ba05830d0 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/include/stdlib/blas/ext/base/snansum.h +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/include/stdlib/blas/ext/base/snansum.h @@ -19,7 +19,7 @@ #ifndef STDLIB_BLAS_EXT_BASE_SNANSUM_H #define STDLIB_BLAS_EXT_BASE_SNANSUM_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. @@ -31,7 +31,12 @@ extern "C" { /** * Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values. */ -float stdlib_strided_snansum( const int64_t N, const float *X, const int64_t stride ); +float API_SUFFIX(stdlib_strided_snansum)( 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 and using alternative indexing semantics. +*/ +float API_SUFFIX(stdlib_strided_snansum_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/snansum/lib/index.js b/lib/node_modules/@stdlib/blas/ext/base/snansum/lib/index.js index 02040b87cb7c..d7145fafd94b 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/lib/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/lib/index.js @@ -29,12 +29,11 @@ * * var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] ); * -* var v = snansum( 4, x, 1 ); +* var v = snansum( x.length, x, 1 ); * // returns 1.0 * * @example * var Float32Array = require( '@stdlib/array/float32' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * var snansum = require( '@stdlib/blas/ext/base/snansum' ); * * var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/snansum/lib/ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/snansum/lib/ndarray.js index 91f0325c9848..ad731e307632 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/lib/ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/lib/ndarray.js @@ -30,8 +30,8 @@ var snansumkbn = require( '@stdlib/blas/ext/base/snansumkbn' ).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 snansumkbn = require( '@stdlib/blas/ext/base/snansumkbn' ).ndarray; * var v = snansum( 5, x, 2, 1 ); * // returns 5.0 */ -function snansum( N, x, stride, offset ) { - return snansumkbn( N, x, stride, offset ); +function snansum( N, x, strideX, offsetX ) { + return snansumkbn( N, x, strideX, offsetX ); } diff --git a/lib/node_modules/@stdlib/blas/ext/base/snansum/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/snansum/lib/ndarray.native.js index 79662ee2c882..b9346df1a115 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/lib/ndarray.native.js @@ -20,8 +20,7 @@ // MODULES // -var Float32Array = require( '@stdlib/array/float32' ); -var addon = require( './snansum.native.js' ); +var addon = require( './../src/addon.node' ); // MAIN // @@ -31,8 +30,8 @@ var addon = require( './snansum.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 @@ -43,13 +42,8 @@ var addon = require( './snansum.native.js' ); * var v = snansum( 5, x, 2, 1 ); * // returns 5.0 */ -function snansum( N, x, stride, offset ) { - var view; - if ( stride < 0 ) { - offset += (N-1) * stride; - } - view = new Float32Array( x.buffer, x.byteOffset+(x.BYTES_PER_ELEMENT*offset), x.length-offset ); // eslint-disable-line max-len - return addon( N, view, stride ); +function snansum( N, x, strideX, offsetX ) { + return addon.ndarray( N, x, strideX, offsetX ); } diff --git a/lib/node_modules/@stdlib/blas/ext/base/snansum/lib/snansum.js b/lib/node_modules/@stdlib/blas/ext/base/snansum/lib/snansum.js index d2c391b610a8..c90707a17833 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/lib/snansum.js +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/lib/snansum.js @@ -20,7 +20,8 @@ // MODULES // -var snansumkbn = require( '@stdlib/blas/ext/base/snansumkbn' ); +var stride2offset = require( '@stdlib/strided/base/stride2offset' ); +var ndarray = require( './ndarray.js' ); // MAIN // @@ -30,7 +31,7 @@ var snansumkbn = require( '@stdlib/blas/ext/base/snansumkbn' ); * * @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 @@ -38,11 +39,11 @@ var snansumkbn = require( '@stdlib/blas/ext/base/snansumkbn' ); * * var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] ); * -* var v = snansum( 4, x, 1 ); +* var v = snansum( x.length, x, 1 ); * // returns 1.0 */ -function snansum( N, x, stride ) { - return snansumkbn( N, x, stride ); +function snansum( N, x, strideX ) { + return ndarray( N, x, strideX, stride2offset( N, strideX ) ); } diff --git a/lib/node_modules/@stdlib/blas/ext/base/snansum/lib/snansum.native.js b/lib/node_modules/@stdlib/blas/ext/base/snansum/lib/snansum.native.js index e6c2d12d0b4b..5ce5eff19563 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/lib/snansum.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/lib/snansum.native.js @@ -30,7 +30,7 @@ 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 @@ -38,11 +38,11 @@ var addon = require( './../src/addon.node' ); * * var x = new Float32Array( [ 1.0, -2.0, NaN, 2.0 ] ); * -* var v = snansum( 4, x, 1 ); +* var v = snansum( x.length, x, 1 ); * // returns 1.0 */ -function snansum( N, x, stride ) { - return addon( N, x, stride ); +function snansum( N, x, strideX ) { + return addon( N, x, strideX ); } diff --git a/lib/node_modules/@stdlib/blas/ext/base/snansum/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/snansum/manifest.json index 104383442b03..5c0c8b772d20 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/manifest.json @@ -28,55 +28,54 @@ { "task": "build", "src": [ - "./src/snansum.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], "dependencies": [ "@stdlib/blas/ext/base/snansumkbn", "@stdlib/napi/export", "@stdlib/napi/argv", - "@stdlib/napi/argv-double", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-float32array", - "@stdlib/napi/create-double" + "@stdlib/napi/create-double", + "@stdlib/strided/base/stride2offset", + "@stdlib/blas/base/shared" ] }, { "task": "benchmark", "src": [ - "./src/snansum.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], "dependencies": [ - "@stdlib/blas/ext/base/snansumkbn" + "@stdlib/blas/ext/base/snansumkbn", + "@stdlib/strided/base/stride2offset", + "@stdlib/blas/base/shared" ] }, { "task": "examples", "src": [ - "./src/snansum.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], "dependencies": [ - "@stdlib/blas/ext/base/snansumkbn" + "@stdlib/blas/ext/base/snansumkbn", + "@stdlib/strided/base/stride2offset", + "@stdlib/blas/base/shared" ] } ] diff --git a/lib/node_modules/@stdlib/blas/ext/base/snansum/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/snansum/src/addon.c index cbd1b333ea01..12a4bb5ca27a 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/src/addon.c +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/src/addon.c @@ -17,24 +17,45 @@ */ #include "stdlib/blas/ext/base/snansum.h" -#include +#include "stdlib/blas/base/shared.h" #include "stdlib/napi/export.h" #include "stdlib/napi/argv.h" -#include "stdlib/napi/argv_double.h" #include "stdlib/napi/argv_int64.h" #include "stdlib/napi/argv_strided_float32array.h" #include "stdlib/napi/create_double.h" +#include /** -* Add-on namespace. +* 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( 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_CREATE_DOUBLE( env, stdlib_strided_snansum( N, X, stride ), v ); + STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 2 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, strideX, argv, 1 ); + STDLIB_NAPI_CREATE_DOUBLE( env, (double)API_SUFFIX(stdlib_strided_snansum)( N, X, strideX ), v ); + return v; +} + +/** +* 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, (double)API_SUFFIX(stdlib_strided_snansum_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/snansum/src/main.c b/lib/node_modules/@stdlib/blas/ext/base/snansum/src/main.c new file mode 100644 index 000000000000..aba7835e2e87 --- /dev/null +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/src/main.c @@ -0,0 +1,48 @@ +/** +* @license Apache-2.0 +* +* Copyright (c) 2025 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/snansum.h" +#include "stdlib/blas/ext/base/snansumkbn.h" +#include "stdlib/strided/base/stride2offset.h" +#include "stdlib/blas/base/shared.h" + +/** +* Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values. +* +* @param N number of indexed elements +* @param X input array +* @param strideX stride length +* @return output value +*/ +float API_SUFFIX(stdlib_strided_snansum)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX ) { + CBLAS_INT ox = stdlib_strided_stride2offset( N, strideX ); + return API_SUFFIX(stdlib_strided_snansum_ndarray)( N, X, strideX, ox ); +} + +/** +* Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values and using alternative indexing semantics. +* +* @param N number of indexed elements +* @param X input array +* @param strideX stride length +* @param offsetX starting index +* @return output value +*/ +float API_SUFFIX(stdlib_strided_snansum_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ) { + return API_SUFFIX(stdlib_strided_snansumkbn_ndarray)( N, X, strideX, offsetX ); +} diff --git a/lib/node_modules/@stdlib/blas/ext/base/snansum/src/snansum.c b/lib/node_modules/@stdlib/blas/ext/base/snansum/src/snansum.c deleted file mode 100644 index d68784cad1a1..000000000000 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/src/snansum.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/snansum.h" -#include "stdlib/blas/ext/base/snansumkbn.h" -#include - -/** -* Computes the sum of single-precision floating-point strided array elements, ignoring `NaN` values. -* -* @param N number of indexed elements -* @param X input array -* @param stride stride length -* @return output value -*/ -float stdlib_strided_snansum( const int64_t N, const float *X, const int64_t stride ) { - return stdlib_strided_snansumkbn( N, X, stride ); -} diff --git a/lib/node_modules/@stdlib/blas/ext/base/snansum/test/test.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/snansum/test/test.ndarray.js index 16faf612e278..4d4007bb17b3 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/test/test.ndarray.js @@ -150,14 +150,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 = snansum( 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/snansum/test/test.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/snansum/test/test.ndarray.native.js index d84442f3646e..d704eaa1b6ab 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/test/test.ndarray.native.js @@ -159,14 +159,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 = snansum( 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/snansum/test/test.snansum.js b/lib/node_modules/@stdlib/blas/ext/base/snansum/test/test.snansum.js index dce766c68142..7d064320ffd7 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/test/test.snansum.js +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/test/test.snansum.js @@ -150,14 +150,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 = snansum( 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/snansum/test/test.snansum.native.js b/lib/node_modules/@stdlib/blas/ext/base/snansum/test/test.snansum.native.js index b6f01a3e7bd2..fd0d867c94f3 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/snansum/test/test.snansum.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/snansum/test/test.snansum.native.js @@ -241,14 +241,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 = snansum( x.length, x, 0 ); - t.strictEqual( v, 1.0, 'returns expected value' ); + t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); });