diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapxsum/examples/c/example.c b/lib/node_modules/@stdlib/blas/ext/base/dapxsum/examples/c/example.c index bdb537989e13..844ffb883024 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapxsum/examples/c/example.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dapxsum/examples/c/example.c @@ -17,7 +17,6 @@ */ #include "stdlib/blas/ext/base/dapxsum.h" -#include #include int main( void ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapxsumkbn/examples/c/example.c b/lib/node_modules/@stdlib/blas/ext/base/dapxsumkbn/examples/c/example.c index cf5676829ad3..ad04c3b521c4 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapxsumkbn/examples/c/example.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dapxsumkbn/examples/c/example.c @@ -17,7 +17,6 @@ */ #include "stdlib/blas/ext/base/dapxsumkbn.h" -#include #include int main( void ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapxsumkbn2/examples/c/example.c b/lib/node_modules/@stdlib/blas/ext/base/dapxsumkbn2/examples/c/example.c index 08422d30a6d6..5882f9bc87ba 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapxsumkbn2/examples/c/example.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dapxsumkbn2/examples/c/example.c @@ -17,7 +17,6 @@ */ #include "stdlib/blas/ext/base/dapxsumkbn2.h" -#include #include int main( void ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapxsumors/examples/c/example.c b/lib/node_modules/@stdlib/blas/ext/base/dapxsumors/examples/c/example.c index 6e5a1df59ec8..1cf2e06e6f5d 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapxsumors/examples/c/example.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dapxsumors/examples/c/example.c @@ -17,7 +17,6 @@ */ #include "stdlib/blas/ext/base/dapxsumors.h" -#include #include int main( void ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapxsumpw/examples/c/example.c b/lib/node_modules/@stdlib/blas/ext/base/dapxsumpw/examples/c/example.c index 6189ae27a568..4318e24340b7 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapxsumpw/examples/c/example.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dapxsumpw/examples/c/example.c @@ -17,7 +17,6 @@ */ #include "stdlib/blas/ext/base/dapxsumpw.h" -#include #include int main( void ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/dasumpw/examples/c/example.c b/lib/node_modules/@stdlib/blas/ext/base/dasumpw/examples/c/example.c index 63aa4ea6792f..ac29d4ae2308 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dasumpw/examples/c/example.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dasumpw/examples/c/example.c @@ -17,7 +17,6 @@ */ #include "stdlib/blas/ext/base/dasumpw.h" -#include #include int main( void ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/dcusum/README.md b/lib/node_modules/@stdlib/blas/ext/base/dcusum/README.md index 2b3d3996877d..ed65650cdc9d 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dcusum/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/dcusum/README.md @@ -65,7 +65,7 @@ The function has the following parameters: - **y**: output [`Float64Array`][@stdlib/array/float64]. - **strideY**: index increment for `y`. -The `N` and `stride` parameters determine which elements in the strided arrays are accessed at runtime. For example, to compute the cumulative sum of every other element in the strided input array, +The `N` and stride parameters determine which elements in the strided arrays are accessed at runtime. For example, to compute the cumulative sum of every other element in the strided input array, ```javascript var Float64Array = require( '@stdlib/array/float64' ); @@ -115,7 +115,7 @@ The function has the following additional parameters: - **offsetX**: starting index for `x`. - **offsetY**: starting index for `y`. -While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying `buffer`, `offsetX` and `offsetY` parameters support indexing semantics based on a starting indices. For example, to calculate the cumulative sum of every other value in the strided input array starting from the second value and to store in the last `N` elements of the strided output array starting from the last element +While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying buffer, offsetX and offsetY parameters support indexing semantics based on a starting indices. For example, to calculate the cumulative sum of every other value in the strided input array starting from the second value and to store in the last `N` elements of the strided output array starting from the last element ```javascript var Float64Array = require( '@stdlib/array/float64' ); @@ -148,12 +148,13 @@ dcusum.ndarray( 4, 0.0, x, 2, 1, y, -1, y.length-1 ); ```javascript -var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory; -var filledarrayBy = require( '@stdlib/array/filled-by' ); +var discreteUniform = require( '@stdlib/random/array/discrete-uniform' ); var Float64Array = require( '@stdlib/array/float64' ); var dcusum = require( '@stdlib/blas/ext/base/dcusum' ); -var x = filledarrayBy( 10, 'float64', discreteUniform( 0, 100 ) ); +var x = discreteUniform( 10, -100, 100, { + 'dtype': 'float64' +}); var y = new Float64Array( x.length ); console.log( x ); @@ -167,6 +168,138 @@ console.log( y ); + + +* * * + +
+ +## C APIs + + + +
+ +
+ + + + + +
+ +### Usage + +```c +#include "stdlib/blas/ext/base/dcusum.h" +``` + +#### stdlib_strided_dcusum( N, sum, \*X, strideX, \*Y, strideY ) + +Computes the cumulative sum of double-precision floating-point strided array elements. + +```c +const double x[] = { 1.0, 2.0, 3.0, 4.0 } +double y[] = { 0.0, 0.0, 0.0, 0.0 } + +stdlib_strided_dcusum( 4, 0.0, x, 1, y, 1 ); +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **sum**: `[in] CBLAS_INT` initial sum. +- **X**: `[in] double*` input array. +- **strideX**: `[in] CBLAS_INT` index increment for `X`. +- **Y**: `[out] double*` output array. +- **strideY**: `[in] CBLAS_INT` index increment for `Y`. + +```c +void stdlib_strided_dcusum( const CBLAS_INT N, const CBLAS_INT sum, const double *X, const CBLAS_INT strideX, double *Y, const CBLAS_INT strideY ); +``` + + + +#### stdlib_strided_dcusum_ndarray( N, sum, \*X, strideX, offsetX, \*Y, strideY, offsetY ) + + + +Computes the cumulative sum of double-precision floating-point strided array elements using alternative indexing semantics. + +```c +const double x[] = { 1.0, 2.0, 3.0, 4.0 } +double y[] = { 0.0, 0.0, 0.0, 0.0 } + +stdlib_strided_dcusum_ndarray( 4, 0.0, x, 1, 0, y, 1, 0 ); +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **sum**: `[in] CBLAS_INT` initial sum. +- **X**: `[in] double*` input array. +- **strideX**: `[in] CBLAS_INT` index increment for `X`. +- **offsetX**: `[in] CBLAS_INT` starting index for `X`. +- **Y**: `[out] double*` output array. +- **strideY**: `[in] CBLAS_INT` index increment for `Y`. +- **offsetY**: `[in] CBLAS_INT` starting index for `Y`. + +```c +void stdlib_strided_dcusum_ndarray( const CBLAS_INT N, const CBLAS_INT sum, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, double *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ); +``` + +
+ + + + + +
+ +
+ + + + + +
+ +### Examples + +```c +#include "stdlib/blas/ext/base/dcusum.h" +#include + +int main( void ) { + // Create strided arrays: + const 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 = 2; + const int strideY = -2; + + // Compute the cumulative sum: + stdlib_strided_dcusum( N, 0.0, x, strideX, y, strideY ); + + // Print the result: + for ( int i = 0; i < 8; i++ ) { + printf( "y[ %d ] = %lf\n", i, y[ i ] ); + } +} +``` + +
+ + + +
+ + +
diff --git a/lib/node_modules/@stdlib/blas/ext/base/dcusum/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/dcusum/benchmark/benchmark.js index 8745829bfb8e..67aec7b88d40 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dcusum/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dcusum/benchmark/benchmark.js @@ -21,8 +21,7 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var uniform = require( '@stdlib/random/base/uniform' ).factory; -var filledarrayBy = require( '@stdlib/array/filled-by' ); +var uniform = require( '@stdlib/random/array/uniform' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); var Float64Array = require( '@stdlib/array/float64' ); @@ -32,7 +31,9 @@ var dcusum = require( './../lib/dcusum.js' ); // VARIABLES // -var rand = uniform( -10.0, 10.0 ); +var options = { + 'dtype': 'float64' +}; // FUNCTIONS // @@ -45,7 +46,7 @@ var rand = uniform( -10.0, 10.0 ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x = filledarrayBy( len, 'float64', rand ); + var x = uniform( len, -100, 100, options ); var y = new Float64Array( len ); return benchmark; diff --git a/lib/node_modules/@stdlib/blas/ext/base/dcusum/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/dcusum/benchmark/benchmark.native.js index 042b0ca0ac68..ffe6304d319c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dcusum/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dcusum/benchmark/benchmark.native.js @@ -22,8 +22,7 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var uniform = require( '@stdlib/random/base/uniform' ).factory; -var filledarrayBy = require( '@stdlib/array/filled-by' ); +var uniform = require( '@stdlib/random/array/uniform' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); var Float64Array = require( '@stdlib/array/float64' ); @@ -37,7 +36,9 @@ var dcusum = tryRequire( resolve( __dirname, './../lib/dcusum.native.js' ) ); var opts = { 'skip': ( dcusum instanceof Error ) }; -var rand = uniform( -10.0, 10.0 ); +var options = { + 'dtype': 'float64' +}; // FUNCTIONS // @@ -50,7 +51,7 @@ var rand = uniform( -10.0, 10.0 ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x = filledarrayBy( len, 'float64', rand ); + var x = uniform( len, -100, 100, options ); var y = new Float64Array( len ); return benchmark; diff --git a/lib/node_modules/@stdlib/blas/ext/base/dcusum/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/dcusum/benchmark/benchmark.ndarray.js index 1b02c85dd207..3fcf01420fc2 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dcusum/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dcusum/benchmark/benchmark.ndarray.js @@ -21,8 +21,7 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var uniform = require( '@stdlib/random/base/uniform' ).factory; -var filledarrayBy = require( '@stdlib/array/filled-by' ); +var uniform = require( '@stdlib/random/array/uniform' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); var Float64Array = require( '@stdlib/array/float64' ); @@ -32,7 +31,9 @@ var dcusum = require( './../lib/ndarray.js' ); // VARIABLES // -var rand = uniform( -10.0, 10.0 ); +var options = { + 'dtype': 'float64' +}; // FUNCTIONS // @@ -45,7 +46,7 @@ var rand = uniform( -10.0, 10.0 ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x = filledarrayBy( len, 'float64', rand ); + var x = uniform( len, -100, 100, options ); var y = new Float64Array( len ); return benchmark; diff --git a/lib/node_modules/@stdlib/blas/ext/base/dcusum/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dcusum/benchmark/benchmark.ndarray.native.js index fb8838f4ae42..ee360fbbbcce 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dcusum/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dcusum/benchmark/benchmark.ndarray.native.js @@ -22,8 +22,7 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var uniform = require( '@stdlib/random/base/uniform' ).factory; -var filledarrayBy = require( '@stdlib/array/filled-by' ); +var uniform = require( '@stdlib/random/array/uniform' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); var Float64Array = require( '@stdlib/array/float64' ); @@ -37,7 +36,9 @@ var dcusum = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' ) ); var opts = { 'skip': ( dcusum instanceof Error ) }; -var rand = uniform( -10.0, 10.0 ); +var options = { + 'dtype': 'float64' +}; // FUNCTIONS // @@ -50,7 +51,7 @@ var rand = uniform( -10.0, 10.0 ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x = filledarrayBy( len, 'float64', rand ); + var x = uniform( len, -100, 100, options ); var y = new Float64Array( len ); return benchmark; diff --git a/lib/node_modules/@stdlib/blas/ext/base/dcusum/benchmark/c/benchmark.length.c b/lib/node_modules/@stdlib/blas/ext/base/dcusum/benchmark/c/benchmark.length.c index 34994e1ed6c8..90c1077a64f8 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dcusum/benchmark/c/benchmark.length.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dcusum/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[ len ]; double y[ len ]; @@ -121,6 +121,40 @@ static double benchmark( int iterations, int len ) { return elapsed; } +/** +* Runs a benchmark. +* +* @param iterations number of iterations +* @param len array length +* @return elapsed time in seconds +*/ +static double benchmark2( int iterations, int len ) { + double elapsed; + double x[ len ]; + double y[ len ]; + double t; + int i; + + for ( i = 0; i < len; i++ ) { + x[ i ] = ( rand_double() * 20000.0 ) - 10000.0; + y[ i ] = 0.0; + } + t = tic(); + for ( i = 0; i < iterations; i++ ) { + x[ 0 ] += 1.0; + stdlib_strided_dcusum_ndarray( len, 0.0, x, 1, 0, y, 1, 0 ); + if ( y[ 0 ] != y[ 0 ] ) { + printf( "should not return NaN\n" ); + break; + } + } + elapsed = tic() - t; + if ( y[ len-1 ] != y[ len-1 ] ) { + printf( "should not return NaN\n" ); + } + return elapsed; +} + /** * Main execution sequence. */ @@ -143,7 +177,18 @@ 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 ( i = MIN; i <= MAX; i++ ) { + len = pow( 10, i ); + iter = ITERATIONS / pow( 10, i-1 ); + 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/ext/base/dcusum/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/dcusum/docs/repl.txt index 4f955bc57eba..1da4bfdfa29d 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dcusum/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/dcusum/docs/repl.txt @@ -3,7 +3,7 @@ Computes the cumulative sum of double-precision floating-point strided array elements. - The `N` and `stride` parameters determine which elements in the strided + The `N` and stride parameters determine which elements in the strided arrays are accessed at runtime. Indexing is relative to the first index. To introduce an offset, use a typed @@ -66,7 +66,7 @@ elements using alternative indexing semantics. While typed array views mandate a view offset based on the underlying - buffer, the `offset` parameter supports indexing semantics based on a + buffer, the offset parameter supports indexing semantics based on a starting index. Parameters diff --git a/lib/node_modules/@stdlib/blas/ext/base/dcusum/examples/c/example.c b/lib/node_modules/@stdlib/blas/ext/base/dcusum/examples/c/example.c index a1e6388894e9..8cf38622bf8b 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dcusum/examples/c/example.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dcusum/examples/c/example.c @@ -17,9 +17,7 @@ */ #include "stdlib/blas/ext/base/dcusum.h" -#include #include -#include int main( void ) { // Create strided arrays: @@ -27,17 +25,17 @@ int main( void ) { double y[] = { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }; // Specify the number of elements: - const int64_t N = 4; + const int N = 4; // Specify stride lengths: - const int64_t strideX = 2; - const int64_t strideY = -2; + const int strideX = 2; + const int strideY = -2; // Compute the cumulative sum: stdlib_strided_dcusum( N, 0.0, x, strideX, y, strideY ); // Print the result: - for ( int64_t i = 0; i < 8; i++ ) { - printf( "y[ %"PRId64" ] = %lf\n", i, y[ i ] ); + for ( int i = 0; i < 8; i++ ) { + printf( "y[ %d ] = %lf\n", i, y[ i ] ); } } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dcusum/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/dcusum/examples/index.js index b5d935807754..55d2efd4976a 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dcusum/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dcusum/examples/index.js @@ -18,12 +18,13 @@ 'use strict'; -var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory; -var filledarrayBy = require( '@stdlib/array/filled-by' ); +var discreteUniform = require( '@stdlib/random/array/discrete-uniform' ); var Float64Array = require( '@stdlib/array/float64' ); var dcusum = require( './../lib' ); -var x = filledarrayBy( 10, 'float64', discreteUniform( 0, 100 ) ); +var x = discreteUniform( 10, -100, 100, { + 'dtype': 'float64' +}); var y = new Float64Array( x.length ); console.log( x ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dcusum/include/stdlib/blas/ext/base/dcusum.h b/lib/node_modules/@stdlib/blas/ext/base/dcusum/include/stdlib/blas/ext/base/dcusum.h index 64ec7287fb0f..a3b97535c44c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dcusum/include/stdlib/blas/ext/base/dcusum.h +++ b/lib/node_modules/@stdlib/blas/ext/base/dcusum/include/stdlib/blas/ext/base/dcusum.h @@ -19,7 +19,7 @@ #ifndef STDLIB_BLAS_EXT_BASE_DCUSUM_H #define STDLIB_BLAS_EXT_BASE_DCUSUM_H -#include +#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. @@ -31,7 +31,12 @@ extern "C" { /** * Computes the cumulative sum of double-precision floating-point strided array elements. */ -void stdlib_strided_dcusum( const int64_t N, const double sum, const double *X, const int64_t strideX, double *Y, const int64_t strideY ); +void API_SUFFIX(stdlib_strided_dcusum)( const CBLAS_INT N, const double sum, const double *X, const CBLAS_INT strideX, double *Y, const CBLAS_INT strideY ); + +/** +* Computes the cumulative sum of double-precision floating-point strided array elements using alternative indexing semantics. +*/ +void API_SUFFIX(stdlib_strided_dcusum_ndarray)( const CBLAS_INT N, const double sum, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, double *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ); #ifdef __cplusplus } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dcusum/lib/dcusum.js b/lib/node_modules/@stdlib/blas/ext/base/dcusum/lib/dcusum.js index c074bd702db9..159622d9b9db 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dcusum/lib/dcusum.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dcusum/lib/dcusum.js @@ -20,7 +20,8 @@ // MODULES // -var dcusumkbn = require( '@stdlib/blas/ext/base/dcusumkbn' ); +var stride2offset = require( '@stdlib/strided/base/stride2offset' ); +var ndarray = require( './ndarray.js' ); // MAIN // @@ -46,7 +47,7 @@ var dcusumkbn = require( '@stdlib/blas/ext/base/dcusumkbn' ); * // returns [ 1.0, -1.0, 1.0 ] */ function dcusum( N, sum, x, strideX, y, strideY ) { - return dcusumkbn( N, sum, x, strideX, y, strideY ); + return ndarray( N, sum, x, strideX, stride2offset( N, strideX ), y, strideY, stride2offset( N, strideY ) ); // eslint-disable-line max-len } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dcusum/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dcusum/lib/ndarray.native.js index 506154e84415..b83f79cd4df3 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dcusum/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dcusum/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( './dcusum.native.js' ); +var addon = require( './../src/addon.node' ); // MAIN // @@ -50,14 +48,7 @@ var addon = require( './dcusum.native.js' ); * // returns [ 1.0, -1.0, 1.0, 5.0, 0.0, 0.0, 0.0, 0.0 ] */ function dcusum( N, sum, x, strideX, offsetX, y, strideY, offsetY ) { - var viewX; - var viewY; - - offsetX = minViewBufferIndex( N, strideX, offsetX ); - viewX = offsetView( x, offsetX ); - offsetY = minViewBufferIndex( N, strideY, offsetY ); - viewY = offsetView( y, offsetY ); - addon( N, sum, viewX, strideX, viewY, strideY ); + addon.ndarray( N, sum, x, strideX, offsetX, y, strideY, offsetY ); return y; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dcusum/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/dcusum/manifest.json index fbea7a95d519..cdcc0f3ff7a6 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dcusum/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/dcusum/manifest.json @@ -28,7 +28,7 @@ { "task": "build", "src": [ - "./src/dcusum.c" + "./src/main.c" ], "include": [ "./include" @@ -36,6 +36,8 @@ "libraries": [], "libpath": [], "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", "@stdlib/napi/export", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", @@ -47,7 +49,7 @@ { "task": "benchmark", "src": [ - "./src/dcusum.c" + "./src/main.c" ], "include": [ "./include" @@ -55,13 +57,15 @@ "libraries": [], "libpath": [], "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", "@stdlib/blas/ext/base/dcusumkbn" ] }, { "task": "examples", "src": [ - "./src/dcusum.c" + "./src/main.c" ], "include": [ "./include" @@ -69,6 +73,8 @@ "libraries": [], "libpath": [], "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", "@stdlib/blas/ext/base/dcusumkbn" ] } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dcusum/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/dcusum/src/addon.c index be3095e38c24..549d121158b8 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dcusum/src/addon.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dcusum/src/addon.c @@ -17,13 +17,13 @@ */ #include "stdlib/blas/ext/base/dcusum.h" +#include "stdlib/blas/base/shared.h" #include "stdlib/napi/export.h" #include "stdlib/napi/argv.h" #include "stdlib/napi/argv_int64.h" #include "stdlib/napi/argv_double.h" #include "stdlib/napi/argv_strided_float64array.h" #include -#include /** * Receives JavaScript callback invocation data. @@ -40,9 +40,29 @@ static napi_value addon( napi_env env, napi_callback_info info ) { STDLIB_NAPI_ARGV_INT64( env, strideY, argv, 5 ); STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, X, N, strideX, argv, 2 ); STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, Y, N, strideY, argv, 4 ); + API_SUFFIX(stdlib_strided_dcusum)( N, sum, X, strideX, Y, strideY ); + return NULL; +} - stdlib_strided_dcusum( N, sum, X, strideX, Y, strideY ); +/** +* 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, 8 ); + STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); + STDLIB_NAPI_ARGV_DOUBLE( env, sum, argv, 1 ); + STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 3 ); + STDLIB_NAPI_ARGV_INT64( env, offsetX, argv, 4 ); + STDLIB_NAPI_ARGV_INT64( env, strideY, argv, 6 ); + STDLIB_NAPI_ARGV_INT64( env, offsetY, argv, 7 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, X, N, strideX, argv, 2 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, Y, N, strideY, argv, 5 ); + API_SUFFIX(stdlib_strided_dcusum_ndarray)( N, sum, X, strideX, offsetX, Y, strideY, offsetY ); return NULL; } -STDLIB_NAPI_MODULE_EXPORT_FCN( addon ) +STDLIB_NAPI_MODULE_EXPORT_FCN_WITH_METHOD( addon, "ndarray", addon_method ) diff --git a/lib/node_modules/@stdlib/blas/ext/base/dcusum/src/dcusum.c b/lib/node_modules/@stdlib/blas/ext/base/dcusum/src/dcusum.c deleted file mode 100644 index 6198053c4880..000000000000 --- a/lib/node_modules/@stdlib/blas/ext/base/dcusum/src/dcusum.c +++ /dev/null @@ -1,35 +0,0 @@ -/** -* @license Apache-2.0 -* -* Copyright (c) 2020 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/ext/base/dcusum.h" -#include "stdlib/blas/ext/base/dcusumkbn.h" -#include - -/** -* Computes the cumulative sum of double-precision floating-point strided array elements. -* -* @param N number of indexed elements -* @param sum initial sum -* @param X input array -* @param strideX X stride length -* @param Y output array -* @param strideY Y stride length -*/ -void stdlib_strided_dcusum( const int64_t N, const double sum, const double *X, const int64_t strideX, double *Y, const int64_t strideY ) { - stdlib_strided_dcusumkbn( N, sum, X, strideX, Y, strideY ); -} diff --git a/lib/node_modules/@stdlib/blas/ext/base/dcusum/src/main.c b/lib/node_modules/@stdlib/blas/ext/base/dcusum/src/main.c new file mode 100644 index 000000000000..5c353d4b860b --- /dev/null +++ b/lib/node_modules/@stdlib/blas/ext/base/dcusum/src/main.c @@ -0,0 +1,54 @@ +/** +* @license Apache-2.0 +* +* Copyright (c) 2020 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/ext/base/dcusum.h" +#include "stdlib/blas/ext/base/dcusumkbn.h" +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/stride2offset.h" + +/** +* Computes the cumulative sum of double-precision floating-point strided array elements. +* +* @param N number of indexed elements +* @param sum initial sum +* @param X input array +* @param strideX X stride length +* @param Y output array +* @param strideY Y stride length +*/ +void API_SUFFIX(stdlib_strided_dcusum)( const CBLAS_INT N, const double sum, const double *X, const CBLAS_INT strideX, double *Y, const CBLAS_INT strideY ) { + const CBLAS_INT ox = stdlib_strided_stride2offset( N, strideX ); + const CBLAS_INT oy = stdlib_strided_stride2offset( N, strideY ); + API_SUFFIX(stdlib_strided_dcusum_ndarray)( N, sum, X, strideX, ox, Y, strideY, oy ); +} + +/** +* Computes the cumulative sum of double-precision floating-point strided array elements using alternative indexing semantics. +* +* @param N number of indexed elements +* @param sum initial sum +* @param X input array +* @param strideX X index increment +* @param offsetX X starting index +* @param Y output array +* @param strideY Y index increment +* @param offsetY Y starting index +*/ +void API_SUFFIX(stdlib_strided_dcusum_ndarray)( const CBLAS_INT N, const double sum, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX, double *Y, const CBLAS_INT strideY, const CBLAS_INT offsetY ) { + API_SUFFIX(stdlib_strided_dcusumkbn_ndarray)( N, sum, X, strideX, offsetX, Y, strideY, offsetY ); +} diff --git a/lib/node_modules/@stdlib/blas/ext/base/dcusumkbn/README.md b/lib/node_modules/@stdlib/blas/ext/base/dcusumkbn/README.md index a5f2afe608b6..99b723ca81bd 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dcusumkbn/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/dcusumkbn/README.md @@ -287,7 +287,7 @@ int main( void ) { // Print the result: for ( int i = 0; i < 8; i++ ) { - printf( "y[ %"PRId64" ] = %lf\n", i, y[ i ] ); + printf( "y[ %d ] = %lf\n", i, y[ i ] ); } } ``` diff --git a/lib/node_modules/@stdlib/blas/ext/base/dcusumkbn/examples/c/example.c b/lib/node_modules/@stdlib/blas/ext/base/dcusumkbn/examples/c/example.c index 8fc05771629d..dd4b66fe1cd4 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dcusumkbn/examples/c/example.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dcusumkbn/examples/c/example.c @@ -17,9 +17,7 @@ */ #include "stdlib/blas/ext/base/dcusumkbn.h" -#include #include -#include int main( void ) { // Create strided arrays: @@ -38,6 +36,6 @@ int main( void ) { // Print the result: for ( int i = 0; i < 8; i++ ) { - printf( "y[ %"PRId64" ] = %lf\n", i, y[ i ] ); + printf( "y[ %d ] = %lf\n", i, y[ i ] ); } }