diff --git a/lib/node_modules/@stdlib/blas/ext/base/cfill/README.md b/lib/node_modules/@stdlib/blas/ext/base/cfill/README.md index e66274afa8a..c474bf9e78a 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/cfill/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/cfill/README.md @@ -287,7 +287,7 @@ console.log( x.get( 0 ).toString() ); #### stdlib_strided_cfill( N, alpha, \*X, strideX ) -Fills a single-precision floating-point strided array `X` with a specified scalar constant `alpha`. +Fills a single-precision complex floating-point strided array `X` with a specified scalar constant `alpha`. ```c float x[] = { 1.0f, 2.0f, 3.0f, 4.0f }; @@ -321,13 +321,13 @@ stdlib_strided_cfill_ndarray( 4, alpha, (stdlib_complex64_t *x), 1, 0 ); The function accepts the following arguments: - **N**: `[in] CBLAS_INT` number of indexed elements. -- **alpha**: `[in] stlib_complex64_t` scalar constant. +- **alpha**: `[in] stdlib_complex64_t` scalar constant. - **X**: `[out] stdlib_complex64_t*` input array. - **strideX**: `[in] CBLAS_INT` index increment for `X`. - **offsetX**: `[in] CBLAS_INT` starting index for `X`. ```c -void stdlib_strided_cfill_ndarray( const CBLAS_INT N, const stdlib_complex64_t alpha, stdlib_complex_64_t *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); +void stdlib_strided_cfill_ndarray( const CBLAS_INT N, const stdlib_complex64_t alpha, stdlib_complex64_t *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); ``` @@ -367,7 +367,7 @@ int main( void ) { const int strideX = 1; // Fill the array: - stdlib_strided_cfill( N, alpha, (stdlib_complex_64_t *)x, strideX ); + stdlib_strided_cfill( N, alpha, (stdlib_complex64_t *)x, strideX ); // Print the result: for ( int i = 0; i < N; i++ ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/cfill/lib/ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/cfill/lib/ndarray.js index e15a4f4b9d2..8b36a9f6e56 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/cfill/lib/ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/cfill/lib/ndarray.js @@ -72,12 +72,10 @@ function cfill( N, alpha, x, strideX, offsetX ) { var ix; var m; var i; - var j; if ( N <= 0 ) { return x; } - ix = offsetX; // Decompose the constant into its real and imaginary components: re = realf( alpha ); @@ -86,16 +84,19 @@ function cfill( N, alpha, x, strideX, offsetX ) { // Reinterpret the complex input array as a real-valued array: view = reinterpret( x, 0 ); - // Use loop unrolling if the stride is equal to `1`... - if ( strideX === 1 ) { + // Adjust the stride and offset according to real-valued array: + ix = offsetX * 2; + strideX *= 2; + + // Use loop unrolling if the stride is equal to `2`... + if ( strideX === 2 ) { m = N % M; // If we have a remainder, run a clean-up loop... if ( m > 0 ) { for ( i = 0; i < m; i++ ) { - j = ix * 2; - view[ j ] = re; - view[ j+1 ] = im; + view[ ix ] = re; + view[ ix+1 ] = im; ix += strideX; } } @@ -103,31 +104,29 @@ function cfill( N, alpha, x, strideX, offsetX ) { return x; } for ( i = m; i < N; i += M ) { - j = ix * 2; - view[ j ] = re; - view[ j+1 ] = im; - view[ j+2 ] = re; - view[ j+3 ] = im; - view[ j+4 ] = re; - view[ j+5 ] = im; - view[ j+6 ] = re; - view[ j+7 ] = im; - view[ j+8 ] = re; - view[ j+9 ] = im; - view[ j+10 ] = re; - view[ j+11 ] = im; - view[ j+12 ] = re; - view[ j+13 ] = im; - view[ j+14 ] = re; - view[ j+15 ] = im; - ix += M; + view[ ix ] = re; + view[ ix+1 ] = im; + view[ ix+2 ] = re; + view[ ix+3 ] = im; + view[ ix+4 ] = re; + view[ ix+5 ] = im; + view[ ix+6 ] = re; + view[ ix+7 ] = im; + view[ ix+8 ] = re; + view[ ix+9 ] = im; + view[ ix+10 ] = re; + view[ ix+11 ] = im; + view[ ix+12 ] = re; + view[ ix+13 ] = im; + view[ ix+14 ] = re; + view[ ix+15 ] = im; + ix += M * 2; } return x; } for ( i = 0; i < N; i++ ) { - j = ix * 2; - view[ j ] = re; - view[ j+1 ] = im; + view[ ix ] = re; + view[ ix+1 ] = im; ix += strideX; } return x; diff --git a/lib/node_modules/@stdlib/blas/ext/base/cfill/test/test.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/cfill/test/test.ndarray.js index 53d614825b8..8cfa5d7d0c2 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/cfill/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/cfill/test/test.ndarray.js @@ -167,23 +167,23 @@ tape( 'the function supports an offset parameter', function test( t ) { -2.0, 3.0, // 0 -4.0, // 0 - 6.0, - -8.0, - 10.0, // 1 - -12.0 // 1 + 6.0, // 1 + -8.0, // 1 + 10.0, + -12.0 ]); expected = new Complex64Array([ 1.0, -2.0, 5.0, // 0 -5.0, // 0 - 6.0, - -8.0, 5.0, // 1 - -5.0 // 1 + -5.0, // 1 + 10.0, + -12.0 ]); - cfill( 2, new Complex64( 5.0, -5.0 ), x, 2, 1 ); + cfill( 2, new Complex64( 5.0, -5.0 ), x, 1, 1 ); t.strictEqual( isSameComplex64Array( x, expected ), true, 'returns expected value' ); t.end(); }); diff --git a/lib/node_modules/@stdlib/blas/ext/base/cfill/test/test.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/cfill/test/test.ndarray.native.js index b6f4192b9bf..48261e15497 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/cfill/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/cfill/test/test.ndarray.native.js @@ -176,23 +176,23 @@ tape( 'the function supports an offset parameter', opts, function test( t ) { -2.0, 3.0, // 0 -4.0, // 0 - 6.0, - -8.0, - 10.0, // 1 - -12.0 // 1 + 6.0, // 1 + -8.0, // 1 + 10.0, + -12.0 ]); expected = new Complex64Array([ 1.0, -2.0, 5.0, // 0 -5.0, // 0 - 6.0, - -8.0, 5.0, // 1 - -5.0 // 1 + -5.0, // 1 + 10.0, + -12.0 ]); - cfill( 2, new Complex64( 5.0, -5.0 ), x, 2, 1 ); + cfill( 2, new Complex64( 5.0, -5.0 ), x, 1, 1 ); t.strictEqual( isSameComplex64Array( x, expected ), true, 'returns expected value' ); t.end(); }); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dfill/test/test.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/dfill/test/test.ndarray.js index dd34e93b373..f1dcd262dce 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dfill/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dfill/test/test.ndarray.js @@ -157,21 +157,21 @@ tape( 'the function supports an offset parameter', function test( t ) { x = new Float64Array([ 1.0, 2.0, // 0 - 3.0, - 4.0, // 1 - 5.0, - 6.0 // 2 + 3.0, // 1 + 4.0, // 2 + 6.0, + 7.0 ]); expected = new Float64Array([ 1.0, 5.0, // 0 - 3.0, 5.0, // 1 - 5.0, - 5.0 // 2 + 5.0, // 2 + 6.0, + 7.0 ]); - dfill( 3, 5.0, x, 2, 1 ); + dfill( 3, 5.0, x, 1, 1 ); t.deepEqual( x, expected, 'returns expected value' ); t.end(); }); diff --git a/lib/node_modules/@stdlib/blas/ext/base/dfill/test/test.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/dfill/test/test.ndarray.native.js index 69806f4c8a4..843f6904a90 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/dfill/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/dfill/test/test.ndarray.native.js @@ -166,21 +166,21 @@ tape( 'the function supports an offset parameter', opts, function test( t ) { x = new Float64Array([ 1.0, 2.0, // 0 - 3.0, - 4.0, // 1 - 5.0, - 6.0 // 2 + 3.0, // 1 + 4.0, // 2 + 6.0, + 7.0 ]); expected = new Float64Array([ 1.0, 5.0, // 0 - 3.0, 5.0, // 1 - 5.0, - 5.0 // 2 + 5.0, // 2 + 6.0, + 7.0 ]); - dfill( 3, 5.0, x, 2, 1 ); + dfill( 3, 5.0, x, 1, 1 ); t.deepEqual( x, expected, 'returns expected value' ); t.end(); }); diff --git a/lib/node_modules/@stdlib/blas/ext/base/sfill/test/test.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/sfill/test/test.ndarray.js index 60101678dc7..df3a549f4e2 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sfill/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sfill/test/test.ndarray.js @@ -157,21 +157,21 @@ tape( 'the function supports an offset parameter', function test( t ) { x = new Float32Array([ 1.0, 2.0, // 0 - 3.0, - 4.0, // 1 - 5.0, - 6.0 // 2 + 3.0, // 1 + 4.0, // 2 + 6.0, + 7.0 ]); expected = new Float32Array([ 1.0, 5.0, // 0 - 3.0, 5.0, // 1 - 5.0, - 5.0 // 2 + 5.0, // 2 + 6.0, + 7.0 ]); - sfill( 3, 5.0, x, 2, 1 ); + sfill( 3, 5.0, x, 1, 1 ); t.deepEqual( x, expected, 'returns expected value' ); t.end(); }); diff --git a/lib/node_modules/@stdlib/blas/ext/base/sfill/test/test.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/sfill/test/test.ndarray.native.js index 3f552668532..a4637594cb7 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/sfill/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/sfill/test/test.ndarray.native.js @@ -166,21 +166,21 @@ tape( 'the function supports an offset parameter', opts, function test( t ) { x = new Float32Array([ 1.0, 2.0, // 0 - 3.0, - 4.0, // 1 - 5.0, - 6.0 // 2 + 3.0, // 1 + 4.0, // 2 + 6.0, + 7.0 ]); expected = new Float32Array([ 1.0, 5.0, // 0 - 3.0, 5.0, // 1 - 5.0, - 5.0 // 2 + 5.0, // 2 + 6.0, + 7.0 ]); - sfill( 3, 5.0, x, 2, 1 ); + sfill( 3, 5.0, x, 1, 1 ); t.deepEqual( x, expected, 'returns expected value' ); t.end(); }); diff --git a/lib/node_modules/@stdlib/blas/ext/base/zfill/README.md b/lib/node_modules/@stdlib/blas/ext/base/zfill/README.md index 86a9072bfb5..e7f65435105 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/zfill/README.md +++ b/lib/node_modules/@stdlib/blas/ext/base/zfill/README.md @@ -30,7 +30,7 @@ limitations under the License. var zfill = require( '@stdlib/blas/ext/base/zfill' ); ``` -#### zfill( N, alpha, x, stride ) +#### zfill( N, alpha, x, strideX ) Fills a double-precision complex floating-point strided array `x` with a specified scalar constant `alpha`. @@ -63,7 +63,7 @@ The function has the following parameters: - **N**: number of indexed elements. - **alpha**: scalar constant. - **x**: input [`Complex128Array`][@stdlib/array/complex128]. -- **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 fill every other element @@ -143,7 +143,7 @@ im = imag( y ); // returns 10.0 ``` -#### zfill.ndarray( N, alpha, x, stride, offset ) +#### zfill.ndarray( N, alpha, x, strideX, offsetX ) Fills a double-precision complex floating-point strided array `x` with a specified scalar constant `alpha` using alternative indexing semantics. @@ -173,9 +173,9 @@ var im = imag( y ); 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 two 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 two elements of the strided array ```javascript var Float64Array = require( '@stdlib/array/float64' ); @@ -240,16 +240,15 @@ im = imag( y ); ```javascript -var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); -var filledarrayBy = require( '@stdlib/array/filled-by' ); +var discreteUniform = require( '@stdlib/random/array/discrete-uniform' ); var Complex128 = require( '@stdlib/complex/float64/ctor' ); +var Complex128Array = require( '@stdlib/array/complex128' ); var zfill = require( '@stdlib/blas/ext/base/zfill' ); -function rand() { - return new Complex128( discreteUniform( 0, 10 ), discreteUniform( -5, 5 ) ); -} - -var x = filledarrayBy( 10, 'complex128', rand ); +var xbuf = discreteUniform( 20, -100, 100, { + 'dtype': 'float64' +}); +var x = new Complex128Array( xbuf.buffer ); var alpha = new Complex128( 10.0, 10.0 ); zfill( x.length, alpha, x, 1 ); @@ -260,6 +259,131 @@ console.log( x.get( 0 ).toString() ); + + +
+ +
+ + + + + +
+ +### Usage + +```c +#include "stdlib/blas/ext/base/zfill.h" +``` + +#### stdlib_strided_zfill( N, alpha, \*X, strideX ) + +Fills a double-precision complex floating-point strided array `X` with a specified scalar constant `alpha`. + +```c +double x[] = { 1.0, 2.0, 3.0, 4.0 }; +const stdlib_complex128_t alpha = stdlib_complex128( 2.0, 2.0 ); + +stdlib_strided_zfill( 2, alpha, (stdlib_complex128_t *)x, 1 ); +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **alpha**: `[in] stdlib_complex128_t` scalar constant. +- **X**: `[out] stdlib_complex128_t*` input array. +- **strideX**: `[in] CBLAS_INT` index increment for `X`. + +```c +void stdlib_strided_zfill( const CBLAS_INT N, const stdlib_complex128_t alpha, stdlib_complex128_t *X, const CBLAS_INT strideX ); +``` + +#### stdlib_strided_zfill_ndarray( N, alpha, \*X, strideX, offsetX ) + +Fills a double-precision complex floating-point strided array `X` with a specified scalar constant `alpha` using alternative indexing semantics. + +```c +double x[] = { 1.0, 2.0, 3.0, 4.0 }; +const stdlib_complex128_t alpha = stdlib_complex128( 2.0, 2.0 ); + +stdlib_strided_zfill_ndarray( 4, alpha, (stdlib_complex128_t *x), 1, 0 ); +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **alpha**: `[in] stdlib_complex128_t` scalar constant. +- **X**: `[out] stdlib_complex128_t*` input array. +- **strideX**: `[in] CBLAS_INT` index increment for `X`. +- **offsetX**: `[in] CBLAS_INT` starting index for `X`. + +```c +void stdlib_strided_zfill_ndarray( const CBLAS_INT N, const stdlib_complex128_t alpha, stdlib_complex128_t *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); +``` + +
+ + + + + +
+ +
+ + + + + +
+ +### Examples + +```c +#include "stdlib/complex/float64/ctor.h" +#include "stdlib/blas/ext/base/zfill.h" +#include + +int main() { + // Create a strided array of interleaved real and imaginary components: + double x[] = { 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0 }; + + // Create a scalar constant: + const stdlib_complex128_t alpha = stdlib_complex128( 2.0, 2.0 ); + + // Specify the number of elements: + const int N = 4; + + // Specify a stride: + const int strideX = 1; + + // Fill the array: + stdlib_strided_zfill( N, alpha, (stdlib_complex128_t *)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/zfill/benchmark/c/benchmark.length.c b/lib/node_modules/@stdlib/blas/ext/base/zfill/benchmark/c/benchmark.length.c index 92ab8e7bd30..78f0ddb3045 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/zfill/benchmark/c/benchmark.length.c +++ b/lib/node_modules/@stdlib/blas/ext/base/zfill/benchmark/c/benchmark.length.c @@ -95,7 +95,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 ) { stdlib_complex128_t alpha; double elapsed; double *x; @@ -110,7 +110,43 @@ static double benchmark( int iterations, int len ) { } t = tic(); for ( i = 0; i < iterations; i++ ) { - c_zfill( len, alpha, (stdlib_complex128_t *)x, 1 ); + stdlib_strided_zfill( len, alpha, (stdlib_complex128_t *)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" ); + } + free( x ); + 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 ) { + stdlib_complex128_t alpha; + double elapsed; + double *x; + double t; + int i; + + x = (double *)malloc( len * 2 * sizeof( double ) ); + alpha = stdlib_complex128( 1.0, 0.0 ); + for ( i = 0; i < len*2; i+=2 ) { + x[ i ] = ( rand_double()*2.0 ) - 1.0; + x[ i+1 ] = ( rand_double()*2.0 ) - 1.0; + } + t = tic(); + for ( i = 0; i < iterations; i++ ) { + stdlib_strided_zfill_ndarray( len, alpha, (stdlib_complex128_t *)x, 1, 0 ); if ( x[ 0 ] != x[ 0 ] ) { printf( "should not return NaN\n" ); break; @@ -146,7 +182,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/zfill/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/zfill/docs/repl.txt index dc3b4ba9651..4bded6f9846 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/zfill/docs/repl.txt +++ b/lib/node_modules/@stdlib/blas/ext/base/zfill/docs/repl.txt @@ -1,5 +1,5 @@ -{{alias}}( N, alpha, x, stride ) +{{alias}}( N, alpha, x, strideX ) Fills a double-precision complex floating-point strided array with a specified scalar constant. @@ -22,7 +22,7 @@ x: Complex128Array Input array. - stride: integer + strideX: integer Index increment. Returns @@ -74,7 +74,7 @@ -5.0 -{{alias}}.ndarray( N, alpha, x, stride, offset ) +{{alias}}.ndarray( N, alpha, x, strideX, offsetX ) Fills a double-precision complex floating-point strided array with a specified scalar constant using alternative indexing semantics. @@ -93,10 +93,10 @@ x: Complex128Array 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/zfill/docs/types/index.d.ts b/lib/node_modules/@stdlib/blas/ext/base/zfill/docs/types/index.d.ts index fcae0225a66..388a7b7bb8d 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/zfill/docs/types/index.d.ts +++ b/lib/node_modules/@stdlib/blas/ext/base/zfill/docs/types/index.d.ts @@ -33,7 +33,7 @@ interface Routine { * @param N - number of indexed elements * @param alpha - scalar constant * @param x - input array - * @param stride - stride length + * @param strideX - stride length * @returns input array * * @example @@ -59,7 +59,7 @@ interface Routine { * var im = imag( y ); * // returns 10.0 */ - ( N: number, alpha: Complex128, x: Complex128Array, stride: number ): Complex128Array; + ( N: number, alpha: Complex128, x: Complex128Array, strideX: number ): Complex128Array; /** * Fills a double-precision complex floating-point strided array with a specified scalar constant. @@ -67,8 +67,8 @@ interface Routine { * @param N - number of indexed elements * @param alpha - scalar 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 @@ -94,7 +94,7 @@ interface Routine { * var im = imag( y ); * // returns 10.0 */ - ndarray( N: number, alpha: Complex128, x: Complex128Array, stride: number, offset: number ): Complex128Array; + ndarray( N: number, alpha: Complex128, x: Complex128Array, strideX: number, offsetX: number ): Complex128Array; } /** @@ -103,7 +103,7 @@ interface Routine { * @param N - number of indexed elements * @param alpha - scalar constant * @param x - input array -* @param stride - index increment +* @param strideX - index increment * @returns input array * * @example diff --git a/lib/node_modules/@stdlib/blas/ext/base/zfill/examples/c/example.c b/lib/node_modules/@stdlib/blas/ext/base/zfill/examples/c/example.c index 3841d7a8317..67fa02ebc66 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/zfill/examples/c/example.c +++ b/lib/node_modules/@stdlib/blas/ext/base/zfill/examples/c/example.c @@ -31,10 +31,10 @@ int main() { const int N = 4; // Specify a stride: - const int stride = 1; + const int strideX = 1; // Fill the array: - c_zfill( N, alpha, (stdlib_complex128_t *)x, stride ); + stdlib_strided_zfill( N, alpha, (stdlib_complex128_t *)x, strideX ); // Print the result: for ( int i = 0; i < 8; i++ ) { diff --git a/lib/node_modules/@stdlib/blas/ext/base/zfill/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/zfill/examples/index.js index 80060cd4955..e2802af0233 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/zfill/examples/index.js +++ b/lib/node_modules/@stdlib/blas/ext/base/zfill/examples/index.js @@ -18,16 +18,15 @@ 'use strict'; -var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ); -var filledarrayBy = require( '@stdlib/array/filled-by' ); +var discreteUniform = require( '@stdlib/random/array/discrete-uniform' ); +var Complex128Array = require( '@stdlib/array/complex128' ); var Complex128 = require( '@stdlib/complex/float64/ctor' ); var zfill = require( './../lib' ); -function rand() { - return new Complex128( discreteUniform( 0, 10 ), discreteUniform( -5, 5 ) ); -} - -var x = filledarrayBy( 10, 'complex128', rand ); +var xbuf = discreteUniform( 20, -100, 100, { + 'dtype': 'float64' +}); +var x = new Complex128Array( xbuf.buffer ); var alpha = new Complex128( 10.0, 10.0 ); zfill( x.length, alpha, x, 1 ); diff --git a/lib/node_modules/@stdlib/blas/ext/base/zfill/include/stdlib/blas/ext/base/zfill.h b/lib/node_modules/@stdlib/blas/ext/base/zfill/include/stdlib/blas/ext/base/zfill.h index 98992034e95..a44e6f76cb2 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/zfill/include/stdlib/blas/ext/base/zfill.h +++ b/lib/node_modules/@stdlib/blas/ext/base/zfill/include/stdlib/blas/ext/base/zfill.h @@ -20,7 +20,7 @@ #define STDLIB_BLAS_EXT_BASE_ZFILL_H #include "stdlib/complex/float64/ctor.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. @@ -32,7 +32,12 @@ extern "C" { /** * Fills a double-precision complex floating-point strided array with a specified scalar constant. */ -void c_zfill( const int64_t N, const stdlib_complex128_t alpha, stdlib_complex128_t *X, const int64_t stride ); +void API_SUFFIX(stdlib_strided_zfill)( const CBLAS_INT N, const stdlib_complex128_t alpha, stdlib_complex128_t *X, const CBLAS_INT strideX ); + +/** +* Fills a double-precision complex floating-point strided array with a specified scalar constant using alternative indexing semantics. +*/ +void API_SUFFIX(stdlib_strided_zfill_ndarray)( const CBLAS_INT N, const stdlib_complex128_t alpha, stdlib_complex128_t *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); #ifdef __cplusplus } diff --git a/lib/node_modules/@stdlib/blas/ext/base/zfill/lib/ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/zfill/lib/ndarray.js index d3cbb32c2b5..d33da443b86 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/zfill/lib/ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/zfill/lib/ndarray.js @@ -38,8 +38,8 @@ var M = 8; * @param {PositiveInteger} N - number of indexed elements * @param {ComplexLike} alpha - scalar constant * @param {Complex128Array} x - input array -* @param {integer} stride - index increment -* @param {NonNegativeInteger} offset - starting index +* @param {integer} strideX - index increment +* @param {NonNegativeInteger} offsetX - starting index * @returns {Complex128Array} input array * * @example @@ -65,19 +65,17 @@ var M = 8; * var im = imag( y ); * // returns 10.0 */ -function zfill( N, alpha, x, stride, offset ) { +function zfill( N, alpha, x, strideX, offsetX ) { var view; var re; var im; var ix; var m; var i; - var j; if ( N <= 0 ) { return x; } - ix = offset; // Decompose the constant into its real and imaginary components: re = real( alpha ); @@ -86,49 +84,50 @@ function zfill( N, alpha, x, stride, offset ) { // Reinterpret the complex input array as a real-valued array: view = reinterpret( x, 0 ); - // Use loop unrolling if the stride is equal to `1`... - if ( stride === 1 ) { + // Adjust the stride and offset according to real-valued array: + ix = offsetX * 2; + strideX *= 2; + + // Use loop unrolling if the stride is equal to `2`... + if ( strideX === 2 ) { m = N % M; // If we have a remainder, run a clean-up loop... if ( m > 0 ) { for ( i = 0; i < m; i++ ) { - j = ix * 2; - view[ j ] = re; - view[ j+1 ] = im; - ix += stride; + view[ ix ] = re; + view[ ix+1 ] = im; + ix += strideX; } } if ( N < M ) { return x; } for ( i = m; i < N; i += M ) { - j = ix * 2; - view[ j ] = re; - view[ j+1 ] = im; - view[ j+2 ] = re; - view[ j+3 ] = im; - view[ j+4 ] = re; - view[ j+5 ] = im; - view[ j+6 ] = re; - view[ j+7 ] = im; - view[ j+8 ] = re; - view[ j+9 ] = im; - view[ j+10 ] = re; - view[ j+11 ] = im; - view[ j+12 ] = re; - view[ j+13 ] = im; - view[ j+14 ] = re; - view[ j+15 ] = im; - ix += M; + view[ ix ] = re; + view[ ix+1 ] = im; + view[ ix+2 ] = re; + view[ ix+3 ] = im; + view[ ix+4 ] = re; + view[ ix+5 ] = im; + view[ ix+6 ] = re; + view[ ix+7 ] = im; + view[ ix+8 ] = re; + view[ ix+9 ] = im; + view[ ix+10 ] = re; + view[ ix+11 ] = im; + view[ ix+12 ] = re; + view[ ix+13 ] = im; + view[ ix+14 ] = re; + view[ ix+15 ] = im; + ix += M * 2; } return x; } for ( i = 0; i < N; i++ ) { - j = ix * 2; - view[ j ] = re; - view[ j+1 ] = im; - ix += stride; + view[ ix ] = re; + view[ ix+1 ] = im; + ix += strideX; } return x; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/zfill/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/zfill/lib/ndarray.native.js index 24cbd3ce9d1..3a22a978868 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/zfill/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/zfill/lib/ndarray.native.js @@ -20,9 +20,8 @@ // MODULES // -var minViewBufferIndex = require( '@stdlib/strided/base/min-view-buffer-index' ); -var offsetView = require( '@stdlib/strided/base/offset-view' ); -var addon = require( './zfill.native.js' ); +var reinterpret = require( '@stdlib/strided/base/reinterpret-complex128' ); +var addon = require( './../src/addon.node' ); // MAIN // @@ -33,8 +32,8 @@ var addon = require( './zfill.native.js' ); * @param {PositiveInteger} N - number of indexed elements * @param {ComplexLike} alpha - scalar constant * @param {Complex128Array} x - input array -* @param {integer} stride - index increment -* @param {NonNegativeInteger} offset - starting index +* @param {integer} strideX - index increment +* @param {NonNegativeInteger} offsetX - starting index * @returns {Complex128Array} input array * * @example @@ -60,11 +59,9 @@ var addon = require( './zfill.native.js' ); * var im = imag( y ); * // returns 10.0 */ -function zfill( N, alpha, x, stride, offset ) { - var view; - offset = minViewBufferIndex( N, stride, offset ); - view = offsetView( x, offset ); - addon( N, alpha, view, stride ); +function zfill( N, alpha, x, strideX, offsetX ) { + var view = reinterpret( x, 0 ); + addon.ndarray( N, alpha, view, strideX, offsetX ); return x; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/zfill/lib/zfill.js b/lib/node_modules/@stdlib/blas/ext/base/zfill/lib/zfill.js index e0d441f4095..149ad73c007 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/zfill/lib/zfill.js +++ b/lib/node_modules/@stdlib/blas/ext/base/zfill/lib/zfill.js @@ -32,7 +32,7 @@ var ndarray = require( './ndarray.js' ); * @param {PositiveInteger} N - number of indexed elements * @param {ComplexLike} alpha - scalar constant * @param {Complex128Array} x - input array -* @param {integer} stride - index increment +* @param {integer} strideX - index increment * @returns {Complex128Array} input array * * @example @@ -58,8 +58,8 @@ var ndarray = require( './ndarray.js' ); * var im = imag( y ); * // returns 10.0 */ -function zfill( N, alpha, x, stride ) { - return ndarray( N, alpha, x, stride, stride2offset( N, stride ) ); +function zfill( N, alpha, x, strideX ) { + return ndarray( N, alpha, x, strideX, stride2offset( N, strideX ) ); } diff --git a/lib/node_modules/@stdlib/blas/ext/base/zfill/lib/zfill.native.js b/lib/node_modules/@stdlib/blas/ext/base/zfill/lib/zfill.native.js index b3cce2bae6b..5faa1d65841 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/zfill/lib/zfill.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/zfill/lib/zfill.native.js @@ -32,7 +32,7 @@ var addon = require( './../src/addon.node' ); * @param {PositiveInteger} N - number of indexed elements * @param {ComplexLike} alpha - scalar constant * @param {Complex128Array} x - input array -* @param {integer} stride - index increment +* @param {integer} strideX - index increment * @returns {Complex128Array} input array * * @example @@ -58,9 +58,9 @@ var addon = require( './../src/addon.node' ); * var im = imag( y ); * // returns 10.0 */ -function zfill( N, alpha, x, stride ) { +function zfill( N, alpha, x, strideX ) { var view = reinterpret( x, 0 ); - addon( N, alpha, view, stride ); + addon( N, alpha, view, strideX ); return x; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/zfill/manifest.json b/lib/node_modules/@stdlib/blas/ext/base/zfill/manifest.json index 2fefd1ae31d..9bc46dc626d 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/zfill/manifest.json +++ b/lib/node_modules/@stdlib/blas/ext/base/zfill/manifest.json @@ -42,7 +42,8 @@ "@stdlib/napi/argv-int64", "@stdlib/napi/argv-strided-complex128array", "@stdlib/complex/float64/ctor", - "@stdlib/strided/base/stride2offset" + "@stdlib/strided/base/stride2offset", + "@stdlib/blas/base/shared" ] }, { @@ -57,7 +58,8 @@ "libpath": [], "dependencies": [ "@stdlib/complex/float64/ctor", - "@stdlib/strided/base/stride2offset" + "@stdlib/strided/base/stride2offset", + "@stdlib/blas/base/shared" ] }, { @@ -72,7 +74,8 @@ "libpath": [], "dependencies": [ "@stdlib/complex/float64/ctor", - "@stdlib/strided/base/stride2offset" + "@stdlib/strided/base/stride2offset", + "@stdlib/blas/base/shared" ] } ] diff --git a/lib/node_modules/@stdlib/blas/ext/base/zfill/src/addon.c b/lib/node_modules/@stdlib/blas/ext/base/zfill/src/addon.c index 523b3c83a3d..6982b3a3ebc 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/zfill/src/addon.c +++ b/lib/node_modules/@stdlib/blas/ext/base/zfill/src/addon.c @@ -17,6 +17,7 @@ */ #include "stdlib/blas/ext/base/zfill.h" +#include "stdlib/blas/base/shared.h" #include "stdlib/napi/export.h" #include "stdlib/napi/argv.h" #include "stdlib/napi/argv_complex128.h" @@ -38,8 +39,26 @@ static napi_value addon( napi_env env, napi_callback_info info ) { STDLIB_NAPI_ARGV_INT64( env, stride, argv, 3 ); STDLIB_NAPI_ARGV_COMPLEX128( env, alpha, argv, 1 ); STDLIB_NAPI_ARGV_STRIDED_COMPLEX128ARRAY( env, X, N, stride, argv, 2 ); - c_zfill( N, alpha, (stdlib_complex128_t *)X, stride ); + API_SUFFIX(stdlib_strided_zfill)( N, alpha, (stdlib_complex128_t *)X, stride ); 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_INT64( env, strideX, argv, 3 ); + STDLIB_NAPI_ARGV_INT64( env, offsetX, argv, 4 ); + STDLIB_NAPI_ARGV_COMPLEX128( env, alpha, argv, 1 ); + STDLIB_NAPI_ARGV_STRIDED_COMPLEX128ARRAY( env, X, N, strideX, argv, 2 ); + API_SUFFIX(stdlib_strided_zfill_ndarray)( N, alpha, (stdlib_complex128_t *)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/zfill/src/main.c b/lib/node_modules/@stdlib/blas/ext/base/zfill/src/main.c index 6b5db3bd51a..2908e0f121c 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/zfill/src/main.c +++ b/lib/node_modules/@stdlib/blas/ext/base/zfill/src/main.c @@ -19,54 +19,70 @@ #include "stdlib/blas/ext/base/zfill.h" #include "stdlib/complex/float64/ctor.h" #include "stdlib/strided/base/stride2offset.h" -#include +#include "stdlib/blas/base/shared.h" /** * Fills a double-precision complex floating-point strided array with a specified scalar constant. * -* @param N number of indexed elements -* @param alpha scalar constant -* @param X input array -* @param stride index increment +* @param N number of indexed elements +* @param alpha scalar constant +* @param X input array +* @param strideX strided length */ -void c_zfill( const int64_t N, const stdlib_complex128_t alpha, stdlib_complex128_t *X, const int64_t stride ) { - int64_t ix; - int64_t m; - int64_t i; +void API_SUFFIX(stdlib_strided_zfill)( const CBLAS_INT N, const stdlib_complex128_t alpha, stdlib_complex128_t *X, const CBLAS_INT strideX ) { + CBLAS_INT ox = stdlib_strided_stride2offset( N, strideX ); + API_SUFFIX(stdlib_strided_zfill_ndarray)( N, alpha, X, strideX, ox ); +} + +/** +* Fills a double-precision complex floating-point strided array with a specified scalar constant using alternative indexing semantics. +* +* @param N number of indexed elements +* @param alpha scalar constant +* @param X input array +* @param strideX index increment +* @param offsetX starting index +*/ +void API_SUFFIX(stdlib_strided_zfill_ndarray)( const CBLAS_INT N, const stdlib_complex128_t alpha, stdlib_complex128_t *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ) { + CBLAS_INT ix; + CBLAS_INT m; + CBLAS_INT i; if ( N <= 0 ) { return; } + ix = offsetX; // Use loop unrolling if the stride is equal to `1`... - if ( stride == 1 ) { + if ( strideX == 1 ) { m = N % 8; // If we have a remainder, run a clean-up loop... if ( m > 0 ) { for ( i = 0; i < m; i++ ) { - X[ i ] = alpha; + X[ ix ] = alpha; + ix += strideX; } } if ( N < 8 ) { return; } for ( i = m; i < N; i += 8 ) { - X[ i ] = alpha; - X[ i+1 ] = alpha; - X[ i+2 ] = alpha; - X[ i+3 ] = alpha; - X[ i+4 ] = alpha; - X[ i+5 ] = alpha; - X[ i+6 ] = alpha; - X[ i+7 ] = alpha; + X[ ix ] = alpha; + X[ ix+1 ] = alpha; + X[ ix+2 ] = alpha; + X[ ix+3 ] = alpha; + X[ ix+4 ] = alpha; + X[ ix+5 ] = alpha; + X[ ix+6 ] = alpha; + X[ ix+7 ] = alpha; + ix += 8; } return; } - ix = stdlib_strided_stride2offset( N, stride ); for ( i = 0; i < N; i++ ) { X[ ix ] = alpha; - ix += stride; + ix += strideX; } return; } diff --git a/lib/node_modules/@stdlib/blas/ext/base/zfill/test/test.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/zfill/test/test.ndarray.js index b38c3e9fc66..6f40906edfb 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/zfill/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/blas/ext/base/zfill/test/test.ndarray.js @@ -167,23 +167,23 @@ tape( 'the function supports an offset parameter', function test( t ) { -2.0, 3.0, // 0 -4.0, // 0 - 6.0, - -8.0, - 10.0, // 1 - -12.0 // 1 + 6.0, // 1 + -8.0, // 1 + 10.0, + -12.0 ]); expected = new Complex128Array([ 1.0, -2.0, 5.0, // 0 -5.0, // 0 - 6.0, - -8.0, 5.0, // 1 - -5.0 // 1 + -5.0, // 1 + 10.0, + -12.0 ]); - zfill( 2, new Complex128( 5.0, -5.0 ), x, 2, 1 ); + zfill( 2, new Complex128( 5.0, -5.0 ), x, 1, 1 ); t.strictEqual( isSameComplex128Array( x, expected ), true, 'returns expected value' ); t.end(); }); diff --git a/lib/node_modules/@stdlib/blas/ext/base/zfill/test/test.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/zfill/test/test.ndarray.native.js index 2de6683b73d..b70297d616f 100644 --- a/lib/node_modules/@stdlib/blas/ext/base/zfill/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/blas/ext/base/zfill/test/test.ndarray.native.js @@ -176,23 +176,23 @@ tape( 'the function supports an offset parameter', opts, function test( t ) { -2.0, 3.0, // 0 -4.0, // 0 - 6.0, - -8.0, - 10.0, // 1 - -12.0 // 1 + 6.0, // 1 + -8.0, // 1 + 10.0, + -12.0 ]); expected = new Complex128Array([ 1.0, -2.0, 5.0, // 0 -5.0, // 0 - 6.0, - -8.0, 5.0, // 1 - -5.0 // 1 + -5.0, // 1 + 10.0, + -12.0 ]); - zfill( 2, new Complex128( 5.0, -5.0 ), x, 2, 1 ); + zfill( 2, new Complex128( 5.0, -5.0 ), x, 1, 1 ); t.strictEqual( isSameComplex128Array( x, expected ), true, 'returns expected value' ); t.end(); });