From b054836b54e2799e546e3cb15dd612ace5cd6db4 Mon Sep 17 00:00:00 2001 From: aman-095 Date: Fri, 20 Sep 2024 14:40:33 +0530 Subject: [PATCH] feat: update Js implementation and add C ndarray implementation for sasum --- .../@stdlib/blas/base/sasum/README.md | 125 +++++++++++++++++- .../base/sasum/benchmark/c/benchmark.length.c | 44 +++++- .../@stdlib/blas/base/sasum/docs/repl.txt | 2 +- .../blas/base/sasum/examples/c/example.c | 10 +- .../sasum/include/stdlib/blas/base/sasum.h | 9 +- .../include/stdlib/blas/base/sasum_cblas.h | 4 +- .../@stdlib/blas/base/sasum/lib/ndarray.js | 33 ++++- .../blas/base/sasum/lib/ndarray.native.js | 14 +- .../@stdlib/blas/base/sasum/lib/sasum.js | 20 +-- .../blas/base/sasum/lib/sasum.native.js | 2 +- .../@stdlib/blas/base/sasum/manifest.json | 109 ++++++++++++--- .../@stdlib/blas/base/sasum/src/addon.c | 26 +++- .../@stdlib/blas/base/sasum/src/sasum.c | 39 +----- .../@stdlib/blas/base/sasum/src/sasum_cblas.c | 28 +++- .../@stdlib/blas/base/sasum/src/sasum_f.c | 34 ++++- .../blas/base/sasum/src/sasum_ndarray.c | 72 ++++++++++ .../blas/base/sasum/test/test.ndarray.js | 2 +- .../base/sasum/test/test.ndarray.native.js | 2 +- .../blas/base/sasum/test/test.sasum.js | 16 ++- .../blas/base/sasum/test/test.sasum.native.js | 16 ++- 20 files changed, 497 insertions(+), 110 deletions(-) create mode 100644 lib/node_modules/@stdlib/blas/base/sasum/src/sasum_ndarray.c diff --git a/lib/node_modules/@stdlib/blas/base/sasum/README.md b/lib/node_modules/@stdlib/blas/base/sasum/README.md index 8a270f4b0de..a79dfb368ce 100644 --- a/lib/node_modules/@stdlib/blas/base/sasum/README.md +++ b/lib/node_modules/@stdlib/blas/base/sasum/README.md @@ -97,7 +97,7 @@ var sum = sasum( 3, x1, 2 ); // returns 12.0 ``` -If either `N` or `stride` is less than or equal to `0`, the function returns `0`. +If either `N` is less than or equal to `0`, the function returns `0`. #### sasum.ndarray( N, x, stride, offset ) @@ -170,6 +170,129 @@ console.log( out ); + + +* * * + +
+ +## C APIs + + + +
+ +
+ + + + + +
+ +### Usage + +```c +#include "stdlib/blas/base/sasum.h" +``` + +#### c_sasum( N, \*X, stride ) + +Computes the sum of [absolute values][@stdlib/math/base/special/abs]. + +```c +const float x[] = { 1.0f, -2.0f, 3.0f, -4.0f, 5.0f, -6.0f, 7.0f, -8.0f }; + +float sum = c_sasum( 8, x, 1 ); +// returns 36.0f +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[in] float*` input array. +- **stride**: `[in] CBLAS_INT` index increment for `X`. + +```c +float c_sasum( const CBLAS_INT N, const float *X, const CBLAS_INT stride ); +``` + +#### c_sasum_ndarray( N, \*X, stride, offset ) + +Computes the sum of [absolute values][@stdlib/math/base/special/abs] using alternative indexing semantics. + +```c +const float x[] = { 1.0f, -2.0f, 3.0f, -4.0f, 5.0f, -6.0f, 7.0f, -8.0f }; + +float sum = c_sasum_ndarray( 8, x, -1, 7 ); +// returns 36.0f +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[in] float*` input array. +- **stride**: `[in] CBLAS_INT` index increment for `X`. +- **offset**: `[in] CBLAS_INT` starting index for `X`. + +```c +float c_sasum_ndarray( const CBLAS_INT N, const float *X, const CBLAS_INT stride, const CBLAS_INT offset ); +``` + +
+ + + + + +
+ +
+ + + + + +
+ +### Examples + +```c +#include "stdlib/blas/base/sasum.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 }; + + // Specify the number of elements: + const int N = 8; + + // Specify a stride: + const int stride = 1; + + // Compute the sum of absolute values: + float sum = c_sasum( N, x, stride ); + + // Print the result: + printf( "sum: %f\n", sum ); + + // Compute the sum of absolute values: + sum = c_sasum_ndarray( N, x, -stride, N-1 ); + + // Print the result: + printf( "sum: %f\n", sum ); +} +``` + +
+ + + +
+ + +
diff --git a/lib/node_modules/@stdlib/blas/base/sasum/benchmark/c/benchmark.length.c b/lib/node_modules/@stdlib/blas/base/sasum/benchmark/c/benchmark.length.c index 91e15ade430..a7973583771 100644 --- a/lib/node_modules/@stdlib/blas/base/sasum/benchmark/c/benchmark.length.c +++ b/lib/node_modules/@stdlib/blas/base/sasum/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 y; @@ -120,6 +120,39 @@ 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 y; + double t; + int i; + + for ( i = 0; i < len; i++ ) { + x[ i ] = ( rand_float()*20000.0f ) - 10000.0f; + } + y = 0.0f; + t = tic(); + for ( i = 0; i < iterations; i++ ) { + y = c_sasum_ndarray( len, x, 1, 0 ); + if ( y != y ) { + printf( "should not return NaN\n" ); + break; + } + } + elapsed = tic() - t; + if ( y != y ) { + printf( "should not return NaN\n" ); + } + return elapsed; +} + /** * Main execution sequence. */ @@ -142,7 +175,14 @@ 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 ( 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/base/sasum/docs/repl.txt b/lib/node_modules/@stdlib/blas/base/sasum/docs/repl.txt index 355352fc0ee..1da32b8a509 100644 --- a/lib/node_modules/@stdlib/blas/base/sasum/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/base/sasum/docs/repl.txt @@ -10,7 +10,7 @@ Indexing is relative to the first index. To introduce an offset, use typed array views. - If `N` or `stride` is less than or equal to `0`, the function returns `0`. + If `N` is less than or equal to `0`, the function returns `0`. Parameters ---------- diff --git a/lib/node_modules/@stdlib/blas/base/sasum/examples/c/example.c b/lib/node_modules/@stdlib/blas/base/sasum/examples/c/example.c index 5c28a520cae..fb711618c31 100644 --- a/lib/node_modules/@stdlib/blas/base/sasum/examples/c/example.c +++ b/lib/node_modules/@stdlib/blas/base/sasum/examples/c/example.c @@ -27,10 +27,16 @@ int main( void ) { const int N = 8; // Specify a stride: - const int strideX = 1; + const int stride = 1; // Compute the sum of absolute values: - float sum = c_sasum( N, x, strideX ); + float sum = c_sasum( N, x, stride ); + + // Print the result: + printf( "sum: %f\n", sum ); + + // Compute the sum of absolute values: + sum = c_sasum_ndarray( N, x, -stride, N-1 ); // Print the result: printf( "sum: %f\n", sum ); diff --git a/lib/node_modules/@stdlib/blas/base/sasum/include/stdlib/blas/base/sasum.h b/lib/node_modules/@stdlib/blas/base/sasum/include/stdlib/blas/base/sasum.h index abcc4eaf502..385bd115a07 100644 --- a/lib/node_modules/@stdlib/blas/base/sasum/include/stdlib/blas/base/sasum.h +++ b/lib/node_modules/@stdlib/blas/base/sasum/include/stdlib/blas/base/sasum.h @@ -22,6 +22,8 @@ #ifndef SASUM_H #define SASUM_H +#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. */ @@ -32,7 +34,12 @@ extern "C" { /** * Computes the sum of absolute values. */ -float c_sasum( const int N, const float *X, const int stride ); +float API_SUFFIX(c_sasum)( const CBLAS_INT N, const float *X, const CBLAS_INT stride ); + +/** +* Computes the sum of absolute values using alternative indexing semantics. +*/ +float API_SUFFIX(c_sasum_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT stride, const CBLAS_INT offset ); #ifdef __cplusplus } diff --git a/lib/node_modules/@stdlib/blas/base/sasum/include/stdlib/blas/base/sasum_cblas.h b/lib/node_modules/@stdlib/blas/base/sasum/include/stdlib/blas/base/sasum_cblas.h index 2e39b5b4b5c..52bab71132c 100644 --- a/lib/node_modules/@stdlib/blas/base/sasum/include/stdlib/blas/base/sasum_cblas.h +++ b/lib/node_modules/@stdlib/blas/base/sasum/include/stdlib/blas/base/sasum_cblas.h @@ -22,6 +22,8 @@ #ifndef SASUM_CBLAS_H #define SASUM_CBLAS_H +#include "stdlib/blas/base/shared" + /* * If C++, prevent name mangling so that the compiler emits a binary file having undecorated names, thus mirroring the behavior of a C compiler. */ @@ -32,7 +34,7 @@ extern "C" { /** * Computes the sum of absolute values. */ -float cblas_sasum( const int N, const float *X, const int stride ); +float API_SUFFIX(cblas_sasum)( const CBLAS_INT N, const float *X, const CBLAS_INT stride ); #ifdef __cplusplus } diff --git a/lib/node_modules/@stdlib/blas/base/sasum/lib/ndarray.js b/lib/node_modules/@stdlib/blas/base/sasum/lib/ndarray.js index 4946f0eed06..87564bf08ad 100644 --- a/lib/node_modules/@stdlib/blas/base/sasum/lib/ndarray.js +++ b/lib/node_modules/@stdlib/blas/base/sasum/lib/ndarray.js @@ -21,7 +21,12 @@ // MODULES // var absf = require( '@stdlib/math/base/special/absf' ); -var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' ); +var f32 = require( '@stdlib/number/float64/base/to-float32' ); + + +// VARIABLES // + +var M = 6; // MAIN // @@ -32,7 +37,7 @@ var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' ); * @param {PositiveInteger} N - number of indexed elements * @param {Float32Array} x - input array * @param {integer} stride - `x` stride length -* @param {NonNegativeInteger} offset - starting `x` index +* @param {NonNegativeInteger} offset - starting index for `x` * @returns {number} sum * * @example @@ -47,14 +52,36 @@ function sasum( N, x, stride, offset ) { var sum; var ix; var i; + var m; sum = 0.0; if ( N <= 0 ) { return sum; } ix = offset; + + // If the stride is equal to `1`, use unrolled loops... + if ( stride === 1 ) { + m = N % M; + + // If we have a remainder, run a clean-up loop... + if ( m > 0 ) { + for ( i = 0; i < m; i++ ) { + sum = f32( sum + absf( x[ ix ] ) ); + ix += stride; + } + } + if ( N < M ) { + return sum; + } + for ( i = m; i < N; i += M ) { + sum = f32( sum + absf( x[ ix ] ) + absf( x[ ix+1 ] ) + absf( x[ ix+2 ] ) + absf( x[ ix+3 ] ) + absf( x[ ix+4 ] ) + absf( x[ ix+5 ] ) ); // eslint-disable-line max-len + ix += M; + } + return sum; + } for ( i = 0; i < N; i++ ) { - sum = float64ToFloat32( sum + absf( x[ix] ) ); + sum = f32( sum + absf( x[ ix ] ) ); ix += stride; } return sum; diff --git a/lib/node_modules/@stdlib/blas/base/sasum/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/base/sasum/lib/ndarray.native.js index 1689e2d1a38..ec3f19620bb 100644 --- a/lib/node_modules/@stdlib/blas/base/sasum/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/base/sasum/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( './sasum.native.js' ); +var addon = require( './../src/addon.node' ); // MAIN // @@ -33,7 +31,7 @@ var addon = require( './sasum.native.js' ); * @param {PositiveInteger} N - number of indexed elements * @param {Float32Array} x - input array * @param {integer} stride - `x` stride length -* @param {NonNegativeInteger} offset - starting `x` index +* @param {NonNegativeInteger} offset - starting index for `x` * @returns {number} sum * * @example @@ -45,13 +43,7 @@ var addon = require( './sasum.native.js' ); * // returns 15.0 */ function sasum( N, x, stride, offset ) { - var view; - offset = minViewBufferIndex( N, stride, offset ); - if ( stride < 0 ) { - stride *= -1; - } - view = offsetView( x, offset ); - return addon( N, view, stride ); + return addon.ndarray( N, x, stride, offset ); } diff --git a/lib/node_modules/@stdlib/blas/base/sasum/lib/sasum.js b/lib/node_modules/@stdlib/blas/base/sasum/lib/sasum.js index 5b4e56bfb0f..1181197049b 100644 --- a/lib/node_modules/@stdlib/blas/base/sasum/lib/sasum.js +++ b/lib/node_modules/@stdlib/blas/base/sasum/lib/sasum.js @@ -20,8 +20,8 @@ // MODULES // -var absf = require( '@stdlib/math/base/special/absf' ); -var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' ); +var stride2offset = require( '@stdlib/strided/base/stride2offset' ); +var ndarray = require( './ndarray.js' ); // MAIN // @@ -31,7 +31,7 @@ var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float32Array} x - input array -* @param {PositiveInteger} stride - `x` stride length +* @param {integer} stride - `x` stride length * @returns {number} sum * * @example @@ -43,18 +43,8 @@ var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' ); * // returns 15.0 */ function sasum( N, x, stride ) { - var sum; - var i; - - sum = 0.0; - if ( N <= 0 || stride <= 0 ) { - return sum; - } - N *= stride; - for ( i = 0; i < N; i += stride ) { - sum = float64ToFloat32( sum + absf( x[i] ) ); - } - return sum; + var ox = stride2offset( N, stride ); + return ndarray( N, x, stride, ox ); } diff --git a/lib/node_modules/@stdlib/blas/base/sasum/lib/sasum.native.js b/lib/node_modules/@stdlib/blas/base/sasum/lib/sasum.native.js index fb6f372e9a0..df62e298126 100644 --- a/lib/node_modules/@stdlib/blas/base/sasum/lib/sasum.native.js +++ b/lib/node_modules/@stdlib/blas/base/sasum/lib/sasum.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 {PositiveInteger} stride - `x` stride length +* @param {integer} stride - `x` stride length * @returns {number} sum * * @example diff --git a/lib/node_modules/@stdlib/blas/base/sasum/manifest.json b/lib/node_modules/@stdlib/blas/base/sasum/manifest.json index 09b93143eb5..9ed9e9410f1 100644 --- a/lib/node_modules/@stdlib/blas/base/sasum/manifest.json +++ b/lib/node_modules/@stdlib/blas/base/sasum/manifest.json @@ -44,6 +44,8 @@ "libraries": [], "libpath": [], "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/export", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", @@ -57,7 +59,8 @@ "blas": "", "wasm": false, "src": [ - "./src/sasum.c" + "./src/sasum.c", + "./src/sasum_ndarray.c" ], "include": [ "./include" @@ -66,7 +69,11 @@ "-lm" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", + "@stdlib/math/base/special/absf" + ] }, { "task": "examples", @@ -74,7 +81,8 @@ "blas": "", "wasm": false, "src": [ - "./src/sasum.c" + "./src/sasum.c", + "./src/sasum_ndarray.c" ], "include": [ "./include" @@ -83,7 +91,11 @@ "-lm" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", + "@stdlib/math/base/special/absf" + ] }, { @@ -103,6 +115,8 @@ ], "libpath": [], "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/export", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", @@ -126,7 +140,10 @@ "-lpthread" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index" + ] }, { "task": "examples", @@ -144,7 +161,10 @@ "-lpthread" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index" + ] }, { @@ -163,6 +183,8 @@ "libraries": [], "libpath": [], "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/export", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", @@ -176,7 +198,8 @@ "blas": "", "wasm": false, "src": [ - "./src/sasum.c" + "./src/sasum.c", + "./src/sasum_ndarray.c" ], "include": [ "./include" @@ -185,7 +208,11 @@ "-lm" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", + "@stdlib/math/base/special/absf" + ] }, { "task": "examples", @@ -193,7 +220,8 @@ "blas": "", "wasm": false, "src": [ - "./src/sasum.c" + "./src/sasum.c", + "./src/sasum_ndarray.c" ], "include": [ "./include" @@ -202,7 +230,11 @@ "-lm" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", + "@stdlib/math/base/special/absf" + ] }, { @@ -221,6 +253,8 @@ ], "libpath": [], "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/export", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", @@ -243,7 +277,10 @@ "-lblas" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index" + ] }, { "task": "examples", @@ -260,7 +297,10 @@ "-lblas" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index" + ] }, { @@ -280,6 +320,8 @@ ], "libpath": [], "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/export", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", @@ -303,7 +345,10 @@ "-lpthread" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index" + ] }, { "task": "examples", @@ -321,7 +366,10 @@ "-lpthread" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index" + ] }, { @@ -330,7 +378,8 @@ "blas": "", "wasm": false, "src": [ - "./src/sasum.c" + "./src/sasum.c", + "./src/sasum_ndarray.c" ], "include": [ "./include" @@ -340,6 +389,9 @@ ], "libpath": [], "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", + "@stdlib/math/base/special/absf", "@stdlib/napi/export", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", @@ -353,7 +405,8 @@ "blas": "", "wasm": false, "src": [ - "./src/sasum.c" + "./src/sasum.c", + "./src/sasum_ndarray.c" ], "include": [ "./include" @@ -362,7 +415,11 @@ "-lm" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", + "@stdlib/math/base/special/absf" + ] }, { "task": "examples", @@ -370,7 +427,8 @@ "blas": "", "wasm": false, "src": [ - "./src/sasum.c" + "./src/sasum.c", + "./src/sasum_ndarray.c" ], "include": [ "./include" @@ -379,7 +437,11 @@ "-lm" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", + "@stdlib/math/base/special/absf" + ] }, { @@ -388,7 +450,8 @@ "blas": "", "wasm": true, "src": [ - "./src/sasum.c" + "./src/sasum.c", + "./src/sasum_ndarray.c" ], "include": [ "./include" @@ -397,7 +460,11 @@ "-lm" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", + "@stdlib/math/base/special/absf" + ] } ] } diff --git a/lib/node_modules/@stdlib/blas/base/sasum/src/addon.c b/lib/node_modules/@stdlib/blas/base/sasum/src/addon.c index 027c7ffff39..f17b218fe7f 100644 --- a/lib/node_modules/@stdlib/blas/base/sasum/src/addon.c +++ b/lib/node_modules/@stdlib/blas/base/sasum/src/addon.c @@ -17,6 +17,7 @@ */ #include "stdlib/blas/base/sasum.h" +#include "stdlib/blas/base/shared.h" #include "stdlib/napi/export.h" #include "stdlib/napi/argv.h" #include "stdlib/napi/argv_int64.h" @@ -34,10 +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, strideX, argv, 2 ); - STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, strideX, argv, 1 ); - STDLIB_NAPI_CREATE_DOUBLE( env, (double)c_sasum( N, X, strideX ), v ); + STDLIB_NAPI_ARGV_INT64( env, stride, argv, 2 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, stride, argv, 1 ); + STDLIB_NAPI_CREATE_DOUBLE( env, (double)API_SUFFIX(c_sasum)( N, X, stride ), v ); return v; } -STDLIB_NAPI_MODULE_EXPORT_FCN( addon ) +/** +* 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, stride, argv, 2 ); + STDLIB_NAPI_ARGV_INT64( env, offset, argv, 3 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, stride, argv, 1 ); + STDLIB_NAPI_CREATE_DOUBLE( env, (double)API_SUFFIX(c_sasum_ndarray)( N, X, stride, offset ), v ); + return v; +} + +STDLIB_NAPI_MODULE_EXPORT_FCN_WITH_METHOD( addon, "ndarray", addon_method ) diff --git a/lib/node_modules/@stdlib/blas/base/sasum/src/sasum.c b/lib/node_modules/@stdlib/blas/base/sasum/src/sasum.c index 50f714945e4..6ab1642108c 100644 --- a/lib/node_modules/@stdlib/blas/base/sasum/src/sasum.c +++ b/lib/node_modules/@stdlib/blas/base/sasum/src/sasum.c @@ -1,7 +1,7 @@ /** * @license Apache-2.0 * -* Copyright (c) 2018 The Stdlib Authors. +* 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. @@ -17,7 +17,8 @@ */ #include "stdlib/blas/base/sasum.h" -#include +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/stride2offset.h" /** * Computes the sum of absolute values. @@ -27,35 +28,7 @@ * @param stride stride length * @return sum of absolute values */ -float c_sasum( const int N, const float *X, const int stride ) { - float sum; - int m; - int i; - - sum = 0.0f; - if ( N <= 0 || stride <= 0 ) { - return sum; - } - // If the stride is equal to `1`, use unrolled loops... - if ( stride == 1 ) { - m = N % 6; - - // If we have a remainder, run a clean-up loop... - if ( m > 0 ) { - for ( i = 0; i < m; i++ ) { - sum += fabsf( X[i] ); - } - } - if ( N < 6 ) { - return sum; - } - for ( i = m; i < N; i += 6 ) { - sum += fabsf( X[i] ) + fabsf( X[i+1] ) + fabsf( X[i+2] ) + fabsf( X[i+3] ) + fabsf( X[i+4] ) + fabsf( X[i+5] ); - } - return sum; - } - for ( i = 0; i < N*stride; i += stride ) { - sum += fabsf( X[i] ); - } - return sum; +float API_SUFFIX(c_sasum)( const CBLAS_INT N, const float *X, const CBLAS_INT stride ) { + CBLAS_INT ox = stdlib_strided_stride2offset( N, stride ); + return API_SUFFIX(c_sasum_ndarray)( N, X, stride, ox ); } diff --git a/lib/node_modules/@stdlib/blas/base/sasum/src/sasum_cblas.c b/lib/node_modules/@stdlib/blas/base/sasum/src/sasum_cblas.c index 6c983552085..12fdf459d68 100644 --- a/lib/node_modules/@stdlib/blas/base/sasum/src/sasum_cblas.c +++ b/lib/node_modules/@stdlib/blas/base/sasum/src/sasum_cblas.c @@ -18,6 +18,8 @@ #include "stdlib/blas/base/sasum.h" #include "stdlib/blas/base/sasum_cblas.h" +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/min_view_buffer_index.h" /** * Computes the sum of absolute values. @@ -27,6 +29,28 @@ * @param stride stride length * @return sum of absolute values */ -float c_sasum( const int N, const float *X, const int stride ) { - return cblas_sasum( N, X, stride ); +float API_SUFFIX(c_sasum)( const CBLAS_INT N, const float *X, const CBLAS_INT stride ) { + CBLAS_INT sx = stride; + if ( sx < 0 ) { + sx = -sx; + } + return API_SUFFIX(cblas_sasum)( N, X, sx ); +} + +/** +* Computes the sum of absolute values using alternative indexing semantics. +* +* @param N number of indexed elements +* @param X input array +* @param stride stride length +* @param offset starting index +* @return sum of absolute values +*/ +float API_SUFFIX(c_sasum_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT stride, const CBLAS_INT offset ) { + CBLAS_INT sx = stride; + if ( sx < 0 ) { + sx = -sx; + } + X += stdlib_strided_min_view_buffer_index( N, stride, offset ); // adjust array pointer + return API_SUFFIX(cblas_sasum)( N, X, sx ); } diff --git a/lib/node_modules/@stdlib/blas/base/sasum/src/sasum_f.c b/lib/node_modules/@stdlib/blas/base/sasum/src/sasum_f.c index fa75ac63316..f9d38622d85 100644 --- a/lib/node_modules/@stdlib/blas/base/sasum/src/sasum_f.c +++ b/lib/node_modules/@stdlib/blas/base/sasum/src/sasum_f.c @@ -18,6 +18,8 @@ #include "stdlib/blas/base/sasum.h" #include "stdlib/blas/base/sasum_fortran.h" +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/min_view_buffer_index.h" /** * Computes the sum of absolute values. @@ -27,8 +29,36 @@ * @param stride stride length * @return sum of absolute values */ -float c_sasum( const int N, const float *X, const int stride ) { +float API_SUFFIX(c_sasum)( const CBLAS_INT N, const float *X, const CBLAS_INT stride ) { + CBLAS_INT sx; float sum; - sasumsub( &N, X, &stride, &sum ); + + sx = stride; + if ( sx < 0 ) { + sx = -sx; + } + sasumsub( &N, X, &sx, &sum ); + return sum; +} + +/** +* Computes the sum of absolute values using alternative indexing semantics. +* +* @param N number of indexed elements +* @param X input array +* @param stride stride length +* @param offset starting index +* @return sum of absolute values +*/ +float API_SUFFIX(c_sasum_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT stride, const CBLAS_INT offset ) { + CBLAS_INT sx; + float sum; + + sx = stride; + X += stdlib_strided_min_view_buffer_index( N, stride, offset ); // adjust array pointer + if ( sx < 0 ) { + sx = -sx; + } + sasumsub( &N, X, &sx, &sum ); return sum; } diff --git a/lib/node_modules/@stdlib/blas/base/sasum/src/sasum_ndarray.c b/lib/node_modules/@stdlib/blas/base/sasum/src/sasum_ndarray.c new file mode 100644 index 00000000000..d1c51dac91c --- /dev/null +++ b/lib/node_modules/@stdlib/blas/base/sasum/src/sasum_ndarray.c @@ -0,0 +1,72 @@ +/** +* @license Apache-2.0 +* +* Copyright (c) 2018 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/base/sasum.h" +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/stride2offset.h" +#include "stdlib/math/base/special/absf.h" + +static const CBLAS_INT M = 6; + +/** +* Computes the sum of absolute values using alternative indexing semantics. +* +* @param N number of indexed elements +* @param X input array +* @param stride stride length +* @param offset starting index +* @return sum of absolute values +*/ +float API_SUFFIX(c_sasum_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT stride, const CBLAS_INT offset ) { + CBLAS_INT ix; + CBLAS_INT i; + CBLAS_INT m; + float sum; + + sum = 0.0f; + if ( N <= 0 ) { + return sum; + } + ix = offset; + + // If the stride is equal to `1`, use unrolled loops... + if ( stride == 1 ) { + m = N % M; + + // If we have a remainder, run a clean-up loop... + if ( m > 0 ) { + for ( i = 0; i < m; i++ ) { + sum += stdlib_base_absf( X[ ix ] ); + ix += stride; + } + } + if ( N < 6 ) { + return sum; + } + for ( i = m; i < N; i += M ) { + sum += stdlib_base_absf( X[ ix ] ) + stdlib_base_absf( X[ ix+1 ] ) + stdlib_base_absf( X[ ix+2 ] ) + stdlib_base_absf( X[ ix+3 ] ) + stdlib_base_absf( X[ ix+4 ] ) + stdlib_base_absf( X[ ix+5 ] ); + ix += M; + } + return sum; + } + for ( i = 0; i < N; i ++ ) { + sum += stdlib_base_absf( X[ ix ] ); + ix += stride; + } + return sum; +} diff --git a/lib/node_modules/@stdlib/blas/base/sasum/test/test.ndarray.js b/lib/node_modules/@stdlib/blas/base/sasum/test/test.ndarray.js index 230ff2d33ab..3c11c7e0534 100644 --- a/lib/node_modules/@stdlib/blas/base/sasum/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/blas/base/sasum/test/test.ndarray.js @@ -106,7 +106,7 @@ tape( 'if provided an `N` parameter less than or equal to `0`, the function retu t.end(); }); -tape( 'the function supports negative strides', function test( t ) { +tape( 'the function supports specifying a negative stride', function test( t ) { var x; var y; var N; diff --git a/lib/node_modules/@stdlib/blas/base/sasum/test/test.ndarray.native.js b/lib/node_modules/@stdlib/blas/base/sasum/test/test.ndarray.native.js index 64a04e28270..9e039198104 100644 --- a/lib/node_modules/@stdlib/blas/base/sasum/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/base/sasum/test/test.ndarray.native.js @@ -115,7 +115,7 @@ tape( 'if provided an `N` parameter less than or equal to `0`, the function retu t.end(); }); -tape( 'the function supports negative strides', opts, function test( t ) { +tape( 'the function supports specifying a negative stride', opts, function test( t ) { var x; var y; var N; diff --git a/lib/node_modules/@stdlib/blas/base/sasum/test/test.sasum.js b/lib/node_modules/@stdlib/blas/base/sasum/test/test.sasum.js index 73f020981d1..33fc98a2349 100644 --- a/lib/node_modules/@stdlib/blas/base/sasum/test/test.sasum.js +++ b/lib/node_modules/@stdlib/blas/base/sasum/test/test.sasum.js @@ -82,15 +82,23 @@ tape( 'if provided an `N` parameter less than or equal to `0`, the function retu t.end(); }); -tape( 'if provided a `stride` parameter less than or equal to `0`, the function returns `0`', function test( t ) { +tape( 'the function supports specifying a negative stride', function test( t ) { var x; var y; + var N; - x = new Float32Array( [ 1.0, -2.0, 3.0, -4.0, 5.0 ] ); + x = new Float32Array([ + 1.0, // 2 + -2.0, + 3.0, // 1 + -4.0, + 5.0 + ]); + N = 2; - y = sasum( x.length, x, -1 ); + y = sasum( N, x, -2 ); - t.strictEqual( y, 0.0, 'returns expected value' ); + t.strictEqual( y, 4.0, 'returns expected value' ); t.end(); }); diff --git a/lib/node_modules/@stdlib/blas/base/sasum/test/test.sasum.native.js b/lib/node_modules/@stdlib/blas/base/sasum/test/test.sasum.native.js index 6dd4de26994..9a6a888cba9 100644 --- a/lib/node_modules/@stdlib/blas/base/sasum/test/test.sasum.native.js +++ b/lib/node_modules/@stdlib/blas/base/sasum/test/test.sasum.native.js @@ -91,15 +91,23 @@ tape( 'if provided an `N` parameter less than or equal to `0`, the function retu t.end(); }); -tape( 'if provided a `stride` parameter less than or equal to `0`, the function returns `0`', opts, function test( t ) { +tape( 'the function supports specifying a negative stride', opts, function test( t ) { var x; var y; + var N; - x = new Float32Array( [ 1.0, -2.0, 3.0, -4.0, 5.0 ] ); + x = new Float32Array([ + 1.0, // 2 + -2.0, + 3.0, // 1 + -4.0, + 5.0 + ]); + N = 2; - y = sasum( x.length, x, -1 ); + y = sasum( N, x, -2 ); - t.strictEqual( y, 0.0, 'returns expected value' ); + t.strictEqual( y, 4.0, 'returns expected value' ); t.end(); });