From 4212a2f97040453252086cf3eef38357ac218171 Mon Sep 17 00:00:00 2001 From: aayush0325 Date: Tue, 24 Dec 2024 14:34:34 +0000 Subject: [PATCH 1/6] 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: na - task: lint_javascript_tests status: passed - task: lint_javascript_benchmarks status: na - 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/dnanmax/README.md | 133 +++++++++++++++--- .../dnanmax/benchmark/c/benchmark.length.c | 54 ++++++- .../@stdlib/stats/base/dnanmax/docs/repl.txt | 28 ++-- .../stats/base/dnanmax/docs/types/index.d.ts | 12 +- .../stats/base/dnanmax/examples/c/example.c | 8 +- .../@stdlib/stats/base/dnanmax/include.gypi | 2 +- .../include/stdlib/stats/base/dnanmax.h | 9 +- .../@stdlib/stats/base/dnanmax/lib/dnanmax.js | 51 +------ .../stats/base/dnanmax/lib/dnanmax.native.js | 9 +- .../@stdlib/stats/base/dnanmax/lib/index.js | 7 +- .../@stdlib/stats/base/dnanmax/lib/ndarray.js | 20 ++- .../stats/base/dnanmax/lib/ndarray.native.js | 20 +-- .../@stdlib/stats/base/dnanmax/manifest.json | 72 +++++++++- .../@stdlib/stats/base/dnanmax/src/addon.c | 60 ++++++++ .../@stdlib/stats/base/dnanmax/src/addon.cpp | 117 --------------- .../base/dnanmax/src/{dnanmax.c => main.c} | 45 +++--- .../stats/base/dnanmax/test/test.dnanmax.js | 13 +- .../base/dnanmax/test/test.dnanmax.native.js | 13 +- .../stats/base/dnanmax/test/test.ndarray.js | 13 +- .../base/dnanmax/test/test.ndarray.native.js | 13 +- 20 files changed, 390 insertions(+), 309 deletions(-) create mode 100644 lib/node_modules/@stdlib/stats/base/dnanmax/src/addon.c delete mode 100644 lib/node_modules/@stdlib/stats/base/dnanmax/src/addon.cpp rename lib/node_modules/@stdlib/stats/base/dnanmax/src/{dnanmax.c => main.c} (54%) diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/README.md b/lib/node_modules/@stdlib/stats/base/dnanmax/README.md index e381f8efb37e..aecb8c6ffea1 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/README.md +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/README.md @@ -36,7 +36,7 @@ limitations under the License. var dnanmax = require( '@stdlib/stats/base/dnanmax' ); ``` -#### dnanmax( N, x, stride ) +#### dnanmax( N, x, strideX ) Computes the maximum value of a double-precision floating-point strided array `x`, ignoring `NaN` values. @@ -44,9 +44,8 @@ Computes the maximum value of a double-precision floating-point strided array `x var Float64Array = require( '@stdlib/array/float64' ); var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] ); -var N = x.length; -var v = dnanmax( N, x, 1 ); +var v = dnanmax( x.length, x, 1 ); // returns 2.0 ``` @@ -54,18 +53,16 @@ The function has the following parameters: - **N**: number of indexed elements. - **x**: input [`Float64Array`][@stdlib/array/float64]. -- **stride**: index increment for `x`. +- **strideX**: stride length for `x`. -The `N` and `stride` parameters determine which elements in `x` are accessed at runtime. For example, to compute the maximum value 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 maximum value of every other element in `x`, ```javascript var Float64Array = require( '@stdlib/array/float64' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x = new Float64Array( [ 1.0, 2.0, -7.0, -2.0, 4.0, 3.0, NaN, NaN ] ); -var N = floor( x.length / 2 ); -var v = dnanmax( N, x, 2 ); +var v = dnanmax( 4, x, 2 ); // returns 4.0 ``` @@ -75,18 +72,15 @@ Note that indexing is relative to the first index. To introduce an offset, use [ ```javascript var Float64Array = require( '@stdlib/array/float64' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x0 = new Float64Array( [ 2.0, 1.0, -2.0, -2.0, 3.0, 4.0, NaN, NaN ] ); var x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element -var N = floor( x0.length / 2 ); - -var v = dnanmax( N, x1, 2 ); +var v = dnanmax( 4, x1, 2 ); // returns 4.0 ``` -#### dnanmax.ndarray( N, x, stride, offset ) +#### dnanmax.ndarray( N, x, strideX, offsetX ) Computes the maximum value of a double-precision floating-point strided array, ignoring `NaN` values and using alternative indexing semantics. @@ -94,26 +88,23 @@ Computes the maximum value of a double-precision floating-point strided array, i var Float64Array = require( '@stdlib/array/float64' ); var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] ); -var N = x.length; -var v = dnanmax.ndarray( N, x, 1, 0 ); +var v = dnanmax.ndarray( x.length, x, 1, 0 ); // returns 2.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 maximum value 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 maximum value for every other value in `x` starting from the second value ```javascript var Float64Array = require( '@stdlib/array/float64' ); -var floor = require( '@stdlib/math/base/special/floor' ); var x = new Float64Array( [ 2.0, 1.0, -2.0, -2.0, 3.0, 4.0, NaN, NaN ] ); -var N = floor( x.length / 2 ); -var v = dnanmax.ndarray( N, x, 2, 1 ); +var v = dnanmax.ndarray( 4, x, 2, 1 ); // returns 4.0 ``` @@ -164,6 +155,108 @@ console.log( v ); + + +
+ +### Usage + +```c +#include "stdlib/stats/base/dnanmax.h" +``` + +#### stdlib_strided_dnanmax( N, \*X, strideX ) + +Calculate the maximum value of a double-precision floating-point strided array, ignoring `NaN` values. + +```c +const double x[] = { 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 0.0/0.0, 0.0/0.0 }; + +double v = stdlib_strided_dnanmax( 5, x, 2 ); +// returns 7.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`. + +```c +double stdlib_strided_dnanmax( const CBLAS_INT N, const double *X, const CBLAS_INT strideX ); +``` + +#### stdlib_strided_dnanmax_ndarray( N, \*X, strideX, offsetX ) + +Computes the maximum value of a double-precision floating-point strided array, ignoring `NaN` values and using alternative indexing semantics. + +```c +const double x[] = { 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 0.0/0.0, 0.0/0.0 }; + +double v = stdlib_strided_dnanmax_ndarray( 5, x, 2, 0 ); +// returns 7.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 +double stdlib_strided_dnanmax_ndarray( const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); +``` + +
+ + + + + +
+ +
+ + + + + +
+ +### Examples + +```c +#include "stdlib/stats/base/dnanmax.h" +#include +#include + +int main( void ) { + // Create a strided array: + const double x[] = { 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 0.0/0.0, 0.0/0.0 }; + + // Specify the number of elements: + const int N = 5; + + // Specify the stride length: + const int strideX = 2; + + // Compute the maximum value: + double v = stdlib_strided_dnanmax( N, x, strideX ); + + // Print the result: + printf( "max: %lf\n", v ); +} +``` + +
+ + + + + + +
diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/c/benchmark.length.c b/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/c/benchmark.length.c index 7b582005aa2a..46e212c8c8d7 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/c/benchmark.length.c +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/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 v; @@ -111,6 +111,7 @@ static double benchmark( int iterations, int len ) { v = 0.0; t = tic(); for ( i = 0; i < iterations; i++ ) { + // cppcheck-suppress uninitvar v = stdlib_strided_dnanmax( len, x, 1 ); if ( v != v ) { printf( "should not return NaN\n" ); @@ -124,6 +125,44 @@ static double benchmark( int iterations, int len ) { return elapsed; } +/** +* Runs a benchmark. +* +* @param iterations number of iterations +* @param len array length +* @return elapsed time in seconds +*/ +static double benchmark2( int iterations, int len ) { + double elapsed; + double x[ len ]; + double v; + double t; + int i; + + for ( i = 0; i < len; i++ ) { + if ( rand_double() < 0.2 ) { + x[ i ] = 0.0 / 0.0; // NaN + } else { + x[ i ] = ( rand_double() * 20000.0 ) - 10000.0; + } + } + v = 0.0; + t = tic(); + for ( i = 0; i < iterations; i++ ) { + // cppcheck-suppress uninitvar + v = stdlib_strided_dnanmax_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. */ @@ -146,7 +185,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/dnanmax/docs/repl.txt b/lib/node_modules/@stdlib/stats/base/dnanmax/docs/repl.txt index f74f37a2e2ad..60f71279393c 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/docs/repl.txt +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/docs/repl.txt @@ -1,10 +1,10 @@ -{{alias}}( N, x, stride ) +{{alias}}( N, x, strideX ) Computes the maximum value of a double-precision floating-point strided array, ignoring `NaN` values. - 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. @@ -19,7 +19,7 @@ x: Float64Array Input array. - stride: integer + strideX: integer Index increment. Returns @@ -34,22 +34,19 @@ > {{alias}}( x.length, x, 1 ) 2.0 - // Using `N` and `stride` parameters: + // Using `N` and stride parameters: > x = new {{alias:@stdlib/array/float64}}( [ -2.0, 1.0, 1.0, -5.0, 2.0, -1.0, NaN ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > var stride = 2; - > {{alias}}( N, x, stride ) + > {{alias}}( 3, x, 2 ) 2.0 // Using view offsets: > var x0 = new {{alias:@stdlib/array/float64}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN ] ); > var x1 = new {{alias:@stdlib/array/float64}}( 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 ) 2.0 -{{alias}}.ndarray( N, x, stride, offset ) + +{{alias}}.ndarray( N, x, strideX, offsetX ) Computes the maximum value of a double-precision floating-point strided array, ignoring `NaN` values and using alternative indexing semantics. @@ -65,10 +62,10 @@ x: Float64Array Input array. - stride: integer + strideX: integer Index increment. - offset: integer + offsetX: integer Starting index. Returns @@ -85,8 +82,7 @@ // Using offset parameter: > var x = new {{alias:@stdlib/array/float64}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0, NaN ] ); - > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 ); - > {{alias}}.ndarray( N, x, 2, 1 ) + > {{alias}}.ndarray( 3, x, 2, 1 ) 2.0 See Also diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/docs/types/index.d.ts b/lib/node_modules/@stdlib/stats/base/dnanmax/docs/types/index.d.ts index 0df4446d0284..5a6bd8afc1a8 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/docs/types/index.d.ts +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/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 maximum value * * @example @@ -38,15 +38,15 @@ interface Routine { * var v = dnanmax( x.length, x, 1 ); * // returns 2.0 */ - ( N: number, x: Float64Array, stride: number ): number; + ( N: number, x: Float64Array, strideX: number ): number; /** * Computes the maximum value of a double-precision floating-point strided array, ignoring `NaN` values and 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 maximum value * * @example @@ -57,7 +57,7 @@ interface Routine { * var v = dnanmax.ndarray( x.length, x, 1, 0 ); * // returns 2.0 */ - ndarray( N: number, x: Float64Array, stride: number, offset: number ): number; + ndarray( N: number, x: Float64Array, 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 maximum value * * @example diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/examples/c/example.c b/lib/node_modules/@stdlib/stats/base/dnanmax/examples/c/example.c index 7b8b4618b3f6..acf2283973c5 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/examples/c/example.c +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/examples/c/example.c @@ -22,16 +22,16 @@ 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, 0.0/0.0, 0.0/0.0 }; + const double x[] = { 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 0.0/0.0, 0.0/0.0 }; // Specify the number of elements: - int64_t N = 5; + const int N = 5; // Specify the stride length: - int64_t stride = 2; + const int strideX = 2; // Compute the maximum value: - double v = stdlib_strided_dnanmax( N, x, stride ); + double v = stdlib_strided_dnanmax( N, x, strideX ); // Print the result: printf( "max: %lf\n", v ); diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/include.gypi b/lib/node_modules/@stdlib/stats/base/dnanmax/include.gypi index 868c5c12e852..26476a8c2655 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/include.gypi +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/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 maximum value of a double-precision floating-point strided array, ignoring `NaN` values. */ -double stdlib_strided_dnanmax( const int64_t N, const double *X, const int64_t stride ); +double API_SUFFIX(stdlib_strided_dnanmax)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX ); + +/** +* Computes the maximum value of a double-precision floating-point strided array, ignoring `NaN` values and using alternative indexing semantics. +*/ +double API_SUFFIX(stdlib_strided_dnanmax_ndarray)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); #ifdef __cplusplus } diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/lib/dnanmax.js b/lib/node_modules/@stdlib/stats/base/dnanmax/lib/dnanmax.js index 5130424d5d16..d0e773e02c57 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/lib/dnanmax.js +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/lib/dnanmax.js @@ -20,8 +20,8 @@ // MODULES // -var isnan = require( '@stdlib/math/base/assert/is-nan' ); -var isPositiveZero = require( '@stdlib/math/base/assert/is-positive-zero' ); +var stride2offset = require( '@stdlib/strided/base/stride2offset' ); +var ndarray = require( './ndarray.js' ); // MAIN // @@ -31,58 +31,19 @@ var isPositiveZero = require( '@stdlib/math/base/assert/is-positive-zero' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} x - input array -* @param {integer} stride - stride length +* @param {integer} strideX - stride length * @returns {number} maximum value * * @example * var Float64Array = require( '@stdlib/array/float64' ); * * var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] ); -* var N = x.length; * -* var v = dnanmax( N, x, 1 ); +* var v = dnanmax( x.length, x, 1 ); * // returns 2.0 */ -function dnanmax( N, x, stride ) { - var max; - var ix; - var v; - var i; - - if ( N <= 0 ) { - return NaN; - } - if ( N === 1 || stride === 0 ) { - return x[ 0 ]; - } - if ( stride < 0 ) { - ix = (1-N) * stride; - } else { - ix = 0; - } - for ( i = 0; i < N; i++ ) { - v = x[ ix ]; - if ( v === v ) { - break; - } - ix += stride; - } - if ( i === N ) { - return NaN; - } - max = v; - i += 1; - for ( i; i < N; i++ ) { - ix += stride; - v = x[ ix ]; - if ( isnan( v ) ) { - continue; - } - if ( v > max || ( v === max && isPositiveZero( v ) ) ) { - max = v; - } - } - return max; +function dnanmax( N, x, strideX ) { + return ndarray( N, x, strideX, stride2offset( N, strideX ) ); } diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/lib/dnanmax.native.js b/lib/node_modules/@stdlib/stats/base/dnanmax/lib/dnanmax.native.js index dd2f303a46af..1ea8229439b6 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/lib/dnanmax.native.js +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/lib/dnanmax.native.js @@ -30,20 +30,19 @@ var addon = require( './../src/addon.node' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} x - input array -* @param {integer} stride - stride length +* @param {integer} strideX - stride length * @returns {number} maximum value * * @example * var Float64Array = require( '@stdlib/array/float64' ); * * var x = new Float64Array( [ 1.0, -2.0, 2.0, NaN ] ); -* var N = x.length; * -* var v = dnanmax( N, x, 1 ); +* var v = dnanmax( x.length, x, 1 ); * // returns 2.0 */ -function dnanmax( N, x, stride ) { - return addon( N, x, stride ); +function dnanmax( N, x, strideX ) { + return addon( N, x, strideX ); } diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/lib/index.js b/lib/node_modules/@stdlib/stats/base/dnanmax/lib/index.js index 56996ad63257..cc50fbcc2951 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/lib/index.js +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/lib/index.js @@ -28,20 +28,17 @@ * var dnanmax = require( '@stdlib/stats/base/dnanmax' ); * * var x = new Float64Array( [ 1.0, -2.0, NaN, 2.0 ] ); -* var N = x.length; * -* var v = dnanmax( N, x, 1 ); +* var v = dnanmax( x.length, x, 1 ); * // returns 2.0 * * @example * var Float64Array = require( '@stdlib/array/float64' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * var dnanmax = require( '@stdlib/stats/base/dnanmax' ); * * var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] ); -* var N = floor( x.length / 2 ); * -* var v = dnanmax.ndarray( N, x, 2, 1 ); +* var v = dnanmax.ndarray( 5, x, 2, 1 ); * // returns 4.0 */ diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/lib/ndarray.js b/lib/node_modules/@stdlib/stats/base/dnanmax/lib/ndarray.js index b0b06e29af60..422544e72b29 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/lib/ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/lib/ndarray.js @@ -31,21 +31,19 @@ var isPositiveZero = require( '@stdlib/math/base/assert/is-positive-zero' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} 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} maximum value * * @example * var Float64Array = require( '@stdlib/array/float64' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * * var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] ); -* var N = floor( x.length / 2 ); * -* var v = dnanmax( N, x, 2, 1 ); +* var v = dnanmax( 5, x, 2, 1 ); * // returns 4.0 */ -function dnanmax( N, x, stride, offset ) { +function dnanmax( N, x, strideX, offsetX ) { var max; var ix; var v; @@ -54,16 +52,16 @@ function dnanmax( N, x, stride, offset ) { if ( N <= 0 ) { return NaN; } - if ( N === 1 || stride === 0 ) { - return x[ offset ]; + if ( N === 1 || strideX === 0 ) { + return x[ offsetX ]; } - ix = offset; + ix = offsetX; for ( i = 0; i < N; i++ ) { v = x[ ix ]; if ( v === v ) { break; } - ix += stride; + ix += strideX; } if ( i === N ) { return NaN; @@ -71,7 +69,7 @@ function dnanmax( N, x, stride, offset ) { max = v; i += 1; for ( i; i < N; i++ ) { - ix += stride; + ix += strideX; v = x[ ix ]; if ( isnan( v ) ) { continue; diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/lib/ndarray.native.js b/lib/node_modules/@stdlib/stats/base/dnanmax/lib/ndarray.native.js index d4e78e633d1b..4e72404c8080 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/lib/ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/lib/ndarray.native.js @@ -20,8 +20,7 @@ // MODULES // -var Float64Array = require( '@stdlib/array/float64' ); -var addon = require( './dnanmax.native.js' ); +var addon = require( './../src/addon.node' ); // MAIN // @@ -31,27 +30,20 @@ var addon = require( './dnanmax.native.js' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float64Array} 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} maximum value * * @example * var Float64Array = require( '@stdlib/array/float64' ); -* var floor = require( '@stdlib/math/base/special/floor' ); * * var x = new Float64Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0, NaN, NaN ] ); -* var N = floor( x.length / 2 ); * -* var v = dnanmax( N, x, 2, 1 ); +* var v = dnanmax( 5, x, 2, 1 ); * // returns 4.0 */ -function dnanmax( N, x, stride, offset ) { - var view; - if ( stride < 0 ) { - offset += (N-1) * stride; - } - view = new Float64Array( x.buffer, x.byteOffset+(x.BYTES_PER_ELEMENT*offset), x.length-offset ); // eslint-disable-line max-len - return addon( N, view, stride ); +function dnanmax( N, x, strideX, offsetX ) { + return addon.ndarray( N, x, strideX, offsetX ); } diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/manifest.json b/lib/node_modules/@stdlib/stats/base/dnanmax/manifest.json index ec9efa56c915..445fadeda17e 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/manifest.json +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/manifest.json @@ -1,5 +1,8 @@ { - "options": {}, + "options": { + "task": "build", + "wasm": false + }, "fields": [ { "field": "src", @@ -24,17 +27,78 @@ ], "confs": [ { + "task": "build", + "wasm": false, "src": [ - "./src/dnanmax.c" + "./src/main.c" ], "include": [ "./include" ], - "libraries": [ - "-lm" + "libraries": [], + "libpath": [], + "dependencies": [ + "@stdlib/blas/base/shared", + "@stdlib/strided/base/stride2offset", + "@stdlib/math/base/assert/is-positive-zero", + "@stdlib/math/base/assert/is-nan", + "@stdlib/napi/export", + "@stdlib/napi/argv", + "@stdlib/napi/argv-int64", + "@stdlib/napi/argv-strided-float64array", + "@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-nan", + "@stdlib/math/base/assert/is-positive-zero" + ] + }, + { + "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-nan", + "@stdlib/math/base/assert/is-positive-zero" + ] + }, + { + "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-nan", "@stdlib/math/base/assert/is-positive-zero" ] diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/src/addon.c b/lib/node_modules/@stdlib/stats/base/dnanmax/src/addon.c new file mode 100644 index 000000000000..a137a99a29f0 --- /dev/null +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/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/dnanmax.h" +#include "stdlib/napi/export.h" +#include "stdlib/napi/argv.h" +#include "stdlib/napi/argv_int64.h" +#include "stdlib/napi/argv_strided_float64array.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_FLOAT64ARRAY( env, X, N, strideX, argv, 1 ); + STDLIB_NAPI_CREATE_DOUBLE( env, stdlib_strided_dnanmax( 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_FLOAT64ARRAY( env, X, N, strideX, argv, 1 ); + STDLIB_NAPI_CREATE_DOUBLE( env, stdlib_strided_dnanmax_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/dnanmax/src/addon.cpp b/lib/node_modules/@stdlib/stats/base/dnanmax/src/addon.cpp deleted file mode 100644 index 308d117b336b..000000000000 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/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/dnanmax.h" -#include -#include -#include -#include -#include - -/** -* Add-on namespace. -*/ -namespace stdlib_stats_base_dnanmax { - - /** - * Computes the maximum value of a double-precision floating-point strided array, ignoring `NaN` values. - * - * ## Notes - * - * - When called from JavaScript, the function expects three arguments: - * - * - `N`: number of indexed elements - * - `X`: input array - * - `stride`: stride length - */ - napi_value node_dnanmax( 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 Float64Array." ); - 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_float64_array ) { - napi_throw_type_error( env, nullptr, "invalid argument. Second argument must be a Float64Array." ); - 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, stdlib_strided_dnanmax( N, (double *)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_dnanmax, NULL, &fcn ); - assert( status == napi_ok ); - return fcn; - } - - NAPI_MODULE( NODE_GYP_MODULE_NAME, Init ) -} // end namespace stdlib_stats_base_dnanmax diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/src/dnanmax.c b/lib/node_modules/@stdlib/stats/base/dnanmax/src/main.c similarity index 54% rename from lib/node_modules/@stdlib/stats/base/dnanmax/src/dnanmax.c rename to lib/node_modules/@stdlib/stats/base/dnanmax/src/main.c index 6dd9c4f6c84b..76ecbd73a4e5 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/src/dnanmax.c +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/src/main.c @@ -19,39 +19,50 @@ #include "stdlib/stats/base/dnanmax.h" #include "stdlib/math/base/assert/is_nan.h" #include "stdlib/math/base/assert/is_positive_zero.h" -#include +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/stride2offset.h" /** * Computes the maximum value of a double-precision floating-point strided array, ignoring `NaN` values. * -* @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 */ -double stdlib_strided_dnanmax( const int64_t N, const double *X, const int64_t stride ) { +double API_SUFFIX(stdlib_strided_dnanmax)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX ) { + const CBLAS_INT ox = stdlib_strided_stride2offset( N, strideX ); + return API_SUFFIX(stdlib_strided_dnanmax_ndarray)( N, X, strideX, ox ); +} + +/** +* Computes the maximum value of a double-precision floating-point strided array, ignoring `NaN` values and 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 +*/ +double API_SUFFIX(stdlib_strided_dnanmax_ndarray)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ) { double max; - int64_t ix; - int64_t i; + CBLAS_INT ix; + CBLAS_INT i; double v; if ( N <= 0 ) { return 0.0 / 0.0; // NaN } - if ( N == 1 || stride == 0 ) { - return X[ 0 ]; - } - if ( stride < 0 ) { - ix = (1-N) * stride; - } else { - ix = 0; + if ( N == 1 || strideX == 0 ) { + return X[ offsetX ]; } + ix = offsetX; for ( i = 0; i < N; i++ ) { v = X[ ix ]; if ( v == v ) { break; } - ix += stride; + ix += strideX; } if ( i == N ) { return 0.0 / 0.0; // NaN @@ -59,7 +70,7 @@ double stdlib_strided_dnanmax( const int64_t N, const double *X, const int64_t s max = v; i += 1; for (; i < N; i++ ) { - ix += stride; + ix += strideX; v = X[ ix ]; if ( stdlib_base_is_nan( v ) ) { continue; diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/test/test.dnanmax.js b/lib/node_modules/@stdlib/stats/base/dnanmax/test/test.dnanmax.js index 94d87560c745..300617cf7445 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/test/test.dnanmax.js +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/test/test.dnanmax.js @@ -21,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var isPositiveZero = require( '@stdlib/math/base/assert/is-positive-zero' ); var Float64Array = require( '@stdlib/array/float64' ); @@ -96,7 +95,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first }); tape( 'the function supports a `stride` parameter', function test( t ) { - var N; var x; var v; @@ -113,15 +111,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = dnanmax( N, x, 2 ); + v = dnanmax( 5, x, 2 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', function test( t ) { - var N; var x; var v; @@ -138,8 +134,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = dnanmax( N, x, -2 ); + v = dnanmax( 5, x, -2 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end(); @@ -160,7 +155,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f tape( 'the function supports view offsets', function test( t ) { var x0; var x1; - var N; var v; x0 = new Float64Array([ @@ -178,9 +172,8 @@ tape( 'the function supports view offsets', function test( t ) { ]); x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element - N = floor(x1.length / 2); - v = dnanmax( N, x1, 2 ); + v = dnanmax( 5, x1, 2 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/test/test.dnanmax.native.js b/lib/node_modules/@stdlib/stats/base/dnanmax/test/test.dnanmax.native.js index 312ac1d49a5d..76ae5c3ffbfb 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/test/test.dnanmax.native.js +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/test/test.dnanmax.native.js @@ -22,7 +22,6 @@ var resolve = require( 'path' ).resolve; var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var isPositiveZero = require( '@stdlib/math/base/assert/is-positive-zero' ); var Float64Array = require( '@stdlib/array/float64' ); @@ -187,7 +186,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first }); tape( 'the function supports a `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -204,15 +202,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = dnanmax( N, x, 2 ); + v = dnanmax( 5, x, 2 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -229,8 +225,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = dnanmax( N, x, -2 ); + v = dnanmax( 5, x, -2 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end(); @@ -251,7 +246,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f tape( 'the function supports view offsets', opts, function test( t ) { var x0; var x1; - var N; var v; x0 = new Float64Array([ @@ -269,9 +263,8 @@ tape( 'the function supports view offsets', opts, function test( t ) { ]); x1 = new Float64Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element - N = floor(x1.length / 2); - v = dnanmax( N, x1, 2 ); + v = dnanmax( 5, x1, 2 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/test/test.ndarray.js b/lib/node_modules/@stdlib/stats/base/dnanmax/test/test.ndarray.js index 4d7335217033..de834d28701f 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/test/test.ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/test/test.ndarray.js @@ -21,7 +21,6 @@ // MODULES // var tape = require( 'tape' ); -var floor = require( '@stdlib/math/base/special/floor' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var isPositiveZero = require( '@stdlib/math/base/assert/is-positive-zero' ); var Float64Array = require( '@stdlib/array/float64' ); @@ -96,7 +95,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first }); tape( 'the function supports a `stride` parameter', function test( t ) { - var N; var x; var v; @@ -113,15 +111,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = dnanmax( N, x, 2, 0 ); + v = dnanmax( 5, x, 2, 0 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', function test( t ) { - var N; var x; var v; @@ -138,8 +134,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = dnanmax( N, x, -2, 8 ); + v = dnanmax( 5, x, -2, 8 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end(); @@ -158,7 +153,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f }); tape( 'the function supports an `offset` parameter', function test( t ) { - var N; var x; var v; @@ -174,9 +168,8 @@ tape( 'the function supports an `offset` parameter', function test( t ) { NaN, NaN // 4 ]); - N = floor( x.length / 2 ); - v = dnanmax( N, x, 2, 1 ); + v = dnanmax( 5, x, 2, 1 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end(); diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/test/test.ndarray.native.js b/lib/node_modules/@stdlib/stats/base/dnanmax/test/test.ndarray.native.js index df5475b84e5e..e8a4b15fec82 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/test/test.ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/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 isnan = require( '@stdlib/math/base/assert/is-nan' ); var isPositiveZero = require( '@stdlib/math/base/assert/is-positive-zero' ); var Float64Array = require( '@stdlib/array/float64' ); @@ -105,7 +104,6 @@ tape( 'if provided an `N` parameter equal to `1`, the function returns the first }); tape( 'the function supports a `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -122,15 +120,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { NaN ]); - N = floor( x.length / 2 ); - v = dnanmax( N, x, 2, 0 ); + v = dnanmax( 5, x, 2, 0 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end(); }); tape( 'the function supports a negative `stride` parameter', opts, function test( t ) { - var N; var x; var v; @@ -147,8 +143,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = dnanmax( N, x, -2, 8 ); + v = dnanmax( 5, x, -2, 8 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end(); @@ -167,7 +162,6 @@ tape( 'if provided a `stride` parameter equal to `0`, the function returns the f }); tape( 'the function supports an `offset` parameter', opts, function test( t ) { - var N; var x; var v; @@ -183,9 +177,8 @@ tape( 'the function supports an `offset` parameter', opts, function test( t ) { NaN, NaN // 4 ]); - N = floor( x.length / 2 ); - v = dnanmax( N, x, 2, 1 ); + v = dnanmax( 5, x, 2, 1 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end(); From 7541b33d5c223c25b3fc4e7fecae2742a8ece4f0 Mon Sep 17 00:00:00 2001 From: Aayush Khanna <96649223+aayush0325@users.noreply.github.com> Date: Wed, 25 Dec 2024 23:33:51 +0530 Subject: [PATCH 2/6] chore: cleaning up --- lib/node_modules/@stdlib/stats/base/dnanmax/README.md | 2 +- lib/node_modules/@stdlib/stats/base/dnanmax/docs/repl.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/README.md b/lib/node_modules/@stdlib/stats/base/dnanmax/README.md index aecb8c6ffea1..8943de6196a5 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/README.md +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/README.md @@ -97,7 +97,7 @@ The function has the following additional parameters: - **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 maximum value 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 maximum value for every other element in `x` starting from the second element ```javascript var Float64Array = require( '@stdlib/array/float64' ); diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/docs/repl.txt b/lib/node_modules/@stdlib/stats/base/dnanmax/docs/repl.txt index 60f71279393c..289112fcb73b 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/docs/repl.txt +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/docs/repl.txt @@ -20,7 +20,7 @@ Input array. strideX: integer - Index increment. + Stride Length. Returns ------- @@ -63,7 +63,7 @@ Input array. strideX: integer - Index increment. + Stride Length. offsetX: integer Starting index. From 783c93114342b76dc2e95080102e438ec9356d05 Mon Sep 17 00:00:00 2001 From: Aayush Khanna <96649223+aayush0325@users.noreply.github.com> Date: Thu, 26 Dec 2024 00:02:34 +0530 Subject: [PATCH 3/6] chore: sort variables according to length --- lib/node_modules/@stdlib/stats/base/dnanmax/src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/src/main.c b/lib/node_modules/@stdlib/stats/base/dnanmax/src/main.c index 76ecbd73a4e5..9fb6f5236b3f 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/src/main.c +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/src/main.c @@ -45,9 +45,9 @@ double API_SUFFIX(stdlib_strided_dnanmax)( const CBLAS_INT N, const double *X, c * @return output value */ double API_SUFFIX(stdlib_strided_dnanmax_ndarray)( const CBLAS_INT N, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ) { - double max; CBLAS_INT ix; CBLAS_INT i; + double max; double v; if ( N <= 0 ) { From add2180e61570c963553106e92dec59ece47c8a1 Mon Sep 17 00:00:00 2001 From: Aayush Khanna <96649223+aayush0325@users.noreply.github.com> Date: Thu, 26 Dec 2024 21:10:11 +0530 Subject: [PATCH 4/6] refactor: update benchmarks --- .../stats/base/dnanmax/benchmark/benchmark.js | 30 +++++++++++-------- .../dnanmax/benchmark/benchmark.native.js | 29 ++++++++++-------- .../dnanmax/benchmark/benchmark.ndarray.js | 29 ++++++++++-------- .../benchmark/benchmark.ndarray.native.js | 30 +++++++++++-------- 4 files changed, 66 insertions(+), 52 deletions(-) diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.js b/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.js index 40c674239fe9..20c123355889 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.js @@ -21,16 +21,30 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float64Array = require( '@stdlib/array/float64' ); +var uniform = require( '@stdlib/random/base/uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var pkg = require( './../package.json' ).name; var dnanmax = require( './../lib/dnanmax.js' ); // FUNCTIONS // + +/** +* Returns a random value or `NaN`. +* +* @returns {number} Random number or `NaN` +*/ +function rand() { + if ( bernoulli( 0.2 ) ) { + return NaN; + } + return uniform( -10.0, 10.0 ); +} + /** * Creates a benchmark function. * @@ -39,17 +53,7 @@ var dnanmax = require( './../lib/dnanmax.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float64Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*20.0 ) - 10.0; - } - } + var x = filledarrayBy( len, 'float64', rand ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.native.js index c542ed0e564d..bc2c311ee8a9 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.native.js +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.native.js @@ -22,10 +22,11 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float64Array = require( '@stdlib/array/float64' ); +var uniform = require( '@stdlib/random/base/uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var tryRequire = require( '@stdlib/utils/try-require' ); var pkg = require( './../package.json' ).name; @@ -40,6 +41,18 @@ var opts = { // FUNCTIONS // +/** +* Returns a random value or `NaN`. +* +* @returns {number} Random number or `NaN` +*/ +function rand() { + if ( bernoulli( 0.2 ) ) { + return NaN; + } + return uniform( -10.0, 10.0 ); +} + /** * Creates a benchmark function. * @@ -48,17 +61,7 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float64Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*20.0 ) - 10.0; - } - } + var x = filledarrayBy( len, 'float64', rand ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.ndarray.js index ccec14b782ec..badb7b1962d6 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.ndarray.js +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.ndarray.js @@ -21,16 +21,29 @@ // MODULES // var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float64Array = require( '@stdlib/array/float64' ); +var uniform = require( '@stdlib/random/base/uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var pkg = require( './../package.json' ).name; var dnanmax = require( './../lib/ndarray.js' ); // FUNCTIONS // +/** +* Returns a random value or `NaN`. +* +* @returns {number} Random number or `NaN` +*/ +function rand() { + if ( bernoulli( 0.2 ) ) { + return NaN; + } + return uniform( -10.0, 10.0 ); +} + /** * Creates a benchmark function. * @@ -39,17 +52,7 @@ var dnanmax = require( './../lib/ndarray.js' ); * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float64Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*20.0 ) - 10.0; - } - } + var x = filledarrayBy( len, 'float64', rand ); return benchmark; function benchmark( b ) { diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.ndarray.native.js index 796c17c94bec..12139993b68c 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.ndarray.native.js @@ -22,10 +22,11 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench' ); -var randu = require( '@stdlib/random/base/randu' ); var isnan = require( '@stdlib/math/base/assert/is-nan' ); var pow = require( '@stdlib/math/base/special/pow' ); -var Float64Array = require( '@stdlib/array/float64' ); +var uniform = require( '@stdlib/random/base/uniform' ); +var bernoulli = require( '@stdlib/random/base/bernoulli' ); +var filledarrayBy = require( '@stdlib/array/filled-by' ); var tryRequire = require( '@stdlib/utils/try-require' ); var pkg = require( './../package.json' ).name; @@ -40,6 +41,19 @@ var opts = { // FUNCTIONS // + +/** +* Returns a random value or `NaN`. +* +* @returns {number} Random number or `NaN` +*/ +function rand() { + if ( bernoulli( 0.2 ) ) { + return NaN; + } + return uniform( -10.0, 10.0 ); +} + /** * Creates a benchmark function. * @@ -48,17 +62,7 @@ var opts = { * @returns {Function} benchmark function */ function createBenchmark( len ) { - var x; - var i; - - x = new Float64Array( len ); - for ( i = 0; i < x.length; i++ ) { - if ( randu() < 0.2 ) { - x[ i ] = NaN; - } else { - x[ i ] = ( randu()*20.0 ) - 10.0; - } - } + var x = filledarrayBy( len, 'float64', rand ); return benchmark; function benchmark( b ) { From 51698717b669b5edcb3b6b531a3d9d91ba118efd Mon Sep 17 00:00:00 2001 From: Aayush Khanna <96649223+aayush0325@users.noreply.github.com> Date: Thu, 26 Dec 2024 21:22:38 +0530 Subject: [PATCH 5/6] chore: fix linting errors --- .../@stdlib/stats/base/dnanmax/benchmark/benchmark.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.js b/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.js index 20c123355889..49ca6c488396 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.js +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.js @@ -32,7 +32,6 @@ var dnanmax = require( './../lib/dnanmax.js' ); // FUNCTIONS // - /** * Returns a random value or `NaN`. * From 0c6e9bd9215a16a5391f4bc41a0a858510261131 Mon Sep 17 00:00:00 2001 From: Aayush Khanna <96649223+aayush0325@users.noreply.github.com> Date: Thu, 26 Dec 2024 21:42:11 +0530 Subject: [PATCH 6/6] chore: fix linting error --- .../stats/base/dnanmax/benchmark/benchmark.ndarray.native.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.ndarray.native.js index 12139993b68c..a5f75c02675d 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.ndarray.native.js +++ b/lib/node_modules/@stdlib/stats/base/dnanmax/benchmark/benchmark.ndarray.native.js @@ -41,7 +41,6 @@ var opts = { // FUNCTIONS // - /** * Returns a random value or `NaN`. *