From 53c8046c99a4c8377f8f24a2f564d38f5b40ab1c Mon Sep 17 00:00:00 2001 From: aman-095 Date: Sat, 9 Nov 2024 11:54:00 +0530 Subject: [PATCH 1/3] feat: add C ndarray API for zswap --- .../@stdlib/blas/base/zswap/README.md | 136 ++++++++++++++++++ .../base/zswap/benchmark/c/benchmark.length.c | 51 ++++++- .../blas/base/zswap/examples/c/example.c | 9 ++ .../zswap/include/stdlib/blas/base/zswap.h | 9 +- .../include/stdlib/blas/base/zswap_cblas.h | 4 +- .../blas/base/zswap/lib/ndarray.native.js | 13 +- .../@stdlib/blas/base/zswap/lib/zswap.js | 59 +------- .../@stdlib/blas/base/zswap/manifest.json | 125 ++++++++++++---- .../@stdlib/blas/base/zswap/src/addon.c | 25 +++- .../@stdlib/blas/base/zswap/src/zswap.c | 52 +------ .../@stdlib/blas/base/zswap/src/zswap_cblas.c | 27 +++- .../@stdlib/blas/base/zswap/src/zswap_f.c | 25 +++- .../blas/base/zswap/src/zswap_ndarray.c | 63 ++++++++ 13 files changed, 452 insertions(+), 146 deletions(-) create mode 100644 lib/node_modules/@stdlib/blas/base/zswap/src/zswap_ndarray.c diff --git a/lib/node_modules/@stdlib/blas/base/zswap/README.md b/lib/node_modules/@stdlib/blas/base/zswap/README.md index 7570adfe7aec..2592342cfb1a 100644 --- a/lib/node_modules/@stdlib/blas/base/zswap/README.md +++ b/lib/node_modules/@stdlib/blas/base/zswap/README.md @@ -265,6 +265,142 @@ console.log( y.get( y.length-1 ).toString() ); + + +* * * + +
+ +## C APIs + + + +
+ +
+ + + + + +
+ +### Usage + +```c +#include "stdlib/blas/base/zswap.h" +``` + +#### c_zswap( N, \*X, strideX, \*Y, strideY ) + +Interchanges two complex double-precision floating-point vectors. + +```c +double x[] = { 1.0, 2.0, 3.0, 4.0 }; // interleaved real and imaginary components +double y[] = { 5.0, 6.0, 7.0, 8.0 }; + +c_zswap( 2, (void *)x, 1, (void *)Y, 1 ); +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[inout] void*` first input array. +- **strideX**: `[in] CBLAS_INT` index increment for `X`. +- **Y**: `[inout] void*` first input array. +- **strideY**: `[in] CBLAS_INT` index increment for `Y`. + +```c +void c_zswap( const CBLAS_INT N, void *X, const CBLAS_INT strideX, void *Y, const CBLAS_INT strideY ); +``` + +#### c_zswap_ndarray( N, \*X, strideX, offsetX, \*Y, strideY, offsetY ) + +Interchanges two complex double-precision floating-point vectors using alternative indexing semantics. + +```c +double x[] = { 1.0, 2.0, 3.0, 4.0 }; // interleaved real and imaginary components +double y[] = { 5.0, 6.0, 7.0, 8.0 }; + +c_zswap_ndarray( 2, (void *)x, 1, 0, (void *)Y, 1, 0 ); +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[inout] void*` first input array. +- **strideX**: `[in] CBLAS_INT` index increment for `X`. +- **offsetX**: `[in] CBLAS_INT` starting index for `X`. +- **Y**: `[inout] void*` first input array. +- **strideY**: `[in] CBLAS_INT` index increment for `Y`. +- **offsetY**: `[in] CBLAS_INT` starting index for `Y`. + +```c +void c_zswap_ndarray( const CBLAS_INT N, void *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, void *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ); +``` + +
+ + + + + +
+ +
+ + + + + +
+ +### Examples + +```c +#include "stdlib/blas/base/zswap.h" +#include + +int main( void ) { + // Create strided arrays: + double x[] = { 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0 }; + double y[] = { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }; + + // Specify the number of elements: + const int N = 4; + + // Specify stride lengths: + const int strideX = 1; + const int strideY = -1; + + // Swap elements: + c_zswap( N, (void *)x, strideX, (void *)y, strideY ); + + // Print the result: + for ( int i = 0; i < N; i++ ) { + printf( "x[ %i ] = %lf + %lfj\n", i, x[ i*2 ], x[ (i*2)+1 ] ); + printf( "y[ %i ] = %lf + %lfj\n", i, y[ i*2 ], y[ (i*2)+1 ] ); + } + + // Swap elements using alternative indexing semantics: + c_zswap_ndarray( N, (void *)x, -strideX, N-1, (void *)y, strideY, N-1 ); + + // Print the result: + for ( int i = 0; i < N; i++ ) { + printf( "x[ %i ] = %lf + %lfj\n", i, x[ i*2 ], x[ (i*2)+1 ] ); + printf( "y[ %i ] = %lf + %lfj\n", i, y[ i*2 ], y[ (i*2)+1 ] ); + } +} +``` + +
+ + + +
+ + +
diff --git a/lib/node_modules/@stdlib/blas/base/zswap/benchmark/c/benchmark.length.c b/lib/node_modules/@stdlib/blas/base/zswap/benchmark/c/benchmark.length.c index 39329b812741..0703872395cd 100644 --- a/lib/node_modules/@stdlib/blas/base/zswap/benchmark/c/benchmark.length.c +++ b/lib/node_modules/@stdlib/blas/base/zswap/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; double *y; @@ -127,6 +127,46 @@ 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; + double *y; + double t; + int i; + + x = (double *) malloc( len*2 * sizeof( double ) ); + y = (double *) malloc( len*2 * sizeof( double ) ); + for ( i = 0; i < len; i++ ) { + x[ i ] = ( rand_double()*10000.0 ) - 5000.0; + x[ i+1 ] = ( rand_double()*10000.0 ) - 5000.0; + y[ i ] = 0.0; + y[ i+1 ] = 0.0; + } + t = tic(); + for ( i = 0; i < iterations; i++ ) { + c_zswap_ndarray( len, (void *)x, 1, 0, (void *)y, 1, 0 ); + if ( y[ 0 ] != y[ 0 ] ) { + printf( "should not return NaN\n" ); + break; + } + } + elapsed = tic() - t; + if ( y[ 0 ] != y[ 0 ] ) { + printf( "should not return NaN\n" ); + } + free( x ); + free( y ); + + return elapsed; +} + /** * Main execution sequence. */ @@ -149,7 +189,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/zswap/examples/c/example.c b/lib/node_modules/@stdlib/blas/base/zswap/examples/c/example.c index d081ade41e97..d9ef312d3bec 100644 --- a/lib/node_modules/@stdlib/blas/base/zswap/examples/c/example.c +++ b/lib/node_modules/@stdlib/blas/base/zswap/examples/c/example.c @@ -32,4 +32,13 @@ int main( void ) { printf( "x[ %i ] = %f + %fj\n", i, x[ i*2 ], x[ ( i*2 )+1 ] ); printf( "y[ %i ] = %f + %fj\n", i, y[ i*2 ], y[ ( i*2 )+1 ] ); } + + // Swap elements using alternative indexing semantics: + c_zswap_ndarray( 4, (void *)x, -1, 3, (void *)y, -1, 3 ); + + // Print the result: + for ( int i = 0; i < 4; i++ ) { + printf( "x[ %i ] = %f + %fj\n", i, x[ i*2 ], x[ ( i*2 )+1 ] ); + printf( "y[ %i ] = %f + %fj\n", i, y[ i*2 ], y[ ( i*2 )+1 ] ); + } } diff --git a/lib/node_modules/@stdlib/blas/base/zswap/include/stdlib/blas/base/zswap.h b/lib/node_modules/@stdlib/blas/base/zswap/include/stdlib/blas/base/zswap.h index 3803df06a1e1..659234aef87e 100644 --- a/lib/node_modules/@stdlib/blas/base/zswap/include/stdlib/blas/base/zswap.h +++ b/lib/node_modules/@stdlib/blas/base/zswap/include/stdlib/blas/base/zswap.h @@ -22,6 +22,8 @@ #ifndef ZSWAP_H #define ZSWAP_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" { /** * Interchanges two complex double-precision floating-point vectors. */ -void c_zswap( const int N, void *X, const int strideX, void *Y, const int strideY ); +void API_SUFFIX(c_zswap)( const CBLAS_INT N, void *X, const CBLAS_INT strideX, void *Y, const CBLAS_INT strideY ); + +/** +* Interchanges two complex double-precision floating-point vectors using alternative indexing semantics. +*/ +void API_SUFFIX(c_zswap_ndarray)( const CBLAS_INT N, void *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, void *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ); #ifdef __cplusplus } diff --git a/lib/node_modules/@stdlib/blas/base/zswap/include/stdlib/blas/base/zswap_cblas.h b/lib/node_modules/@stdlib/blas/base/zswap/include/stdlib/blas/base/zswap_cblas.h index 0445a754296b..d8bb38bcd0e9 100644 --- a/lib/node_modules/@stdlib/blas/base/zswap/include/stdlib/blas/base/zswap_cblas.h +++ b/lib/node_modules/@stdlib/blas/base/zswap/include/stdlib/blas/base/zswap_cblas.h @@ -22,6 +22,8 @@ #ifndef ZSWAP_CBLAS_H #define ZSWAP_CBLAS_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,7 @@ extern "C" { /** * Interchanges two complex double-precision floating-point vectors. */ -void cblas_zswap( const int N, void *X, const int strideX, void *Y, const int strideY ); +void API_SUFFIX(cblas_zswap)( const CBLAS_INT N, void *X, const CBLAS_INT strideX, void *Y, const CBLAS_INT strideY ); #ifdef __cplusplus } diff --git a/lib/node_modules/@stdlib/blas/base/zswap/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/base/zswap/lib/ndarray.native.js index 4738ad1577aa..b4c08839f45c 100644 --- a/lib/node_modules/@stdlib/blas/base/zswap/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/base/zswap/lib/ndarray.native.js @@ -21,7 +21,6 @@ // MODULES // var reinterpret = require( '@stdlib/strided/base/reinterpret-complex128' ); -var minViewBufferIndex = require( '@stdlib/strided/base/min-view-buffer-index' ); var addon = require( './../src/addon.node' ); @@ -68,16 +67,10 @@ var addon = require( './../src/addon.node' ); * // returns 8.0 */ function zswap( N, x, strideX, offsetX, y, strideY, offsetY ) { - var viewX; - var viewY; + var viewZX = reinterpret( x, 0 ); + var viewZY = reinterpret( y, 0 ); - offsetX = minViewBufferIndex( N, strideX, offsetX ); - offsetY = minViewBufferIndex( N, strideY, offsetY ); - - viewX = reinterpret( x, offsetX ); - viewY = reinterpret( y, offsetY ); - - addon( N, viewX, strideX, viewY, strideY ); + addon.ndarray( N, viewZX, strideX, offsetX, viewZY, strideY, offsetY ); return y; } diff --git a/lib/node_modules/@stdlib/blas/base/zswap/lib/zswap.js b/lib/node_modules/@stdlib/blas/base/zswap/lib/zswap.js index 819927c22c5b..cc346da751f1 100644 --- a/lib/node_modules/@stdlib/blas/base/zswap/lib/zswap.js +++ b/lib/node_modules/@stdlib/blas/base/zswap/lib/zswap.js @@ -20,7 +20,8 @@ // MODULES // -var reinterpret = require( '@stdlib/strided/base/reinterpret-complex128' ); +var stride2offset = require( '@stdlib/strided/base/stride2offset' ); +var ndarray = require( './ndarray.js' ); // MAIN // @@ -64,59 +65,9 @@ var reinterpret = require( '@stdlib/strided/base/reinterpret-complex128' ); * // returns 8.0 */ function zswap( N, x, strideX, y, strideY ) { - var viewX; - var viewY; - var tmp; - var sx; - var sy; - var ix; - var iy; - var i; - var j; - - if ( N <= 0 ) { - return y; - } - viewX = reinterpret( x, 0 ); - viewY = reinterpret( y, 0 ); - if ( strideX === 1 && strideY === 1 ) { - for ( i = 0; i < N*2; i += 2 ) { - tmp = viewX[ i ]; - viewX[ i ] = viewY[ i ]; - viewY[ i ] = tmp; - - j = i + 1; - tmp = viewX[ j ]; - viewX[ j ] = viewY[ j ]; - viewY[ j ] = tmp; - } - return y; - } - if ( strideX < 0 ) { - ix = 2 * ( 1-N ) * strideX; - } else { - ix = 0; - } - if ( strideY < 0 ) { - iy = 2 * ( 1-N ) * strideY; - } else { - iy = 0; - } - sx = strideX * 2; - sy = strideY * 2; - for ( i = 0; i < N; i++ ) { - tmp = viewX[ ix ]; - viewX[ ix ] = viewY[ iy ]; - viewY[ iy ] = tmp; - - tmp = viewX[ ix+1 ]; - viewX[ ix+1 ] = viewY[ iy+1 ]; - viewY[ iy+1 ] = tmp; - - ix += sx; - iy += sy; - } - return y; + var ox = stride2offset( N, strideX ); + var oy = stride2offset( N, strideY ); + return ndarray( N, x, strideX, ox, y, strideY, oy ); } diff --git a/lib/node_modules/@stdlib/blas/base/zswap/manifest.json b/lib/node_modules/@stdlib/blas/base/zswap/manifest.json index 7a780f3aefe9..c1e2e2b7b2eb 100644 --- a/lib/node_modules/@stdlib/blas/base/zswap/manifest.json +++ b/lib/node_modules/@stdlib/blas/base/zswap/manifest.json @@ -45,8 +45,11 @@ "dependencies": [ "@stdlib/napi/export", "@stdlib/napi/argv", + "@stdlib/blas/base/shared", "@stdlib/napi/argv-int64", - "@stdlib/napi/argv-strided-complex128array" + "@stdlib/napi/argv-strided-complex128array", + "@stdlib/strided/base/min-view-buffer-index", + "@stdlib/complex/float64/ctor" ] }, { @@ -55,14 +58,18 @@ "blas": "", "wasm": false, "src": [ - "./src/zswap.c" + "./src/zswap.c", + "./src/zswap_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] }, { "task": "examples", @@ -70,14 +77,18 @@ "blas": "", "wasm": false, "src": [ - "./src/zswap.c" + "./src/zswap.c", + "./src/zswap_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] }, { @@ -99,8 +110,11 @@ "dependencies": [ "@stdlib/napi/export", "@stdlib/napi/argv", + "@stdlib/blas/base/shared", "@stdlib/napi/argv-int64", - "@stdlib/napi/argv-strided-complex128array" + "@stdlib/napi/argv-strided-complex128array", + "@stdlib/strided/base/min-view-buffer-index", + "@stdlib/complex/float64/ctor" ] }, { @@ -119,7 +133,11 @@ "-lpthread" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", + "@stdlib/complex/float64/ctor" + ] }, { "task": "examples", @@ -137,7 +155,11 @@ "-lpthread" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", + "@stdlib/complex/float64/ctor" + ] }, { @@ -157,8 +179,11 @@ "dependencies": [ "@stdlib/napi/export", "@stdlib/napi/argv", + "@stdlib/blas/base/shared", "@stdlib/napi/argv-int64", - "@stdlib/napi/argv-strided-complex128array" + "@stdlib/napi/argv-strided-complex128array", + "@stdlib/strided/base/min-view-buffer-index", + "@stdlib/complex/float64/ctor" ] }, { @@ -167,14 +192,18 @@ "blas": "", "wasm": false, "src": [ - "./src/zswap.c" + "./src/zswap.c", + "./src/zswap_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] }, { "task": "examples", @@ -182,14 +211,18 @@ "blas": "", "wasm": false, "src": [ - "./src/zswap.c" + "./src/zswap.c", + "./src/zswap_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] }, { @@ -210,8 +243,11 @@ "dependencies": [ "@stdlib/napi/export", "@stdlib/napi/argv", + "@stdlib/blas/base/shared", "@stdlib/napi/argv-int64", - "@stdlib/napi/argv-strided-complex128array" + "@stdlib/napi/argv-strided-complex128array", + "@stdlib/strided/base/min-view-buffer-index", + "@stdlib/complex/float64/ctor" ] }, { @@ -229,7 +265,11 @@ "-lblas" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", + "@stdlib/complex/float64/ctor" + ] }, { "task": "examples", @@ -246,7 +286,11 @@ "-lblas" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", + "@stdlib/complex/float64/ctor" + ] }, { @@ -268,8 +312,11 @@ "dependencies": [ "@stdlib/napi/export", "@stdlib/napi/argv", + "@stdlib/blas/base/shared", "@stdlib/napi/argv-int64", - "@stdlib/napi/argv-strided-complex128array" + "@stdlib/napi/argv-strided-complex128array", + "@stdlib/strided/base/min-view-buffer-index", + "@stdlib/complex/float64/ctor" ] }, { @@ -288,7 +335,11 @@ "-lpthread" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", + "@stdlib/complex/float64/ctor" + ] }, { "task": "examples", @@ -306,7 +357,11 @@ "-lpthread" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", + "@stdlib/complex/float64/ctor" + ] }, { @@ -315,7 +370,8 @@ "blas": "", "wasm": false, "src": [ - "./src/zswap.c" + "./src/zswap.c", + "./src/zswap_ndarray.c" ], "include": [ "./include" @@ -325,8 +381,11 @@ "dependencies": [ "@stdlib/napi/export", "@stdlib/napi/argv", + "@stdlib/blas/base/shared", "@stdlib/napi/argv-int64", - "@stdlib/napi/argv-strided-complex128array" + "@stdlib/napi/argv-strided-complex128array", + "@stdlib/strided/base/stride2offset", + "@stdlib/complex/float64/ctor" ] }, { @@ -335,14 +394,18 @@ "blas": "", "wasm": false, "src": [ - "./src/zswap.c" + "./src/zswap.c", + "./src/zswap_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] }, { "task": "examples", @@ -350,14 +413,18 @@ "blas": "", "wasm": false, "src": [ - "./src/zswap.c" + "./src/zswap.c", + "./src/zswap_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] }, { @@ -366,14 +433,18 @@ "blas": "", "wasm": true, "src": [ - "./src/zswap.c" + "./src/zswap.c", + "./src/zswap_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] } ] } diff --git a/lib/node_modules/@stdlib/blas/base/zswap/src/addon.c b/lib/node_modules/@stdlib/blas/base/zswap/src/addon.c index 6835d3a8e764..e31afbd51571 100644 --- a/lib/node_modules/@stdlib/blas/base/zswap/src/addon.c +++ b/lib/node_modules/@stdlib/blas/base/zswap/src/addon.c @@ -17,6 +17,7 @@ */ #include "stdlib/blas/base/zswap.h" +#include "stdlib/blas/base/shared.h" #include "stdlib/napi/export.h" #include "stdlib/napi/argv.h" #include "stdlib/napi/argv_int64.h" @@ -37,8 +38,28 @@ static napi_value addon( napi_env env, napi_callback_info info ) { STDLIB_NAPI_ARGV_INT64( env, strideY, argv, 4 ); STDLIB_NAPI_ARGV_STRIDED_COMPLEX128ARRAY( env, X, N, strideX, argv, 1 ); STDLIB_NAPI_ARGV_STRIDED_COMPLEX128ARRAY( env, Y, N, strideY, argv, 3 ); - c_zswap( N, (void *)X, strideX, (void *)Y, strideY ); + API_SUFFIX(c_zswap)( N, (void *)X, strideX, (void *)Y, strideY ); return NULL; } -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, 7 ); + 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_INT64( env, strideY, argv, 5 ); + STDLIB_NAPI_ARGV_INT64( env, offsetY, argv, 6 ); + STDLIB_NAPI_ARGV_STRIDED_COMPLEX128ARRAY( env, X, N, strideX, argv, 1 ); + STDLIB_NAPI_ARGV_STRIDED_COMPLEX128ARRAY( env, Y, N, strideY, argv, 4 ); + API_SUFFIX(c_zswap_ndarray)( N, (void *)X, strideX, offsetX, (void *)Y, strideY, offsetY ); + return NULL; +} + +STDLIB_NAPI_MODULE_EXPORT_FCN_WITH_METHOD( addon, "ndarray", addon_method ) diff --git a/lib/node_modules/@stdlib/blas/base/zswap/src/zswap.c b/lib/node_modules/@stdlib/blas/base/zswap/src/zswap.c index ea0e25895d57..9bbbd16b205c 100644 --- a/lib/node_modules/@stdlib/blas/base/zswap/src/zswap.c +++ b/lib/node_modules/@stdlib/blas/base/zswap/src/zswap.c @@ -17,6 +17,8 @@ */ #include "stdlib/blas/base/zswap.h" +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/stride2offset.h" /** * Interchanges two complex double-precision floating-point vectors. @@ -27,50 +29,8 @@ * @param Y second input array * @param strideY Y stride length */ -void c_zswap( const int N, void *X, const int strideX, void *Y, const int strideY ) { - double *x = (double *)X; - double *y = (double *)Y; - double tmp; - int ix; - int iy; - int i; - - if ( N <= 0 ) { - return; - } - if ( strideX == 1 && strideY == 1 ) { - for ( i = 0; i < N*2; i += 2 ) { - tmp = x[ i ]; - x[ i ] = y[ i ]; - y[ i ] = tmp; - - tmp = x[ i+1 ]; - x[ i+1 ] = y[ i+1 ]; - y[ i+1 ] = tmp; - } - return; - } - if ( strideX < 0 ) { - ix = 2 * ( 1-N ) * strideX; - } else { - ix = 0; - } - if ( strideY < 0 ) { - iy = 2 * ( 1-N ) * strideY; - } else { - iy = 0; - } - for ( i = 0; i < N; i++ ) { - tmp = x[ ix ]; - x[ ix ] = y[ iy ]; - y[ iy ] = tmp; - - tmp = x[ ix+1 ]; - x[ ix+1 ] = y[ iy+1 ]; - y[ iy+1 ] = tmp; - - ix += strideX * 2; - iy += strideY * 2; - } - return; +void API_SUFFIX(c_zswap)( const CBLAS_INT N, void *X, const CBLAS_INT strideX, void *Y, const CBLAS_INT strideY ) { + CBLAS_INT ox = stdlib_strided_stride2offset( N, strideX ); + CBLAS_INT oy = stdlib_strided_stride2offset( N, strideY ); + API_SUFFIX(c_zswap_ndarray)( N, X, strideX, ox, Y, strideY, oy ); } diff --git a/lib/node_modules/@stdlib/blas/base/zswap/src/zswap_cblas.c b/lib/node_modules/@stdlib/blas/base/zswap/src/zswap_cblas.c index 24cc9c488372..4cf4faea62f4 100644 --- a/lib/node_modules/@stdlib/blas/base/zswap/src/zswap_cblas.c +++ b/lib/node_modules/@stdlib/blas/base/zswap/src/zswap_cblas.c @@ -18,6 +18,9 @@ #include "stdlib/blas/base/zswap.h" #include "stdlib/blas/base/zswap_cblas.h" +#include "stdlib/blas/base/shared.h" +#include "stdlib/complex/float64/ctor.h" +#include "stdlib/strided/base/min_view_buffer_index.h" /** * Interchanges two complex double-precision floating-point vectors. @@ -28,6 +31,26 @@ * @param Y second input array * @param strideY Y stride length */ -void c_zswap( const int N, void *X, const int strideX, void *Y, const int strideY ) { - cblas_zswap( N, X, strideX, Y, strideY ); +void API_SUFFIX(c_zswap)( const CBLAS_INT N, void *X, const CBLAS_INT strideX, void *Y, const CBLAS_INT strideY ) { + API_SUFFIX(cblas_zswap)( N, X, strideX, Y, strideY ); +} + +/** +* Interchanges two complex double-precision floating-point vectors using alternative indexing semantics. +* +* @param N number of indexed elements +* @param X first input array +* @param strideX X stride length +* @param offsetX starting index for X +* @param Y second input array +* @param strideY Y stride length +* @param offsetY starting index for Y +*/ +void API_SUFFIX(c_zswap_ndarray)( const CBLAS_INT N, void *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, void *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ) { + stdlib_complex128_t *zx = (stdlib_complex128_t *)X; + stdlib_complex128_t *zy = (stdlib_complex128_t *)Y; + + zx += stdlib_strided_min_view_buffer_index( N, strideX, offsetX ); // adjust array pointer + zy += stdlib_strided_min_view_buffer_index( N, strideY, offsetY ); // adjust array pointer + API_SUFFIX(cblas_zswap)( N, (void *)zx, strideX, (void *)zy, strideY ); } diff --git a/lib/node_modules/@stdlib/blas/base/zswap/src/zswap_f.c b/lib/node_modules/@stdlib/blas/base/zswap/src/zswap_f.c index 5963e5fe5448..aa614372e25f 100644 --- a/lib/node_modules/@stdlib/blas/base/zswap/src/zswap_f.c +++ b/lib/node_modules/@stdlib/blas/base/zswap/src/zswap_f.c @@ -18,6 +18,9 @@ #include "stdlib/blas/base/zswap.h" #include "stdlib/blas/base/zswap_fortran.h" +#include "stdlib/blas/base/shared.h" +#include "stdlib/complex/float64/ctor.h" +#include "stdlib/strided/base/min_view_buffer_index.h" /** * Interchanges two complex double-precision floating-point vectors. @@ -28,6 +31,26 @@ * @param Y second input array * @param strideY Y stride length */ -void c_zswap( const int N, void *X, const int strideX, void *Y, const int strideY ) { +void API_SUFFIX(c_zswap)( const CBLAS_INT N, void *X, const CBLAS_INT strideX, void *Y, const CBLAS_INT strideY ) { zswap( &N, X, &strideX, Y, &strideY ); } + +/** +* Interchanges two complex double-precision floating-point vectors using alternative indexing semantics. +* +* @param N number of indexed elements +* @param X first input array +* @param strideX X stride length +* @param offsetX starting index for X +* @param Y second input array +* @param strideY Y stride length +* @param offsetY starting index for Y +*/ +void API_SUFFIX(c_zswap_ndarray)( const CBLAS_INT N, void *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, void *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ) { + stdlib_complex128_t *zx = (stdlib_complex128_t *)X; + stdlib_complex128_t *zy = (stdlib_complex128_t *)Y; + + zx += stdlib_strided_min_view_buffer_index( N, strideX, offsetX ); + zy += stdlib_strided_min_view_buffer_index( N, strideY, offsetY ); + zswap( &N, (void *)zx, &strideX, (void *)zy, &strideY ); +} diff --git a/lib/node_modules/@stdlib/blas/base/zswap/src/zswap_ndarray.c b/lib/node_modules/@stdlib/blas/base/zswap/src/zswap_ndarray.c new file mode 100644 index 000000000000..37e2c2ff66c8 --- /dev/null +++ b/lib/node_modules/@stdlib/blas/base/zswap/src/zswap_ndarray.c @@ -0,0 +1,63 @@ +/** +* @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/zswap.h" +#include "stdlib/blas/base/shared.h" + +/** +* Interchanges two complex double-precision floating-point vectors using alternative indexing semantics. +* +* @param N number of indexed elements +* @param X first input array +* @param strideX X stride length +* @param offsetX starting index for X +* @param Y second input array +* @param strideY Y stride length +* @param offsetY starting index for Y +*/ +void API_SUFFIX(c_zswap_ndarray)( const CBLAS_INT N, void *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, void *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ) { + double *x = (double *)X; + double *y = (double *)Y; + CBLAS_INT ix; + CBLAS_INT iy; + CBLAS_INT sx; + CBLAS_INT sy; + CBLAS_INT i; + double tmp; + + if ( N <= 0 ) { + return; + } + sx = strideX * 2; + ix = offsetX * 2; + sy = strideY * 2; + iy = offsetY * 2; + for ( i = 0; i < N; i++ ) { + tmp = x[ ix ]; + x[ ix ] = y[ iy ]; + y[ iy ] = tmp; + + tmp = x[ ix+1 ]; + x[ ix+1 ] = y[ iy+1 ]; + y[ iy+1 ] = tmp; + + ix += sx; + iy += sy; + } + return; +} From be96cd23dfa7be57016910537abef92cb1b8fb34 Mon Sep 17 00:00:00 2001 From: Athan Date: Sun, 17 Nov 2024 13:48:35 -0800 Subject: [PATCH 2/3] Apply suggestions from code review Signed-off-by: Athan --- lib/node_modules/@stdlib/blas/base/zswap/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/base/zswap/README.md b/lib/node_modules/@stdlib/blas/base/zswap/README.md index 2592342cfb1a..4b69e2b186cf 100644 --- a/lib/node_modules/@stdlib/blas/base/zswap/README.md +++ b/lib/node_modules/@stdlib/blas/base/zswap/README.md @@ -299,7 +299,7 @@ Interchanges two complex double-precision floating-point vectors. double x[] = { 1.0, 2.0, 3.0, 4.0 }; // interleaved real and imaginary components double y[] = { 5.0, 6.0, 7.0, 8.0 }; -c_zswap( 2, (void *)x, 1, (void *)Y, 1 ); +c_zswap( 2, (void *)x, 1, (void *)y, 1 ); ``` The function accepts the following arguments: @@ -307,7 +307,7 @@ The function accepts the following arguments: - **N**: `[in] CBLAS_INT` number of indexed elements. - **X**: `[inout] void*` first input array. - **strideX**: `[in] CBLAS_INT` index increment for `X`. -- **Y**: `[inout] void*` first input array. +- **Y**: `[inout] void*` second input array. - **strideY**: `[in] CBLAS_INT` index increment for `Y`. ```c @@ -322,7 +322,7 @@ Interchanges two complex double-precision floating-point vectors using alternati double x[] = { 1.0, 2.0, 3.0, 4.0 }; // interleaved real and imaginary components double y[] = { 5.0, 6.0, 7.0, 8.0 }; -c_zswap_ndarray( 2, (void *)x, 1, 0, (void *)Y, 1, 0 ); +c_zswap_ndarray( 2, (void *)x, 1, 0, (void *)y, 1, 0 ); ``` The function accepts the following arguments: @@ -331,7 +331,7 @@ The function accepts the following arguments: - **X**: `[inout] void*` first input array. - **strideX**: `[in] CBLAS_INT` index increment for `X`. - **offsetX**: `[in] CBLAS_INT` starting index for `X`. -- **Y**: `[inout] void*` first input array. +- **Y**: `[inout] void*` second input array. - **strideY**: `[in] CBLAS_INT` index increment for `Y`. - **offsetY**: `[in] CBLAS_INT` starting index for `Y`. From c0d3160d3059ea037fb2cdb9b3b693a0f278d319 Mon Sep 17 00:00:00 2001 From: Athan Date: Sun, 17 Nov 2024 13:50:24 -0800 Subject: [PATCH 3/3] Apply suggestions from code review Signed-off-by: Athan --- .../@stdlib/blas/base/zswap/lib/ndarray.native.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/base/zswap/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/base/zswap/lib/ndarray.native.js index b4c08839f45c..5264ee9a1283 100644 --- a/lib/node_modules/@stdlib/blas/base/zswap/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/base/zswap/lib/ndarray.native.js @@ -67,10 +67,10 @@ var addon = require( './../src/addon.node' ); * // returns 8.0 */ function zswap( N, x, strideX, offsetX, y, strideY, offsetY ) { - var viewZX = reinterpret( x, 0 ); - var viewZY = reinterpret( y, 0 ); + var viewX = reinterpret( x, 0 ); + var viewY = reinterpret( y, 0 ); - addon.ndarray( N, viewZX, strideX, offsetX, viewZY, strideY, offsetY ); + addon.ndarray( N, viewX, strideX, offsetX, viewY, strideY, offsetY ); return y; }