From eb6e266ded74445c2544d7e21abd077745facf06 Mon Sep 17 00:00:00 2001 From: aman-095 Date: Thu, 7 Nov 2024 12:12:26 +0530 Subject: [PATCH 1/5] feat: update Js and add C ndarray implementation for scasum --- .../@stdlib/blas/base/scasum/README.md | 28 +++++++ .../scasum/benchmark/c/benchmark.length.c | 45 ++++++++++- .../@stdlib/blas/base/scasum/docs/repl.txt | 2 +- .../blas/base/scasum/examples/c/example.c | 6 ++ .../scasum/include/stdlib/blas/base/scasum.h | 5 ++ .../@stdlib/blas/base/scasum/lib/ndarray.js | 7 +- .../blas/base/scasum/lib/ndarray.native.js | 9 +-- .../@stdlib/blas/base/scasum/lib/scasum.js | 6 +- .../blas/base/scasum/lib/scasum.native.js | 2 +- .../@stdlib/blas/base/scasum/manifest.json | 76 ++++++++++++++----- .../@stdlib/blas/base/scasum/src/addon.c | 19 ++++- .../@stdlib/blas/base/scasum/src/scasum.c | 21 +---- .../blas/base/scasum/src/scasum_cblas.c | 26 ++++++- .../@stdlib/blas/base/scasum/src/scasum_f.c | 32 +++++++- .../blas/base/scasum/src/scasum_ndarray.c | 49 ++++++++++++ .../blas/base/scasum/test/test.ndarray.js | 64 +++++++++++++++- .../base/scasum/test/test.ndarray.native.js | 64 +++++++++++++++- .../blas/base/scasum/test/test.scasum.js | 26 ++++++- .../base/scasum/test/test.scasum.native.js | 26 ++++++- 19 files changed, 449 insertions(+), 64 deletions(-) create mode 100644 lib/node_modules/@stdlib/blas/base/scasum/src/scasum_ndarray.c diff --git a/lib/node_modules/@stdlib/blas/base/scasum/README.md b/lib/node_modules/@stdlib/blas/base/scasum/README.md index 9066bf4c5a71..0181c0f29e44 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/README.md +++ b/lib/node_modules/@stdlib/blas/base/scasum/README.md @@ -194,6 +194,28 @@ The function accepts the following arguments: float c_scasum( const CBLAS_INT N, const void *CX, const CBLAS_INT strideX ); ``` +#### c_scasum_ndarray( N, \*CX, strideX, offsetX ) + +Computes the sum of the absolute values of the real and imaginary components of a single-precision complex floating-point vector using alternative indexing semantics. + +```c +const float cx[] = { 0.3f, 0.1f, 0.5f, 0.0f, 0.0f, 0.5f, 0.0f, 0.2f }; + +float out = c_scasum_ndarray( 4, (void *)cx, 1, 0 ); +// returns 1.6f +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **CX**: `[in] void*` input array. +- **strideX**: `[in] CBLAS_INT` index increment for `CX`. +- **offsetX**: `[in] CBLAS_INT` starting index for `CX`. + +```c +float c_scasum_ndarray( const CBLAS_INT N, const void *CX, const CBLAS_INT strideX, const CBLAS_INT offsetX ); +``` + @@ -231,6 +253,12 @@ int main( void ) { // Print the result: printf( "out: %f\n", out ); + + // Compute the sum of the absolute values of real and imaginary components using alternative indexing semantics: + out = c_scasum_ndarray( N, (void *)cx, -strideX, N-1 ); + + // Print the result: + printf( "out: %f\n", out ); } ``` diff --git a/lib/node_modules/@stdlib/blas/base/scasum/benchmark/c/benchmark.length.c b/lib/node_modules/@stdlib/blas/base/scasum/benchmark/c/benchmark.length.c index 0f5b27678f73..e6ae993028c0 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/benchmark/c/benchmark.length.c +++ b/lib/node_modules/@stdlib/blas/base/scasum/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 ) { float cx[ len*2 ]; double elapsed; float out; @@ -121,6 +121,40 @@ 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 ) { + float cx[ len*2 ]; + double elapsed; + float out; + double t; + int i; + + for ( i = 0; i < len*2; i += 2 ) { + cx[ i ] = ( rand_float()*10000.0f ) - 5000.0f; + cx[ i+1 ] = ( rand_float()*10000.0f ) - 5000.0f; + } + out = 0.0f; + t = tic(); + for ( i = 0; i < iterations; i++ ) { + out = c_scasum_ndarray( len, (void *)cx, 1, 0 ); + if ( out != out ) { + printf( "should not return NaN\n" ); + break; + } + } + elapsed = tic() - t; + if ( out != out ) { + printf( "should not return NaN\n" ); + } + return elapsed; +} + /** * Main execution sequence. */ @@ -143,7 +177,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/scasum/docs/repl.txt b/lib/node_modules/@stdlib/blas/base/scasum/docs/repl.txt index 610defe96a7f..5610b6441d0e 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/base/scasum/docs/repl.txt @@ -9,7 +9,7 @@ Indexing is relative to the first index. To introduce an offset, use typed array views. - If `N <= 0` or `strideX <= 0`, the function returns `0.0`. + If `N <= 0` the function returns `0.0`. Parameters ---------- diff --git a/lib/node_modules/@stdlib/blas/base/scasum/examples/c/example.c b/lib/node_modules/@stdlib/blas/base/scasum/examples/c/example.c index 46f2e0717b44..9f1826ad6887 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/examples/c/example.c +++ b/lib/node_modules/@stdlib/blas/base/scasum/examples/c/example.c @@ -34,4 +34,10 @@ int main( void ) { // Print the result: printf( "out: %f\n", out ); + + // Compute the sum of the absolute values of real and imaginary components using alternative indexing semantics: + out = c_scasum_ndarray( N, (void *)cx, -strideX, N-1 ); + + // Print the result: + printf( "out: %f\n", out ); } diff --git a/lib/node_modules/@stdlib/blas/base/scasum/include/stdlib/blas/base/scasum.h b/lib/node_modules/@stdlib/blas/base/scasum/include/stdlib/blas/base/scasum.h index 0aa4d2b44b03..c029fee74ec4 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/include/stdlib/blas/base/scasum.h +++ b/lib/node_modules/@stdlib/blas/base/scasum/include/stdlib/blas/base/scasum.h @@ -36,6 +36,11 @@ extern "C" { */ float API_SUFFIX(c_scasum)( const CBLAS_INT N, const void *CX, const CBLAS_INT strideX ); +/** +* Computes the sum of the absolute values of the real and imaginary components of a single-precision complex floating-point vector using alternative indexing semantics. +*/ +float API_SUFFIX(c_scasum_ndarray)( const CBLAS_INT N, const void *CX, const CBLAS_INT strideX, const CBLAS_INT offsetX ); + #ifdef __cplusplus } #endif diff --git a/lib/node_modules/@stdlib/blas/base/scasum/lib/ndarray.js b/lib/node_modules/@stdlib/blas/base/scasum/lib/ndarray.js index e620bb0cb371..dd74be4f14ba 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/lib/ndarray.js +++ b/lib/node_modules/@stdlib/blas/base/scasum/lib/ndarray.js @@ -22,6 +22,7 @@ var absf = require( '@stdlib/math/base/special/absf' ); var reinterpret = require( '@stdlib/strided/base/reinterpret-complex64' ); +var f32 = require( '@stdlib/number/float64/base/to-float32' ); // MAIN // @@ -31,7 +32,7 @@ var reinterpret = require( '@stdlib/strided/base/reinterpret-complex64' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Complex64Array} cx - input array -* @param {PositiveInteger} strideX - `cx` stride length +* @param {integer} strideX - `cx` stride length * @param {NonNegativeInteger} offsetX - starting index for `cx` * @returns {number} result * @@ -51,14 +52,14 @@ function scasum( N, cx, strideX, offsetX ) { var i; stemp = 0.0; - if ( N <= 0 || strideX <= 0 ) { + if ( N <= 0 ) { return stemp; } viewX = reinterpret( cx, 0 ); sx = strideX * 2; ix = offsetX * 2; for ( i = 0; i < N; i++ ) { - stemp += absf( viewX[ ix ] ) + absf( viewX[ ix+1 ] ); + stemp = f32( stemp + absf( viewX[ ix ] ) + absf( viewX[ ix+1 ] ) ); ix += sx; } return stemp; diff --git a/lib/node_modules/@stdlib/blas/base/scasum/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/base/scasum/lib/ndarray.native.js index c40309ceaaa2..63bd2ef00527 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/base/scasum/lib/ndarray.native.js @@ -21,7 +21,6 @@ // MODULES // var reinterpret = require( '@stdlib/strided/base/reinterpret-complex64' ); -var minViewBufferIndex = require( '@stdlib/strided/base/min-view-buffer-index' ); var addon = require( './../src/addon.node' ); @@ -32,7 +31,7 @@ var addon = require( './../src/addon.node' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Complex64Array} cx - input array -* @param {PositiveInteger} strideX - `cx` stride length +* @param {integer} strideX - `cx` stride length * @param {NonNegativeInteger} offsetX - starting index for `cx` * @returns {number} result * @@ -45,10 +44,8 @@ var addon = require( './../src/addon.node' ); * // returns 14.0 */ function scasum( N, cx, strideX, offsetX ) { - var viewX; - offsetX = minViewBufferIndex( N, strideX, offsetX ); - viewX = reinterpret( cx, offsetX ); - return addon( N, viewX, strideX ); + var viewX = reinterpret( cx, 0 ); + return addon.ndarray( N, viewX, strideX, offsetX ); } diff --git a/lib/node_modules/@stdlib/blas/base/scasum/lib/scasum.js b/lib/node_modules/@stdlib/blas/base/scasum/lib/scasum.js index 420bf1aa9940..45da9affed07 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/lib/scasum.js +++ b/lib/node_modules/@stdlib/blas/base/scasum/lib/scasum.js @@ -20,6 +20,7 @@ // MODULES // +var stride2offset = require( '@stdlib/strided/base/stride2offset' ); var ndarray = require( './ndarray.js' ); @@ -30,7 +31,7 @@ var ndarray = require( './ndarray.js' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Complex64Array} cx - input array -* @param {PositiveInteger} strideX - `cx` stride length +* @param {integer} strideX - `cx` stride length * @returns {number} result * * @example @@ -42,7 +43,8 @@ var ndarray = require( './ndarray.js' ); * // returns 18.0 */ function scasum( N, cx, strideX ) { - return ndarray( N, cx, strideX, 0 ); + var ox = stride2offset( N, strideX ); + return ndarray( N, cx, strideX, ox ); } diff --git a/lib/node_modules/@stdlib/blas/base/scasum/lib/scasum.native.js b/lib/node_modules/@stdlib/blas/base/scasum/lib/scasum.native.js index a0e6bad0ad1a..4e59e1e8fcd9 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/lib/scasum.native.js +++ b/lib/node_modules/@stdlib/blas/base/scasum/lib/scasum.native.js @@ -31,7 +31,7 @@ var addon = require( './../src/addon.node' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Complex64Array} cx - input array -* @param {PositiveInteger} strideX - `cx` stride length +* @param {integer} strideX - `cx` stride length * @returns {number} result * * @example diff --git a/lib/node_modules/@stdlib/blas/base/scasum/manifest.json b/lib/node_modules/@stdlib/blas/base/scasum/manifest.json index 8a91e4d202cd..97dd8ca84443 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/manifest.json +++ b/lib/node_modules/@stdlib/blas/base/scasum/manifest.json @@ -46,6 +46,8 @@ "dependencies": [ "@stdlib/blas/base/shared", "@stdlib/napi/export", + "@stdlib/complex/float32/ctor", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-complex64array", @@ -58,7 +60,8 @@ "blas": "", "wasm": false, "src": [ - "./src/scasum.c" + "./src/scasum.c", + "./src/scasum_ndarray.c" ], "include": [ "./include" @@ -67,7 +70,8 @@ "libpath": [], "dependencies": [ "@stdlib/blas/base/shared", - "@stdlib/math/base/special/absf" + "@stdlib/math/base/special/absf", + "@stdlib/strided/base/stride2offset" ] }, { @@ -76,7 +80,8 @@ "blas": "", "wasm": false, "src": [ - "./src/scasum.c" + "./src/scasum.c", + "./src/scasum_ndarray.c" ], "include": [ "./include" @@ -85,7 +90,8 @@ "libpath": [], "dependencies": [ "@stdlib/blas/base/shared", - "@stdlib/math/base/special/absf" + "@stdlib/math/base/special/absf", + "@stdlib/strided/base/stride2offset" ] }, @@ -108,6 +114,8 @@ "dependencies": [ "@stdlib/blas/base/shared", "@stdlib/napi/export", + "@stdlib/complex/float32/ctor", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-complex64array", @@ -131,7 +139,9 @@ ], "libpath": [], "dependencies": [ - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/complex/float32/ctor", + "@stdlib/strided/base/min-view-buffer-index" ] }, { @@ -151,7 +161,9 @@ ], "libpath": [], "dependencies": [ - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/complex/float32/ctor", + "@stdlib/strided/base/min-view-buffer-index" ] }, @@ -173,6 +185,8 @@ "dependencies": [ "@stdlib/blas/base/shared", "@stdlib/napi/export", + "@stdlib/complex/float32/ctor", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-complex64array", @@ -185,7 +199,8 @@ "blas": "", "wasm": false, "src": [ - "./src/scasum.c" + "./src/scasum.c", + "./src/scasum_ndarray.c" ], "include": [ "./include" @@ -194,7 +209,8 @@ "libpath": [], "dependencies": [ "@stdlib/blas/base/shared", - "@stdlib/math/base/special/absf" + "@stdlib/math/base/special/absf", + "@stdlib/strided/base/stride2offset" ] }, { @@ -203,7 +219,8 @@ "blas": "", "wasm": false, "src": [ - "./src/scasum.c" + "./src/scasum.c", + "./src/scasum_ndarray.c" ], "include": [ "./include" @@ -212,7 +229,8 @@ "libpath": [], "dependencies": [ "@stdlib/blas/base/shared", - "@stdlib/math/base/special/absf" + "@stdlib/math/base/special/absf", + "@stdlib/strided/base/stride2offset" ] }, @@ -234,6 +252,8 @@ "dependencies": [ "@stdlib/blas/base/shared", "@stdlib/napi/export", + "@stdlib/complex/float32/ctor", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-complex64array", @@ -256,7 +276,9 @@ ], "libpath": [], "dependencies": [ - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/complex/float32/ctor", + "@stdlib/strided/base/min-view-buffer-index" ] }, { @@ -275,7 +297,9 @@ ], "libpath": [], "dependencies": [ - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/complex/float32/ctor", + "@stdlib/strided/base/min-view-buffer-index" ] }, @@ -298,6 +322,8 @@ "dependencies": [ "@stdlib/blas/base/shared", "@stdlib/napi/export", + "@stdlib/complex/float32/ctor", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-complex64array", @@ -321,7 +347,9 @@ ], "libpath": [], "dependencies": [ - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/complex/float32/ctor", + "@stdlib/strided/base/min-view-buffer-index" ] }, { @@ -351,7 +379,8 @@ "blas": "", "wasm": false, "src": [ - "./src/scasum.c" + "./src/scasum.c", + "./src/scasum_ndarray.c" ], "include": [ "./include" @@ -361,6 +390,7 @@ "dependencies": [ "@stdlib/blas/base/shared", "@stdlib/napi/export", + "@stdlib/strided/base/stride2offset", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-complex64array", @@ -374,7 +404,8 @@ "blas": "", "wasm": false, "src": [ - "./src/scasum.c" + "./src/scasum.c", + "./src/scasum_ndarray.c" ], "include": [ "./include" @@ -383,7 +414,8 @@ "libpath": [], "dependencies": [ "@stdlib/blas/base/shared", - "@stdlib/math/base/special/absf" + "@stdlib/math/base/special/absf", + "@stdlib/strided/base/stride2offset" ] }, { @@ -392,7 +424,8 @@ "blas": "", "wasm": false, "src": [ - "./src/scasum.c" + "./src/scasum.c", + "./src/scasum_ndarray.c" ], "include": [ "./include" @@ -401,7 +434,8 @@ "libpath": [], "dependencies": [ "@stdlib/blas/base/shared", - "@stdlib/math/base/special/absf" + "@stdlib/math/base/special/absf", + "@stdlib/strided/base/stride2offset" ] }, @@ -411,7 +445,8 @@ "blas": "", "wasm": true, "src": [ - "./src/scasum.c" + "./src/scasum.c", + "./src/scasum_ndarray.c" ], "include": [ "./include" @@ -420,7 +455,8 @@ "libpath": [], "dependencies": [ "@stdlib/blas/base/shared", - "@stdlib/math/base/special/absf" + "@stdlib/math/base/special/absf", + "@stdlib/strided/base/stride2offset" ] } ] diff --git a/lib/node_modules/@stdlib/blas/base/scasum/src/addon.c b/lib/node_modules/@stdlib/blas/base/scasum/src/addon.c index ff2e3626cded..b95e33ca56f1 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/src/addon.c +++ b/lib/node_modules/@stdlib/blas/base/scasum/src/addon.c @@ -41,4 +41,21 @@ static napi_value addon( napi_env env, napi_callback_info info ) { return out; } -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, strideX, argv, 2 ); + STDLIB_NAPI_ARGV_INT64( env, offsetX, argv, 3 ); + STDLIB_NAPI_ARGV_STRIDED_COMPLEX64ARRAY( env, CX, N, strideX, argv, 1 ); + STDLIB_NAPI_CREATE_DOUBLE( env, (double)API_SUFFIX(c_scasum_ndarray)( N, CX, strideX, offsetX ), out ); + return out; +} + +STDLIB_NAPI_MODULE_EXPORT_FCN_WITH_METHOD( addon, "ndarray", addon_method ) diff --git a/lib/node_modules/@stdlib/blas/base/scasum/src/scasum.c b/lib/node_modules/@stdlib/blas/base/scasum/src/scasum.c index acea98236b8b..305212ba555b 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/src/scasum.c +++ b/lib/node_modules/@stdlib/blas/base/scasum/src/scasum.c @@ -18,7 +18,7 @@ #include "stdlib/blas/base/scasum.h" #include "stdlib/blas/base/shared.h" -#include "stdlib/math/base/special/absf.h" +#include "stdlib/strided/base/stride2offset.h" /** * Computes the sum of the absolute values of the real and imaginary components of a single-precision complex floating-point vector. @@ -28,21 +28,6 @@ * @param strideX CX stride length */ float API_SUFFIX(c_scasum)( const CBLAS_INT N, const void *CX, const CBLAS_INT strideX ) { - float *x = (float *)CX; - float stemp; - CBLAS_INT sx; - CBLAS_INT ix; - CBLAS_INT i; - - if ( N <= 0 || strideX <= 0 ) { - return 0.0f; - } - stemp = 0.0f; - sx = strideX * 2; - ix = 0; - for( i = 0; i < N; i++ ) { - stemp += stdlib_base_absf( x[ix] ) + stdlib_base_absf( x[ix+1] ); - ix += sx; - } - return stemp; + CBLAS_INT ox = stdlib_strided_stride2offset( N, strideX ); + return API_SUFFIX(c_scasum_ndarray)( N, CX, strideX, ox ); } diff --git a/lib/node_modules/@stdlib/blas/base/scasum/src/scasum_cblas.c b/lib/node_modules/@stdlib/blas/base/scasum/src/scasum_cblas.c index 076520afef48..e780a4b4ed26 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/src/scasum_cblas.c +++ b/lib/node_modules/@stdlib/blas/base/scasum/src/scasum_cblas.c @@ -19,6 +19,8 @@ #include "stdlib/blas/base/scasum.h" #include "stdlib/blas/base/scasum_cblas.h" #include "stdlib/blas/base/shared.h" +#include "stdlib/complex/float32/ctor.h" +#include "stdlib/strided/base/min_view_buffer_index.h" /** * Computes the sum of the absolute values of the real and imaginary components of a single-precision complex floating-point vector. @@ -28,5 +30,27 @@ * @param strideX CX stride length */ float API_SUFFIX(c_scasum)( const CBLAS_INT N, const void *CX, const CBLAS_INT strideX ) { - return API_SUFFIX(cblas_scasum)( N, CX, strideX ); + CBLAS_INT sx = strideX; + if( sx < 0 ) { + sx = -sx; + } + return API_SUFFIX(cblas_scasum)( N, CX, sx ); +} + +/** +* Computes the sum of the absolute values of the real and imaginary components of a single-precision complex floating-point vector using alternative indexing semantics. +* +* @param N number of indexed elements +* @param CX input array +* @param strideX CX stride length +* @param offsetX starting index for CX +*/ +float API_SUFFIX(c_scasum_ndarray)( const CBLAS_INT N, const void *CX, const CBLAS_INT strideX, const CBLAS_INT offsetX ) { + stdlib_complex64_t *cx = (stdlib_complex64_t *)CX; + CBLAS_INT sx = strideX; + if( sx < 0 ) { + sx = -sx; + } + cx += stdlib_strided_min_view_buffer_index( N, strideX, offsetX ); + return API_SUFFIX(cblas_scasum)( N, (void *)cx, sx ); } diff --git a/lib/node_modules/@stdlib/blas/base/scasum/src/scasum_f.c b/lib/node_modules/@stdlib/blas/base/scasum/src/scasum_f.c index 23b9d6df35af..bafa97f7069e 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/src/scasum_f.c +++ b/lib/node_modules/@stdlib/blas/base/scasum/src/scasum_f.c @@ -19,6 +19,8 @@ #include "stdlib/blas/base/scasum.h" #include "stdlib/blas/base/scasum_fortran.h" #include "stdlib/blas/base/shared.h" +#include "stdlib/complex/float32/ctor.h" +#include "stdlib/strided/base/min_view_buffer_index.h" /** * Computes the sum of the absolute values of the real and imaginary components of a single-precision complex floating-point vector. @@ -29,7 +31,35 @@ * @return result */ float API_SUFFIX(c_scasum)( const CBLAS_INT N, const void *CX, const CBLAS_INT strideX ) { + CBLAS_INT sx; float out; - scasumsub( &N, CX, &strideX, &out ); + + sx = strideX; + if( sx < 0 ) { + sx = -sx; + } + scasumsub( &N, CX, &sx, &out ); + return out; +} + +/** +* Computes the sum of the absolute values of the real and imaginary components of a single-precision complex floating-point vector using alternative indexing semantics. +* +* @param N number of indexed elements +* @param CX input array +* @param strideX CX stride length +* @param offsetX starting index for CX +* @return result +*/ +float API_SUFFIX(c_scasum_ndarray)( const CBLAS_INT N, const void *CX, const CBLAS_INT strideX, const CBLAS_INT offsetX ) { + stdlib_complex64_t *cx = (stdlib_complex64_t *)CX; + CBLAS_INT sx = strideX; + float out; + + cx += stdlib_strided_min_view_buffer_index( N, strideX, offsetX ); + if( sx < 0 ) { + sx = -sx; + } + scasumsub( &N, (void *)cx, &sx, &out ); return out; } diff --git a/lib/node_modules/@stdlib/blas/base/scasum/src/scasum_ndarray.c b/lib/node_modules/@stdlib/blas/base/scasum/src/scasum_ndarray.c new file mode 100644 index 000000000000..04262b03704b --- /dev/null +++ b/lib/node_modules/@stdlib/blas/base/scasum/src/scasum_ndarray.c @@ -0,0 +1,49 @@ +/** +* @license Apache-2.0 +* +* Copyright (c) 2024 The Stdlib Authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +#include "stdlib/blas/base/scasum.h" +#include "stdlib/blas/base/shared.h" +#include "stdlib/math/base/special/absf.h" + +/** +* Computes the sum of the absolute values of the real and imaginary components of a single-precision complex floating-point vector using alternative indexing semantics. +* +* @param N number of indexed elements +* @param CX input array +* @param strideX CX stride length +* @param offsetX starting index for CX +*/ +float API_SUFFIX(c_scasum_ndarray)( const CBLAS_INT N, const void *CX, const CBLAS_INT strideX, const CBLAS_INT offsetX ) { + float *x = (float *)CX; + float stemp; + CBLAS_INT sx; + CBLAS_INT ix; + CBLAS_INT i; + + if ( N <= 0 ) { + return 0.0f; + } + stemp = 0.0f; + sx = strideX * 2; + ix = offsetX * 2; + for( i = 0; i < N; i++ ) { + stemp += stdlib_base_absf( x[ix] ) + stdlib_base_absf( x[ix+1] ); + ix += sx; + } + return stemp; +} diff --git a/lib/node_modules/@stdlib/blas/base/scasum/test/test.ndarray.js b/lib/node_modules/@stdlib/blas/base/scasum/test/test.ndarray.js index c03e237af46b..8090285df36c 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/blas/base/scasum/test/test.ndarray.js @@ -104,7 +104,7 @@ tape( 'the function computes the sum of the absolute values of the real and imag t.end(); }); -tape( 'if provided an `N` or a stride parameter less than or equal to `0`, the function returns `0.0`', function test( t ) { +tape( 'if provided an `N` parameter less than or equal to `0`, the function returns `0.0`', function test( t ) { var expected; var actual; var cx; @@ -128,7 +128,7 @@ tape( 'if provided an `N` or a stride parameter less than or equal to `0`, the f ]); expected = 0.0; - actual = scasum( 2, cx, 0, 0 ); + actual = scasum( -1, cx, 1, 0 ); t.strictEqual( actual, expected, 'returns expected value' ); t.end(); @@ -164,6 +164,36 @@ tape( 'the function supports specifying a stride', function test( t ) { t.end(); }); +tape( 'the function supports specifying a negative stride', function test( t ) { + var expected; + var actual; + var cx; + + cx = new Complex64Array([ + 0.3, // 4 + 0.1, // 4 + 5.0, // 3 + 8.0, // 3 + 0.5, // 2 + 0.0, // 2 + 6.0, // 1 + 9.0, // 1 + 0.0, + 0.5, + 8.0, + 3.0, + 0.0, + 0.2, + 9.0, + 4.0 + ]); + expected = 28.9; + + actual = scasum( 4, cx, -1, 3 ); + isApprox( t, actual, expected, 2.0 ); + t.end(); +}); + tape( 'the function supports specifying an offset', function test( t ) { var expected; var actual; @@ -187,3 +217,33 @@ tape( 'the function supports specifying an offset', function test( t ) { t.strictEqual( actual, expected, 'returns expected value' ); t.end(); }); + +tape( 'the function supports specifying complex access patterns', function test( t ) { + var expected; + var actual; + var cx; + + cx = new Complex64Array([ + 0.3, // 4 + 0.1, // 4 + 5.0, + 8.0, + 0.5, // 3 + 0.0, // 3 + 6.0, + 9.0, + 0.0, // 2 + 0.5, // 2 + 8.0, + 3.0, + 0.0, // 1 + 0.2, // 1 + 9.0, + 4.0 + ]); + expected = 1.6; + + actual = scasum( 4, cx, -2, 6 ); + isApprox( t, actual, expected, 2.0 ); + t.end(); +}); diff --git a/lib/node_modules/@stdlib/blas/base/scasum/test/test.ndarray.native.js b/lib/node_modules/@stdlib/blas/base/scasum/test/test.ndarray.native.js index b46180e74dd2..f90fc0b2689e 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/base/scasum/test/test.ndarray.native.js @@ -113,7 +113,7 @@ tape( 'the function computes the sum of the absolute values of the real and imag t.end(); }); -tape( 'if provided an `N` or a stride parameter less than or equal to `0`, the function returns `0.0`', opts, function test( t ) { +tape( 'if provided an `N` parameter less than or equal to `0`, the function returns `0.0`', opts, function test( t ) { var expected; var actual; var cx; @@ -137,7 +137,7 @@ tape( 'if provided an `N` or a stride parameter less than or equal to `0`, the f ]); expected = 0.0; - actual = scasum( 2, cx, 0, 0 ); + actual = scasum( -1, cx, 1, 0 ); t.strictEqual( actual, expected, 'returns expected value' ); t.end(); @@ -173,6 +173,36 @@ tape( 'the function supports specifying a stride', opts, function test( t ) { t.end(); }); +tape( 'the function supports specifying a negative stride', opts, function test( t ) { + var expected; + var actual; + var cx; + + cx = new Complex64Array([ + 0.3, // 4 + 0.1, // 4 + 5.0, // 3 + 8.0, // 3 + 0.5, // 2 + 0.0, // 2 + 6.0, // 1 + 9.0, // 1 + 0.0, + 0.5, + 8.0, + 3.0, + 0.0, + 0.2, + 9.0, + 4.0 + ]); + expected = 28.9; + + actual = scasum( 4, cx, -1, 3 ); + isApprox( t, actual, expected, 2.0 ); + t.end(); +}); + tape( 'the function supports specifying an offset', opts, function test( t ) { var expected; var actual; @@ -196,3 +226,33 @@ tape( 'the function supports specifying an offset', opts, function test( t ) { t.strictEqual( actual, expected, 'returns expected value' ); t.end(); }); + +tape( 'the function supports specifying complex access patterns', opts, function test( t ) { + var expected; + var actual; + var cx; + + cx = new Complex64Array([ + 0.3, // 4 + 0.1, // 4 + 5.0, + 8.0, + 0.5, // 3 + 0.0, // 3 + 6.0, + 9.0, + 0.0, // 2 + 0.5, // 2 + 8.0, + 3.0, + 0.0, // 1 + 0.2, // 1 + 9.0, + 4.0 + ]); + expected = 1.6; + + actual = scasum( 4, cx, -2, 6 ); + isApprox( t, actual, expected, 2.0 ); + t.end(); +}); diff --git a/lib/node_modules/@stdlib/blas/base/scasum/test/test.scasum.js b/lib/node_modules/@stdlib/blas/base/scasum/test/test.scasum.js index e5e7ab6b13cb..bde8a66d5c4d 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/test/test.scasum.js +++ b/lib/node_modules/@stdlib/blas/base/scasum/test/test.scasum.js @@ -104,7 +104,7 @@ tape( 'the function computes the sum of the absolute values of the real and imag t.end(); }); -tape( 'if provided an `N` or a stride parameter less than or equal to `0`, the function returns `0.0`', function test( t ) { +tape( 'if provided an `N` parameter less than or equal to `0`, the function returns `0.0`', function test( t ) { var expected; var actual; var cx; @@ -128,7 +128,7 @@ tape( 'if provided an `N` or a stride parameter less than or equal to `0`, the f ]); expected = 0.0; - actual = scasum( 2, cx, 0 ); + actual = scasum( -1, cx, 1 ); t.strictEqual( actual, expected, 'returns expected value' ); t.end(); @@ -164,6 +164,28 @@ tape( 'the function supports specifying a stride', function test( t ) { t.end(); }); +tape( 'the function supports specifying a negative stride', function test( t ) { + var expected; + var actual; + var cx; + + cx = new Complex64Array([ + 0.3, // 4 + 0.1, // 4 + 5.0, // 3 + 8.0, // 3 + 0.5, // 2 + 0.0, // 2 + 6.0, // 1 + 9.0 // 1 + ]); + expected = 28.9; + + actual = scasum( 4, cx, -1 ); + isApprox( t, actual, expected, 2.0 ); + t.end(); +}); + tape( 'the function supports view offsets', function test( t ) { var expected; var actual; diff --git a/lib/node_modules/@stdlib/blas/base/scasum/test/test.scasum.native.js b/lib/node_modules/@stdlib/blas/base/scasum/test/test.scasum.native.js index 78627c4ff897..7ad9856a4093 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/test/test.scasum.native.js +++ b/lib/node_modules/@stdlib/blas/base/scasum/test/test.scasum.native.js @@ -113,7 +113,7 @@ tape( 'the function computes the sum of the absolute values of the real and imag t.end(); }); -tape( 'if provided an `N` or a stride parameter less than or equal to `0`, the function returns `0.0`', opts, function test( t ) { +tape( 'if provided an `N` parameter less than or equal to `0`, the function returns `0.0`', opts, function test( t ) { var expected; var actual; var cx; @@ -137,7 +137,7 @@ tape( 'if provided an `N` or a stride parameter less than or equal to `0`, the f ]); expected = 0.0; - actual = scasum( 2, cx, 0 ); + actual = scasum( -1, cx, 0 ); t.strictEqual( actual, expected, 'returns expected value' ); t.end(); @@ -173,6 +173,28 @@ tape( 'the function supports specifying a stride', opts, function test( t ) { t.end(); }); +tape( 'the function supports specifying a negative stride', opts, function test( t ) { + var expected; + var actual; + var cx; + + cx = new Complex64Array([ + 0.3, // 4 + 0.1, // 4 + 5.0, // 3 + 8.0, // 3 + 0.5, // 2 + 0.0, // 2 + 6.0, // 1 + 9.0 // 1 + ]); + expected = 28.9; + + actual = scasum( 4, cx, -1 ); + isApprox( t, actual, expected, 2.0 ); + t.end(); +}); + tape( 'the function supports view offsets', opts, function test( t ) { var expected; var actual; From 4f3c12bac4d3b9b5586a55ab349107fc0d492fb5 Mon Sep 17 00:00:00 2001 From: Athan Date: Sun, 17 Nov 2024 16:07:29 -0800 Subject: [PATCH 2/5] Apply suggestions from code review Signed-off-by: Athan --- lib/node_modules/@stdlib/blas/base/scasum/docs/repl.txt | 2 +- lib/node_modules/@stdlib/blas/base/scasum/lib/ndarray.js | 2 +- lib/node_modules/@stdlib/blas/base/scasum/src/scasum_f.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/base/scasum/docs/repl.txt b/lib/node_modules/@stdlib/blas/base/scasum/docs/repl.txt index 5610b6441d0e..1fc1b8f68775 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/base/scasum/docs/repl.txt @@ -9,7 +9,7 @@ Indexing is relative to the first index. To introduce an offset, use typed array views. - If `N <= 0` the function returns `0.0`. + If `N <= 0`, the function returns `0.0`. Parameters ---------- diff --git a/lib/node_modules/@stdlib/blas/base/scasum/lib/ndarray.js b/lib/node_modules/@stdlib/blas/base/scasum/lib/ndarray.js index dd74be4f14ba..716fcce3e40c 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/lib/ndarray.js +++ b/lib/node_modules/@stdlib/blas/base/scasum/lib/ndarray.js @@ -59,7 +59,7 @@ function scasum( N, cx, strideX, offsetX ) { sx = strideX * 2; ix = offsetX * 2; for ( i = 0; i < N; i++ ) { - stemp = f32( stemp + absf( viewX[ ix ] ) + absf( viewX[ ix+1 ] ) ); + stemp = f32( stemp + f32( absf( viewX[ ix ] ) + absf( viewX[ ix+1 ] ) ) ); ix += sx; } return stemp; diff --git a/lib/node_modules/@stdlib/blas/base/scasum/src/scasum_f.c b/lib/node_modules/@stdlib/blas/base/scasum/src/scasum_f.c index bafa97f7069e..b224aa411228 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/src/scasum_f.c +++ b/lib/node_modules/@stdlib/blas/base/scasum/src/scasum_f.c @@ -35,7 +35,7 @@ float API_SUFFIX(c_scasum)( const CBLAS_INT N, const void *CX, const CBLAS_INT s float out; sx = strideX; - if( sx < 0 ) { + if ( sx < 0 ) { sx = -sx; } scasumsub( &N, CX, &sx, &out ); From 8ad5d4127af343f2867cb9b3e6f7a7003e6b1919 Mon Sep 17 00:00:00 2001 From: Athan Date: Sun, 17 Nov 2024 16:08:19 -0800 Subject: [PATCH 3/5] style: fix spacing Signed-off-by: Athan --- lib/node_modules/@stdlib/blas/base/scasum/src/scasum_f.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/blas/base/scasum/src/scasum_f.c b/lib/node_modules/@stdlib/blas/base/scasum/src/scasum_f.c index b224aa411228..607ede038504 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/src/scasum_f.c +++ b/lib/node_modules/@stdlib/blas/base/scasum/src/scasum_f.c @@ -57,7 +57,7 @@ float API_SUFFIX(c_scasum_ndarray)( const CBLAS_INT N, const void *CX, const CBL float out; cx += stdlib_strided_min_view_buffer_index( N, strideX, offsetX ); - if( sx < 0 ) { + if ( sx < 0 ) { sx = -sx; } scasumsub( &N, (void *)cx, &sx, &out ); From 9b85d98c021c585dce8f48a3e50a996e67381877 Mon Sep 17 00:00:00 2001 From: Athan Date: Sun, 17 Nov 2024 16:09:20 -0800 Subject: [PATCH 4/5] fix: perform explicit cast Signed-off-by: Athan --- lib/node_modules/@stdlib/blas/base/scasum/src/addon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/blas/base/scasum/src/addon.c b/lib/node_modules/@stdlib/blas/base/scasum/src/addon.c index b95e33ca56f1..c14f03fb77bd 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/src/addon.c +++ b/lib/node_modules/@stdlib/blas/base/scasum/src/addon.c @@ -54,7 +54,7 @@ static napi_value addon_method( napi_env env, napi_callback_info info ) { STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 2 ); STDLIB_NAPI_ARGV_INT64( env, offsetX, argv, 3 ); STDLIB_NAPI_ARGV_STRIDED_COMPLEX64ARRAY( env, CX, N, strideX, argv, 1 ); - STDLIB_NAPI_CREATE_DOUBLE( env, (double)API_SUFFIX(c_scasum_ndarray)( N, CX, strideX, offsetX ), out ); + STDLIB_NAPI_CREATE_DOUBLE( env, (double)API_SUFFIX(c_scasum_ndarray)( N, (void *)CX, strideX, offsetX ), out ); return out; } From a284b92d9e5e4a5d77ccf891e85bb52396ce25f0 Mon Sep 17 00:00:00 2001 From: Athan Date: Sun, 17 Nov 2024 16:10:04 -0800 Subject: [PATCH 5/5] fix: perform explicit cast Signed-off-by: Athan --- lib/node_modules/@stdlib/blas/base/scasum/src/addon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/blas/base/scasum/src/addon.c b/lib/node_modules/@stdlib/blas/base/scasum/src/addon.c index c14f03fb77bd..06b7b0abedcd 100644 --- a/lib/node_modules/@stdlib/blas/base/scasum/src/addon.c +++ b/lib/node_modules/@stdlib/blas/base/scasum/src/addon.c @@ -37,7 +37,7 @@ 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_COMPLEX64ARRAY( env, CX, N, strideX, argv, 1 ); - STDLIB_NAPI_CREATE_DOUBLE( env, (double)API_SUFFIX(c_scasum)( N, CX, strideX ), out ); + STDLIB_NAPI_CREATE_DOUBLE( env, (double)API_SUFFIX(c_scasum)( N, (void *)CX, strideX ), out ); return out; }