From df85f8fc619137dbfde719d616dd0d025ccacf4d Mon Sep 17 00:00:00 2001 From: aman-095 Date: Wed, 6 Nov 2024 12:40:30 +0530 Subject: [PATCH 1/3] feat: update Js and add C ndarray implementation for ccopy --- .../@stdlib/blas/base/ccopy/README.md | 33 +++++++ .../base/ccopy/benchmark/c/benchmark.length.c | 46 +++++++++- .../blas/base/ccopy/examples/c/example.c | 8 ++ .../ccopy/include/stdlib/blas/base/ccopy.h | 5 ++ .../@stdlib/blas/base/ccopy/lib/ccopy.js | 45 ++-------- .../blas/base/ccopy/lib/ndarray.native.js | 14 +-- .../@stdlib/blas/base/ccopy/manifest.json | 87 +++++++++++++------ .../@stdlib/blas/base/ccopy/src/addon.c | 22 ++++- .../@stdlib/blas/base/ccopy/src/ccopy.c | 39 ++------- .../@stdlib/blas/base/ccopy/src/ccopy_cblas.c | 23 +++++ .../@stdlib/blas/base/ccopy/src/ccopy_f.c | 23 +++++ .../blas/base/ccopy/src/ccopy_ndarray.c | 56 ++++++++++++ 12 files changed, 288 insertions(+), 113 deletions(-) create mode 100644 lib/node_modules/@stdlib/blas/base/ccopy/src/ccopy_ndarray.c diff --git a/lib/node_modules/@stdlib/blas/base/ccopy/README.md b/lib/node_modules/@stdlib/blas/base/ccopy/README.md index 295c0ad62ad0..a3482e8c6b56 100644 --- a/lib/node_modules/@stdlib/blas/base/ccopy/README.md +++ b/lib/node_modules/@stdlib/blas/base/ccopy/README.md @@ -260,6 +260,31 @@ The function accepts the following arguments: void c_ccopy( const CBLAS_INT N, const void *X, const CBLAS_INT strideX, void *Y, const CBLAS_INT strideY ); ``` +#### c_ccopy_ndarray( N, \*X, strideX, offsetX, \*Y, strideY, offsetY ) + +Copies values from `X` into `Y` using alternative indexing semantics. + +```c +const float x[] = { 1.0f, 2.0f, 3.0f, 4.0f }; // interleaved real and imaginary components +float y[] = { 0.0f, 0.0f, 0.0f, 0.0f }; + +c_ccopy_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**: `[in] void*` input array. +- **strideX**: `[in] CBLAS_INT` index increment for `X`. +- **offsetX**: `[in] CBLAS_INT` starting index for `X`. +- **Y**: `[out] void*` output array. +- **strideY**: `[in] CBLAS_INT` index increment for `Y`. +- **offsetY**: `[in] CBLAS_INT` starting index for `Y`. + +```c +void c_ccopy_ndarray( const CBLAS_INT N, const void *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, void *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ); +``` + @@ -301,6 +326,14 @@ int main( void ) { for ( int i = 0; i < N; i++ ) { printf( "y[ %i ] = %f + %fj\n", i, y[ i*2 ], y[ (i*2)+1 ] ); } + + // Copy elements using alternative indexing semantics: + c_ccopy_ndarray( N, (void *)x, -strideX, N-1, (void *)y, strideY, N-1 ); + + // Print the result: + for ( int i = 0; i < N; i++ ) { + printf( "y[ %i ] = %f + %fj\n", i, y[ i*2 ], y[ (i*2)+1 ] ); + } } ``` diff --git a/lib/node_modules/@stdlib/blas/base/ccopy/benchmark/c/benchmark.length.c b/lib/node_modules/@stdlib/blas/base/ccopy/benchmark/c/benchmark.length.c index b92d77ebc5ad..cabaf46341ea 100644 --- a/lib/node_modules/@stdlib/blas/base/ccopy/benchmark/c/benchmark.length.c +++ b/lib/node_modules/@stdlib/blas/base/ccopy/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*2 ]; float y[ len*2 ]; @@ -122,6 +122,41 @@ 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*2 ]; + float y[ len*2 ]; + double t; + int i; + + for ( i = 0; i < len; i++ ) { + x[ i ] = ( rand_float()*10000.0f ) - 5000.0f; + x[ i+1 ] = ( rand_float()*10000.0f ) - 5000.0f; + y[ i ] = 0.0f; + y[ i+1 ] = 0.0f; + } + t = tic(); + for ( i = 0; i < iterations; i++ ) { + c_ccopy_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" ); + } + return elapsed; +} + /** * Main execution sequence. */ @@ -144,7 +179,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/ccopy/examples/c/example.c b/lib/node_modules/@stdlib/blas/base/ccopy/examples/c/example.c index 846f95373a90..9944899fb438 100644 --- a/lib/node_modules/@stdlib/blas/base/ccopy/examples/c/example.c +++ b/lib/node_modules/@stdlib/blas/base/ccopy/examples/c/example.c @@ -38,4 +38,12 @@ int main( void ) { for ( int i = 0; i < N; i++ ) { printf( "y[ %i ] = %f + %fj\n", i, y[ i*2 ], y[ (i*2)+1 ] ); } + + // Copy elements using alternative indexing semantics: + c_ccopy_ndarray( N, (void *)x, -strideX, N-1, (void *)y, strideY, N-1 ); + + // Print the result: + for ( int i = 0; i < N; i++ ) { + printf( "y[ %i ] = %f + %fj\n", i, y[ i*2 ], y[ (i*2)+1 ] ); + } } diff --git a/lib/node_modules/@stdlib/blas/base/ccopy/include/stdlib/blas/base/ccopy.h b/lib/node_modules/@stdlib/blas/base/ccopy/include/stdlib/blas/base/ccopy.h index 21042015e662..e4a72d9b3241 100644 --- a/lib/node_modules/@stdlib/blas/base/ccopy/include/stdlib/blas/base/ccopy.h +++ b/lib/node_modules/@stdlib/blas/base/ccopy/include/stdlib/blas/base/ccopy.h @@ -36,6 +36,11 @@ extern "C" { */ void API_SUFFIX(c_ccopy)( const CBLAS_INT N, const void *X, const CBLAS_INT strideX, void *Y, const CBLAS_INT strideY ); +/** +* Copies values from one complex single-precision floating-point vector to another complex single-precision floating-point vector using alternative indexing semantics. +*/ +void API_SUFFIX(c_ccopy_ndarray)( const CBLAS_INT N, const void *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, void *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ); + #ifdef __cplusplus } #endif diff --git a/lib/node_modules/@stdlib/blas/base/ccopy/lib/ccopy.js b/lib/node_modules/@stdlib/blas/base/ccopy/lib/ccopy.js index d7244ef5fc07..ca32ce9c9d46 100644 --- a/lib/node_modules/@stdlib/blas/base/ccopy/lib/ccopy.js +++ b/lib/node_modules/@stdlib/blas/base/ccopy/lib/ccopy.js @@ -20,7 +20,8 @@ // MODULES // -var reinterpret = require( '@stdlib/strided/base/reinterpret-complex64' ); +var stride2offset = require( '@stdlib/strided/base/stride2offset' ); +var ndarray = require( './ndarray.js' ); // MAIN // @@ -55,45 +56,9 @@ var reinterpret = require( '@stdlib/strided/base/reinterpret-complex64' ); * // returns 2.0 */ function ccopy( N, x, strideX, y, strideY ) { - var viewX; - var viewY; - var sx; - var sy; - var ix; - var iy; - var i; - - 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 ) { - viewY[ i ] = viewX[ i ]; - viewY[ i+1 ] = viewX[ i+1 ]; - } - 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++ ) { - viewY[ iy ] = viewX[ ix ]; - viewY[ iy+1 ] = viewX[ ix+1 ]; - 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/ccopy/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/base/ccopy/lib/ndarray.native.js index 575632d07a5b..d7825e5783af 100644 --- a/lib/node_modules/@stdlib/blas/base/ccopy/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/base/ccopy/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' ); @@ -59,16 +58,9 @@ var addon = require( './../src/addon.node' ); * // returns 2.0 */ function ccopy( N, x, strideX, offsetX, y, strideY, offsetY ) { - var viewX; - var viewY; - - offsetX = minViewBufferIndex( N, strideX, offsetX ); - offsetY = minViewBufferIndex( N, strideY, offsetY ); - - viewX = reinterpret( x, offsetX ); - viewY = reinterpret( y, offsetY ); - - addon( N, viewX, strideX, viewY, strideY ); + var viewCX = reinterpret( x, 0 ); + var viewCY = reinterpret( y, 0 ); + addon.ndarray( N, viewCX, strideX, offsetX, viewCY, strideY, offsetY ); return y; } diff --git a/lib/node_modules/@stdlib/blas/base/ccopy/manifest.json b/lib/node_modules/@stdlib/blas/base/ccopy/manifest.json index b169ce8a4528..636a02dc46f2 100644 --- a/lib/node_modules/@stdlib/blas/base/ccopy/manifest.json +++ b/lib/node_modules/@stdlib/blas/base/ccopy/manifest.json @@ -45,9 +45,11 @@ "dependencies": [ "@stdlib/napi/export", "@stdlib/napi/argv", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-complex64array", - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/complex/float32/ctor" ] }, { @@ -56,7 +58,8 @@ "blas": "", "wasm": false, "src": [ - "./src/ccopy.c" + "./src/ccopy.c", + "./src/ccopy_ndarray.c" ], "include": [ "./include" @@ -64,7 +67,8 @@ "libraries": [], "libpath": [], "dependencies": [ - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" ] }, { @@ -73,7 +77,8 @@ "blas": "", "wasm": false, "src": [ - "./src/ccopy.c" + "./src/ccopy.c", + "./src/ccopy_ndarray.c" ], "include": [ "./include" @@ -81,7 +86,8 @@ "libraries": [], "libpath": [], "dependencies": [ - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" ] }, @@ -104,9 +110,11 @@ "dependencies": [ "@stdlib/napi/export", "@stdlib/napi/argv", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-complex64array", - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/complex/float32/ctor" ] }, { @@ -126,7 +134,9 @@ ], "libpath": [], "dependencies": [ - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", + "@stdlib/complex/float32/ctor" ] }, { @@ -146,7 +156,9 @@ ], "libpath": [], "dependencies": [ - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", + "@stdlib/complex/float32/ctor" ] }, @@ -167,9 +179,11 @@ "dependencies": [ "@stdlib/napi/export", "@stdlib/napi/argv", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-complex64array", - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/complex/float32/ctor" ] }, { @@ -178,7 +192,8 @@ "blas": "", "wasm": false, "src": [ - "./src/ccopy.c" + "./src/ccopy.c", + "./src/ccopy_ndarray.c" ], "include": [ "./include" @@ -195,7 +210,8 @@ "blas": "", "wasm": false, "src": [ - "./src/ccopy.c" + "./src/ccopy.c", + "./src/ccopy_ndarray.c" ], "include": [ "./include" @@ -225,9 +241,11 @@ "dependencies": [ "@stdlib/napi/export", "@stdlib/napi/argv", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-complex64array", - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/complex/float32/ctor" ] }, { @@ -246,7 +264,9 @@ ], "libpath": [], "dependencies": [ - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", + "@stdlib/complex/float32/ctor" ] }, { @@ -265,7 +285,9 @@ ], "libpath": [], "dependencies": [ - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", + "@stdlib/complex/float32/ctor" ] }, @@ -288,9 +310,11 @@ "dependencies": [ "@stdlib/napi/export", "@stdlib/napi/argv", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-complex64array", - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/complex/float32/ctor" ] }, { @@ -310,7 +334,9 @@ ], "libpath": [], "dependencies": [ - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", + "@stdlib/complex/float32/ctor" ] }, { @@ -330,7 +356,9 @@ ], "libpath": [], "dependencies": [ - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", + "@stdlib/complex/float32/ctor" ] }, @@ -340,7 +368,8 @@ "blas": "", "wasm": false, "src": [ - "./src/ccopy.c" + "./src/ccopy.c", + "./src/ccopy_ndarray.c" ], "include": [ "./include" @@ -350,9 +379,11 @@ "dependencies": [ "@stdlib/napi/export", "@stdlib/napi/argv", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-complex64array", - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/complex/float32/ctor" ] }, { @@ -361,7 +392,8 @@ "blas": "", "wasm": false, "src": [ - "./src/ccopy.c" + "./src/ccopy.c", + "./src/ccopy_ndarray.c" ], "include": [ "./include" @@ -369,7 +401,8 @@ "libraries": [], "libpath": [], "dependencies": [ - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" ] }, { @@ -378,7 +411,8 @@ "blas": "", "wasm": false, "src": [ - "./src/ccopy.c" + "./src/ccopy.c", + "./src/ccopy_ndarray.c" ], "include": [ "./include" @@ -386,7 +420,8 @@ "libraries": [], "libpath": [], "dependencies": [ - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" ] }, @@ -396,7 +431,8 @@ "blas": "", "wasm": true, "src": [ - "./src/ccopy.c" + "./src/ccopy.c", + "./src/ccopy_ndarray.c" ], "include": [ "./include" @@ -404,7 +440,8 @@ "libraries": [], "libpath": [], "dependencies": [ - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" ] } ] diff --git a/lib/node_modules/@stdlib/blas/base/ccopy/src/addon.c b/lib/node_modules/@stdlib/blas/base/ccopy/src/addon.c index 48d9fe6a9dd2..84ba9e230517 100644 --- a/lib/node_modules/@stdlib/blas/base/ccopy/src/addon.c +++ b/lib/node_modules/@stdlib/blas/base/ccopy/src/addon.c @@ -42,4 +42,24 @@ static napi_value addon( napi_env env, napi_callback_info info ) { 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_COMPLEX64ARRAY( env, X, N, strideX, argv, 1 ); + STDLIB_NAPI_ARGV_STRIDED_COMPLEX64ARRAY( env, Y, N, strideY, argv, 4 ); + API_SUFFIX(c_ccopy_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/ccopy/src/ccopy.c b/lib/node_modules/@stdlib/blas/base/ccopy/src/ccopy.c index a6161ab8c1cf..a050db7e2fe8 100644 --- a/lib/node_modules/@stdlib/blas/base/ccopy/src/ccopy.c +++ b/lib/node_modules/@stdlib/blas/base/ccopy/src/ccopy.c @@ -1,7 +1,7 @@ /** * @license Apache-2.0 * -* Copyright (c) 2020 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. @@ -18,6 +18,7 @@ #include "stdlib/blas/base/ccopy.h" #include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/stride2offset.h" /** * Copies values from one complex single-precision floating-point vector to another complex single-precision floating-point vector. @@ -29,37 +30,7 @@ * @param strideY Y stride length */ void API_SUFFIX(c_ccopy)( const CBLAS_INT N, const void *X, const CBLAS_INT strideX, void *Y, const CBLAS_INT strideY ) { - float *x = (float *)X; - float *y = (float *)Y; - CBLAS_INT ix; - CBLAS_INT iy; - CBLAS_INT i; - - if ( N <= 0 ) { - return; - } - if ( strideX == 1 && strideY == 1 ) { - for ( i = 0; i < N*2; i += 2 ) { - y[ i ] = x[ i ]; - y[ i+1 ] = x[ i+1 ]; - } - 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++ ) { - y[ iy ] = x[ ix ]; - y[ iy+1 ] = x[ ix+1 ]; - ix += strideX * 2; - iy += strideY * 2; - } - return; + CBLAS_INT ox = stdlib_strided_stride2offset( N, strideX ); + CBLAS_INT oy = stdlib_strided_stride2offset( N, strideY ); + API_SUFFIX(c_ccopy_ndarray)( N, X, strideX, ox, Y, strideY, oy ); } diff --git a/lib/node_modules/@stdlib/blas/base/ccopy/src/ccopy_cblas.c b/lib/node_modules/@stdlib/blas/base/ccopy/src/ccopy_cblas.c index a7deabf7120b..81b6b88eaf9a 100644 --- a/lib/node_modules/@stdlib/blas/base/ccopy/src/ccopy_cblas.c +++ b/lib/node_modules/@stdlib/blas/base/ccopy/src/ccopy_cblas.c @@ -19,6 +19,8 @@ #include "stdlib/blas/base/ccopy.h" #include "stdlib/blas/base/ccopy_cblas.h" #include "stdlib/blas/base/shared.h" +#include "stdlib/complex/float32/ctor.h" +#include "stdlib/strided/base/min_view_buffer_index.h" /** * Copies values from one complex single-precision floating-point vector to another complex single-precision floating-point vector. @@ -32,3 +34,24 @@ void API_SUFFIX(c_ccopy)( const CBLAS_INT N, const void *X, const CBLAS_INT strideX, void *Y, const CBLAS_INT strideY ) { API_SUFFIX(cblas_ccopy)( N, X, strideX, Y, strideY ); } + +/** +* Copies values from one complex single-precision floating-point vector to another complex single-precision floating-point vector using alternative indexing semantics. +* +* @param N number of indexed elements +* @param X input array +* @param strideX X stride length +* @param offsetX starting index for X +* @param Y output array +* @param strideY Y stride length +* @param offsetY starting index for Y +*/ +void API_SUFFIX(c_ccopy_ndarray)( const CBLAS_INT N, const void *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, void *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ) { + stdlib_complex64_t *x = (stdlib_complex64_t *)X; + stdlib_complex64_t *y = (stdlib_complex64_t *)Y; + + x += stdlib_strided_min_view_buffer_index( N, strideX, offsetX ); // adjust array pointer + y += stdlib_strided_min_view_buffer_index( N, strideY, offsetY ); // adjust array pointer + + API_SUFFIX(cblas_ccopy)( N, (void *)x, strideX, (void *)y, strideY ); +} diff --git a/lib/node_modules/@stdlib/blas/base/ccopy/src/ccopy_f.c b/lib/node_modules/@stdlib/blas/base/ccopy/src/ccopy_f.c index 5a94ac92cef2..c06daad06b56 100644 --- a/lib/node_modules/@stdlib/blas/base/ccopy/src/ccopy_f.c +++ b/lib/node_modules/@stdlib/blas/base/ccopy/src/ccopy_f.c @@ -19,6 +19,8 @@ #include "stdlib/blas/base/ccopy.h" #include "stdlib/blas/base/ccopy_fortran.h" #include "stdlib/blas/base/shared.h" +#include "stdlib/complex/float32/ctor.h" +#include "stdlib/strided/base/min_view_buffer_index.h" /** * Copies values from one complex single-precision floating-point vector to another complex single-precision floating-point vector. @@ -32,3 +34,24 @@ void API_SUFFIX(c_ccopy)( const CBLAS_INT N, const void *X, const CBLAS_INT strideX, void *Y, const CBLAS_INT strideY ) { ccopy( &N, X, &strideX, Y, &strideY ); } + +/** +* Copies values from one complex single-precision floating-point vector to another complex single-precision floating-point vector using alternative indexing semantics. +* +* @param N number of indexed elements +* @param X input array +* @param strideX X stride length +* @param offsetX starting index for X +* @param Y output array +* @param strideY Y stride length +* @param offsetY starting index for Y +*/ +void API_SUFFIX(c_ccopy_ndarray)( const CBLAS_INT N, const void *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, void *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ) { + stdlib_complex64_t *x = (stdlib_complex64_t *)X; + stdlib_complex64_t *y = (stdlib_complex64_t *)Y; + + x += stdlib_strided_min_view_buffer_index( N, strideX, offsetX ); + y += stdlib_strided_min_view_buffer_index( N, strideY, offsetY ); + + ccopy( &N, (void *)x, &strideX, (void *)y, &strideY ); +} diff --git a/lib/node_modules/@stdlib/blas/base/ccopy/src/ccopy_ndarray.c b/lib/node_modules/@stdlib/blas/base/ccopy/src/ccopy_ndarray.c new file mode 100644 index 000000000000..a09529c2b33d --- /dev/null +++ b/lib/node_modules/@stdlib/blas/base/ccopy/src/ccopy_ndarray.c @@ -0,0 +1,56 @@ +/** +* @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/ccopy.h" +#include "stdlib/blas/base/shared.h" + +/** +* Copies values from one complex single-precision floating-point vector to another complex single-precision floating-point vector using alternative indexing semantics. +* +* @param N number of indexed elements +* @param X input array +* @param strideX X stride length +* @param offsetX starting index for X +* @param Y output array +* @param strideY Y stride length +* @param offsetY starting index for Y +*/ +void API_SUFFIX(c_ccopy_ndarray)( const CBLAS_INT N, const void *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, void *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ) { + float *x = (float *)X; + float *y = (float *)Y; + CBLAS_INT ix; + CBLAS_INT iy; + CBLAS_INT sx; + CBLAS_INT sy; + CBLAS_INT i; + + if ( N <= 0 ) { + return; + } + sx = strideX * 2; + sy = strideY * 2; + ix = offsetX * 2; + iy = offsetY * 2; + for ( i = 0; i < N; i++ ) { + y[ iy ] = x[ ix ]; + y[ iy+1 ] = x[ ix+1 ]; + ix += sx; + iy += sy; + } + return; +} From 1e9998e71233a819a616b7d360bfc1850d348b12 Mon Sep 17 00:00:00 2001 From: aman-095 Date: Wed, 6 Nov 2024 18:45:43 +0530 Subject: [PATCH 2/3] chore: update manifest --- lib/node_modules/@stdlib/blas/base/ccopy/manifest.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/base/ccopy/manifest.json b/lib/node_modules/@stdlib/blas/base/ccopy/manifest.json index 636a02dc46f2..e3f066e155ae 100644 --- a/lib/node_modules/@stdlib/blas/base/ccopy/manifest.json +++ b/lib/node_modules/@stdlib/blas/base/ccopy/manifest.json @@ -201,7 +201,8 @@ "libraries": [], "libpath": [], "dependencies": [ - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" ] }, { @@ -219,7 +220,8 @@ "libraries": [], "libpath": [], "dependencies": [ - "@stdlib/blas/base/shared" + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" ] }, @@ -379,11 +381,10 @@ "dependencies": [ "@stdlib/napi/export", "@stdlib/napi/argv", - "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-complex64array", "@stdlib/blas/base/shared", - "@stdlib/complex/float32/ctor" + "@stdlib/strided/base/stride2offset" ] }, { From 25ad683925606ffbc955feea9969f186d20684e4 Mon Sep 17 00:00:00 2001 From: Athan Date: Sun, 17 Nov 2024 19:05:49 -0800 Subject: [PATCH 3/3] Apply suggestions from code review Signed-off-by: Athan --- lib/node_modules/@stdlib/blas/base/ccopy/README.md | 2 +- .../@stdlib/blas/base/ccopy/lib/ndarray.native.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/node_modules/@stdlib/blas/base/ccopy/README.md b/lib/node_modules/@stdlib/blas/base/ccopy/README.md index a3482e8c6b56..d7affeea13f7 100644 --- a/lib/node_modules/@stdlib/blas/base/ccopy/README.md +++ b/lib/node_modules/@stdlib/blas/base/ccopy/README.md @@ -268,7 +268,7 @@ Copies values from `X` into `Y` using alternative indexing semantics. const float x[] = { 1.0f, 2.0f, 3.0f, 4.0f }; // interleaved real and imaginary components float y[] = { 0.0f, 0.0f, 0.0f, 0.0f }; -c_ccopy_ndarray( 2, (void *)x, 1, 0, (void *)Y, 1, 0 ); +c_ccopy_ndarray( 2, (void *)x, 1, 0, (void *)y, 1, 0 ); ``` The function accepts the following arguments: diff --git a/lib/node_modules/@stdlib/blas/base/ccopy/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/base/ccopy/lib/ndarray.native.js index d7825e5783af..b82c32b746ff 100644 --- a/lib/node_modules/@stdlib/blas/base/ccopy/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/base/ccopy/lib/ndarray.native.js @@ -58,9 +58,9 @@ var addon = require( './../src/addon.node' ); * // returns 2.0 */ function ccopy( N, x, strideX, offsetX, y, strideY, offsetY ) { - var viewCX = reinterpret( x, 0 ); - var viewCY = reinterpret( y, 0 ); - addon.ndarray( N, viewCX, strideX, offsetX, viewCY, strideY, offsetY ); + var viewX = reinterpret( x, 0 ); + var viewY = reinterpret( y, 0 ); + addon.ndarray( N, viewX, strideX, offsetX, viewY, strideY, offsetY ); return y; }