From d2d0ec05d90a31e2bbdeea46bc206632006fa994 Mon Sep 17 00:00:00 2001 From: stdlib-bot Date: Tue, 17 Sep 2024 07:37:19 +0000 Subject: [PATCH] Auto-generated commit --- .github/.keepalive | 1 - CHANGELOG.md | 16 ++- CONTRIBUTORS | 7 ++ README.md | 134 +++++++++++++++++++++++++ benchmark/c/benchmark.length.c | 44 +++++++- examples/c/example.c | 8 ++ include/stdlib/blas/base/scopy.h | 9 +- include/stdlib/blas/base/scopy_cblas.h | 4 +- lib/ndarray.native.js | 15 +-- manifest.json | 101 +++++++++++++++---- package.json | 4 +- src/addon.c | 25 ++++- src/scopy.c | 55 ++-------- src/scopy_cblas.c | 21 +++- src/scopy_f.c | 21 +++- src/scopy_ndarray.c | 79 +++++++++++++++ 16 files changed, 447 insertions(+), 97 deletions(-) delete mode 100644 .github/.keepalive create mode 100644 src/scopy_ndarray.c diff --git a/.github/.keepalive b/.github/.keepalive deleted file mode 100644 index 635f77d..0000000 --- a/.github/.keepalive +++ /dev/null @@ -1 +0,0 @@ -2024-09-01T02:11:35.170Z diff --git a/CHANGELOG.md b/CHANGELOG.md index 47a96b4..e2271d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,17 @@
-## Unreleased (2024-09-01) +## Unreleased (2024-09-17) + +
+ +### Features + +- [`08f39b4`](https://github.com/stdlib-js/stdlib/commit/08f39b45439d043323ec402647f6b3ea8a5a4a56) - add C `ndarray` implementation for `blas/base/scopy` [(#2913)](https://github.com/stdlib-js/stdlib/pull/2913) + +
+ +
@@ -12,6 +22,7 @@
+- [`08f39b4`](https://github.com/stdlib-js/stdlib/commit/08f39b45439d043323ec402647f6b3ea8a5a4a56) - **feat:** add C `ndarray` implementation for `blas/base/scopy` [(#2913)](https://github.com/stdlib-js/stdlib/pull/2913) _(by Aman Bhansali, Athan Reines)_ - [`2777e4b`](https://github.com/stdlib-js/stdlib/commit/2777e4be161869d09406e3b17947d24c64b47af2) - **bench:** resolve lint errors in benchmarks _(by Athan Reines)_
@@ -24,8 +35,9 @@ ### Contributors -A total of 1 person contributed to this release. Thank you to this contributor: +A total of 2 people contributed to this release. Thank you to the following contributors: +- Aman Bhansali - Athan Reines
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 57d1184..147a89e 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2,6 +2,7 @@ # # Contributors listed in alphabetical order. +Aayush Khanna <96649223+aayush0325@users.noreply.github.com> Adarsh Palaskar Aditya Sapra AgPriyanshu18 <113460573+AgPriyanshu18@users.noreply.github.com> @@ -26,17 +27,20 @@ EuniceSim142 <77243938+EuniceSim142@users.noreply.github.com> Frank Kovacs Golden Kumar <103646877+AuenKr@users.noreply.github.com> Gunj Joshi +HarshaNP <96897754+GittyHarsha@users.noreply.github.com> Harshita Kalani Hridyanshu <124202756+HRIDYANSHU054@users.noreply.github.com> Jaimin Godhani <112328542+Jai0401@users.noreply.github.com> James Gelok Jaysukh Makvana +Jenish Thapa <141203631+jenish-thapa@users.noreply.github.com> Jithin KS Joel Mathew Koshy Joey Reed Jordan Gallivan <115050475+Jordan-Gallivan@users.noreply.github.com> Joris Labie Justin Dennison +Kaif Mohd Karthik Prakash <116057817+skoriop@users.noreply.github.com> Khaldon Krishnendu Das <86651039+itskdhere@users.noreply.github.com> @@ -86,8 +90,10 @@ Stephannie Jiménez Gacha Suraj kumar <125961509+kumarsuraj212003@users.noreply.github.com> Tirtadwipa Manunggal Tudor Pagu <104032457+tudor-pagu@users.noreply.github.com> +Tufailahmed Bargir <142114244+Tufailahmed-Bargir@users.noreply.github.com> Utkarsh Utkarsh Raj +Vaibhav Patel <98279986+noobCoderVP@users.noreply.github.com> Varad Gupta Xiaochuan Ye Yernar Yergaziyev @@ -96,3 +102,4 @@ nishant-s7 <97207366+nishant-s7@users.noreply.github.com> orimiles5 <97595296+orimiles5@users.noreply.github.com> rainn <88160429+AmCodesLame@users.noreply.github.com> rei2hu +yaswanth <116426380+yaswanthkosuru@users.noreply.github.com> diff --git a/README.md b/README.md index fd5c634..0e6ef1d 100644 --- a/README.md +++ b/README.md @@ -191,6 +191,140 @@ console.log( y ); + + +* * * + +
+ +## C APIs + + + +
+ +
+ + + + + +
+ +### Usage + +```c +#include "stdlib/blas/base/scopy.h" +``` + +#### c_scopy( N, \*X, strideX, \*Y, strideY ) + +Copies values from `X` into `Y`. + +```c +const float x[] = { 1.0f, 2.0f, 3.0f, 4.0f }; +float y[] = { 0.0f, 0.0f, 0.0f, 0.0f }; + +c_scopy( 4, x, 1, y, 1 ); +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[in] float*` input array. +- **strideX**: `[in] CBLAS_INT` index increment for `X`. +- **Y**: `[out] float*` output array. +- **strideY**: `[in] CBLAS_INT` index increment for `Y`. + +```c +void c_scopy( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, float *Y, const CBLAS_INT strideY ); +``` + +#### c_scopy_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, 5.0f }; +float y[] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; + +c_scopy_ndarray( 3, x, 1, 2, y, 1, 2 ); +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[in] float*` input array. +- **strideX**: `[in] CBLAS_INT` index increment for `X`. +- **offsetX**: `[in] CBLAS_INT` starting index for `X`. +- **Y**: `[out] float*` output array. +- **strideY**: `[in] CBLAS_INT` index increment for `Y`. +- **offsetY**: `[in] CBLAS_INT` starting index for `Y`. + +```c +void c_scopy_ndarray( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, float *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ); +``` + +
+ + + + + +
+ +
+ + + + + +
+ +### Examples + +```c +#include "stdlib/blas/base/scopy.h" +#include + +int main( void ) { + // Create strided arrays: + const float x[] = { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f }; + float y[] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; + + // Specify the number of elements: + const int N = 4; + + // Specify stride lengths: + const int strideX = 2; + const int strideY = -2; + + // Copy elements: + c_scopy( N, x, strideX, y, strideY ); + + // Print the result: + for ( int i = 0; i < 8; i++ ) { + printf( "y[ %i ] = %f\n", i, y[ i ] ); + } + + // Copy elements: + c_scopy_ndarray( N, x, strideX, 0, y, strideY, 6 ); + + // Print the result: + for ( int i = 0; i < 8; i++ ) { + printf( "y[ %i ] = %f\n", i, y[ i ] ); + } +} +``` + +
+ + + +
+ + +
diff --git a/benchmark/c/benchmark.length.c b/benchmark/c/benchmark.length.c index e0bc079..e169250 100644 --- a/benchmark/c/benchmark.length.c +++ b/benchmark/c/benchmark.length.c @@ -94,7 +94,7 @@ static float rand_float( void ) { * @param len array length * @return elapsed time in seconds */ -static double benchmark( int iterations, int len ) { +static double benchmark1( int iterations, int len ) { double elapsed; float x[ len ]; float y[ len ]; @@ -120,6 +120,39 @@ static double benchmark( int iterations, int len ) { return elapsed; } +/** +* Runs a benchmark. +* +* @param iterations number of iterations +* @param len array length +* @return elapsed time in seconds +*/ +static double benchmark2( int iterations, int len ) { + double elapsed; + float x[ len ]; + float y[ len ]; + double t; + int i; + + for ( i = 0; i < len; i++ ) { + x[ i ] = ( rand_float()*20000.0f ) - 10000.0f; + y[ i ] = 0.0f; + } + t = tic(); + for ( i = 0; i < iterations; i++ ) { + c_scopy_ndarray( len, x, 1, 0, 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. */ @@ -142,7 +175,14 @@ int main( void ) { for ( j = 0; j < REPEATS; j++ ) { count += 1; printf( "# c::%s:len=%d\n", NAME, len ); - elapsed = benchmark( iter, len ); + elapsed = benchmark1( iter, len ); + print_results( iter, elapsed ); + printf( "ok %d benchmark finished\n", count ); + } + for ( j = 0; j < REPEATS; j++ ) { + count += 1; + printf( "# c::%s:ndarray:len=%d\n", NAME, len ); + elapsed = benchmark2( iter, len ); print_results( iter, elapsed ); printf( "ok %d benchmark finished\n", count ); } diff --git a/examples/c/example.c b/examples/c/example.c index 624b959..1c27580 100644 --- a/examples/c/example.c +++ b/examples/c/example.c @@ -38,4 +38,12 @@ int main( void ) { for ( int i = 0; i < 8; i++ ) { printf( "y[ %i ] = %f\n", i, y[ i ] ); } + + // Copy elements: + c_scopy_ndarray( N, x, strideX, 0, y, strideY, 6 ); + + // Print the result: + for ( int i = 0; i < 8; i++ ) { + printf( "y[ %i ] = %f\n", i, y[ i ] ); + } } diff --git a/include/stdlib/blas/base/scopy.h b/include/stdlib/blas/base/scopy.h index ddf1636..bede66a 100644 --- a/include/stdlib/blas/base/scopy.h +++ b/include/stdlib/blas/base/scopy.h @@ -22,6 +22,8 @@ #ifndef SCOPY_H #define SCOPY_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" { /** * Copies values from `x` into `y`. */ -void c_scopy( const int N, const float *X, const int strideX, float *Y, const int strideY ); +void API_SUFFIX(c_scopy)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, float *Y, const CBLAS_INT strideY ); + +/** +* Copies values from `x` into `y` using alternative indexing semantics. +*/ +void API_SUFFIX(c_scopy_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, float *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ); #ifdef __cplusplus } diff --git a/include/stdlib/blas/base/scopy_cblas.h b/include/stdlib/blas/base/scopy_cblas.h index 82b73b0..84afab6 100644 --- a/include/stdlib/blas/base/scopy_cblas.h +++ b/include/stdlib/blas/base/scopy_cblas.h @@ -22,6 +22,8 @@ #ifndef SCOPY_CBLAS_H #define SCOPY_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" { /** * Copies values from `x` into `y`. */ -void cblas_scopy( const int N, const float *X, const int strideX, float *Y, const int strideY ); +void API_SUFFIX(cblas_scopy)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, float *Y, const CBLAS_INT strideY ); #ifdef __cplusplus } diff --git a/lib/ndarray.native.js b/lib/ndarray.native.js index 454d305..7e064d5 100644 --- a/lib/ndarray.native.js +++ b/lib/ndarray.native.js @@ -20,9 +20,7 @@ // MODULES // -var minViewBufferIndex = require( '@stdlib/strided-base-min-view-buffer-index' ); -var offsetView = require( '@stdlib/strided-base-offset-view' ); -var addon = require( './scopy.native.js' ); +var addon = require( './../src/addon.node' ); // MAIN // @@ -49,16 +47,7 @@ var addon = require( './scopy.native.js' ); * // y => [ 1.0, 2.0, 3.0, 4.0, 5.0 ] */ function scopy( N, x, strideX, offsetX, y, strideY, offsetY ) { - var viewX; - var viewY; - - offsetX = minViewBufferIndex( N, strideX, offsetX ); - offsetY = minViewBufferIndex( N, strideY, offsetY ); - - viewX = offsetView( x, offsetX ); - viewY = offsetView( y, offsetY ); - - addon( N, viewX, strideX, viewY, strideY ); + addon.ndarray( N, x, strideX, offsetX, y, strideY, offsetY ); return y; } diff --git a/manifest.json b/manifest.json index d761764..e45a9bf 100644 --- a/manifest.json +++ b/manifest.json @@ -43,6 +43,8 @@ "libraries": [], "libpath": [], "dependencies": [ + "@stdlib/blas-base-shared", + "@stdlib/strided-base-min-view-buffer-index", "@stdlib/napi-export", "@stdlib/napi-argv", "@stdlib/napi-argv-int64", @@ -55,14 +57,18 @@ "blas": "", "wasm": false, "src": [ - "./src/scopy.c" + "./src/scopy.c", + "./src/scopy_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas-base-shared", + "@stdlib/strided-base-stride2offset" + ] }, { "task": "examples", @@ -70,14 +76,18 @@ "blas": "", "wasm": false, "src": [ - "./src/scopy.c" + "./src/scopy.c", + "./src/scopy_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas-base-shared", + "@stdlib/strided-base-stride2offset" + ] }, { @@ -97,6 +107,8 @@ ], "libpath": [], "dependencies": [ + "@stdlib/blas-base-shared", + "@stdlib/strided-base-min-view-buffer-index", "@stdlib/napi-export", "@stdlib/napi-argv", "@stdlib/napi-argv-int64", @@ -119,7 +131,10 @@ "-lpthread" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas-base-shared", + "@stdlib/strided-base-min-view-buffer-index" + ] }, { "task": "examples", @@ -137,7 +152,10 @@ "-lpthread" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas-base-shared", + "@stdlib/strided-base-min-view-buffer-index" + ] }, { @@ -155,6 +173,8 @@ "libraries": [], "libpath": [], "dependencies": [ + "@stdlib/blas-base-shared", + "@stdlib/strided-base-min-view-buffer-index", "@stdlib/napi-export", "@stdlib/napi-argv", "@stdlib/napi-argv-int64", @@ -167,14 +187,18 @@ "blas": "", "wasm": false, "src": [ - "./src/scopy.c" + "./src/scopy.c", + "./src/scopy_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas-base-shared", + "@stdlib/strided-base-stride2offset" + ] }, { "task": "examples", @@ -182,14 +206,18 @@ "blas": "", "wasm": false, "src": [ - "./src/scopy.c" + "./src/scopy.c", + "./src/scopy_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas-base-shared", + "@stdlib/strided-base-stride2offset" + ] }, { @@ -208,6 +236,8 @@ ], "libpath": [], "dependencies": [ + "@stdlib/blas-base-shared", + "@stdlib/strided-base-min-view-buffer-index", "@stdlib/napi-export", "@stdlib/napi-argv", "@stdlib/napi-argv-int64", @@ -229,7 +259,10 @@ "-lblas" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas-base-shared", + "@stdlib/strided-base-min-view-buffer-index" + ] }, { "task": "examples", @@ -246,7 +279,10 @@ "-lblas" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas-base-shared", + "@stdlib/strided-base-min-view-buffer-index" + ] }, { @@ -266,6 +302,8 @@ ], "libpath": [], "dependencies": [ + "@stdlib/blas-base-shared", + "@stdlib/strided-base-min-view-buffer-index", "@stdlib/napi-export", "@stdlib/napi-argv", "@stdlib/napi-argv-int64", @@ -288,7 +326,10 @@ "-lpthread" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas-base-shared", + "@stdlib/strided-base-min-view-buffer-index" + ] }, { "task": "examples", @@ -306,7 +347,10 @@ "-lpthread" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas-base-shared", + "@stdlib/strided-base-min-view-buffer-index" + ] }, { @@ -315,7 +359,8 @@ "blas": "", "wasm": false, "src": [ - "./src/scopy.c" + "./src/scopy.c", + "./src/scopy_ndarray.c" ], "include": [ "./include" @@ -323,6 +368,8 @@ "libraries": [], "libpath": [], "dependencies": [ + "@stdlib/blas-base-shared", + "@stdlib/strided-base-min-view-buffer-index", "@stdlib/napi-export", "@stdlib/napi-argv", "@stdlib/napi-argv-int64", @@ -335,14 +382,18 @@ "blas": "", "wasm": false, "src": [ - "./src/scopy.c" + "./src/scopy.c", + "./src/scopy_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas-base-shared", + "@stdlib/strided-base-stride2offset" + ] }, { "task": "examples", @@ -350,14 +401,18 @@ "blas": "", "wasm": false, "src": [ - "./src/scopy.c" + "./src/scopy.c", + "./src/scopy_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas-base-shared", + "@stdlib/strided-base-stride2offset" + ] }, { @@ -366,14 +421,18 @@ "blas": "", "wasm": true, "src": [ - "./src/scopy.c" + "./src/scopy.c", + "./src/scopy_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas-base-shared", + "@stdlib/strided-base-stride2offset" + ] } ] } diff --git a/package.json b/package.json index e7ae0ba..160229a 100644 --- a/package.json +++ b/package.json @@ -42,10 +42,12 @@ }, "dependencies": { "@stdlib/assert-is-error": "^0.2.2", + "@stdlib/blas-base-shared": "^0.1.0", "@stdlib/napi-argv": "^0.2.2", "@stdlib/napi-argv-int64": "^0.2.2", "@stdlib/napi-argv-strided-float32array": "^0.2.2", "@stdlib/napi-export": "^0.2.2", + "@stdlib/strided-base-min-view-buffer-index": "^0.2.2", "@stdlib/strided-base-stride2offset": "^0.1.0", "@stdlib/utils-define-nonenumerable-read-only-property": "^0.2.2", "@stdlib/utils-library-manifest": "^0.2.2", @@ -58,8 +60,6 @@ "@stdlib/math-base-special-pow": "^0.3.0", "@stdlib/random-array-discrete-uniform": "^0.2.1", "@stdlib/random-array-uniform": "^0.2.1", - "@stdlib/strided-base-min-view-buffer-index": "^0.2.2", - "@stdlib/strided-base-offset-view": "^0.2.2", "proxyquire": "^2.0.0", "tape": "git+https://github.com/kgryte/tape.git#fix/globby", "istanbul": "^0.4.1", diff --git a/src/addon.c b/src/addon.c index dc7738b..66ce091 100644 --- a/src/addon.c +++ b/src/addon.c @@ -17,6 +17,7 @@ */ #include "stdlib/blas/base/scopy.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_FLOAT32ARRAY( env, X, N, strideX, argv, 1 ); STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, Y, N, strideY, argv, 3 ); - c_scopy( N, X, strideX, Y, strideY ); + API_SUFFIX(c_scopy)( N, X, strideX, 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_FLOAT32ARRAY( env, X, N, strideX, argv, 1 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, Y, N, strideY, argv, 4 ); + API_SUFFIX(c_scopy_ndarray)( N, X, strideX, offsetX, Y, strideY, offsetY ); + return NULL; +} + +STDLIB_NAPI_MODULE_EXPORT_FCN_WITH_METHOD( addon, "ndarray", addon_method ) diff --git a/src/scopy.c b/src/scopy.c index 2ec3078..8bf86ef 100644 --- a/src/scopy.c +++ b/src/scopy.c @@ -17,6 +17,8 @@ */ #include "stdlib/blas/base/scopy.h" +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/stride2offset.h" /** * Copies values from `X` into `Y`. @@ -27,53 +29,8 @@ * @param Y output array * @param strideY Y stride length */ -void c_scopy( const int N, const float *X, const int strideX, float *Y, const int strideY ) { - int ix; - int iy; - int i; - int m; - - if ( N <= 0 ) { - return; - } - // If both strides are equal to `1`, use unrolled loops... - if ( strideX == 1 && strideY == 1 ) { - m = N % 7; - - // If we have a remainder, do a clean-up loop... - if ( m > 0 ) { - for ( i = 0; i < m; i++ ) { - Y[ i ] = X[ i ]; - } - if ( N < 7 ) { - return; - } - } - for ( i = m; i < N; i += 7 ) { - Y[ i ] = X[ i ]; - Y[ i+1 ] = X[ i+1 ]; - Y[ i+2 ] = X[ i+2 ]; - Y[ i+3 ] = X[ i+3 ]; - Y[ i+4 ] = X[ i+4 ]; - Y[ i+5 ] = X[ i+5 ]; - Y[ i+6 ] = X[ i+6 ]; - } - return; - } - if ( strideX < 0 ) { - ix = (1-N) * strideX; - } else { - ix = 0; - } - if ( strideY < 0 ) { - iy = (1-N) * strideY; - } else { - iy = 0; - } - for ( i = 0; i < N; i++ ) { - Y[ iy ] = X[ ix ]; - ix += strideX; - iy += strideY; - } - return; +void API_SUFFIX(c_scopy)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, float *Y, const CBLAS_INT strideY ) { + CBLAS_INT ox = stdlib_strided_stride2offset( N, strideX ); + CBLAS_INT oy = stdlib_strided_stride2offset( N, strideY ); + API_SUFFIX(c_scopy_ndarray)( N, X, strideX, ox, Y, strideY, oy ); } diff --git a/src/scopy_cblas.c b/src/scopy_cblas.c index 73247c8..2438b4a 100644 --- a/src/scopy_cblas.c +++ b/src/scopy_cblas.c @@ -18,6 +18,8 @@ #include "stdlib/blas/base/scopy.h" #include "stdlib/blas/base/scopy_cblas.h" +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/min_view_buffer_index.h" /** * Copies values from `X` into `Y`. @@ -28,6 +30,21 @@ * @param Y output array * @param strideY Y stride length */ -void c_scopy( const int N, const float *X, const int strideX, float *Y, const int strideY ) { - cblas_scopy( N, X, strideX, Y, strideY ); +void API_SUFFIX(c_scopy)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, float *Y, const CBLAS_INT strideY ) { + API_SUFFIX(cblas_scopy)( N, X, strideX, Y, strideY ); +} + +/** +* Copies values from `X` into `Y` using alternative indexing semantics. +* +* @param N number of indexed elements +* @param X input array +* @param strideX X stride length +* @param Y output array +* @param strideY Y stride length +*/ +void API_SUFFIX(c_scopy_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, float *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ) { + 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_scopy)( N, X, strideX, Y, strideY ); } diff --git a/src/scopy_f.c b/src/scopy_f.c index 283d301..e8d6cf6 100644 --- a/src/scopy_f.c +++ b/src/scopy_f.c @@ -18,6 +18,8 @@ #include "stdlib/blas/base/scopy.h" #include "stdlib/blas/base/scopy_fortran.h" +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/min_view_buffer_index.h" /** * Copies values from `X` into `Y`. @@ -28,6 +30,23 @@ * @param Y output array * @param strideY Y stride length */ -void c_scopy( const int N, const float *X, const int strideX, float *Y, const int strideY ) { +void API_SUFFIX(c_scopy)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, float *Y, const CBLAS_INT strideY ) { + scopy( &N, X, &strideX, Y, &strideY ); +} + +/** +* Copies values from `X` into `Y` 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_scopy_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, float *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ) { + 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 scopy( &N, X, &strideX, Y, &strideY ); } diff --git a/src/scopy_ndarray.c b/src/scopy_ndarray.c new file mode 100644 index 0000000..c984dad --- /dev/null +++ b/src/scopy_ndarray.c @@ -0,0 +1,79 @@ +/** +* @license Apache-2.0 +* +* Copyright (c) 2023 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/scopy.h" +#include "stdlib/blas/base/shared.h" + +static const CBLAS_INT M = 7; + +/** +* Copies values from `X` into `Y`. +* +* @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_scopy_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, float *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ) { + CBLAS_INT ix; + CBLAS_INT iy; + CBLAS_INT i; + CBLAS_INT m; + + if ( N <= 0 ) { + return; + } + ix = offsetX; + iy = offsetY; + + // If both strides are equal to `1`, use unrolled loops... + if ( strideX == 1 && strideY == 1 ) { + m = N % M; + + // If we have a remainder, do a clean-up loop... + if ( m > 0 ) { + for ( i = 0; i < m; i++ ) { + Y[ iy ] = X[ ix ]; + ix += strideX; + iy += strideY; + } + if ( N < 7 ) { + return; + } + } + for ( i = m; i < N; i += 7 ) { + Y[ iy ] = X[ ix ]; + Y[ iy+1 ] = X[ ix+1 ]; + Y[ iy+2 ] = X[ ix+2 ]; + Y[ iy+3 ] = X[ ix+3 ]; + Y[ iy+4 ] = X[ ix+4 ]; + Y[ iy+5 ] = X[ ix+5 ]; + Y[ iy+6 ] = X[ ix+6 ]; + } + return; + } + for ( i = 0; i < N; i++ ) { + Y[ iy ] = X[ ix ]; + ix += strideX; + iy += strideY; + } + return; +}