diff --git a/lib/node_modules/@stdlib/blas/ext/base/drev/README.md b/lib/node_modules/@stdlib/blas/ext/base/drev/README.md index 303719c37d5d..6f08750b7cd4 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/drev/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/drev/README.md @@ -30,7 +30,7 @@ limitations under the License. var drev = require( '@stdlib/blas/ext/base/drev' ); ``` -#### drev( N, x, stride ) +#### drev( N, x, strideX ) Reverses a double-precision floating-point strided array `x` in-place. @@ -47,9 +47,9 @@ The function has the following parameters: - **N**: number of indexed elements. - **x**: input [`Float64Array`][@stdlib/array/float64]. -- **stride**: index increment. +- **strideX**: stride length for `x`. -The `N` and stride parameters determine which elements in the strided array are accessed at runtime. For example, to reverse every other element +The `N` and stride parameters determine which elements in the strided array are accessed at runtime. For example, to reverse every other element: ```javascript var Float64Array = require( '@stdlib/array/float64' ); @@ -76,7 +76,7 @@ drev( 3, x1, 2 ); // x0 => [ 1.0, -6.0, 3.0, -4.0, 5.0, -2.0 ] ``` -#### drev.ndarray( N, x, stride, offset ) +#### drev.ndarray( N, x, strideX, offsetX ) Reverses a double-precision floating-point strided array `x` in-place using alternative indexing semantics. @@ -91,9 +91,9 @@ drev.ndarray( x.length, x, 1, 0 ); The function has the following additional parameters: -- **offset**: starting index. +- **offsetX**: starting index for `x`. -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 @@ drev.ndarray( 3, 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 drev = require( '@stdlib/blas/ext/base/drev' ); -var x = filledarrayBy( 10, 'float64', discreteUniform( -100.0, 100.0 ) ); +var x = discreteUniform( 10, -100, 100, { + 'dtype': 'float64' +}); console.log( x ); drev( x.length, x, 1 ); @@ -141,6 +142,123 @@ console.log( x ); + + +* * * + +
+ +## C APIs + + + +
+ +
+ + + + + +
+ +### Usage + +```c +#include "stdlib/blas/ext/base/drev.h" +``` + +#### stdlib_strided_drev( N, \*X, strideX ) + +Reverses a double-precision floating-point strided array `X` in-place. + +```c +double x[] = { 1.0, 2.0, 3.0, 4.0 }; + +stdlib_strided_drev( 4, x, 1 ); +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[in] double*` input array. +- **strideX**: `[in] CBLAS_INT` stride length for `X`. + +```c +double stdlib_strided_drev( const CBLAS_INT N, double *X, const CBLAS_INT strideX ); +``` + +#### stdlib_strided_drev_ndarray( N, \*X, strideX, offsetX ) + +Reverses a double-precision floating-point strided array `X` in-place using alternative indexing semantics. + +```c +double x[] = { 1.0, 2.0, 3.0, 4.0 }; + +stdlib_strided_drev_ndarray( 4, x, 1, 0 ); +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[in] double*` input array. +- **strideX**: `[in] CBLAS_INT` stride length for `X`. +- **offsetX**: `[in] CBLAS_INT` starting index for `X`. + +```c +void stdlib_strided_drev_ndarray( const CBLAS_INT N, double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); +``` + +
+ + + + + +
+ +
+ + + + + +
+ +### Examples + +```c +#include "stdlib/blas/ext/base/drev.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 elements: + const int N = 8; + + // Specify a stride: + const int strideX = 1; + + // Reverse the array: + stdlib_strided_drev( N, 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/drev/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/drev/benchmark/benchmark.js index 208e82c3fcd1..19b21d6bf5ea 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/drev/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/blas/ext/base/drev/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 drev = require( './../lib/drev.js' ); // VARIABLES // -var rand = uniform( -10.0, 10.0 ); +var options = { + 'dtype': 'float64' +}; // FUNCTIONS // @@ -44,7 +45,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, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/drev/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/drev/benchmark/benchmark.native.js index 645e5a8efc0b..c68e8b120406 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/drev/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/drev/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 drev = tryRequire( resolve( __dirname, './../lib/drev.native.js' ) ); var opts = { 'skip': ( drev instanceof Error ) }; -var rand = uniform( -10.0, 10.0 ); +var options = { + 'dtype': 'float64' +}; // FUNCTIONS // @@ -49,7 +50,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, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/drev/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/drev/benchmark/benchmark.ndarray.js index 12e2b5d4ee8a..a0a3bc86f888 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/drev/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/drev/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 drev = require( './../lib/ndarray.js' ); // VARIABLES // -var rand = uniform( -10.0, 10.0 ); +var options = { + 'dtype': 'float64' +}; // FUNCTIONS // @@ -44,7 +45,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, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/drev/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/drev/benchmark/benchmark.ndarray.native.js index 20fa4384274b..b9cd3c0c27d7 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/drev/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/drev/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 drev = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' ) ); var opts = { 'skip': ( drev instanceof Error ) }; -var rand = uniform( -10.0, 10.0 ); +var options = { + 'dtype': 'float64' +}; // FUNCTIONS // @@ -49,7 +50,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, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/drev/benchmark/c/benchmark.length.c b/lib/node_modules/@stdlib/blas/ext/base/drev/benchmark/c/benchmark.length.c index 7fb0c35f11d8..2f05602753d0 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/drev/benchmark/c/benchmark.length.c +++ b/lib/node_modules/@stdlib/blas/ext/base/drev/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; @@ -105,7 +105,38 @@ static double benchmark( int iterations, int len ) { } t = tic(); for ( i = 0; i < iterations; i++ ) { - c_drev( len, x, 1 ); + stdlib_strided_drev( len, x, 1 ); + 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; +} + +/** +* 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 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++ ) { + stdlib_strided_drev_ndarray( len, x, 1, 0 ); if ( x[ 0 ] != x[ 0 ] ) { printf( "should not return NaN\n" ); break; @@ -140,7 +171,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/drev/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/drev/docs/repl.txt index c5e6d177e560..c787907e6005 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/drev/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/drev/docs/repl.txt @@ -1,5 +1,5 @@ -{{alias}}( N, x, stride ) +{{alias}}( N, x, strideX ) Reverses a double-precision floating-point strided array in-place. The `N` and stride parameters determine which elements in the strided array @@ -18,8 +18,8 @@ x: Float64Array Input array. - stride: integer - Index increment for `x`. + strideX: integer + Stride length for `x`. Returns ------- @@ -47,12 +47,12 @@ [ 1.0, -6.0, 3.0, -4.0, 5.0, -2.0 ] -{{alias}}.ndarray( N, x, stride, offset ) +{{alias}}.ndarray( N, x, strideX, offsetX ) Reverses a double-precision floating-point strided array in-place 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 @@ -63,10 +63,10 @@ x: Float64Array Input array. - stride: integer - Index increment for `x`. + strideX: integer + Stride length for `x`. - offset: integer + offsetX: integer Starting index of `x`. Returns diff --git a/lib/node_modules/@stdlib/blas/ext/base/drev/docs/types/index.d.ts b/lib/node_modules/@stdlib/blas/ext/base/drev/docs/types/index.d.ts index 0ea1fb7ee4b7..d71d464cd388 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/drev/docs/types/index.d.ts +++ b/lib/node_modules/@stdlib/blas/ext/base/drev/docs/types/index.d.ts @@ -27,7 +27,7 @@ interface Routine { * * @param N - number of indexed elements * @param x - input array - * @param stride - stride length + * @param strideX - stride length * @returns `x` * * @example @@ -38,15 +38,15 @@ interface Routine { * drev( x.length, x, 1 ); * // x => [ -3.0, -1.0, 0.0, 4.0, -5.0, 3.0, 1.0, -2.0 ] */ - ( N: number, x: Float64Array, stride: number ): Float64Array; + ( N: number, x: Float64Array, strideX: number ): Float64Array; /** * Reverses a double-precision floating-point strided array in-place. using alternative indexing semantics. * * @param N - number of indexed elements * @param x - input array - * @param stride - stride length - * @param offset - starting index + * @param strideX - stride length + * @param offsetX - starting index * @returns `x` * * @example @@ -57,7 +57,7 @@ interface Routine { * drev.ndarray( x.length, x, 1, 0 ); * // x => [ -3.0, -1.0, 0.0, 4.0, -5.0, 3.0, 1.0, -2.0 ] */ - ndarray( N: number, x: Float64Array, stride: number, offset: number ): Float64Array; + ndarray( N: number, x: Float64Array, strideX: number, offsetX: number ): Float64Array; } /** @@ -65,7 +65,7 @@ interface Routine { * * @param N - number of indexed elements * @param x - input array -* @param stride - stride length +* @param strideX - stride length * @returns `x` * * @example diff --git a/lib/node_modules/@stdlib/blas/ext/base/drev/examples/c/example.c b/lib/node_modules/@stdlib/blas/ext/base/drev/examples/c/example.c index 4eaf0f085dc5..e4aeb14051c9 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/drev/examples/c/example.c +++ b/lib/node_modules/@stdlib/blas/ext/base/drev/examples/c/example.c @@ -27,10 +27,10 @@ int main( void ) { const int N = 8; // Specify a stride: - const int stride = 1; + const int strideX = 1; // Reverse the array: - c_drev( N, x, stride ); + stdlib_strided_drev( N, x, strideX ); // Print the result: for ( int i = 0; i < 8; i++ ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/drev/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/drev/examples/index.js index 3b35c07cb4a2..078a0ca357d3 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/drev/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/drev/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 drev = require( './../lib' ); -var x = filledarrayBy( 10, 'float64', discreteUniform( -100.0, 100.0 ) ); +var x = discreteUniform( 10, -100, 100, { + 'dtype': 'float64' +}); console.log( x ); drev( x.length, x, 1 ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/drev/include/stdlib/blas/ext/base/drev.h b/lib/node_modules/@stdlib/blas/ext/base/drev/include/stdlib/blas/ext/base/drev.h index 15bccf5b85f4..9d2d952753e0 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/drev/include/stdlib/blas/ext/base/drev.h +++ b/lib/node_modules/@stdlib/blas/ext/base/drev/include/stdlib/blas/ext/base/drev.h @@ -19,7 +19,7 @@ #ifndef STDLIB_BLAS_EXT_BASE_DREV_H #define STDLIB_BLAS_EXT_BASE_DREV_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" { /** * Reverses a double-precision floating-point strided array in-place. */ -void c_drev( const int64_t N, double *X, const int64_t stride ); +void API_SUFFIX(stdlib_strided_drev)( const CBLAS_INT N, double *X, const CBLAS_INT strideX ); + +/** +* Reverses a double-precision floating-point strided array in-place using alternative indexing semantics. +*/ +void API_SUFFIX(stdlib_strided_drev_ndarray)( const CBLAS_INT N, double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); #ifdef __cplusplus } diff --git a/lib/node_modules/@stdlib/blas/ext/base/drev/lib/drev.js b/lib/node_modules/@stdlib/blas/ext/base/drev/lib/drev.js index 4a111da9795b..55c1c035319a 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/drev/lib/drev.js +++ b/lib/node_modules/@stdlib/blas/ext/base/drev/lib/drev.js @@ -20,12 +20,8 @@ // MODULES // -var floor = require( '@stdlib/math/base/special/floor' ); - - -// VARIABLES // - -var M = 3; +var stride2offset = require( '@stdlib/strided/base/stride2offset' ); +var ndarray = require( './ndarray.js' ); // MAIN // @@ -35,7 +31,7 @@ var M = 3; * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} x - input array -* @param {integer} stride - index increment +* @param {integer} strideX - stride length * @returns {Float64Array} input array * * @example @@ -46,67 +42,8 @@ var M = 3; * drev( x.length, x, 1 ); * // x => [ -3.0, -1.0, 0.0, 4.0, -5.0, 3.0, 1.0, -2.0 ] */ -function drev( N, x, stride ) { - var tmp; - var ix; - var iy; - var m; - var n; - var i; - - if ( N <= 0 ) { - return x; - } - n = floor( N/2 ); - - // Use loop unrolling if the stride is equal to `1`... - if ( stride === 1 ) { - m = n % M; - iy = N - 1; - - // If we have a remainder, run a clean-up loop... - if ( m > 0 ) { - for ( ix = 0; ix < m; ix++ ) { - tmp = x[ ix ]; - x[ ix ] = x[ iy ]; - x[ iy ] = tmp; - iy -= 1; - } - } - if ( n < M ) { - return x; - } - for ( ix = m; ix < n; ix += M ) { - tmp = x[ ix ]; - x[ ix ] = x[ iy ]; - x[ iy ] = tmp; - - tmp = x[ ix+1 ]; - x[ ix+1 ] = x[ iy-1 ]; - x[ iy-1 ] = tmp; - - tmp = x[ ix+2 ]; - x[ ix+2 ] = x[ iy-2 ]; - x[ iy-2 ] = tmp; - - iy -= M; - } - return x; - } - if ( stride < 0 ) { - ix = (1-N) * stride; - } else { - ix = 0; - } - iy = ix + ((N-1)*stride); - for ( i = 0; i < n; i++ ) { - tmp = x[ ix ]; - x[ ix ] = x[ iy ]; - x[ iy ] = tmp; - ix += stride; - iy -= stride; - } - return x; +function drev( N, x, strideX ) { + return ndarray( N, x, strideX, stride2offset( N, strideX) ); } diff --git a/lib/node_modules/@stdlib/blas/ext/base/drev/lib/drev.native.js b/lib/node_modules/@stdlib/blas/ext/base/drev/lib/drev.native.js index 55349de3749a..0c596e43a8ad 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/drev/lib/drev.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/drev/lib/drev.native.js @@ -30,7 +30,7 @@ var addon = require( './../src/addon.node' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} x - input array -* @param {integer} stride - index increment +* @param {integer} strideX - stride length * @returns {Float64Array} input array * * @example @@ -41,8 +41,8 @@ var addon = require( './../src/addon.node' ); * drev( x.length, x, 1 ); * // x => [ -3.0, -1.0, 0.0, 4.0, -5.0, 3.0, 1.0, -2.0 ] */ -function drev( N, x, stride ) { - addon( N, x, stride ); +function drev( N, x, strideX ) { + addon( N, x, strideX ); return x; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/drev/lib/ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/drev/lib/ndarray.js index 728d5304f757..9b0e5b9786d1 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/drev/lib/ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/drev/lib/ndarray.js @@ -35,8 +35,8 @@ var M = 3; * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} x - input array -* @param {integer} stride - index increment -* @param {NonNegativeInteger} offset - starting index +* @param {integer} strideX - stride length +* @param {NonNegativeInteger} offsetX - starting index * @returns {Float64Array} input array * * @example @@ -47,7 +47,7 @@ var M = 3; * drev( 3, x, 1, x.length-3 ); * // x => [ 1.0, -2.0, 3.0, -6.0, 5.0, -4.0 ] */ -function drev( N, x, stride, offset ) { +function drev( N, x, strideX, offsetX ) { var tmp; var ix; var iy; @@ -59,10 +59,10 @@ function drev( N, x, stride, offset ) { return x; } n = floor( N/2 ); - ix = offset; + ix = offsetX; // Use loop unrolling if the stride is equal to `1`... - if ( stride === 1 ) { + if ( strideX === 1 ) { m = n % M; iy = ix + N - 1; @@ -72,8 +72,8 @@ function drev( N, x, stride, offset ) { tmp = x[ ix ]; x[ ix ] = x[ iy ]; x[ iy ] = tmp; - ix += stride; - iy -= stride; + ix += strideX; + iy -= strideX; } } if ( n < M ) { @@ -97,13 +97,13 @@ function drev( N, x, stride, offset ) { } return x; } - iy = ix + ((N-1)*stride); + iy = ix + ( (N-1) * strideX ); for ( i = 0; i < n; i++ ) { tmp = x[ ix ]; x[ ix ] = x[ iy ]; x[ iy ] = tmp; - ix += stride; - iy -= stride; + ix += strideX; + iy -= strideX; } return x; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/drev/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/drev/lib/ndarray.native.js index 0f4ea4b81268..36bee2fd68d6 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/drev/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/drev/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( './drev.native.js' ); +var addon = require( './../src/addon.node' ); // MAIN // @@ -32,8 +30,8 @@ var addon = require( './drev.native.js' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} x - input array -* @param {integer} stride - index increment -* @param {NonNegativeInteger} offset - starting index +* @param {integer} strideX - stride length +* @param {NonNegativeInteger} offsetX - starting index * @returns {Float64Array} input array * * @example @@ -44,14 +42,8 @@ var addon = require( './drev.native.js' ); * drev( 3, x, 1, x.length-3 ); * // x => [ 1.0, -2.0, 3.0, -6.0, 5.0, -4.0 ] */ -function drev( N, x, stride, offset ) { - var view; - - offset = minViewBufferIndex( N, stride, offset ); - - view = offsetView( x, offset ); - - addon( N, view, stride ); +function drev( N, x, strideX, offsetX ) { + addon.ndarray( N, x, strideX, offsetX ); return x; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/drev/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/drev/manifest.json index 175d83847358..ae77c3ade69f 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/drev/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/drev/manifest.json @@ -28,49 +28,51 @@ { "task": "build", "src": [ - "./src/drev.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], "dependencies": [ "@stdlib/napi/export", "@stdlib/napi/argv", "@stdlib/napi/argv-int64", - "@stdlib/napi/argv-strided-float64array" + "@stdlib/napi/argv-strided-float64array", + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" ] }, { "task": "benchmark", "src": [ - "./src/drev.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" - ], + "libraries": [], "libpath": [], - "dependencies": [] + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset" + ] }, { "task": "examples", "src": [ - "./src/drev.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/drev/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/drev/src/addon.c index d5ba6158e3e3..eeb5b82de0fc 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/drev/src/addon.c +++ b/lib/node_modules/@stdlib/blas/ext/base/drev/src/addon.c @@ -17,6 +17,7 @@ */ #include "stdlib/blas/ext/base/drev.h" +#include "stdlib/blas/base/shared.h" #include "stdlib/napi/export.h" #include "stdlib/napi/argv.h" #include "stdlib/napi/argv_int64.h" @@ -33,10 +34,27 @@ static napi_value addon( napi_env env, napi_callback_info info ) { STDLIB_NAPI_ARGV( env, info, argv, argc, 3 ); STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); - STDLIB_NAPI_ARGV_INT64( env, stride, argv, 2 ); - STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, X, N, stride, argv, 1 ); - c_drev( N, (double *)X, stride ); + STDLIB_NAPI_ARGV_INT64( env, strideX, argv, 2 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, X, N, strideX, argv, 1 ); + API_SUFFIX(stdlib_strided_drev)( N, (double *)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, 4 ); + 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_STRIDED_FLOAT64ARRAY( env, X, N, strideX, argv, 1 ); + API_SUFFIX(stdlib_strided_drev_ndarray)( N, (double *)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/drev/src/drev.c b/lib/node_modules/@stdlib/blas/ext/base/drev/src/main.c similarity index 54% rename from lib/node_modules/@stdlib/blas/ext/base/drev/src/drev.c rename to lib/node_modules/@stdlib/blas/ext/base/drev/src/main.c index 8b8723a8b110..b1945d6356d7 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/drev/src/drev.c +++ b/lib/node_modules/@stdlib/blas/ext/base/drev/src/main.c @@ -17,46 +17,62 @@ */ #include "stdlib/blas/ext/base/drev.h" -#include +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/stride2offset.h" /** * Reverses a double-precision floating-point strided array in-place. * -* @param N number of indexed elements -* @param X input array -* @param stride index increment +* @param N number of indexed elements +* @param X input array +* @param strideX stride length */ -void c_drev( const int64_t N, double *X, const int64_t stride ) { +void API_SUFFIX(stdlib_strided_drev)( const CBLAS_INT N, double *X, const CBLAS_INT strideX ) { + const CBLAS_INT ox = stdlib_strided_stride2offset( N, strideX ); + API_SUFFIX(stdlib_strided_drev_ndarray)( N, X, strideX, ox ); +} + +/** +* Reverses a double-precision floating-point strided array in-place using alternative indexing semantics. +* +* @param N number of indexed elements +* @param X input array +* @param strideX stride length +* @param offsetX starting index +*/ +void API_SUFFIX(stdlib_strided_drev_ndarray)( const CBLAS_INT N, double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ) { double tmp; - int64_t ix; - int64_t iy; - int64_t m; - int64_t n; - int64_t i; + CBLAS_INT ix; + CBLAS_INT iy; + CBLAS_INT m; + CBLAS_INT n; + CBLAS_INT i; if ( N <= 0 ) { return; } n = N / 2; + ix = offsetX; // Use loop unrolling if the stride is equal to `1`... - if ( stride == 1 ) { + if ( strideX == 1 ) { m = n % 3; - iy = N - 1; + iy = ix + N - 1; // If we have a remainder, run a clean-up loop... if ( m > 0 ) { - for ( ix = 0; ix < m; ix++ ) { + for ( i = 0; i < m; i++ ) { tmp = X[ ix ]; X[ ix ] = X[ iy ]; X[ iy ] = tmp; - iy -= 1; + ix += strideX; + iy -= strideX; } } if ( n < 3 ) { return; } - for ( ix = m; ix < n; ix += 3 ) { + for ( i = m; i < n; i += 3 ) { tmp = X[ ix ]; X[ ix ] = X[ iy ]; X[ iy ] = tmp; @@ -69,22 +85,18 @@ void c_drev( const int64_t N, double *X, const int64_t stride ) { X[ ix+2 ] = X[ iy-2 ]; X[ iy-2 ] = tmp; + ix += 3; iy -= 3; } return; } - if ( stride < 0 ) { - ix = (1-N) * stride; - } else { - ix = 0; - } - iy = ix + ((N-1)*stride); + iy = ix + ( (N-1) * strideX ); for ( i = 0; i < n; i++ ) { tmp = X[ ix ]; X[ ix ] = X[ iy ]; X[ iy ] = tmp; - ix += stride; - iy -= stride; + ix += strideX; + iy -= strideX; } return; }