diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/README.md b/lib/node_modules/@stdlib/blas/ext/base/dapx/README.md index 1aadc282dbc..70e7012cabc 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/README.md @@ -30,9 +30,9 @@ limitations under the License. var dapx = require( '@stdlib/blas/ext/base/dapx' ); ``` -#### dapx( N, alpha, x, stride ) +#### dapx( N, alpha, x, strideX ) -Adds a constant `alpha` to each element in a double-precision floating-point strided array. +Adds a scalar constant `alpha` to each element in a double-precision floating-point strided array. ```javascript var Float64Array = require( '@stdlib/array/float64' ); @@ -48,9 +48,9 @@ The function has the following parameters: - **N**: number of indexed elements. - **alpha**: scalar constant. - **x**: input [`Float64Array`][@stdlib/array/float64]. -- **stride**: index increment. +- **strideX**: index increment. -The `N` and `stride` parameters determine which elements in the strided array are accessed at runtime. For example, to add a constant to every other element +The `N` and stride parameters determine which elements in the strided array are accessed at runtime. For example, to add a constant to every other element ```javascript var Float64Array = require( '@stdlib/array/float64' ); @@ -77,9 +77,9 @@ dapx( 3, 5.0, x1, 2 ); // x0 => [ 1.0, 3.0, 3.0, 1.0, 5.0, -1.0 ] ``` -#### dapx.ndarray( N, alpha, x, stride, offset ) +#### dapx.ndarray( N, alpha, x, strideX, offsetX ) -Adds a constant `alpha` to each element in a double-precision floating-point strided array using alternative indexing semantics. +Adds a scalar constant `alpha` to each element in a double-precision floating-point strided array using alternative indexing semantics. ```javascript var Float64Array = require( '@stdlib/array/float64' ); @@ -92,9 +92,9 @@ dapx.ndarray( x.length, 5.0, x, 1, 0 ); The function has the following additional parameters: -- **offset**: starting index. +- **offsetX**: starting index. -While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying `buffer`, the `offset` parameter supports indexing semantics based on a starting index. For example, to access only the last three elements of the strided array +While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying buffer, the offset parameter supports indexing semantics based on a starting index. For example, to access only the last three elements of the strided array ```javascript var Float64Array = require( '@stdlib/array/float64' ); @@ -126,11 +126,12 @@ dapx.ndarray( 3, 5.0, x, 1, x.length-3 ); ```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 dapx = require( '@stdlib/blas/ext/base/dapx' ); -var x = filledarrayBy( 10, 'float64', discreteUniform( -100, 100 ) ); +var x = discreteUniform( 10, -100, 100, { + 'dtype': 'float64' +}); console.log( x ); dapx( x.length, 5.0, x, 1 ); @@ -141,6 +142,126 @@ console.log( x ); + + +* * * + +
+ +## C APIs + + + +
+ +
+ + + + + +
+ +### Usage + +```c +#include "stdlib/blas/ext/base/dapx.h" +``` + +#### c_dapx( N, alpha, \*X, strideX ) + +Adds a scalar constant `alpha` to each element in a double-precision floating-point strided array. + +```c +double x[] = { 1.0, 2.0, 3.0, 4.0 }; + +c_dapx( 4, 5.0, x, 1 ); + +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **alpha**: `[in] double` scalar constant. +- **X**: `[inout] double*` input array. +- **strideX**: `[in] CBLAS_INT` index increment for `X`. + +```c +void c_dapx( const CBLAS_INT N, const double alpha, double *X, const CBLAS_INT strideX ); +``` + +#### c_dapx_ndarray( N, alpha, \*X, strideX, offsetX ) + +Adds a scalar constant `alpha` to each element in a double-precision floating-point strided array `X` using alternative indexing semantics. + +```c +double x[] = { 1.0, 2.0, 3.0, 4.0 }; + +c_dapx_ndarray( 4, 5.0, x, 1, 0 ); +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **alpha**: `[in] double` scalar constant. +- **X**: `[inout] double*` input array. +- **strideX**: `[in] CBLAS_INT` index increment for `X`. +- **offsetX**: `[in] CBLAS_INT` starting index for `X`. + +```c +void c_dapx_ndarray( const CBLAS_INT N, const double alpha, double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); +``` + +
+ + + + + +
+ +
+ + + + + +
+ +### Examples + +```c +#include "stdlib/blas/ext/base/dapx.h" +#include + +int main( void ) { + // Create a strided array: + double x[] = { 1.0, -2.0, 3.0, -4.0, 5.0, -6.0, 7.0, -8.0 }; + + // Specify the number of indexed elements: + const int N = 8; + + // Specify a stride: + const int strideX = 1; + + // Fill the array: + c_dapx( N, 5.0, x, strideX ); + + // Print the result: + for ( int i = 0; i < 8; i++ ) { + printf( "x[ %i ] = %lf\n", i, x[ i ] ); + } +} +``` + +
+ + + +
+ + +
diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/dapx/benchmark/benchmark.js index 1e2ec3f9006..ca5cf53c08c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/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 pkg = require( './../package.json' ).name; @@ -31,7 +30,9 @@ var dapx = require( './../lib/dapx.js' ); // VARIABLES // -var rand = uniform( -10.0, 10.0 ); +var options = { + 'dtype': 'float64' +}; // FUNCTIONS // @@ -46,7 +47,7 @@ var rand = uniform( -10.0, 10.0 ); function createBenchmark( len ) { var x; - x = filledarrayBy( len, 'float64', rand ); + x = uniform( len, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/dapx/benchmark/benchmark.native.js index bec331f1727..8aee1784b41 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/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 tryRequire = require( '@stdlib/utils/try-require' ); @@ -36,7 +35,9 @@ var dapx = tryRequire( resolve( __dirname, './../lib/dapx.native.js' ) ); var opts = { 'skip': ( dapx instanceof Error ) }; -var rand = uniform( -10.0, 10.0 ); +var options = { + 'dtype': 'float64' +}; // FUNCTIONS // @@ -51,7 +52,7 @@ var rand = uniform( -10.0, 10.0 ); function createBenchmark( len ) { var x; - x = filledarrayBy( len, 'float64', rand ); + x = uniform( len, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/dapx/benchmark/benchmark.ndarray.js index 0a0fd541875..08735112ee3 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/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 pkg = require( './../package.json' ).name; @@ -31,7 +30,9 @@ var dapx = require( './../lib/ndarray.js' ); // VARIABLES // -var rand = uniform( -10.0, 10.0 ); +var options = { + 'dtype': 'float64' +}; // FUNCTIONS // @@ -46,7 +47,7 @@ var rand = uniform( -10.0, 10.0 ); function createBenchmark( len ) { var x; - x = filledarrayBy( len, 'float64', rand ); + x = uniform( len, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dapx/benchmark/benchmark.ndarray.native.js index 77d9e12eeb1..78668ff3289 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/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 tryRequire = require( '@stdlib/utils/try-require' ); @@ -36,7 +35,9 @@ var dapx = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' ) ); var opts = { 'skip': ( dapx instanceof Error ) }; -var rand = uniform( -10.0, 10.0 ); +var options = { + 'dtype': 'float64' +}; // FUNCTIONS // @@ -51,7 +52,7 @@ var rand = uniform( -10.0, 10.0 ); function createBenchmark( len ) { var x; - x = filledarrayBy( len, 'float64', rand ); + x = uniform( len, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/benchmark/c/benchmark.length.c b/lib/node_modules/@stdlib/blas/ext/base/dapx/benchmark/c/benchmark.length.c index ed6ee2a2f36..dd8eed45314 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/benchmark/c/benchmark.length.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/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 t; @@ -118,6 +118,30 @@ static double benchmark( int iterations, int len ) { return elapsed; } +static double benchmark2( int iterations, int len ) { + double elapsed; + double x[ len ]; + double t; + int i; + + for ( i = 0; i < len; i++ ) { + x[ i ] = ( rand_double()*200.0 ) - 100.0; + } + t = tic(); + for ( i = 0; i < iterations; i++ ) { + c_dapx_ndarray( len, 5.0, x, 1, 0 ); + if ( x[ 0 ] != x[ 0 ] ) { + printf( "should not return NaN\n" ); + break; + } + } + elapsed = tic() - t; + if ( x[ 0 ] != x[ 0 ] ) { + printf( "should not return NaN\n" ); + } + return elapsed; +} + /** * Main execution sequence. */ @@ -140,7 +164,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::%sndarray: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/dapx/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/dapx/docs/repl.txt index 2f77bbf08b2..c948221663c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/docs/repl.txt @@ -1,7 +1,7 @@ -{{alias}}( N, alpha, x, stride ) - Adds a constant to each element in a double-precision floating-point strided - array. +{{alias}}( N, alpha, x, strideX ) + Adds a scalar constant to each element in a double-precision floating-point + strided array. The `N` and stride parameters determine which elements in the strided array are accessed at runtime. @@ -22,7 +22,7 @@ x: Float64Array Input array. - stride: integer + strideX: integer Index increment. Returns @@ -37,7 +37,7 @@ > {{alias}}( x.length, 5.0, x, 1 ) [ 3.0, 6.0, 8.0, 0.0, 9.0, 4.0, 2.0 ] - // Using `N` and `stride` parameters: + // Using `N` and stride parameters: > x = new {{alias:@stdlib/array/float64}}( [ -2.0, 1.0, 3.0, -5.0, 4.0, -1.0, -3.0 ] ); > {{alias}}( 3, 5.0, x, 2 ) [ 3.0, 1.0, 8.0, -5.0, 9.0, -1.0, -3.0 ] @@ -51,12 +51,12 @@ [ 1.0, 3.0, 3.0, 1.0, 5.0, -1.0 ] -{{alias}}.ndarray( N, alpha, x, stride, offset ) - Adds a constant to each element in a double-precision floating-point strided - array using alternative indexing semantics. +{{alias}}.ndarray( N, alpha, x, strideX, offsetX ) + Adds a scalar constant to each element in a double-precision floating-point + strided array 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 @@ -70,10 +70,10 @@ x: Float64Array Input array. - stride: integer + strideX: integer Index increment. - offset: integer + offsetX: integer Starting index. Returns diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/docs/types/index.d.ts b/lib/node_modules/@stdlib/blas/ext/base/dapx/docs/types/index.d.ts index 1211a0d3463..b0f4cf18005 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/docs/types/index.d.ts +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/docs/types/index.d.ts @@ -23,12 +23,12 @@ */ interface Routine { /** - * Adds a constant to each element in a double-precision floating-point strided array. + * Adds a scalar constant to each element in a double-precision floating-point strided array. * * @param N - number of indexed elements * @param alpha - constant * @param x - input array - * @param stride - stride length + * @param strideX - stride length * @returns input array * * @example @@ -39,16 +39,16 @@ interface Routine { * dapx( x.length, 5.0, x, 1 ); * // x => [ 3.0, 6.0, 8.0, 0.0, 9.0, 5.0, 4.0, 2.0 ] */ - ( N: number, alpha: number, x: Float64Array, stride: number ): Float64Array; + ( N: number, alpha: number, x: Float64Array, strideX: number ): Float64Array; /** - * Adds a constant to each element in a double-precision floating-point strided array using alternative indexing semantics. + * Adds a scalar constant to each element in a double-precision floating-point strided array using alternative indexing semantics. * * @param N - number of indexed elements * @param alpha - constant * @param x - input array - * @param stride - stride length - * @param offset - starting index + * @param strideX - stride length + * @param offsetX - starting index * @returns input array * * @example @@ -59,16 +59,16 @@ interface Routine { * dapx.ndarray( x.length, 5.0, x, 1, 0 ); * // x => [ 3.0, 6.0, 8.0, 0.0, 9.0, 5.0, 4.0, 2.0 ] */ - ndarray( N: number, alpha: number, x: Float64Array, stride: number, offset: number ): Float64Array; + ndarray( N: number, alpha: number, x: Float64Array, strideX: number, offsetX: number ): Float64Array; } /** -* Adds a constant to each element in a double-precision floating-point strided array. +* Adds a scalar constant to each element in a double-precision floating-point strided array. * * @param N - number of indexed elements * @param alpha - constant * @param x - input array -* @param stride - stride length +* @param strideX - stride length * @returns input array * * @example diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/examples/c/example.c b/lib/node_modules/@stdlib/blas/ext/base/dapx/examples/c/example.c index c403b573362..ec1ac38026e 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/examples/c/example.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/examples/c/example.c @@ -23,11 +23,11 @@ int main( void ) { // Create a strided array: double x[] = { 1.0, -2.0, 3.0, -4.0, 5.0, -6.0, 7.0, -8.0 }; - // Specify the number of elements: - int N = 8; + // Specify the number of indexed elements: + const int N = 8; // Specify a stride: - int strideX = 1; + const int strideX = 1; // Add a constant to each element: c_dapx( N, 5.0, x, strideX ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/dapx/examples/index.js index 58d039e922b..893646ba806 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/examples/index.js @@ -18,11 +18,12 @@ '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 dapx = require( './../lib' ); -var x = filledarrayBy( 10, 'float64', discreteUniform( -100, 100 ) ); +var x = discreteUniform( 10, -100, 100, { + 'dtype': 'float64' +}); console.log( x ); dapx( x.length, 5.0, x, 1 ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/include/stdlib/blas/ext/base/dapx.h b/lib/node_modules/@stdlib/blas/ext/base/dapx/include/stdlib/blas/ext/base/dapx.h index 0f84c7d4769..d292078b1ca 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/include/stdlib/blas/ext/base/dapx.h +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/include/stdlib/blas/ext/base/dapx.h @@ -19,7 +19,7 @@ #ifndef STDLIB_BLAS_EXT_BASE_DAPX_H #define STDLIB_BLAS_EXT_BASE_DAPX_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. @@ -29,9 +29,14 @@ extern "C" { #endif /** -* Adds a constant to each element in a double-precision floating-point strided array. +* Adds a scalar constant to each element in a double-precision floating-point strided array. */ -void c_dapx( const int64_t N, const double alpha, double *X, const int64_t stride ); +void API_SUFFIX(c_dapx)( const CBLAS_INT N, const double alpha, double *X, const CBLAS_INT strideX ); + +/** +* Adds a scalar constant to each element in a double-precision floating-point strided array using alternative indexing semantics. +*/ +void API_SUFFIX(c_dapx_ndarray)( const CBLAS_INT N, const double alpha, double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); #ifdef __cplusplus } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/dapx.js b/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/dapx.js index 34d760006fb..2031033ba8c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/dapx.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/dapx.js @@ -20,18 +20,19 @@ // VARIABLES // -var M = 5; +var stride2offset = require( '@stdlib/strided/base/stride2offset' ); +var ndarray = require( './ndarray.js' ); // MAIN // /** -* Adds a constant to each element in a double-precision floating-point strided array. +* Adds a scalar constant to each element in a double-precision floating-point strided array. * * @param {PositiveInteger} N - number of indexed elements * @param {number} alpha - scalar * @param {Float64Array} x - input array -* @param {integer} stride - index increment +* @param {integer} strideX - index increment * @returns {Float64Array} input array * * @example @@ -42,46 +43,8 @@ var M = 5; * dapx( x.length, 5.0, x, 1 ); * // x => [ 3.0, 6.0, 8.0, 0.0, 9.0, 5.0, 4.0, 2.0 ] */ -function dapx( N, alpha, x, stride ) { - var ix; - var i; - var m; - - if ( N <= 0 || alpha === 0.0 ) { - return x; - } - // Use loop unrolling if the stride is equal to `1`... - if ( stride === 1 ) { - m = N % M; - - // If we have a remainder, run a clean-up loop... - if ( m > 0 ) { - for ( i = 0; i < m; i++ ) { - x[ i ] += alpha; - } - } - if ( N < M ) { - return x; - } - for ( i = m; i < N; i += M ) { - x[ i ] += alpha; - x[ i+1 ] += alpha; - x[ i+2 ] += alpha; - x[ i+3 ] += alpha; - x[ i+4 ] += alpha; - } - return x; - } - if ( stride < 0 ) { - ix = (1-N) * stride; - } else { - ix = 0; - } - for ( i = 0; i < N; i++ ) { - x[ ix ] += alpha; - ix += stride; - } - return x; +function dapx( N, alpha, x, strideX ) { + return ndarray( N, alpha, x, strideX, stride2offset( N, strideX ) ); } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/dapx.native.js b/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/dapx.native.js index 231869370d3..7ff6386fcdc 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/dapx.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/dapx.native.js @@ -26,12 +26,12 @@ var addon = require( './../src/addon.node' ); // MAIN // /** -* Adds a constant to each element in a double-precision floating-point strided array. +* Adds a scalar constant to each element in a double-precision floating-point strided array. * * @param {PositiveInteger} N - number of indexed elements * @param {number} alpha - scalar * @param {Float64Array} x - input array -* @param {integer} stride - index increment +* @param {integer} strideX - index increment * @returns {Float64Array} input array * * @example @@ -42,8 +42,8 @@ var addon = require( './../src/addon.node' ); * dapx( x.length, 5.0, x, 1 ); * // x => [ 3.0, 6.0, 8.0, 0.0, 9.0, 5.0, 4.0, 2.0 ] */ -function dapx( N, alpha, x, stride ) { - addon( N, alpha, x, stride ); +function dapx( N, alpha, x, strideX ) { + addon( N, alpha, x, strideX ); return x; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/index.js b/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/index.js index 14043689474..72b0a564209 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/index.js @@ -19,7 +19,7 @@ 'use strict'; /** -* Add a constant to each element in a double-precision floating-point strided array. +* Add a scalar constant to each element in a double-precision floating-point strided array. * * @module @stdlib/blas/ext/base/dapx * diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/ndarray.js index dddeb69dd75..7129ebb491b 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/ndarray.js @@ -26,13 +26,13 @@ var M = 5; // MAIN // /** -* Adds a constant to each element in a double-precision floating-point strided array. +* Adds a scalar constant to each element in a double-precision floating-point strided array. * * @param {PositiveInteger} N - number of indexed elements * @param {number} alpha - scalar * @param {Float64Array} x - input array -* @param {integer} stride - index increment -* @param {NonNegativeInteger} offset - starting index +* @param {integer} strideX - index increment +* @param {NonNegativeInteger} offsetX - starting index * @returns {Float64Array} input array * * @example @@ -44,7 +44,7 @@ var M = 5; * dapx( 3, alpha, x, 1, x.length-3 ); * // x => [ 1.0, -2.0, 3.0, 1.0, 10.0, -1.0 ] */ -function dapx( N, alpha, x, stride, offset ) { +function dapx( N, alpha, x, strideX, offsetX ) { var ix; var m; var i; @@ -52,17 +52,17 @@ function dapx( N, alpha, x, stride, offset ) { if ( N <= 0 || alpha === 0.0 ) { return x; } - ix = offset; + ix = offsetX; // Use loop unrolling if the stride is equal to `1`... - if ( stride === 1 ) { + if ( strideX === 1 ) { m = N % M; // If we have a remainder, run a clean-up loop... if ( m > 0 ) { for ( i = 0; i < m; i++ ) { x[ ix ] += alpha; - ix += stride; + ix += strideX; } } if ( N < M ) { @@ -80,7 +80,7 @@ function dapx( N, alpha, x, stride, offset ) { } for ( i = 0; i < N; i++ ) { x[ ix ] += alpha; - ix += stride; + ix += strideX; } return x; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/ndarray.native.js index 8ad34baeaaf..f0f0bccc0b9 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/lib/ndarray.native.js @@ -20,21 +20,19 @@ // MODULES // -var minViewBufferIndex = require( '@stdlib/strided/base/min-view-buffer-index' ); -var offsetView = require( '@stdlib/strided/base/offset-view' ); -var addon = require( './dapx.native.js' ); +var addon = require( './../src/addon.node' ); // MAIN // /** -* Adds a constant to each element in a double-precision floating-point strided array. +* Adds a scalar constant to each element in a double-precision floating-point strided array. * * @param {PositiveInteger} N - number of indexed elements * @param {number} alpha - scalar * @param {Float64Array} x - input array -* @param {integer} stride - index increment -* @param {NonNegativeInteger} offset - starting index +* @param {integer} strideX - index increment +* @param {NonNegativeInteger} offsetX - starting index * @returns {Float64Array} input array * * @example @@ -46,11 +44,8 @@ var addon = require( './dapx.native.js' ); * dapx( 3, alpha, x, 1, x.length-3 ); * // x => [ 1.0, -2.0, 3.0, 1.0, 10.0, -1.0 ] */ -function dapx( N, alpha, x, stride, offset ) { - var view; - offset = minViewBufferIndex( N, stride, offset ); - view = offsetView( x, offset ); - addon( N, alpha, view, stride ); +function dapx( N, alpha, x, strideX, offsetX ) { + addon.ndarray( N, alpha, x, strideX, offsetX ); return x; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/dapx/manifest.json index ddbc8a43860..13cc0c24361 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/manifest.json @@ -28,16 +28,16 @@ { "task": "build", "src": [ - "./src/dapx.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", "@stdlib/napi/export", "@stdlib/napi/argv", "@stdlib/napi/argv-double", @@ -48,30 +48,32 @@ { "task": "benchmark", "src": [ - "./src/dapx.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] }, { "task": "examples", "src": [ - "./src/dapx.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] } ] } diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/package.json b/lib/node_modules/@stdlib/blas/ext/base/dapx/package.json index 872aeaf1989..6da5462fd73 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/package.json +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/package.json @@ -1,7 +1,7 @@ { "name": "@stdlib/blas/ext/base/dapx", "version": "0.0.0", - "description": "Add a constant to each element in a double-precision floating-point strided array.", + "description": "Add a scalar constant to each element in a double-precision floating-point strided array.", "license": "Apache-2.0", "author": { "name": "The Stdlib Authors", diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/dapx/src/addon.c index f1c9b45126d..455f74e295d 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/src/addon.c +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/src/addon.c @@ -18,6 +18,7 @@ #include "stdlib/blas/ext/base/dapx.h" #include "stdlib/napi/export.h" +#include "stdlib/blas/base/shared.h" #include "stdlib/napi/argv.h" #include "stdlib/napi/argv_double.h" #include "stdlib/napi/argv_int64.h" @@ -35,10 +36,28 @@ static napi_value addon( napi_env env, napi_callback_info info ) { STDLIB_NAPI_ARGV( env, info, argv, argc, 4 ); STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); STDLIB_NAPI_ARGV_DOUBLE( env, alpha, argv, 1 ); - STDLIB_NAPI_ARGV_INT64( env, stride, argv, 3 ); - STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, X, N, stride, argv, 2 ); - c_dapx( N, alpha, X, stride ); + STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 3 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, X, N, strideX, argv, 2 ); + API_SUFFIX(c_dapx)( N, alpha, X, strideX ); 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, 5 ); + STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); + STDLIB_NAPI_ARGV_DOUBLE( env, alpha, argv, 1 ); + STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 3 ); + STDLIB_NAPI_ARGV_INT64( env, offsetX, argv, 4 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, X, N, strideX, argv, 2 ); + API_SUFFIX(c_dapx_ndarray)( N, alpha, X, strideX, offsetX ); + return NULL; +} + +STDLIB_NAPI_MODULE_EXPORT_FCN_WITH_METHOD( addon, "ndarray", addon_method ) diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/src/dapx.c b/lib/node_modules/@stdlib/blas/ext/base/dapx/src/dapx.c deleted file mode 100644 index 31e2ca26d10..00000000000 --- a/lib/node_modules/@stdlib/blas/ext/base/dapx/src/dapx.c +++ /dev/null @@ -1,70 +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/dapx.h" -#include - -/** -* Adds a constant to each element in a double-precision floating-point strided array. -* -* @param N number of indexed elements -* @param alpha scalar -* @param X input array -* @param stride index increment -*/ -void c_dapx( const int64_t N, const double alpha, double *X, const int64_t stride ) { - int64_t ix; - int64_t m; - int64_t i; - - if ( N <= 0 || alpha == 0.0 ) { - return; - } - // Use loop unrolling if the stride is equal to `1`... - if ( stride == 1 ) { - m = N % 5; - - // If we have a remainder, run a clean-up loop... - if ( m > 0 ) { - for ( i = 0; i < m; i++ ) { - X[ i ] += alpha; - } - } - if ( N < 5 ) { - return; - } - for ( i = m; i < N; i += 5 ) { - X[ i ] += alpha; - X[ i+1 ] += alpha; - X[ i+2 ] += alpha; - X[ i+3 ] += alpha; - X[ i+4 ] += alpha; - } - return; - } - if ( stride < 0 ) { - ix = (1-N) * stride; - } else { - ix = 0; - } - for ( i = 0; i < N; i++ ) { - X[ ix ] += alpha; - ix += stride; - } - return; -} diff --git a/lib/node_modules/@stdlib/blas/ext/base/dapx/src/main.c b/lib/node_modules/@stdlib/blas/ext/base/dapx/src/main.c new file mode 100644 index 00000000000..6952b077c70 --- /dev/null +++ b/lib/node_modules/@stdlib/blas/ext/base/dapx/src/main.c @@ -0,0 +1,84 @@ +/** +* @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/dapx.h" +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/stride2offset.h" + +/** +* Adds a scalar constant to each element in a double-precision floating-point strided array. +* +* @param N number of indexed elements +* @param alpha scalar +* @param X input array +* @param strideX index increment +*/ +void API_SUFFIX(c_dapx)( const CBLAS_INT N, const double alpha, double *X, const CBLAS_INT strideX ) { + CBLAS_INT ox = stdlib_strided_stride2offset( N, strideX ); + API_SUFFIX(c_dapx_ndarray)( N, alpha, X, strideX, ox ); +} + +/** +* Adds a scalar constant to each element in a double-precision floating-point strided array using alternative indexing semantics. +* +* @param N number of indexed elements +* @param alpha scalar +* @param X input array +* @param strideX index increment +* @param offsetX starting index +*/ +void API_SUFFIX(c_dapx_ndarray)( const CBLAS_INT N, const double alpha, double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ) { + CBLAS_INT ix; + CBLAS_INT m; + CBLAS_INT i; + + if ( N <= 0 || alpha == 0.0 ) { + return; + } + ix = offsetX; + + // Use loop unrolling if the stride is equal to `1`... + if ( strideX == 1 ) { + m = N % 5; + + // If we have a remainder, run a clean-up loop... + if ( m > 0 ) { + for ( i = 0; i < m; i++ ) { + X[ ix ] += alpha; + ix += strideX; + } + } + if ( N < 5 ) { + return; + } + for ( i = m; i < N; i += 5 ) { + X[ ix ] += alpha; + X[ ix+1 ] += alpha; + X[ ix+2 ] += alpha; + X[ ix+3 ] += alpha; + X[ ix+4 ] += alpha; + ix += 5; + } + return; + } + for ( i = 0; i < N; i++ ) { + X[ ix ] += alpha; + ix += strideX; + } + return; +}