From 7df58771f61965f3c819af3ea3b9376fedd86a86 Mon Sep 17 00:00:00 2001 From: Muhammad Haris <101793258+headlessNode@users.noreply.github.com> Date: Sat, 26 Oct 2024 12:24:07 +0500 Subject: [PATCH] feat: add C `ndarray` API and refactor `blas/ext/base/dnansumors` PR-URL: https://github.com/stdlib-js/stdlib/pull/3001 Co-authored-by: Athan Reines Reviewed-by: Athan Reines Signed-off-by: Athan Reines --- .../blas/ext/base/dnansumors/README.md | 132 ++++++++++++++++-- .../base/dnansumors/benchmark/benchmark.js | 20 ++- .../dnansumors/benchmark/benchmark.native.js | 20 ++- .../dnansumors/benchmark/benchmark.ndarray.js | 20 ++- .../benchmark/benchmark.ndarray.native.js | 20 ++- .../dnansumors/benchmark/c/benchmark.length.c | 52 ++++++- .../blas/ext/base/dnansumors/docs/repl.txt | 32 ++--- .../ext/base/dnansumors/docs/types/index.d.ts | 12 +- .../ext/base/dnansumors/examples/c/example.c | 7 +- .../include/stdlib/blas/ext/base/dnansumors.h | 9 +- .../ext/base/dnansumors/lib/dnansumors.js | 37 +---- .../base/dnansumors/lib/dnansumors.native.js | 9 +- .../blas/ext/base/dnansumors/lib/index.js | 3 +- .../blas/ext/base/dnansumors/lib/ndarray.js | 16 +-- .../ext/base/dnansumors/lib/ndarray.native.js | 15 +- .../blas/ext/base/dnansumors/manifest.json | 31 ++-- .../blas/ext/base/dnansumors/src/addon.c | 26 +++- .../blas/ext/base/dnansumors/src/dnansumors.c | 58 -------- .../blas/ext/base/dnansumors/src/main.c | 69 +++++++++ .../base/dnansumors/test/test.dnansumors.js | 4 +- .../dnansumors/test/test.dnansumors.native.js | 4 +- .../ext/base/dnansumors/test/test.ndarray.js | 4 +- .../dnansumors/test/test.ndarray.native.js | 4 +- 23 files changed, 393 insertions(+), 211 deletions(-) delete mode 100644 lib/node_modules/@stdlib/blas/ext/base/dnansumors/src/dnansumors.c create mode 100644 lib/node_modules/@stdlib/blas/ext/base/dnansumors/src/main.c diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/README.md b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/README.md index 4f17dfb8836..7be8b667927 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/README.md @@ -36,7 +36,7 @@ limitations under the License. var dnansumors = require( '@stdlib/blas/ext/base/dnansumors' ); ``` -#### dnansumors( N, x, stride ) +#### dnansumors( N, x, strideX ) Computes the sum of double-precision floating-point strided array elements, ignoring `NaN` values and using ordinary recursive summation. @@ -44,9 +44,8 @@ Computes the sum of double-precision floating-point strided array elements, igno var Float64Array = require( '@stdlib/array/float64' ); var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] ); -var N = x.length; -var v = dnansumors( N, x, 1 ); +var v = dnansumors( x.length, x, 1 ); // returns 1.0 ``` @@ -54,7 +53,7 @@ The function has the following parameters: - **N**: number of indexed elements. - **x**: input [`Float64Array`][@stdlib/array/float64]. -- **stride**: index increment for `x`. +- **strideX**: stride length for `x`. The `N` and stride parameters determine which elements in the strided arrays are accessed at runtime. For example, to compute the sum of every other element in `x`, @@ -82,7 +81,7 @@ var v = dnansumors( 4, x1, 2 ); // returns 5.0 ``` -#### dnansumors.ndarray( N, x, stride, offset ) +#### dnansumors.ndarray( N, x, strideX, offsetX ) Computes the sum of double-precision floating-point strided array elements, ignoring `NaN` values and using ordinary recursive summation and alternative indexing semantics. @@ -91,15 +90,15 @@ var Float64Array = require( '@stdlib/array/float64' ); var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] ); -var v = dnansumors.ndarray( 4, x, 1, 0 ); +var v = dnansumors.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 Float64Array = require( '@stdlib/array/float64' ); @@ -155,6 +154,123 @@ console.log( v ); + + +* * * + +
+ +## C APIs + + + +
+ +
+ + + + + +
+ +### Usage + +```c +#include "stdlib/blas/ext/base/dnansumors.h" +``` + +#### stdlib_strided_dnansumors( N, \*X, strideX ) + +Computes the sum of double-precision floating-point strided array elements, ignoring `NaN` values and using ordinary recursive summation. + +```c +const double x[] = { 1.0, 2.0, 0.0/0.0, 4.0 }; + +double v = stdlib_strided_dnansumors( 4, x, 1 ); +// returns 7.0 +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[in] double*` input array. +- **strideX**: `[in] CBLAS_INT` stride length for `X`. + +```c +double stdlib_strided_dnansumors( const CBLAS_INT N, const double *X, const CBLAS_INT strideX ); +``` + +#### stdlib_strided_dnansumors_ndarray( N, \*X, strideX, offsetX ) + +Computes the sum of double-precision floating-point strided array elements, ignoring `NaN` values and using ordinary recursive summation and alternative indexing semantics. + +```c +const double x[] = { 1.0, 2.0, 0.0/0.0, 4.0 }; + +double v = stdlib_strided_dnansumors_ndarray( 4, x, 1, 0 ); +// returns 7.0 +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[in] double*` input array. +- **strideX**: `[in] CBLAS_INT` stride length for `X`. +- **offsetX**: `[in] CBLAS_INT` starting index for `X`. + +```c +double stdlib_strided_dnansumors_ndarray( const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); +``` + +
+ + + + + +
+ +
+ + + + + +
+ +### Examples + +```c +#include "stdlib/blas/ext/base/dnansumors.h" +#include + +int main( void ) { + // Create a strided array: + const double 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 }; + + // Specify the number of elements: + const int N = 5; + + // Specify the stride length: + const int strideX = 2; + + // Compute the sum: + double v = stdlib_strided_dnansumors( N, x, strideX ); + + // Print the result: + printf( "sum: %lf\n", v ); +} +``` + +
+ + + +
+ + +
diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/benchmark/benchmark.js index 16329336ef6..604baf769c9 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/benchmark/benchmark.js @@ -32,6 +32,19 @@ var dnansumors = require( './../lib/dnansumors.js' ); // FUNCTIONS // +/** +* Returns a random number. +* +* @private +* @returns {number} random number +*/ +function rand() { + if ( bernoulli( 0.8 ) > 0 ) { + return uniform( -10.0, 10.0 ); + } + return NaN; +} + /** * Creates a benchmark function. * @@ -43,13 +56,6 @@ function createBenchmark( len ) { var x = filledarrayBy( len, 'float64', 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/dnansumors/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/benchmark/benchmark.native.js index 446a62c8921..eb4b59b4678 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/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.8 ) > 0 ) { + return uniform( -10.0, 10.0 ); + } + return NaN; +} + /** * Creates a benchmark function. * @@ -52,13 +65,6 @@ function createBenchmark( len ) { var x = filledarrayBy( len, 'float64', 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/dnansumors/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/benchmark/benchmark.ndarray.js index ba95c912f57..7da5cabc308 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/benchmark/benchmark.ndarray.js @@ -32,6 +32,19 @@ var dnansumors = require( './../lib/ndarray.js' ); // FUNCTIONS // +/** +* Returns a random number. +* +* @private +* @returns {number} random number +*/ +function rand() { + if ( bernoulli( 0.8 ) > 0 ) { + return uniform( -10.0, 10.0 ); + } + return NaN; +} + /** * Creates a benchmark function. * @@ -43,13 +56,6 @@ function createBenchmark( len ) { var x = filledarrayBy( len, 'float64', 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/dnansumors/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/benchmark/benchmark.ndarray.native.js index 880f184fe0c..9acd8b9397c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/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.8 ) > 0 ) { + return uniform( -10.0, 10.0 ); + } + return NaN; +} + /** * Creates a benchmark function. * @@ -52,13 +65,6 @@ function createBenchmark( len ) { var x = filledarrayBy( len, 'float64', 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/dnansumors/benchmark/c/benchmark.length.c b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/benchmark/c/benchmark.length.c index 6116617b414..05acf4b3a84 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/benchmark/c/benchmark.length.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/benchmark/c/benchmark.length.c @@ -94,7 +94,7 @@ static double rand_double( 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; double x[ len ]; double v; @@ -124,6 +124,43 @@ 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; + double x[ len ]; + double v; + double t; + int i; + + for ( i = 0; i < len; i++ ) { + if ( rand_double() < 0.2 ) { + x[ i ] = 0.0 / 0.0; // NaN + } else { + x[ i ] = ( rand_double() * 20000.0 ) - 10000.0; + } + } + v = 0.0; + t = tic(); + for ( i = 0; i < iterations; i++ ) { + v = stdlib_strided_dnansumors_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 +183,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/dnansumors/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/docs/repl.txt index 2967f48e54c..4253c2521cb 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/docs/repl.txt @@ -1,9 +1,9 @@ -{{alias}}( N, x, stride ) +{{alias}}( N, x, strideX ) Computes the sum of double-precision floating-point strided array elements, ignoring `NaN` values and using ordinary recursive summation. - The `N` and `stride` parameters determine which elements in `x` are accessed + The `N` and stride parameters determine which elements in `x` are accessed at runtime. Indexing is relative to the first index. To introduce an offset, use a typed @@ -19,8 +19,8 @@ x: Float64Array Input array. - stride: integer - Index increment. + strideX: integer + Stride length. Returns ------- @@ -34,28 +34,25 @@ > {{alias}}( x.length, x, 1 ) 1.0 - // Using `N` and `stride` parameters: + // Using `N` and stride parameters: > x = new {{alias:@stdlib/array/float64}}( [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0, NaN, NaN ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > var stride = 2; - > {{alias}}( N, x, stride ) + > {{alias}}( 4, x, 2 ) 1.0 // Using view offsets: > var x0 = new {{alias:@stdlib/array/float64}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN, NaN ] ); > var x1 = new {{alias:@stdlib/array/float64}}( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); - > N = {{alias:@stdlib/math/base/special/floor}}( x0.length / 2 ); - > stride = 2; - > {{alias}}( N, x1, stride ) + > {{alias}}( 4, x1, 2 ) -1.0 -{{alias}}.ndarray( N, x, stride, offset ) + +{{alias}}.ndarray( N, x, strideX, offsetX ) Computes the sum of double-precision floating-point strided array elements, ignoring `NaN` values and using ordinary recursive summation and 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 + buffer, the offset parameter supports indexing semantics based on a starting index. Parameters @@ -66,10 +63,10 @@ x: Float64Array Input array. - stride: integer - Index increment. + strideX: integer + Stride length. - offset: integer + offsetX: integer Starting index. Returns @@ -86,8 +83,7 @@ // Using offset parameter: > var x = new {{alias:@stdlib/array/float64}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN, NaN ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > {{alias}}.ndarray( N, x, 2, 1 ) + > {{alias}}.ndarray( 4, x, 2, 1 ) -1.0 See Also diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/docs/types/index.d.ts b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/docs/types/index.d.ts index b2d004cc9c4..95e74d8973d 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/docs/types/index.d.ts +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/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 = dnansumors( x.length, x, 1 ); * // returns 1.0 */ - ( N: number, x: Float64Array, stride: number ): number; + ( N: number, x: Float64Array, strideX: number ): number; /** * Computes the sum of double-precision floating-point strided array elements, ignoring `NaN` values and using ordinary recursive summation and 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 = dnansumors.ndarray( x.length, x, 1, 0 ); * // returns 1.0 */ - ndarray( N: number, x: Float64Array, stride: number, offset: number ): number; + ndarray( N: number, x: Float64Array, 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/dnansumors/examples/c/example.c b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/examples/c/example.c index 3e1726087a7..5085e91007c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/examples/c/example.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/examples/c/example.c @@ -17,7 +17,6 @@ */ #include "stdlib/blas/ext/base/dnansumors.h" -#include #include int main( void ) { @@ -25,13 +24,13 @@ int main( void ) { const double 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 }; // 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_dnansumors( N, x, stride ); + double v = stdlib_strided_dnansumors( N, x, strideX ); // Print the result: printf( "sum: %lf\n", v ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/include/stdlib/blas/ext/base/dnansumors.h b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/include/stdlib/blas/ext/base/dnansumors.h index b1a7c20dadd..2759b973359 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/include/stdlib/blas/ext/base/dnansumors.h +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/include/stdlib/blas/ext/base/dnansumors.h @@ -19,7 +19,7 @@ #ifndef STDLIB_BLAS_EXT_BASE_DNANSUMORS_H #define STDLIB_BLAS_EXT_BASE_DNANSUMORS_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 double-precision floating-point strided array elements, ignoring `NaN` values and using ordinary recursive summation. */ -double stdlib_strided_dnansumors( const int64_t N, const double *X, const int64_t stride ); +double API_SUFFIX(stdlib_strided_dnansumors)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX ); + +/** +* Computes the sum of double-precision floating-point strided array elements, ignoring `NaN` values and using ordinary recursive summation and alternative indexing semantics. +*/ +double API_SUFFIX(stdlib_strided_dnansumors_ndarray)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); #ifdef __cplusplus } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/lib/dnansumors.js b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/lib/dnansumors.js index e9f544141a5..837c6b795a1 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/lib/dnansumors.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/lib/dnansumors.js @@ -20,7 +20,8 @@ // MODULES // -var isnan = require( '@stdlib/math/base/assert/is-nan' ); +var stride2offset = require( '@stdlib/strided/base/stride2offset' ); +var ndarray = require( './ndarray.js' ); // MAIN // @@ -30,45 +31,19 @@ var isnan = require( '@stdlib/math/base/assert/is-nan' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} x - input array -* @param {integer} stride - stride length +* @param {integer} strideX - stride length * @returns {number} sum * * @example * var Float64Array = require( '@stdlib/array/float64' ); * * var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] ); -* var N = x.length; * -* var v = dnansumors( N, x, 1 ); +* var v = dnansumors( x.length, x, 1 ); * // returns 1.0 */ -function dnansumors( N, x, stride ) { - var sum; - var ix; - var i; - - sum = 0.0; - if ( N <= 0 ) { - return sum; - } - if ( N === 1 || stride === 0 ) { - if ( isnan( x[ 0 ] ) ) { - return sum; - } - return x[ 0 ]; - } - if ( stride < 0 ) { - ix = (1-N) * stride; - } else { - ix = 0; - } - for ( i = 0; i < N; i++ ) { - if ( isnan( x[ ix ] ) === false ) { - sum += x[ ix ]; - } - ix += stride; - } - return sum; +function dnansumors( N, x, strideX ) { + return ndarray( N, x, strideX, stride2offset( N, strideX ) ); } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/lib/dnansumors.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/lib/dnansumors.native.js index 361783bc8cd..427a7813a67 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/lib/dnansumors.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/lib/dnansumors.native.js @@ -30,20 +30,19 @@ var addon = require( './../src/addon.node' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} x - input array -* @param {integer} stride - stride length +* @param {integer} strideX - stride length * @returns {number} sum * * @example * var Float64Array = require( '@stdlib/array/float64' ); * * var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] ); -* var N = x.length; * -* var v = dnansumors( N, x, 1 ); +* var v = dnansumors( x.length, x, 1 ); * // returns 1.0 */ -function dnansumors( N, x, stride ) { - return addon( N, x, stride ); +function dnansumors( N, x, strideX ) { + return addon( N, x, strideX ); } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/lib/index.js b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/lib/index.js index 9821a0550a7..b15c3edf9fd 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/lib/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/lib/index.js @@ -28,9 +28,8 @@ * var dnansumors = require( '@stdlib/blas/ext/base/dnansumors' ); * * var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] ); -* var N = x.length; * -* var v = dnansumors( N, x, 1 ); +* var v = dnansumors( x.length, x, 1 ); * // returns 1.0 * * @example diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/lib/ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/lib/ndarray.js index 30e711cbbd7..50fbf43c5a5 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/lib/ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/lib/ndarray.js @@ -30,8 +30,8 @@ var isnan = require( '@stdlib/math/base/assert/is-nan' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} 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,7 +42,7 @@ var isnan = require( '@stdlib/math/base/assert/is-nan' ); * var v = dnansumors( 5, x, 2, 1 ); * // returns 5.0 */ -function dnansumors( N, x, stride, offset ) { +function dnansumors( N, x, strideX, offsetX ) { var sum; var ix; var i; @@ -51,18 +51,18 @@ function dnansumors( N, x, stride, offset ) { if ( N <= 0 ) { return sum; } - if ( N === 1 || stride === 0 ) { - if ( isnan( x[ offset ] ) ) { + ix = offsetX; + if ( strideX === 0 ) { + if ( isnan( x[ ix ] ) ) { return sum; } - return x[ offset ]; + return x[ ix ] * N; } - ix = offset; for ( i = 0; i < N; i++ ) { if ( isnan( x[ ix ] ) === false ) { sum += x[ ix ]; } - ix += stride; + ix += strideX; } return sum; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/lib/ndarray.native.js index 210ef9a1f1a..8968019495b 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/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( './dnansumors.native.js' ); +var addon = require( './../src/addon.node' ); // MAIN // @@ -32,8 +30,8 @@ var addon = require( './dnansumors.native.js' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} 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( './dnansumors.native.js' ); * var v = dnansumors( 5, x, 2, 1 ); * // returns 5.0 */ -function dnansumors( N, x, stride, offset ) { - var view; - offset = minViewBufferIndex( N, stride, offset ); - view = offsetView( x, offset ); - return addon( N, view, stride ); +function dnansumors( N, x, strideX, offsetX ) { + return addon.ndarray( N, x, strideX, offsetX ); } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/manifest.json index 73541919f8b..a7ed214aa08 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/manifest.json @@ -28,53 +28,54 @@ { "task": "build", "src": [ - "./src/dnansumors.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], "dependencies": [ "@stdlib/math/base/assert/is-nan", "@stdlib/napi/export", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", - "@stdlib/napi/argv-strided-float64array" + "@stdlib/napi/argv-strided-float64array", + "@stdlib/strided/base/stride2offset", + "@stdlib/blas/base/shared", + "@stdlib/napi/create-double" ] }, { "task": "benchmark", "src": [ - "./src/dnansumors.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], "dependencies": [ - "@stdlib/math/base/assert/is-nan" + "@stdlib/math/base/assert/is-nan", + "@stdlib/strided/base/stride2offset", + "@stdlib/blas/base/shared" ] }, { "task": "examples", "src": [ - "./src/dnansumors.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], "dependencies": [ - "@stdlib/math/base/assert/is-nan" + "@stdlib/math/base/assert/is-nan", + "@stdlib/strided/base/stride2offset", + "@stdlib/blas/base/shared" ] } ] diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/src/addon.c index 37744e9f716..6b164abdb21 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/src/addon.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/src/addon.c @@ -17,12 +17,13 @@ */ #include "stdlib/blas/ext/base/dnansumors.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_float64array.h" +#include "stdlib/napi/create_double.h" #include -#include /** * Receives JavaScript callback invocation data. @@ -36,12 +37,25 @@ static napi_value addon( napi_env env, napi_callback_info info ) { STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 2 ); STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, X, N, strideX, argv, 1 ); + STDLIB_NAPI_CREATE_DOUBLE( env, API_SUFFIX(stdlib_strided_dnansumors)( N, X, strideX ), v ); + return v; +} - napi_value v; - napi_status status = napi_create_double( env, stdlib_strided_dnansumors( N, X, strideX ), &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_FLOAT64ARRAY( env, X, N, strideX, argv, 1 ); + STDLIB_NAPI_CREATE_DOUBLE( env, API_SUFFIX(stdlib_strided_dnansumors_ndarray)( N, X, strideX, offsetX ), v ); return v; } -STDLIB_NAPI_MODULE_EXPORT_FCN( addon ) \ No newline at end of file +STDLIB_NAPI_MODULE_EXPORT_FCN_WITH_METHOD( addon, "ndarray", addon_method ) diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/src/dnansumors.c b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/src/dnansumors.c deleted file mode 100644 index c02a0387c0c..00000000000 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/src/dnansumors.c +++ /dev/null @@ -1,58 +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/dnansumors.h" -#include "stdlib/math/base/assert/is_nan.h" -#include - -/** -* Computes the sum of double-precision floating-point strided array elements, ignoring `NaN` values and using ordinary recursive summation. -* -* @param N number of indexed elements -* @param X input array -* @param stride stride length -* @return output value -*/ -double stdlib_strided_dnansumors( const int64_t N, const double *X, const int64_t stride ) { - double sum; - int64_t ix; - int64_t i; - - sum = 0.0; - if ( N <= 0 ) { - return sum; - } - if ( N == 1 || stride == 0 ) { - if ( stdlib_base_is_nan( X[ 0 ] ) ) { - return sum; - } - return X[ 0 ]; - } - if ( stride < 0 ) { - ix = (1-N) * stride; - } else { - ix = 0; - } - for ( i = 0; i < N; i++ ) { - if ( !stdlib_base_is_nan( X[ ix ] ) ) { - sum += X[ ix ]; - } - ix += stride; - } - return sum; -} diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/src/main.c b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/src/main.c new file mode 100644 index 00000000000..d9c07c5abe6 --- /dev/null +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/src/main.c @@ -0,0 +1,69 @@ +/** +* @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/dnansumors.h" +#include "stdlib/strided/base/stride2offset.h" +#include "stdlib/math/base/assert/is_nan.h" +#include "stdlib/blas/base/shared.h" + +/** +* Computes the sum of double-precision floating-point strided array elements, ignoring `NaN` values and using ordinary recursive summation. +* +* @param N number of indexed elements +* @param X input array +* @param strideX stride length +* @return output value +*/ +double API_SUFFIX(stdlib_strided_dnansumors)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX ) { + CBLAS_INT ox = stdlib_strided_stride2offset( N, strideX ); + return API_SUFFIX(stdlib_strided_dnansumors_ndarray)( N, X, strideX, ox ); +} + +/** +* Computes the sum of double-precision floating-point strided array elements, ignoring `NaN` values and using ordinary recursive summation and alternative indexing semantics. +* +* @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_dnansumors_ndarray)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ) { + double sum; + CBLAS_INT ix; + CBLAS_INT i; + + sum = 0.0; + if ( N <= 0 ) { + return sum; + } + ix = offsetX; + if ( strideX == 0 ) { + if ( stdlib_base_is_nan( X[ ix ] ) ) { + return sum; + } + return X[ ix ] * N; + } + for ( i = 0; i < N; i++ ) { + if ( !stdlib_base_is_nan( X[ ix ] ) ) { + sum += X[ ix ]; + } + ix += strideX; + } + return sum; +} diff --git a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/test/test.dnansumors.js b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/test/test.dnansumors.js index c11ef3d8487..e04541f8a36 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/test/test.dnansumors.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/test/test.dnansumors.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 Float64Array( [ 1.0, -2.0, -4.0, 5.0, 3.0 ] ); v = dnansumors( 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/dnansumors/test/test.dnansumors.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/test/test.dnansumors.native.js index 6e32bfe3868..6be38143d54 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/test/test.dnansumors.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/test/test.dnansumors.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 Float64Array( [ 1.0, -2.0, -4.0, 5.0, 3.0 ] ); v = dnansumors( 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/dnansumors/test/test.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/test/test.ndarray.js index 2f63b55fb9f..d4c8bc03a1c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/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 Float64Array( [ 1.0, -2.0, -4.0, 5.0, 3.0 ] ); v = dnansumors( 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/dnansumors/test/test.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/test/test.ndarray.native.js index 5609a90a554..a7525907717 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dnansumors/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dnansumors/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 Float64Array( [ 1.0, -2.0, -4.0, 5.0, 3.0 ] ); v = dnansumors( x.length, x, 0, 0 ); - t.strictEqual( v, 1.0, 'returns expected value' ); + t.strictEqual( v, 5.0, 'returns expected value' ); t.end(); });