From a9fdb65b772028b6e260a3a58a0124afbfd53117 Mon Sep 17 00:00:00 2001 From: aayush0325 Date: Fri, 27 Dec 2024 19:49:32 +0000 Subject: [PATCH 1/2] feat: add C ndarray interface and refactor implementation --- type: pre_commit_static_analysis_report description: Results of running static analysis checks when committing changes. report: - task: lint_filenames status: passed - task: lint_editorconfig status: passed - task: lint_markdown status: passed - task: lint_package_json status: na - task: lint_repl_help status: passed - task: lint_javascript_src status: passed - task: lint_javascript_cli status: na - task: lint_javascript_examples status: passed - task: lint_javascript_tests status: passed - task: lint_javascript_benchmarks status: passed - task: lint_python status: na - task: lint_r status: na - task: lint_c_src status: passed - task: lint_c_examples status: passed - task: lint_c_benchmarks status: passed - task: lint_c_tests_fixtures status: na - task: lint_shell status: na - task: lint_typescript_declarations status: passed - task: lint_typescript_tests status: na - task: lint_license_headers status: passed --- --- .../@stdlib/stats/base/srange/README.md | 162 ++++++++++++++---- .../stats/base/srange/benchmark/benchmark.js | 18 +- .../base/srange/benchmark/benchmark.native.js | 14 +- .../srange/benchmark/benchmark.ndarray.js | 18 +- .../benchmark/benchmark.ndarray.native.js | 14 +- .../srange/benchmark/c/benchmark.length.c | 50 +++++- .../@stdlib/stats/base/srange/docs/repl.txt | 32 ++-- .../stats/base/srange/docs/types/index.d.ts | 12 +- .../stats/base/srange/examples/c/example.c | 9 +- .../stats/base/srange/examples/index.js | 14 +- .../@stdlib/stats/base/srange/include.gypi | 2 +- .../srange/include/stdlib/stats/base/srange.h | 9 +- .../@stdlib/stats/base/srange/lib/index.js | 7 +- .../@stdlib/stats/base/srange/lib/ndarray.js | 18 +- .../stats/base/srange/lib/ndarray.native.js | 20 +-- .../@stdlib/stats/base/srange/lib/srange.js | 47 +---- .../stats/base/srange/lib/srange.native.js | 9 +- .../@stdlib/stats/base/srange/manifest.json | 69 +++++++- .../@stdlib/stats/base/srange/src/addon.c | 60 +++++++ .../@stdlib/stats/base/srange/src/addon.cpp | 117 ------------- .../base/srange/src/{srange.c => main.c} | 43 +++-- .../stats/base/srange/test/test.ndarray.js | 13 +- .../base/srange/test/test.ndarray.native.js | 13 +- .../stats/base/srange/test/test.srange.js | 13 +- .../base/srange/test/test.srange.native.js | 13 +- 25 files changed, 434 insertions(+), 362 deletions(-) create mode 100644 lib/node_modules/@stdlib/stats/base/srange/src/addon.c delete mode 100644 lib/node_modules/@stdlib/stats/base/srange/src/addon.cpp rename lib/node_modules/@stdlib/stats/base/srange/src/{srange.c => main.c} (53%) diff --git a/lib/node_modules/@stdlib/stats/base/srange/README.md b/lib/node_modules/@stdlib/stats/base/srange/README.md index e1195421ba39..0f07767a0368 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/README.md +++ b/lib/node_modules/@stdlib/stats/base/srange/README.md @@ -38,7 +38,7 @@ The [**range**][range] is defined as the difference between the maximum and mini var srange = require( '@stdlib/stats/base/srange' ); ``` -#### srange( N, x, stride ) +#### srange( N, x, strideX ) Computes the [range][range] of a single-precision floating-point strided array `x`. @@ -46,9 +46,8 @@ Computes the [range][range] of a single-precision floating-point strided array ` var Float32Array = require( '@stdlib/array/float32' ); var x = new Float32Array( [ 1.0, -2.0, 2.0 ] ); -var N = x.length; -var v = srange( N, x, 1 ); +var v = srange( x.length, x, 1 ); // returns 4.0 ``` @@ -56,18 +55,16 @@ The function has the following parameters: - **N**: number of indexed elements. - **x**: input [`Float32Array`][@stdlib/array/float32]. -- **stride**: index increment for `x`. +- **strideX**: index increment for `x`. -The `N` and `stride` parameters determine which elements in `x` are accessed at runtime. For example, to compute the [range][range] of every other element in `x`, +The `N` and stride parameters determine which elements in the strided array are accessed at runtime. For example, to compute the [range][range] of every other element in `x`, ```javascript var Float32Array = require( '@stdlib/array/float32' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x = new Float32Array( [ 1.0, 2.0, 2.0, -7.0, -2.0, 3.0, 4.0, 2.0 ] ); -var N = floor( x.length / 2 ); -var v = srange( N, x, 2 ); +var v = srange( 4, x, 2 ); // returns 6.0 ``` @@ -77,18 +74,15 @@ Note that indexing is relative to the first index. To introduce an offset, use [ ```javascript var Float32Array = require( '@stdlib/array/float32' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x0 = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); var x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element -var N = floor( x0.length / 2 ); - -var v = srange( N, x1, 2 ); +var v = srange( 4, x1, 2 ); // returns 6.0 ``` -#### srange.ndarray( N, x, stride, offset ) +#### srange.ndarray( N, x, strideX, offsetX ) Computes the [range][range] of a single-precision floating-point strided array using alternative indexing semantics. @@ -96,26 +90,23 @@ Computes the [range][range] of a single-precision floating-point strided array u var Float32Array = require( '@stdlib/array/float32' ); var x = new Float32Array( [ 1.0, -2.0, 2.0 ] ); -var N = x.length; -var v = srange.ndarray( N, x, 1, 0 ); +var v = srange.ndarray( x.length, x, 1, 0 ); // returns 4.0 ``` The function has the following additional parameters: -- **offset**: starting index for `x`. +- **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 calculate the [range][range] for every other value in `x` starting from the second value +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 calculate the [range][range] for every other element in `x` starting from the second element ```javascript var Float32Array = require( '@stdlib/array/float32' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); -var N = floor( x.length / 2 ); -var v = srange.ndarray( N, x, 2, 1 ); +var v = srange.ndarray( 4, x, 2, 1 ); // returns 6.0 ``` @@ -140,18 +131,12 @@ var v = srange.ndarray( N, x, 2, 1 ); ```javascript -var randu = require( '@stdlib/random/base/randu' ); -var round = require( '@stdlib/math/base/special/round' ); -var Float32Array = require( '@stdlib/array/float32' ); +var discreteUniform = require( '@stdlib/random/array/discrete-uniform' ); var srange = require( '@stdlib/stats/base/srange' ); -var x; -var i; - -x = new Float32Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - x[ i ] = round( (randu()*100.0) - 50.0 ); -} +var x = discreteUniform( 10, -50, 50, { + 'dtype': 'float32' +}); console.log( x ); var v = srange( x.length, x, 1 ); @@ -162,6 +147,123 @@ console.log( v ); + + +* * * + +
+ +## C APIs + + + +
+ +
+ + + + + +
+ +### Usage + +```c +#include "stdlib/stats/base/srange.h" +``` + +#### stdlib_strided_srange( N, \*X, strideX ) + +Computes the [range][range] of a single-precision floating-point strided array `x`. + +```c +const float x[] = { 1.0f, -2.0f, 3.0f, -4.0f }; + +float v = stdlib_strided_srange( 4, x, 1 ); +// returns 7.0f +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[in] float*` input array. +- **strideX**: `[in] CBLAS_INT` stride length for `X`. + +```c +float stdlib_strided_srange( const CBLAS_INT N, const float *X, const CBLAS_INT strideX ); +``` + +#### stdlib_strided_srange_ndarray( N, \*X, strideX, offsetX ) + +Computes the [range][range] of a single-precision floating-point strided array using alternative indexing semantics. + +```c +const float x[] = { 1.0f, -2.0f, 3.0f, -4.0f }; + +float v = stdlib_strided_srange_ndarray( 4, x, 1, 0 ); +// returns 7.0f +``` + +The function accepts the following arguments: + +- **N**: `[in] CBLAS_INT` number of indexed elements. +- **X**: `[in] float*` input array. +- **strideX**: `[in] CBLAS_INT` stride length for `X`. +- **offsetX**: `[in] CBLAS_INT` starting index for `X`. + +```c +float stdlib_strided_srange_ndarray( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); +``` + +
+ + + + + +
+ +
+ + + + + +
+ +### Examples + +```c +#include "stdlib/stats/base/srange.h" +#include + +int main( void ) { + // Create a strided array: + const float x[] = { 1.0f, -2.0f, -3.0f, 4.0f, -5.0f, -6.0f, 7.0f, 8.0f }; + + // Specify the number of elements: + const int N = 4; + + // Specify the stride length: + const int strideX = 2; + + // Compute the range: + float v = stdlib_strided_srange( N, x, strideX ); + + // Print the result: + printf( "range: %f\n", v ); +} +``` + +
+ + + +
+ + +
diff --git a/lib/node_modules/@stdlib/stats/base/srange/benchmark/benchmark.js b/lib/node_modules/@stdlib/stats/base/srange/benchmark/benchmark.js index 6c6db32017e8..ce281d593418 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/stats/base/srange/benchmark/benchmark.js @@ -21,14 +21,20 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/array/uniform' ); var isnanf = require( '@stdlib/math/base/assert/is-nanf' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float32Array = require( '@stdlib/array/float32' ); var pkg = require( './../package.json' ).name; var srange = require( './../lib/srange.js' ); +// VARIABLES // + +var options = { + 'dtype': 'float32' +}; + + // FUNCTIONS // /** @@ -39,13 +45,7 @@ var srange = require( './../lib/srange.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - x[ i ] = ( randu()*20.0 ) - 10.0; - } + var x = uniform( len, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/srange/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/stats/base/srange/benchmark/benchmark.native.js index 4d1d220ca232..0b30589d49b9 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/stats/base/srange/benchmark/benchmark.native.js @@ -22,10 +22,9 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/array/uniform' ); var isnanf = require( '@stdlib/math/base/assert/is-nanf' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float32Array = require( '@stdlib/array/float32' ); var tryRequire = require( '@stdlib/utils/try-require' ); var pkg = require( './../package.json' ).name; @@ -36,6 +35,9 @@ var srange = tryRequire( resolve( __dirname, './../lib/srange.native.js' ) ); var opts = { 'skip': ( srange instanceof Error ) }; +var options = { + 'dtype': 'float32' +}; // FUNCTIONS // @@ -48,13 +50,7 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - x[ i ] = ( randu()*20.0 ) - 10.0; - } + var x = uniform( len, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/srange/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/stats/base/srange/benchmark/benchmark.ndarray.js index a6e62b30bffa..02d190fcb99e 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/srange/benchmark/benchmark.ndarray.js @@ -21,14 +21,20 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/array/uniform' ); var isnanf = require( '@stdlib/math/base/assert/is-nanf' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float32Array = require( '@stdlib/array/float32' ); var pkg = require( './../package.json' ).name; var srange = require( './../lib/ndarray.js' ); +// VARIABLES // + +var options = { + 'dtype': 'float32' +}; + + // FUNCTIONS // /** @@ -39,13 +45,7 @@ var srange = require( './../lib/ndarray.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - x[ i ] = ( randu()*20.0 ) - 10.0; - } + var x = uniform( len, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/srange/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/stats/base/srange/benchmark/benchmark.ndarray.native.js index 0f576638b243..f8c44d76ffeb 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/srange/benchmark/benchmark.ndarray.native.js @@ -22,10 +22,9 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); +var uniform = require( '@stdlib/random/array/uniform' ); var isnanf = require( '@stdlib/math/base/assert/is-nanf' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float32Array = require( '@stdlib/array/float32' ); var tryRequire = require( '@stdlib/utils/try-require' ); var pkg = require( './../package.json' ).name; @@ -36,6 +35,9 @@ var srange = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' ) ); var opts = { 'skip': ( srange instanceof Error ) }; +var options = { + 'dtype': 'float32' +}; // FUNCTIONS // @@ -48,13 +50,7 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float32Array( len ); - for ( i = 0; i < x.length; i++ ) { - x[ i ] = ( randu()*20.0 ) - 10.0; - } + var x = uniform( len, -10.0, 10.0, options ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/srange/benchmark/c/benchmark.length.c b/lib/node_modules/@stdlib/stats/base/srange/benchmark/c/benchmark.length.c index db2bef3d095c..d6ae03661695 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/benchmark/c/benchmark.length.c +++ b/lib/node_modules/@stdlib/stats/base/srange/benchmark/c/benchmark.length.c @@ -94,7 +94,7 @@ static float rand_float( void ) { * @param len array length * @return elapsed time in seconds */ -static double benchmark( int iterations, int len ) { +static double benchmark1( int iterations, int len ) { double elapsed; float x[ len ]; float v; @@ -107,6 +107,7 @@ static double benchmark( int iterations, int len ) { v = 0.0f; t = tic(); for ( i = 0; i < iterations; i++ ) { + // cppcheck-suppress uninitvar v = stdlib_strided_srange( len, x, 1 ); if ( v != v ) { printf( "should not return NaN\n" ); @@ -120,6 +121,40 @@ static double benchmark( int iterations, int len ) { return elapsed; } +/** +* Runs a benchmark. +* +* @param iterations number of iterations +* @param len array length +* @return elapsed time in seconds +*/ +static double benchmark2( int iterations, int len ) { + double elapsed; + float x[ len ]; + float v; + double t; + int i; + + for ( i = 0; i < len; i++ ) { + x[ i ] = ( rand_float() * 20000.0f ) - 10000.0f; + } + v = 0.0f; + t = tic(); + for ( i = 0; i < iterations; i++ ) { + // cppcheck-suppress uninitvar + v = stdlib_strided_srange_ndarray( len, x, 1, 0 ); + if ( v != v ) { + printf( "should not return NaN\n" ); + break; + } + } + elapsed = tic() - t; + if ( v != v ) { + printf( "should not return NaN\n" ); + } + return elapsed; +} + /** * Main execution sequence. */ @@ -142,7 +177,18 @@ int main( void ) { for ( j = 0; j < REPEATS; j++ ) { count += 1; printf( "# c::%s:len=%d\n", NAME, len ); - elapsed = benchmark( iter, len ); + elapsed = benchmark1( iter, len ); + print_results( iter, elapsed ); + printf( "ok %d benchmark finished\n", count ); + } + } + for ( i = MIN; i <= MAX; i++ ) { + len = pow( 10, i ); + iter = ITERATIONS / pow( 10, i-1 ); + for ( j = 0; j < REPEATS; j++ ) { + count += 1; + printf( "# c::%s:ndarray:len=%d\n", NAME, len ); + elapsed = benchmark2( iter, len ); print_results( iter, elapsed ); printf( "ok %d benchmark finished\n", count ); } diff --git a/lib/node_modules/@stdlib/stats/base/srange/docs/repl.txt b/lib/node_modules/@stdlib/stats/base/srange/docs/repl.txt index 5ecebc599055..1b69b0e8eeb3 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/docs/repl.txt +++ b/lib/node_modules/@stdlib/stats/base/srange/docs/repl.txt @@ -1,9 +1,9 @@ -{{alias}}( N, x, stride ) +{{alias}}( N, x, strideX ) Computes the range of a single-precision floating-point strided array. - The `N` and `stride` parameters determine which elements in `x` are accessed - at runtime. + The `N` and stride parameters determine which elements in the strided array + are accessed at runtime. Indexing is relative to the first index. To introduce an offset, use a typed array view. @@ -18,8 +18,8 @@ x: Float32Array Input array. - stride: integer - Index increment. + strideX: integer + Stride Length. Returns ------- @@ -33,22 +33,19 @@ > {{alias}}( x.length, x, 1 ) 4.0 - // Using `N` and `stride` parameters: + // Using `N` and stride parameters: > x = new {{alias:@stdlib/array/float32}}( [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0 ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > var stride = 2; - > {{alias}}( N, x, stride ) + > {{alias}}( 3, x, 2 ) 4.0 // Using view offsets: > var x0 = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] ); > var x1 = new {{alias:@stdlib/array/float32}}( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); - > N = {{alias:@stdlib/math/base/special/floor}}( x0.length / 2 ); - > stride = 2; - > {{alias}}( N, x1, stride ) + > {{alias}}( 3, x1, 2 ) 4.0 -{{alias}}.ndarray( N, x, stride, offset ) + +{{alias}}.ndarray( N, x, strideX, offsetX ) Computes the range of a single-precision floating-point strided array using alternative indexing semantics. @@ -64,10 +61,10 @@ x: Float32Array Input array. - stride: integer - Index increment. + strideX: integer + Stride Length. - offset: integer + offsetX: integer Starting index. Returns @@ -84,8 +81,7 @@ // Using offset parameter: > var x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > {{alias}}.ndarray( N, x, 2, 1 ) + > {{alias}}.ndarray( 3, x, 2, 1 ) 4.0 See Also diff --git a/lib/node_modules/@stdlib/stats/base/srange/docs/types/index.d.ts b/lib/node_modules/@stdlib/stats/base/srange/docs/types/index.d.ts index 9daa5d70e778..7eaad259f706 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/docs/types/index.d.ts +++ b/lib/node_modules/@stdlib/stats/base/srange/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 range * * @example @@ -38,15 +38,15 @@ interface Routine { * var v = srange( x.length, x, 1 ); * // returns 4.0 */ - ( N: number, x: Float32Array, stride: number ): number; + ( N: number, x: Float32Array, strideX: number ): number; /** * Computes the range of a single-precision floating-point strided array 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 range * * @example @@ -57,7 +57,7 @@ interface Routine { * var v = srange.ndarray( x.length, x, 1, 0 ); * // returns 4.0 */ - ndarray( N: number, x: Float32Array, stride: number, offset: number ): number; + ndarray( N: number, x: Float32Array, strideX: number, offsetX: number ): number; } /** @@ -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 range * * @example diff --git a/lib/node_modules/@stdlib/stats/base/srange/examples/c/example.c b/lib/node_modules/@stdlib/stats/base/srange/examples/c/example.c index 8bc03849b14a..45799276d19c 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/examples/c/example.c +++ b/lib/node_modules/@stdlib/stats/base/srange/examples/c/example.c @@ -17,21 +17,20 @@ */ #include "stdlib/stats/base/srange.h" -#include #include int main( void ) { // Create a strided array: - float x[] = { 1.0, -2.0, -3.0, 4.0, -5.0, -6.0, 7.0, 8.0 }; + const float x[] = { 1.0f, -2.0f, -3.0f, 4.0f, -5.0f, -6.0f, 7.0f, 8.0f }; // Specify the number of elements: - int64_t N = 4; + const int N = 4; // Specify the stride length: - int64_t stride = 2; + const int strideX = 2; // Compute the range: - float v = stdlib_strided_srange( N, x, stride ); + float v = stdlib_strided_srange( N, x, strideX ); // Print the result: printf( "range: %f\n", v ); diff --git a/lib/node_modules/@stdlib/stats/base/srange/examples/index.js b/lib/node_modules/@stdlib/stats/base/srange/examples/index.js index 781a4bab327b..48f1200f75e2 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/examples/index.js +++ b/lib/node_modules/@stdlib/stats/base/srange/examples/index.js @@ -18,18 +18,12 @@ 'use strict'; -var randu = require( '@stdlib/random/base/randu' ); -var round = require( '@stdlib/math/base/special/round' ); -var Float32Array = require( '@stdlib/array/float32' ); +var discreteUniform = require( '@stdlib/random/array/discrete-uniform' ); var srange = require( './../lib' ); -var x; -var i; - -x = new Float32Array( 10 ); -for ( i = 0; i < x.length; i++ ) { - x[ i ] = round( (randu()*100.0) - 50.0 ); -} +var x = discreteUniform( 10, -50, 50, { + 'dtype': 'float32' +}); console.log( x ); var v = srange( x.length, x, 1 ); diff --git a/lib/node_modules/@stdlib/stats/base/srange/include.gypi b/lib/node_modules/@stdlib/stats/base/srange/include.gypi index 868c5c12e852..26476a8c2655 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/include.gypi +++ b/lib/node_modules/@stdlib/stats/base/srange/include.gypi @@ -36,7 +36,7 @@ # Source files: 'src_files': [ - '<(src_dir)/addon.cpp', + '<(src_dir)/addon.c', ' +#include "stdlib/blas/base/shared.h" /* * If C++, prevent name mangling so that the compiler emits a binary file having undecorated names, thus mirroring the behavior of a C compiler. @@ -31,7 +31,12 @@ extern "C" { /** * Computes the range of a single-precision floating-point strided array. */ -float stdlib_strided_srange( const int64_t N, const float *X, const int64_t stride ); +float API_SUFFIX(stdlib_strided_srange)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX ); + +/** +* Computes the range of a single-precision floating-point strided array and using alternative indexing semantics. +*/ +float API_SUFFIX(stdlib_strided_srange_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); #ifdef __cplusplus } diff --git a/lib/node_modules/@stdlib/stats/base/srange/lib/index.js b/lib/node_modules/@stdlib/stats/base/srange/lib/index.js index 7dab2811e672..1cd65138102a 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/lib/index.js +++ b/lib/node_modules/@stdlib/stats/base/srange/lib/index.js @@ -28,20 +28,17 @@ * var srange = require( '@stdlib/stats/base/srange' ); * * var x = new Float32Array( [ 1.0, -2.0, 2.0 ] ); -* var N = x.length; * -* var v = srange( N, x, 1 ); +* var v = srange( x.length, x, 1 ); * // returns 4.0 * * @example * var Float32Array = require( '@stdlib/array/float32' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * var srange = require( '@stdlib/stats/base/srange' ); * * var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); -* var N = floor( x.length / 2 ); * -* var v = srange.ndarray( N, x, 2, 1 ); +* var v = srange.ndarray( 4, x, 2, 1 ); * // returns 6.0 */ diff --git a/lib/node_modules/@stdlib/stats/base/srange/lib/ndarray.js b/lib/node_modules/@stdlib/stats/base/srange/lib/ndarray.js index d91fdae71163..80ba9f065ee6 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/lib/ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/srange/lib/ndarray.js @@ -31,21 +31,19 @@ var isnanf = require( '@stdlib/math/base/assert/is-nanf' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float32Array} x - input array -* @param {integer} stride - stride length -* @param {NonNegativeInteger} offset - starting index +* @param {integer} strideX - stride length +* @param {NonNegativeInteger} offsetX - starting index * @returns {number} range * * @example * var Float32Array = require( '@stdlib/array/float32' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * * var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); -* var N = floor( x.length / 2 ); * -* var v = srange( N, x, 2, 1 ); +* var v = srange( 4, x, 2, 1 ); * // returns 6.0 */ -function srange( N, x, stride, offset ) { +function srange( N, x, strideX, offsetX ) { var max; var min; var ix; @@ -55,17 +53,17 @@ function srange( N, x, stride, offset ) { if ( N <= 0 ) { return NaN; } - if ( N === 1 || stride === 0 ) { - if ( isnanf( x[ offset ] ) ) { + if ( N === 1 || strideX === 0 ) { + if ( isnanf( x[ offsetX ] ) ) { return NaN; } return 0.0; } - ix = offset; + ix = offsetX; min = x[ ix ]; max = min; for ( i = 1; i < N; i++ ) { - ix += stride; + ix += strideX; v = x[ ix ]; if ( isnanf( v ) ) { return v; diff --git a/lib/node_modules/@stdlib/stats/base/srange/lib/ndarray.native.js b/lib/node_modules/@stdlib/stats/base/srange/lib/ndarray.native.js index 932fb876df08..ecb4baf74ff9 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/srange/lib/ndarray.native.js @@ -20,8 +20,7 @@ // MODULES // -var Float32Array = require( '@stdlib/array/float32' ); -var addon = require( './srange.native.js' ); +var addon = require( './../src/addon.node' ); // MAIN // @@ -31,27 +30,20 @@ var addon = require( './srange.native.js' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float32Array} x - input array -* @param {integer} stride - stride length -* @param {NonNegativeInteger} offset - starting index +* @param {integer} strideX - stride length +* @param {NonNegativeInteger} offsetX - starting index * @returns {number} range * * @example * var Float32Array = require( '@stdlib/array/float32' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * * var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] ); -* var N = floor( x.length / 2 ); * -* var v = srange( N, x, 2, 1 ); +* var v = srange( 4, x, 2, 1 ); * // returns 6.0 */ -function srange( N, x, stride, offset ) { - var view; - if ( stride < 0 ) { - offset += (N-1) * stride; - } - view = new Float32Array( x.buffer, x.byteOffset+(x.BYTES_PER_ELEMENT*offset), x.length-offset ); // eslint-disable-line max-len - return addon( N, view, stride ); +function srange( N, x, strideX, offsetX ) { + return addon.ndarray( N, x, strideX, offsetX ); } diff --git a/lib/node_modules/@stdlib/stats/base/srange/lib/srange.js b/lib/node_modules/@stdlib/stats/base/srange/lib/srange.js index 666e86e14d1b..bc87837d7025 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/lib/srange.js +++ b/lib/node_modules/@stdlib/stats/base/srange/lib/srange.js @@ -20,8 +20,8 @@ // MODULES // -var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' ); -var isnanf = require( '@stdlib/math/base/assert/is-nanf' ); +var stride2offset = require( '@stdlib/strided/base/stride2offset' ); +var ndarray = require( './ndarray.js' ); // MAIN // @@ -31,54 +31,19 @@ var isnanf = require( '@stdlib/math/base/assert/is-nanf' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float32Array} x - input array -* @param {integer} stride - stride length +* @param {integer} strideX - stride length * @returns {number} range * * @example * var Float32Array = require( '@stdlib/array/float32' ); * * var x = new Float32Array( [ 1.0, -2.0, 2.0 ] ); -* var N = x.length; * -* var v = srange( N, x, 1 ); +* var v = srange( x.length, x, 1 ); * // returns 4.0 */ -function srange( N, x, stride ) { - var max; - var min; - var ix; - var v; - var i; - - if ( N <= 0 ) { - return NaN; - } - if ( N === 1 || stride === 0 ) { - if ( isnanf( x[ 0 ] ) ) { - return NaN; - } - return 0.0; - } - if ( stride < 0 ) { - ix = (1-N) * stride; - } else { - ix = 0; - } - min = x[ ix ]; - max = min; - for ( i = 1; i < N; i++ ) { - ix += stride; - v = x[ ix ]; - if ( isnanf( v ) ) { - return v; - } - if ( v < min ) { - min = v; - } else if ( v > max ) { - max = v; - } - } - return float64ToFloat32( max - min ); +function srange( N, x, strideX ) { + return ndarray( N, x, strideX, stride2offset( N, strideX ) ); } diff --git a/lib/node_modules/@stdlib/stats/base/srange/lib/srange.native.js b/lib/node_modules/@stdlib/stats/base/srange/lib/srange.native.js index fc1ec898f929..4be0ce8903a2 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/lib/srange.native.js +++ b/lib/node_modules/@stdlib/stats/base/srange/lib/srange.native.js @@ -30,20 +30,19 @@ var addon = require( './../src/addon.node' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float32Array} x - input array -* @param {integer} stride - stride length +* @param {integer} strideX - stride length * @returns {number} range * * @example * var Float32Array = require( '@stdlib/array/float32' ); * * var x = new Float32Array( [ 1.0, -2.0, 2.0 ] ); -* var N = x.length; * -* var v = srange( N, x, 1 ); +* var v = srange( x.length, x, 1 ); * // returns 4.0 */ -function srange( N, x, stride ) { - return addon( N, x, stride ); +function srange( N, x, strideX ) { + return addon( N, x, strideX ); } diff --git a/lib/node_modules/@stdlib/stats/base/srange/manifest.json b/lib/node_modules/@stdlib/stats/base/srange/manifest.json index 54cf4af57ec0..c0f5943f4e81 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/manifest.json +++ b/lib/node_modules/@stdlib/stats/base/srange/manifest.json @@ -1,5 +1,8 @@ { - "options": {}, + "options": { + "task": "build", + "wasm": false + }, "fields": [ { "field": "src", @@ -24,17 +27,75 @@ ], "confs": [ { + "task": "build", + "wasm": false, "src": [ - "./src/srange.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" + "libraries": [], + "libpath": [], + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", + "@stdlib/math/base/assert/is-nanf", + "@stdlib/napi/export", + "@stdlib/napi/argv", + "@stdlib/napi/argv-int64", + "@stdlib/napi/argv-strided-float32array", + "@stdlib/napi/create-double" + ] + }, + { + "task": "benchmark", + "wasm": false, + "src": [ + "./src/main.c" + ], + "include": [ + "./include" + ], + "libraries": [], + "libpath": [], + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", + "@stdlib/math/base/assert/is-nanf" + ] + }, + { + "task": "examples", + "wasm": false, + "src": [ + "./src/main.c" + ], + "include": [ + "./include" + ], + "libraries": [], + "libpath": [], + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", + "@stdlib/math/base/assert/is-nanf" + ] + }, + { + "task": "", + "wasm": true, + "src": [ + "./src/main.c" + ], + "include": [ + "./include" ], + "libraries": [], "libpath": [], "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", "@stdlib/math/base/assert/is-nanf" ] } diff --git a/lib/node_modules/@stdlib/stats/base/srange/src/addon.c b/lib/node_modules/@stdlib/stats/base/srange/src/addon.c new file mode 100644 index 000000000000..a21211178c98 --- /dev/null +++ b/lib/node_modules/@stdlib/stats/base/srange/src/addon.c @@ -0,0 +1,60 @@ +/** +* @license Apache-2.0 +* +* Copyright (c) 2024 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/stats/base/srange.h" +#include "stdlib/napi/export.h" +#include "stdlib/napi/argv.h" +#include "stdlib/napi/argv_int64.h" +#include "stdlib/napi/argv_strided_float32array.h" +#include "stdlib/napi/create_double.h" +#include + +/** +* 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( 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, strideX, argv, 2 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT32ARRAY( env, X, N, strideX, argv, 1 ); + STDLIB_NAPI_CREATE_DOUBLE( env, (double)stdlib_strided_srange( N, X, strideX ), v ); + return v; +} + +/** +* 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_FLOAT32ARRAY( env, X, N, strideX, argv, 1 ); + STDLIB_NAPI_CREATE_DOUBLE( env, (double)stdlib_strided_srange_ndarray( N, X, strideX, offsetX ), v ); + return v; +} + +STDLIB_NAPI_MODULE_EXPORT_FCN_WITH_METHOD( addon, "ndarray", addon_method ) diff --git a/lib/node_modules/@stdlib/stats/base/srange/src/addon.cpp b/lib/node_modules/@stdlib/stats/base/srange/src/addon.cpp deleted file mode 100644 index 6204601ac04e..000000000000 --- a/lib/node_modules/@stdlib/stats/base/srange/src/addon.cpp +++ /dev/null @@ -1,117 +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/stats/base/srange.h" -#include -#include -#include -#include -#include - -/** -* Add-on namespace. -*/ -namespace stdlib_stats_base_srange { - - /** - * Computes the range of a single-precision floating-point strided array. - * - * ## Notes - * - * - When called from JavaScript, the function expects three arguments: - * - * - `N`: number of indexed elements - * - `X`: input array - * - `stride`: stride length - */ - napi_value node_srange( napi_env env, napi_callback_info info ) { - napi_status status; - - size_t argc = 3; - napi_value argv[ 3 ]; - status = napi_get_cb_info( env, info, &argc, argv, nullptr, nullptr ); - assert( status == napi_ok ); - - if ( argc < 3 ) { - napi_throw_error( env, nullptr, "invalid invocation. Must provide 3 arguments." ); - return nullptr; - } - - napi_valuetype vtype0; - status = napi_typeof( env, argv[ 0 ], &vtype0 ); - assert( status == napi_ok ); - if ( vtype0 != napi_number ) { - napi_throw_type_error( env, nullptr, "invalid argument. First argument must be a number." ); - return nullptr; - } - - bool res; - status = napi_is_typedarray( env, argv[ 1 ], &res ); - assert( status == napi_ok ); - if ( res == false ) { - napi_throw_type_error( env, nullptr, "invalid argument. Second argument must be a Float32Array." ); - return nullptr; - } - - napi_valuetype vtype2; - status = napi_typeof( env, argv[ 2 ], &vtype2 ); - assert( status == napi_ok ); - if ( vtype2 != napi_number ) { - napi_throw_type_error( env, nullptr, "invalid argument. Third argument must be a number." ); - return nullptr; - } - - int64_t N; - status = napi_get_value_int64( env, argv[ 0 ], &N ); - assert( status == napi_ok ); - - int64_t stride; - status = napi_get_value_int64( env, argv[ 2 ], &stride ); - assert( status == napi_ok ); - - napi_typedarray_type vtype1; - size_t xlen; - void *X; - status = napi_get_typedarray_info( env, argv[ 1 ], &vtype1, &xlen, &X, nullptr, nullptr ); - assert( status == napi_ok ); - if ( vtype1 != napi_float32_array ) { - napi_throw_type_error( env, nullptr, "invalid argument. Second argument must be a Float32Array." ); - return nullptr; - } - if ( (N-1)*llabs(stride) >= (int64_t)xlen ) { - napi_throw_range_error( env, nullptr, "invalid argument. Second argument has insufficient elements based on the associated stride and the number of indexed elements." ); - return nullptr; - } - - napi_value v; - status = napi_create_double( env, (double)stdlib_strided_srange( N, (float *)X, stride ), &v ); - assert( status == napi_ok ); - - return v; - } - - napi_value Init( napi_env env, napi_value exports ) { - napi_status status; - napi_value fcn; - status = napi_create_function( env, "exports", NAPI_AUTO_LENGTH, node_srange, NULL, &fcn ); - assert( status == napi_ok ); - return fcn; - } - - NAPI_MODULE( NODE_GYP_MODULE_NAME, Init ) -} // end namespace stdlib_stats_base_srange diff --git a/lib/node_modules/@stdlib/stats/base/srange/src/srange.c b/lib/node_modules/@stdlib/stats/base/srange/src/main.c similarity index 53% rename from lib/node_modules/@stdlib/stats/base/srange/src/srange.c rename to lib/node_modules/@stdlib/stats/base/srange/src/main.c index 5e19a40ff6b5..8b6b27011ad2 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/src/srange.c +++ b/lib/node_modules/@stdlib/stats/base/srange/src/main.c @@ -18,19 +18,34 @@ #include "stdlib/stats/base/srange.h" #include "stdlib/math/base/assert/is_nanf.h" -#include +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/stride2offset.h" /** * Computes the range of a single-precision floating-point strided array. * -* @param N number of indexed elements -* @param X input array -* @param stride stride length -* @return output value +* @param N number of indexed elements +* @param X input array +* @param strideX stride length +* @return output value */ -float stdlib_strided_srange( const int64_t N, const float *X, const int64_t stride ) { - int64_t ix; - int64_t i; +float API_SUFFIX(stdlib_strided_srange)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX ) { + const CBLAS_INT ox = stdlib_strided_stride2offset( N, strideX ); + return API_SUFFIX(stdlib_strided_srange_ndarray)( N, X, strideX, ox ); +} + +/** +* Computes the range of a single-precision floating-point strided array using alternative indexing semantics. +* +* @param N number of indexed elements +* @param X input array +* @param strideX stride length +* @param offsetX starting index for X +* @return output value +*/ +float API_SUFFIX(stdlib_strided_srange_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ) { + CBLAS_INT ix; + CBLAS_INT i; float max; float min; float v; @@ -38,21 +53,17 @@ float stdlib_strided_srange( const int64_t N, const float *X, const int64_t stri if ( N <= 0 ) { return 0.0f / 0.0f; // NaN } - if ( N == 1 || stride == 0 ) { + if ( N == 1 || strideX == 0 ) { if ( stdlib_base_is_nanf( X[ 0 ] ) ) { - return X[ 0 ]; + return X[ offsetX ]; } return 0.0f; } - if ( stride < 0 ) { - ix = (1-N) * stride; - } else { - ix = 0; - } + ix = offsetX; min = X[ ix ]; max = min; for ( i = 1; i < N; i++ ) { - ix += stride; + ix += strideX; v = X[ ix ]; if ( stdlib_base_is_nanf( v ) ) { return v; diff --git a/lib/node_modules/@stdlib/stats/base/srange/test/test.ndarray.js b/lib/node_modules/@stdlib/stats/base/srange/test/test.ndarray.js index f41e2b271f76..2fa312deef42 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/srange/test/test.ndarray.js @@ -21,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnanf = require( '@stdlib/math/base/assert/is-nanf' ); var isPositiveZerof = require( '@stdlib/math/base/assert/is-positive-zerof' ); var Float32Array = require( '@stdlib/array/float32' ); @@ -101,7 +100,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns `0` or `N }); tape( 'the function supports a `stride` parameter', function test( t ) { - var N; var x; var v; @@ -116,15 +114,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = srange( N, x, 2, 0 ); + v = srange( 4, x, 2, 0 ); t.strictEqual( v, 6.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', function test( t ) { - var N; var x; var v; @@ -139,8 +135,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = srange( N, x, -2, 6 ); + v = srange( 4, x, -2, 6 ); t.strictEqual( v, 6.0, 'returns expected value' ); t.end(); @@ -164,7 +159,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns `0` o }); tape( 'the function supports an `offset` parameter', function test( t ) { - var N; var x; var v; @@ -178,9 +172,8 @@ tape( 'the function supports an `offset` parameter', function test( t ) { 3.0, 4.0 // 3 ]); - N = floor( x.length / 2 ); - v = srange( N, x, 2, 1 ); + v = srange( 4, x, 2, 1 ); t.strictEqual( v, 6.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/stats/base/srange/test/test.ndarray.native.js b/lib/node_modules/@stdlib/stats/base/srange/test/test.ndarray.native.js index bb98abd65367..a9609636bcb8 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/srange/test/test.ndarray.native.js @@ -22,7 +22,6 @@ var resolve = require( 'path' ).resolve; var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnanf = require( '@stdlib/math/base/assert/is-nanf' ); var isPositiveZerof = require( '@stdlib/math/base/assert/is-positive-zerof' ); var Float32Array = require( '@stdlib/array/float32' ); @@ -110,7 +109,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns `0` or `N }); tape( 'the function supports a `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -125,15 +123,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = srange( N, x, 2, 0 ); + v = srange( 4, x, 2, 0 ); t.strictEqual( v, 6.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -148,8 +144,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = srange( N, x, -2, 6 ); + v = srange( 4, x, -2, 6 ); t.strictEqual( v, 6.0, 'returns expected value' ); t.end(); @@ -173,7 +168,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns `0` o }); tape( 'the function supports an `offset` parameter', opts, function test( t ) { - var N; var x; var v; @@ -187,9 +181,8 @@ tape( 'the function supports an `offset` parameter', opts, function test( t ) { 3.0, 4.0 // 3 ]); - N = floor( x.length / 2 ); - v = srange( N, x, 2, 1 ); + v = srange( 4, x, 2, 1 ); t.strictEqual( v, 6.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/stats/base/srange/test/test.srange.js b/lib/node_modules/@stdlib/stats/base/srange/test/test.srange.js index 06bdadb3b77a..6f2b8732f6f0 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/test/test.srange.js +++ b/lib/node_modules/@stdlib/stats/base/srange/test/test.srange.js @@ -21,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnanf = require( '@stdlib/math/base/assert/is-nanf' ); var isPositiveZerof = require( '@stdlib/math/base/assert/is-positive-zerof' ); var Float32Array = require( '@stdlib/array/float32' ); @@ -101,7 +100,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns `0` or `N }); tape( 'the function supports a `stride` parameter', function test( t ) { - var N; var x; var v; @@ -116,15 +114,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = srange( N, x, 2 ); + v = srange( 4, x, 2 ); t.strictEqual( v, 6.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', function test( t ) { - var N; var x; var v; @@ -139,8 +135,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = srange( N, x, -2 ); + v = srange( 4, x, -2 ); t.strictEqual( v, 6.0, 'returns expected value' ); t.end(); @@ -166,7 +161,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns `0` o tape( 'the function supports view offsets', function test( t ) { var x0; var x1; - var N; var v; x0 = new Float32Array([ @@ -182,9 +176,8 @@ tape( 'the function supports view offsets', function test( t ) { ]); x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element - N = floor(x1.length / 2); - v = srange( N, x1, 2 ); + v = srange( 4, x1, 2 ); t.strictEqual( v, 6.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/stats/base/srange/test/test.srange.native.js b/lib/node_modules/@stdlib/stats/base/srange/test/test.srange.native.js index 6b7a8808a481..1cb7cadefd53 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/test/test.srange.native.js +++ b/lib/node_modules/@stdlib/stats/base/srange/test/test.srange.native.js @@ -22,7 +22,6 @@ var resolve = require( 'path' ).resolve; var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnanf = require( '@stdlib/math/base/assert/is-nanf' ); var isPositiveZerof = require( '@stdlib/math/base/assert/is-positive-zerof' ); var Float32Array = require( '@stdlib/array/float32' ); @@ -192,7 +191,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns `0` or `N }); tape( 'the function supports a `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -207,15 +205,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = srange( N, x, 2 ); + v = srange( 4, x, 2 ); t.strictEqual( v, 6.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -230,8 +226,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = srange( N, x, -2 ); + v = srange( 4, x, -2 ); t.strictEqual( v, 6.0, 'returns expected value' ); t.end(); @@ -257,7 +252,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns `0` o tape( 'the function supports view offsets', opts, function test( t ) { var x0; var x1; - var N; var v; x0 = new Float32Array([ @@ -273,9 +267,8 @@ tape( 'the function supports view offsets', opts, function test( t ) { ]); x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element - N = floor(x1.length / 2); - v = srange( N, x1, 2 ); + v = srange( 4, x1, 2 ); t.strictEqual( v, 6.0, 'returns expected value' ); t.end(); From ef712bdf484e2a3e508c081c16a6ece438e53ba9 Mon Sep 17 00:00:00 2001 From: Athan Date: Fri, 27 Dec 2024 13:11:47 -0800 Subject: [PATCH 2/2] docs: fix description Signed-off-by: Athan --- .../stats/base/srange/include/stdlib/stats/base/srange.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/stats/base/srange/include/stdlib/stats/base/srange.h b/lib/node_modules/@stdlib/stats/base/srange/include/stdlib/stats/base/srange.h index f9e7389c6bd2..938a07e40b3c 100644 --- a/lib/node_modules/@stdlib/stats/base/srange/include/stdlib/stats/base/srange.h +++ b/lib/node_modules/@stdlib/stats/base/srange/include/stdlib/stats/base/srange.h @@ -34,7 +34,7 @@ extern "C" { float API_SUFFIX(stdlib_strided_srange)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX ); /** -* Computes the range of a single-precision floating-point strided array and using alternative indexing semantics. +* Computes the range of a single-precision floating-point strided array using alternative indexing semantics. */ float API_SUFFIX(stdlib_strided_srange_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX );