From d4c94d2cd1dd05df0045a6be88fd4cc9eae5d27d Mon Sep 17 00:00:00 2001 From: stdlib-bot Date: Wed, 18 Sep 2024 21:47:38 +0000 Subject: [PATCH] Auto-generated commit --- CHANGELOG.md | 23 +++ base/sdot/README.md | 132 ++++++++++++++++++ base/sdot/benchmark/c/benchmark.length.c | 46 +++++- base/sdot/examples/c/example.c | 6 + base/sdot/include/stdlib/blas/base/sdot.h | 9 +- .../include/stdlib/blas/base/sdot_cblas.h | 4 +- base/sdot/lib/ndarray.native.js | 15 +- base/sdot/manifest.json | 101 +++++++++++--- base/sdot/src/addon.c | 25 +++- base/sdot/src/sdot.c | 51 +------ base/sdot/src/sdot_cblas.c | 24 +++- base/sdot/src/sdot_f.c | 27 +++- base/sdot/src/sdot_ndarray.c | 84 +++++++++++ 13 files changed, 459 insertions(+), 88 deletions(-) create mode 100644 base/sdot/src/sdot_ndarray.c diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b8a3d1c8..c571f040d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -187,6 +187,28 @@ +
+ +#### [@stdlib/blas/base/sdot](https://github.com/stdlib-js/stdlib/tree/develop/lib/node_modules/%40stdlib/blas/base/sdot) + +
+ +
+ +##### Features + +- [`2bedae9`](https://github.com/stdlib-js/stdlib/commit/2bedae91dbdd0080b38ae0413f5e8f26b88db95b) - add C `ndarray` implementation for `blas/base/sdot` [(#2919)](https://github.com/stdlib-js/stdlib/pull/2919) + +
+ + + +
+ +
+ + +
#### [@stdlib/blas/base/sspr](https://github.com/stdlib-js/stdlib/tree/develop/lib/node_modules/%40stdlib/blas/base/sspr) @@ -471,6 +493,7 @@ A total of 6 people contributed to this release. Thank you to the following cont
+- [`2bedae9`](https://github.com/stdlib-js/stdlib/commit/2bedae91dbdd0080b38ae0413f5e8f26b88db95b) - **feat:** add C `ndarray` implementation for `blas/base/sdot` [(#2919)](https://github.com/stdlib-js/stdlib/pull/2919) _(by Aman Bhansali, Athan Reines)_ - [`e85f394`](https://github.com/stdlib-js/stdlib/commit/e85f3947aaca3cbbd6ab4f84e41577928e0a10a4) - **feat:** add C `ndarray` implementation for `blas/base/saxpy` [(#2918)](https://github.com/stdlib-js/stdlib/pull/2918) _(by Aman Bhansali)_ - [`6ae1c10`](https://github.com/stdlib-js/stdlib/commit/6ae1c10d70d86520a0c915864440ef6e8d255a21) - **docs:** rename parameter _(by Athan Reines)_ - [`7eb1266`](https://github.com/stdlib-js/stdlib/commit/7eb12667e2052db9fc1e678bf0cc2082e2993aec) - **docs:** rename parameters _(by Athan Reines)_ diff --git a/base/sdot/README.md b/base/sdot/README.md index efb312b2c..3ae6e8d9f 100644 --- a/base/sdot/README.md +++ b/base/sdot/README.md @@ -177,6 +177,138 @@ console.log( out ); + + +* * * + +
+ +## C APIs + + + +
+ +
+ + + + + +
+ +### Usage + +```c +#include "stdlib/blas/base/sdot.h" +``` + +#### c_sdot( N, \*X, strideX, \*Y, strideY ) + +Computes the dot product of two single-precision floating-point vectors. + +```c +const float x[] = { 4.0f, 2.0f, -3.0f, 5.0f, -1.0f }; +const float y[] = { 2.0f, 6.0f, -1.0f, -4.0f, 8.0f }; + +float d = c_sdot( 5, x, 1, y, 1 ); +// returns -5.0f +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[in] float*` first input array. +- **strideX**: `[in] CBLAS_INT` index increment for `X`. +- **Y**: `[in] float*` second input array. +- **strideY**: `[in] CBLAS_INT` index increment for `Y`. + +```c +float c_sdot( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const float *Y, const CBLAS_INT strideY ); +``` + +#### c_sdot_ndarray( N, \*X, strideX, offsetX, \*Y, strideY, offsetY ) + +Computes the dot product of two single-precision floating-point vectors using alternative indexing semantics. + +```c +const float x[] = { 4.0f, 2.0f, -3.0f, 5.0f, -1.0f }; +const float y[] = { 2.0f, 6.0f, -1.0f, -4.0f, 8.0f }; + +float d = c_sdot_ndarray( 3, x, 1, 2, y, 1, 2 ); +// returns -25.0f +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[in] float*` first input array. +- **strideX**: `[in] CBLAS_INT` index increment for `X`. +- **offsetX**: `[in] CBLAS_INT` starting index for `X`. +- **Y**: `[in] float*` second input array. +- **strideY**: `[in] CBLAS_INT` index increment for `Y`. +- **offsetY**: `[in] CBLAS_INT` starting index for `Y`. + +```c +float c_sdot_ndarray( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, const float *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ); +``` + +
+ + + + + +
+ +
+ + + + + +
+ +### Examples + +```c +#include "stdlib/blas/base/sdot.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 }; + const float y[] = { 1.0f, -2.0f, 3.0f, -4.0f, 5.0f, -6.0f, 7.0f, -8.0f }; + + // Specify the number of indexed elements: + const int N = 8; + + // Specify strides: + const int strideX = 1; + const int strideY = -1; + + // Compute the dot product: + float d = c_sdot( N, x, strideX, y, strideY ); + + // Print the result: + printf( "dot product: %f\n", d ); + + // Compute the dot product: + d = c_sdot_ndarray( N, x, strideX, 0, y, strideY, 7 ); + + // Print the result: + printf( "dot product: %f\n", d ); +} +``` + +
+ + + +
+ + +
diff --git a/base/sdot/benchmark/c/benchmark.length.c b/base/sdot/benchmark/c/benchmark.length.c index dd1970a40..726b6d6ba 100644 --- a/base/sdot/benchmark/c/benchmark.length.c +++ b/base/sdot/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 ]; @@ -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 ]; + float y[ len ]; + float z; + double t; + int i; + + for ( i = 0; i < len; i++ ) { + x[ i ] = ( rand_float()*20000.0f ) - 10000.0f; + y[ i ] = ( rand_float()*20000.0f ) - 10000.0f; + } + z = 0.0f; + t = tic(); + for ( i = 0; i < iterations; i++ ) { + z = c_sdot_ndarray( len, x, 1, 0, y, 1, 0 ); + if ( z != z ) { + printf( "should not return NaN\n" ); + break; + } + } + elapsed = tic() - t; + if ( z != z ) { + 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/base/sdot/examples/c/example.c b/base/sdot/examples/c/example.c index dd07f29a3..500617bb4 100644 --- a/base/sdot/examples/c/example.c +++ b/base/sdot/examples/c/example.c @@ -36,4 +36,10 @@ int main( void ) { // Print the result: printf( "dot product: %f\n", d ); + + // Compute the dot product: + d = c_sdot_ndarray( N, x, strideX, 0, y, strideY, 7 ); + + // Print the result: + printf( "dot product: %f\n", d ); } diff --git a/base/sdot/include/stdlib/blas/base/sdot.h b/base/sdot/include/stdlib/blas/base/sdot.h index ca3453ff6..8a08025cb 100644 --- a/base/sdot/include/stdlib/blas/base/sdot.h +++ b/base/sdot/include/stdlib/blas/base/sdot.h @@ -22,6 +22,8 @@ #ifndef SDOT_H #define SDOT_H +#include "stdlib/blas/base/shared.h" + /* * If C++, prevent name mangling so that the compiler emits a binary file having undecorated names, thus mirroring the behavior of a C compiler. */ @@ -32,7 +34,12 @@ extern "C" { /** * Computes the dot product of two single-precision floating-point vectors. */ -float c_sdot( const int N, const float *X, const int strideX, const float *Y, const int strideY ); +float API_SUFFIX(c_sdot)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const float *Y, const CBLAS_INT strideY ); + +/** +* Computes the dot product of two single-precision floating-point vectors using alternative indexing semantics. +*/ +float API_SUFFIX(c_sdot_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, const float *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ); #ifdef __cplusplus } diff --git a/base/sdot/include/stdlib/blas/base/sdot_cblas.h b/base/sdot/include/stdlib/blas/base/sdot_cblas.h index d02eaf181..5bae0337f 100644 --- a/base/sdot/include/stdlib/blas/base/sdot_cblas.h +++ b/base/sdot/include/stdlib/blas/base/sdot_cblas.h @@ -22,6 +22,8 @@ #ifndef SDOT_CBLAS_H #define SDOT_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" { /** * Computes the dot product of two single-precision floating-point vectors. */ -float cblas_sdot( const int N, const float *X, const int strideX, const float *Y, const int strideY ); +float API_SUFFIX(cblas_sdot)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const float *Y, const CBLAS_INT strideY ); #ifdef __cplusplus } diff --git a/base/sdot/lib/ndarray.native.js b/base/sdot/lib/ndarray.native.js index b032bdcc8..0aa3602a7 100644 --- a/base/sdot/lib/ndarray.native.js +++ b/base/sdot/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( './sdot.native.js' ); +var addon = require( './../src/addon.node' ); // MAIN // @@ -49,16 +47,7 @@ var addon = require( './sdot.native.js' ); * // returns -5.0 */ function sdot( 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 ); - - return addon( N, viewX, strideX, viewY, strideY ); + return addon.ndarray( N, x, strideX, offsetX, y, strideY, offsetY ); } diff --git a/base/sdot/manifest.json b/base/sdot/manifest.json index 7d0e5b19e..2f2fd17c4 100644 --- a/base/sdot/manifest.json +++ b/base/sdot/manifest.json @@ -45,6 +45,8 @@ "libpath": [], "dependencies": [ "@stdlib/napi/export", + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-float32array", @@ -57,14 +59,18 @@ "blas": "", "wasm": false, "src": [ - "./src/sdot.c" + "./src/sdot.c", + "./src/sdot_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] }, { "task": "examples", @@ -72,14 +78,18 @@ "blas": "", "wasm": false, "src": [ - "./src/sdot.c" + "./src/sdot.c", + "./src/sdot_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] }, { @@ -100,6 +110,8 @@ "libpath": [], "dependencies": [ "@stdlib/napi/export", + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-float32array", @@ -122,7 +134,10 @@ "-lpthread" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index" + ] }, { "task": "examples", @@ -140,7 +155,10 @@ "-lpthread" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index" + ] }, { @@ -160,6 +178,8 @@ "libpath": [], "dependencies": [ "@stdlib/napi/export", + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-float32array", @@ -172,14 +192,18 @@ "blas": "", "wasm": false, "src": [ - "./src/sdot.c" + "./src/sdot.c", + "./src/sdot_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] }, { "task": "examples", @@ -187,14 +211,18 @@ "blas": "", "wasm": false, "src": [ - "./src/sdot.c" + "./src/sdot.c", + "./src/sdot_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] }, { @@ -214,6 +242,8 @@ "libpath": [], "dependencies": [ "@stdlib/napi/export", + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-float32array", @@ -235,7 +265,10 @@ "-lblas" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index" + ] }, { "task": "examples", @@ -252,7 +285,10 @@ "-lblas" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index" + ] }, { @@ -273,6 +309,8 @@ "libpath": [], "dependencies": [ "@stdlib/napi/export", + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-float32array", @@ -295,7 +333,10 @@ "-lpthread" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index" + ] }, { "task": "examples", @@ -313,7 +354,10 @@ "-lpthread" ], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/min-view-buffer-index" + ] }, { @@ -322,7 +366,8 @@ "blas": "", "wasm": false, "src": [ - "./src/sdot.c" + "./src/sdot.c", + "./src/sdot_ndarray.c" ], "include": [ "./include" @@ -331,6 +376,8 @@ "libpath": [], "dependencies": [ "@stdlib/napi/export", + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-float32array", @@ -343,14 +390,18 @@ "blas": "", "wasm": false, "src": [ - "./src/sdot.c" + "./src/sdot.c", + "./src/sdot_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] }, { "task": "examples", @@ -358,14 +409,18 @@ "blas": "", "wasm": false, "src": [ - "./src/sdot.c" + "./src/sdot.c", + "./src/sdot_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] }, { @@ -374,14 +429,18 @@ "blas": "", "wasm": true, "src": [ - "./src/sdot.c" + "./src/sdot.c", + "./src/sdot_ndarray.c" ], "include": [ "./include" ], "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] } ] } diff --git a/base/sdot/src/addon.c b/base/sdot/src/addon.c index 5fa37f0dd..712e45afb 100644 --- a/base/sdot/src/addon.c +++ b/base/sdot/src/addon.c @@ -17,6 +17,7 @@ */ #include "stdlib/blas/base/sdot.h" +#include "stdlib/blas/base/shared.h" #include "stdlib/napi/export.h" #include "stdlib/napi/argv.h" #include "stdlib/napi/argv_int64.h" @@ -38,8 +39,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 ); - STDLIB_NAPI_CREATE_DOUBLE( env, (double)c_sdot( N, X, strideX, Y, strideY ), v ); + STDLIB_NAPI_CREATE_DOUBLE( env, (double)API_SUFFIX(c_sdot)( N, X, strideX, Y, strideY ), v ); return v; } -STDLIB_NAPI_MODULE_EXPORT_FCN( addon ) +/** +* Receives JavaScript callback invocation data. +* +* @param env environment under which the function is invoked +* @param info callback data +* @return Node-API value +*/ +static napi_value addon_method( napi_env env, napi_callback_info info ) { + STDLIB_NAPI_ARGV( env, info, argv, argc, 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 ); + STDLIB_NAPI_CREATE_DOUBLE( env, (double)API_SUFFIX(c_sdot_ndarray)( N, X, strideX, offsetX, Y, strideY, offsetY ), v ); + return v; +} + +STDLIB_NAPI_MODULE_EXPORT_FCN_WITH_METHOD( addon, "ndarray", addon_method ) diff --git a/base/sdot/src/sdot.c b/base/sdot/src/sdot.c index 8ed48cfb8..40782617c 100644 --- a/base/sdot/src/sdot.c +++ b/base/sdot/src/sdot.c @@ -22,6 +22,8 @@ * @see sdot */ #include "stdlib/blas/base/sdot.h" +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/stride2offset.h" /** * Computes the dot product of two single-precision floating-point vectors. @@ -33,50 +35,9 @@ * @param strideY Y stride length * @return the dot product */ -float c_sdot( const int N, const float *X, const int strideX, const float *Y, const int strideY ) { - float dot; - int ix; - int iy; - int m; - int i; - - dot = 0.0f; - if ( N <= 0 ) { - return dot; - } - // If both strides are equal to `1`, use unrolled loops... - if ( strideX == 1 && strideY == 1 ) { - m = N % 5; - - // If we have a remainder, do a clean-up loop... - if ( m > 0 ) { - for ( i = 0; i < m; i++ ) { - dot += X[ i ] * Y[ i ]; - } - } - if ( N < 5 ) { - return dot; - } - for ( i = m; i < N; i += 5 ) { - dot += ( X[i]*Y[i] ) + ( X[i+1]*Y[i+1] ) + ( X[i+2]*Y[i+2] ) + ( X[i+3]*Y[i+3] ) + ( X[i+4]*Y[i+4] ); - } - return dot; - } - 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++ ) { - dot += X[ ix ] * Y[ iy]; - ix += strideX; - iy += strideY; - } - return dot; +float API_SUFFIX(c_sdot)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const float *Y, const CBLAS_INT strideY ) { + CBLAS_INT ox = stdlib_strided_stride2offset( N, strideX ); + CBLAS_INT oy = stdlib_strided_stride2offset( N, strideY ); + return API_SUFFIX(c_sdot_ndarray)( N, X, strideX, ox, Y, strideY, oy ); } diff --git a/base/sdot/src/sdot_cblas.c b/base/sdot/src/sdot_cblas.c index a725236c5..37af408a2 100644 --- a/base/sdot/src/sdot_cblas.c +++ b/base/sdot/src/sdot_cblas.c @@ -18,6 +18,8 @@ #include "stdlib/blas/base/sdot.h" #include "stdlib/blas/base/sdot_cblas.h" +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/min_view_buffer_index.h" /** * Computes the dot product of two single-precision floating-point vectors. @@ -29,6 +31,24 @@ * @param strideY Y stride length * @return the dot product */ -float c_sdot( const int N, const float *X, const int strideX, const float *Y, const int strideY ) { - return cblas_sdot( N, X, strideX, Y, strideY ); +float API_SUFFIX(c_sdot)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const float *Y, const CBLAS_INT strideY ) { + return API_SUFFIX(cblas_sdot)( N, X, strideX, Y, strideY ); +} + +/** +* Computes the dot product of two single-precision floating-point vectors using alternative indexing semantics. +* +* @param N number of indexed elements +* @param X first array +* @param strideX X stride length +* @param offsetX starting index for X +* @param Y second array +* @param strideY Y stride length +* @param offsetY starting index for Y +* @return the dot product +*/ +float API_SUFFIX(c_sdot_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, const 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 + return API_SUFFIX(cblas_sdot)( N, X, strideX, Y, strideY ); } diff --git a/base/sdot/src/sdot_f.c b/base/sdot/src/sdot_f.c index 743baf7d5..df545e778 100644 --- a/base/sdot/src/sdot_f.c +++ b/base/sdot/src/sdot_f.c @@ -23,6 +23,8 @@ */ #include "stdlib/blas/base/sdot.h" #include "stdlib/blas/base/sdot_fortran.h" +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/min_view_buffer_index.h" /** * Computes the dot product of two single-precision floating-point vectors. @@ -36,8 +38,31 @@ * @param strideY Y stride length * @return the dot product */ -float c_sdot( const int N, const float *X, const int strideX, const float *Y, const int strideY ) { +float API_SUFFIX(c_sdot)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const float *Y, const CBLAS_INT strideY ) { float dot; sdotsub( &N, X, &strideX, Y, &strideY, &dot ); return dot; } + +/** +* Computes the dot product of two single-precision floating-point vectors using alternative indexing semantics. +* +* Arguments are passed by reference to a Fortran subroutine implementing `sdot`. +* +* @param N number of indexed elements +* @param X first array +* @param strideX X stride length +* @param offsetX starting index for X +* @param Y second array +* @param strideY Y stride length +* @param strideY starting index for Y +* @return the dot product +*/ +float API_SUFFIX(c_sdot_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, const float *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ) { + float dot; + + 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 + sdotsub( &N, X, &strideX, Y, &strideY, &dot ); + return dot; +} diff --git a/base/sdot/src/sdot_ndarray.c b/base/sdot/src/sdot_ndarray.c new file mode 100644 index 000000000..5829d7259 --- /dev/null +++ b/base/sdot/src/sdot_ndarray.c @@ -0,0 +1,84 @@ +/** +* @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. +*/ + +/** +* Compute the dot product of two single-precision floating-point vectors. +* +* @see sdot +*/ +#include "stdlib/blas/base/sdot.h" +#include "stdlib/blas/base/shared.h" + +static const CBLAS_INT M = 5; + +/** +* Computes the dot product of two single-precision floating-point vectors using alternative indexing semantics. +* +* @param N number of indexed elements +* @param X first array +* @param strideX X stride length +* @param offsetX starting index for X +* @param Y second array +* @param strideY Y stride length +* @param offsetY starting index for Y +* @return the dot product +*/ +float API_SUFFIX(c_sdot_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, CBLAS_INT offsetX, const float *Y, const CBLAS_INT strideY, CBLAS_INT offsetY ) { + CBLAS_INT ix; + CBLAS_INT iy; + CBLAS_INT m; + CBLAS_INT i; + float dot; + + dot = 0.0f; + if ( N <= 0 ) { + return dot; + } + 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++ ) { + dot += X[ ix ] * Y[ iy ]; + ix += strideX; + iy += strideY; + } + } + if ( N < M ) { + return dot; + } + for ( i = m; i < N; i += M ) { + dot += ( X[ ix ]*Y[ iy ] ) + ( X[ ix+1 ]*Y[ iy+1 ] ) + ( X[ ix+2 ]*Y[ iy+2 ] ) + ( X[ ix+3 ]*Y[ iy+3 ] ) + ( X[ ix+4 ]*Y[ iy+4 ] ); + ix += M; + iy += M; + } + return dot; + } + for ( i = 0; i < N; i++ ) { + dot += X[ ix ] * Y[ iy]; + ix += strideX; + iy += strideY; + } + return dot; +} +