From 483d57f798dc1ff1a7cc72e0bcecb4e465f521a9 Mon Sep 17 00:00:00 2001 From: stdlib-bot Date: Thu, 26 Dec 2024 15:06:23 +0000 Subject: [PATCH] Auto-generated commit --- CHANGELOG.md | 16 ++- README.md | 162 +++++++++++++++++++++----- benchmark/benchmark.js | 18 +-- benchmark/benchmark.native.js | 14 +-- benchmark/benchmark.ndarray.js | 18 +-- benchmark/benchmark.ndarray.native.js | 14 +-- benchmark/c/benchmark.length.c | 50 +++++++- dist/index.js | 14 +-- dist/index.js.map | 8 +- docs/repl.txt | 27 ++--- docs/types/index.d.ts | 12 +- examples/c/example.c | 9 +- examples/index.js | 14 +-- include.gypi | 2 +- include/stdlib/stats/base/smax.h | 9 +- lib/index.js | 7 +- lib/ndarray.js | 18 ++- lib/ndarray.native.js | 20 +--- lib/smax.js | 40 +------ lib/smax.native.js | 9 +- manifest.json | 72 +++++++++++- package.json | 12 +- src/addon.c | 60 ++++++++++ src/addon.cpp | 117 ------------------- src/{smax.c => main.c} | 43 ++++--- test/test.ndarray.js | 13 +-- test/test.ndarray.native.js | 13 +-- test/test.smax.js | 13 +-- test/test.smax.native.js | 13 +-- 29 files changed, 469 insertions(+), 368 deletions(-) create mode 100644 src/addon.c delete mode 100644 src/addon.cpp rename src/{smax.c => main.c} (52%) diff --git a/CHANGELOG.md b/CHANGELOG.md index d90e316..9c6e0d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,17 @@
-## Unreleased (2024-12-23) +## Unreleased (2024-12-26) + +
+ +### Features + +- [`de70ec9`](https://github.com/stdlib-js/stdlib/commit/de70ec98ccdecbfe33566df3cdb6802c29e668b1) - add C ndarray interface and refactor implementation for `stats/base/smax` [(#4240)](https://github.com/stdlib-js/stdlib/pull/4240) + +
+ +
@@ -12,6 +22,7 @@
+- [`de70ec9`](https://github.com/stdlib-js/stdlib/commit/de70ec98ccdecbfe33566df3cdb6802c29e668b1) - **feat:** add C ndarray interface and refactor implementation for `stats/base/smax` [(#4240)](https://github.com/stdlib-js/stdlib/pull/4240) _(by Aayush Khanna)_ - [`62364f6`](https://github.com/stdlib-js/stdlib/commit/62364f62ea823a3b52c2ad25660ecd80c71f8f36) - **style:** fix C comment alignment _(by Philipp Burckhardt)_ - [`9e689ff`](https://github.com/stdlib-js/stdlib/commit/9e689ffcb7c6223afc521f1e574b42f10921cf5e) - **chore:** fix indentation in manifest.json files _(by Philipp Burckhardt)_ - [`272ae7a`](https://github.com/stdlib-js/stdlib/commit/272ae7ac5c576c68cfab1b6e304c86407faa20cd) - **docs:** remove comment _(by Athan Reines)_ @@ -27,8 +38,9 @@ ### Contributors -A total of 2 people contributed to this release. Thank you to the following contributors: +A total of 3 people contributed to this release. Thank you to the following contributors: +- Aayush Khanna - Athan Reines - Philipp Burckhardt diff --git a/README.md b/README.md index c3346da..5a3f523 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ To view installation and usage instructions specific to each branch build, be su var smax = require( '@stdlib/stats-base-smax' ); ``` -#### smax( N, x, stride ) +#### smax( N, x, strideX ) Computes the maximum value of a single-precision floating-point strided array `x`. @@ -77,9 +77,8 @@ Computes the maximum value of a single-precision floating-point strided array `x var Float32Array = require( '@stdlib/array-float32' ); var x = new Float32Array( [ 1.0, -2.0, 2.0 ] ); -var N = x.length; -var v = smax( N, x, 1 ); +var v = smax( x.length, x, 1 ); // returns 2.0 ``` @@ -87,18 +86,16 @@ The function has the following parameters: - **N**: number of indexed elements. - **x**: input [`Float32Array`][@stdlib/array/float32]. -- **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 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 = smax( N, x, 2 ); +var v = smax( 4, x, 2 ); // returns 4.0 ``` @@ -108,18 +105,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 = smax( N, x1, 2 ); +var v = smax( 4, x1, 2 ); // returns 4.0 ``` -#### smax.ndarray( N, x, stride, offset ) +#### smax.ndarray( N, x, strideX, offsetX ) Computes the maximum value of a single-precision floating-point strided array using alternative indexing semantics. @@ -127,26 +121,23 @@ Computes the maximum value of a single-precision floating-point strided array us var Float32Array = require( '@stdlib/array-float32' ); var x = new Float32Array( [ 1.0, -2.0, 2.0 ] ); -var N = x.length; -var v = smax.ndarray( N, x, 1, 0 ); +var v = smax.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 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 = smax.ndarray( N, x, 2, 1 ); +var v = smax.ndarray( 4, x, 2, 1 ); // returns 4.0 ``` @@ -171,18 +162,12 @@ var v = smax.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 smax = require( '@stdlib/stats-base-smax' ); -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 = smax( x.length, x, 1 ); @@ -193,6 +178,123 @@ console.log( v ); + + +* * * + +
+ +## C APIs + + + +
+ +
+ + + + + +
+ +### Usage + +```c +#include "stdlib/stats/base/smax.h" +``` + +#### stdlib_strided_smax( N, \*X, strideX ) + +Computes the maximum value of a single-precision floating-point strided array. + +```c +const float x[] = { 1.0f, -2.0f, 3.0f, -4.0f }; + +float v = stdlib_strided_smax( 4, x, 1 ); +// returns 3.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_smax( const CBLAS_INT N, const float *X, const CBLAS_INT strideX ); +``` + +#### stdlib_strided_smax_ndarray( N, \*X, strideX, offsetX ) + +Computes the maximum value 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_dmax_ndarray( 4, x, 1, 0 ); +// returns 3.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_smax_ndarray( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); +``` + +
+ + + + + +
+ +
+ + + + + +
+ +### Examples + +```c +#include "stdlib/stats/base/smax.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 maximum value: + float v = stdlib_strided_smax( N, x, strideX ); + + // Print the result: + printf( "max: %f\n", v ); +} +``` + +
+ + + +
+ + +
diff --git a/benchmark/benchmark.js b/benchmark/benchmark.js index 0c63662..be1738d 100644 --- a/benchmark/benchmark.js +++ b/benchmark/benchmark.js @@ -21,14 +21,20 @@ // MODULES // var bench = require( '@stdlib/bench-harness' ); -var randu = require( '@stdlib/random-base-randu' ); +var uniform = require( '@stdlib/random-array-uniform' ); var isnan = require( '@stdlib/math-base-assert-is-nan' ); var pow = require( '@stdlib/math-base-special-pow' ); -var Float32Array = require( '@stdlib/array-float32' ); var pkg = require( './../package.json' ).name; var smax = require( './../lib/smax.js' ); +// VARIABLES // + +var options = { + 'dtype': 'float32' +}; + + // FUNCTIONS // /** @@ -39,13 +45,7 @@ var smax = require( './../lib/smax.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/benchmark/benchmark.native.js b/benchmark/benchmark.native.js index 1c58f8b..f4605be 100644 --- a/benchmark/benchmark.native.js +++ b/benchmark/benchmark.native.js @@ -22,10 +22,9 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench-harness' ); -var randu = require( '@stdlib/random-base-randu' ); +var uniform = require( '@stdlib/random-array-uniform' ); var isnan = require( '@stdlib/math-base-assert-is-nan' ); var pow = require( '@stdlib/math-base-special-pow' ); -var Float32Array = require( '@stdlib/array-float32' ); var tryRequire = require( '@stdlib/utils-try-require' ); var pkg = require( './../package.json' ).name; @@ -36,6 +35,9 @@ var smax = tryRequire( resolve( __dirname, './../lib/smax.native.js' ) ); var opts = { 'skip': ( smax 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/benchmark/benchmark.ndarray.js b/benchmark/benchmark.ndarray.js index 08fcb88..e31fcd1 100644 --- a/benchmark/benchmark.ndarray.js +++ b/benchmark/benchmark.ndarray.js @@ -21,14 +21,20 @@ // MODULES // var bench = require( '@stdlib/bench-harness' ); -var randu = require( '@stdlib/random-base-randu' ); +var uniform = require( '@stdlib/random-array-uniform' ); var isnan = require( '@stdlib/math-base-assert-is-nan' ); var pow = require( '@stdlib/math-base-special-pow' ); -var Float32Array = require( '@stdlib/array-float32' ); var pkg = require( './../package.json' ).name; var smax = require( './../lib/ndarray.js' ); +// VARIABLES // + +var options = { + 'dtype': 'float32' +}; + + // FUNCTIONS // /** @@ -39,13 +45,7 @@ var smax = 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/benchmark/benchmark.ndarray.native.js b/benchmark/benchmark.ndarray.native.js index e189671..d22689b 100644 --- a/benchmark/benchmark.ndarray.native.js +++ b/benchmark/benchmark.ndarray.native.js @@ -22,10 +22,9 @@ var resolve = require( 'path' ).resolve; var bench = require( '@stdlib/bench-harness' ); -var randu = require( '@stdlib/random-base-randu' ); +var uniform = require( '@stdlib/random-array-uniform' ); var isnan = require( '@stdlib/math-base-assert-is-nan' ); var pow = require( '@stdlib/math-base-special-pow' ); -var Float32Array = require( '@stdlib/array-float32' ); var tryRequire = require( '@stdlib/utils-try-require' ); var pkg = require( './../package.json' ).name; @@ -36,6 +35,9 @@ var smax = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' ) ); var opts = { 'skip': ( smax 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/benchmark/c/benchmark.length.c b/benchmark/c/benchmark.length.c index 66dae83..954b6cd 100644 --- a/benchmark/c/benchmark.length.c +++ b/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_smax( 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_smax_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/dist/index.js b/dist/index.js index 32e191b..bfd604f 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1,9 +1,9 @@ -"use strict";var s=function(u,r){return function(){return r||u((r={exports:{}}).exports,r),r.exports}};var q=s(function(z,o){ -var l=require('@stdlib/math-base-assert-is-nanf/dist'),P=require('@stdlib/math-base-assert-is-positive-zerof/dist');function R(u,r,n){var v,i,e,a;if(u<=0)return NaN;if(u===1||n===0)return r[0];for(n<0?i=(1-u)*n:i=0,v=r[i],a=1;av||e===v&&P(e))&&(v=e)}return v}o.exports=R -});var x=s(function(A,m){ -var Z=require('@stdlib/math-base-assert-is-nanf/dist'),_=require('@stdlib/math-base-assert-is-positive-zerof/dist');function E(u,r,n,v){var i,e,a,t;if(u<=0)return NaN;if(u===1||n===0)return r[v];for(e=v,i=r[e],t=1;ti||a===i&&_(a))&&(i=a)}return i}m.exports=E -});var y=s(function(B,p){ -var O=require('@stdlib/utils-define-nonenumerable-read-only-property/dist'),c=q(),b=x();O(c,"ndarray",b);p.exports=c -});var d=require("path").join,g=require('@stdlib/utils-try-require/dist'),h=require('@stdlib/assert-is-error/dist'),k=y(),f,j=g(d(__dirname,"./native.js"));h(j)?f=k:f=j;module.exports=f; +"use strict";var n=function(e,r){return function(){return r||e((r={exports:{}}).exports,r),r.exports}};var v=n(function(z,f){ +var j=require('@stdlib/math-base-assert-is-nanf/dist'),l=require('@stdlib/math-base-assert-is-positive-zerof/dist');function R(e,r,i,q){var t,u,a,s;if(e<=0)return NaN;if(e===1||i===0)return r[q];for(u=q,t=r[u],s=1;st||a===t&&l(a))&&(t=a)}return t}f.exports=R +});var x=n(function(A,m){ +var _=require('@stdlib/strided-base-stride2offset/dist'),E=v();function O(e,r,i){return E(e,r,i,_(e,i))}m.exports=O +});var y=n(function(B,p){ +var P=require('@stdlib/utils-define-nonenumerable-read-only-property/dist'),c=x(),Z=v();P(c,"ndarray",Z);p.exports=c +});var b=require("path").join,g=require('@stdlib/utils-try-require/dist'),h=require('@stdlib/assert-is-error/dist'),k=y(),o,d=g(b(__dirname,"./native.js"));h(d)?o=k:o=d;module.exports=o; /** @license Apache-2.0 */ //# sourceMappingURL=index.js.map diff --git a/dist/index.js.map b/dist/index.js.map index 0cc9d72..48c430f 100644 --- a/dist/index.js.map +++ b/dist/index.js.map @@ -1,7 +1,7 @@ { "version": 3, - "sources": ["../lib/smax.js", "../lib/ndarray.js", "../lib/main.js", "../lib/index.js"], - "sourcesContent": ["/**\n* @license Apache-2.0\n*\n* Copyright (c) 2020 The Stdlib Authors.\n*\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n* you may not use this file except in compliance with the License.\n* You may obtain a copy of the License at\n*\n* http://www.apache.org/licenses/LICENSE-2.0\n*\n* Unless required by applicable law or agreed to in writing, software\n* distributed under the License is distributed on an \"AS IS\" BASIS,\n* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n* See the License for the specific language governing permissions and\n* limitations under the License.\n*/\n\n'use strict';\n\n// MODULES //\n\nvar isnanf = require( '@stdlib/math-base-assert-is-nanf' );\nvar isPositiveZerof = require( '@stdlib/math-base-assert-is-positive-zerof' );\n\n\n// MAIN //\n\n/**\n* Computes the maximum value of a single-precision floating-point strided array.\n*\n* @param {PositiveInteger} N - number of indexed elements\n* @param {Float32Array} x - input array\n* @param {integer} stride - stride length\n* @returns {number} maximum value\n*\n* @example\n* var Float32Array = require( '@stdlib/array-float32' );\n*\n* var x = new Float32Array( [ 1.0, -2.0, 2.0 ] );\n* var N = x.length;\n*\n* var v = smax( N, x, 1 );\n* // returns 2.0\n*/\nfunction smax( N, x, stride ) {\n\tvar max;\n\tvar ix;\n\tvar v;\n\tvar i;\n\n\tif ( N <= 0 ) {\n\t\treturn NaN;\n\t}\n\tif ( N === 1 || stride === 0 ) {\n\t\treturn x[ 0 ];\n\t}\n\tif ( stride < 0 ) {\n\t\tix = (1-N) * stride;\n\t} else {\n\t\tix = 0;\n\t}\n\tmax = x[ ix ];\n\tfor ( i = 1; i < N; i++ ) {\n\t\tix += stride;\n\t\tv = x[ ix ];\n\t\tif ( isnanf( v ) ) {\n\t\t\treturn v;\n\t\t}\n\t\tif ( v > max || ( v === max && isPositiveZerof( v ) ) ) {\n\t\t\tmax = v;\n\t\t}\n\t}\n\treturn max;\n}\n\n\n// EXPORTS //\n\nmodule.exports = smax;\n", "/**\n* @license Apache-2.0\n*\n* Copyright (c) 2020 The Stdlib Authors.\n*\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n* you may not use this file except in compliance with the License.\n* You may obtain a copy of the License at\n*\n* http://www.apache.org/licenses/LICENSE-2.0\n*\n* Unless required by applicable law or agreed to in writing, software\n* distributed under the License is distributed on an \"AS IS\" BASIS,\n* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n* See the License for the specific language governing permissions and\n* limitations under the License.\n*/\n\n'use strict';\n\n// MODULES //\n\nvar isnanf = require( '@stdlib/math-base-assert-is-nanf' );\nvar isPositiveZerof = require( '@stdlib/math-base-assert-is-positive-zerof' );\n\n\n// MAIN //\n\n/**\n* Computes the maximum value of a single-precision floating-point strided array.\n*\n* @param {PositiveInteger} N - number of indexed elements\n* @param {Float32Array} x - input array\n* @param {integer} stride - stride length\n* @param {NonNegativeInteger} offset - starting index\n* @returns {number} maximum value\n*\n* @example\n* var Float32Array = require( '@stdlib/array-float32' );\n* var floor = require( '@stdlib/math-base-special-floor' );\n*\n* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] );\n* var N = floor( x.length / 2 );\n*\n* var v = smax( N, x, 2, 1 );\n* // returns 4.0\n*/\nfunction smax( N, x, stride, offset ) {\n\tvar max;\n\tvar ix;\n\tvar v;\n\tvar i;\n\n\tif ( N <= 0 ) {\n\t\treturn NaN;\n\t}\n\tif ( N === 1 || stride === 0 ) {\n\t\treturn x[ offset ];\n\t}\n\tix = offset;\n\tmax = x[ ix ];\n\tfor ( i = 1; i < N; i++ ) {\n\t\tix += stride;\n\t\tv = x[ ix ];\n\t\tif ( isnanf( v ) ) {\n\t\t\treturn v;\n\t\t}\n\t\tif ( v > max || ( v === max && isPositiveZerof( v ) ) ) {\n\t\t\tmax = v;\n\t\t}\n\t}\n\treturn max;\n}\n\n\n// EXPORTS //\n\nmodule.exports = smax;\n", "/**\n* @license Apache-2.0\n*\n* Copyright (c) 2020 The Stdlib Authors.\n*\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n* you may not use this file except in compliance with the License.\n* You may obtain a copy of the License at\n*\n* http://www.apache.org/licenses/LICENSE-2.0\n*\n* Unless required by applicable law or agreed to in writing, software\n* distributed under the License is distributed on an \"AS IS\" BASIS,\n* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n* See the License for the specific language governing permissions and\n* limitations under the License.\n*/\n\n'use strict';\n\n// MODULES //\n\nvar setReadOnly = require( '@stdlib/utils-define-nonenumerable-read-only-property' );\nvar smax = require( './smax.js' );\nvar ndarray = require( './ndarray.js' );\n\n\n// MAIN //\n\nsetReadOnly( smax, 'ndarray', ndarray );\n\n\n// EXPORTS //\n\nmodule.exports = smax;\n", "/**\n* @license Apache-2.0\n*\n* Copyright (c) 2020 The Stdlib Authors.\n*\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n* you may not use this file except in compliance with the License.\n* You may obtain a copy of the License at\n*\n* http://www.apache.org/licenses/LICENSE-2.0\n*\n* Unless required by applicable law or agreed to in writing, software\n* distributed under the License is distributed on an \"AS IS\" BASIS,\n* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n* See the License for the specific language governing permissions and\n* limitations under the License.\n*/\n\n'use strict';\n\n/**\n* Compute the maximum value of a single-precision floating-point strided array.\n*\n* @module @stdlib/stats-base-smax\n*\n* @example\n* var Float32Array = require( '@stdlib/array-float32' );\n* var smax = require( '@stdlib/stats-base-smax' );\n*\n* var x = new Float32Array( [ 1.0, -2.0, 2.0 ] );\n* var N = x.length;\n*\n* var v = smax( N, x, 1 );\n* // returns 2.0\n*\n* @example\n* var Float32Array = require( '@stdlib/array-float32' );\n* var floor = require( '@stdlib/math-base-special-floor' );\n* var smax = require( '@stdlib/stats-base-smax' );\n*\n* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] );\n* var N = floor( x.length / 2 );\n*\n* var v = smax.ndarray( N, x, 2, 1 );\n* // returns 4.0\n*/\n\n// MODULES //\n\nvar join = require( 'path' ).join;\nvar tryRequire = require( '@stdlib/utils-try-require' );\nvar isError = require( '@stdlib/assert-is-error' );\nvar main = require( './main.js' );\n\n\n// MAIN //\n\nvar smax;\nvar tmp = tryRequire( join( __dirname, './native.js' ) );\nif ( isError( tmp ) ) {\n\tsmax = main;\n} else {\n\tsmax = tmp;\n}\n\n\n// EXPORTS //\n\nmodule.exports = smax;\n\n// exports: { \"ndarray\": \"smax.ndarray\" }\n"], - "mappings": "uGAAA,IAAAA,EAAAC,EAAA,SAAAC,EAAAC,EAAA,cAsBA,IAAIC,EAAS,QAAS,kCAAmC,EACrDC,EAAkB,QAAS,4CAA6C,EAsB5E,SAASC,EAAMC,EAAGC,EAAGC,EAAS,CAC7B,IAAIC,EACAC,EACAC,EACAC,EAEJ,GAAKN,GAAK,EACT,MAAO,KAER,GAAKA,IAAM,GAAKE,IAAW,EAC1B,OAAOD,EAAG,CAAE,EAQb,IANKC,EAAS,EACbE,GAAM,EAAEJ,GAAKE,EAEbE,EAAK,EAEND,EAAMF,EAAGG,CAAG,EACNE,EAAI,EAAGA,EAAIN,EAAGM,IAAM,CAGzB,GAFAF,GAAMF,EACNG,EAAIJ,EAAGG,CAAG,EACLP,EAAQQ,CAAE,EACd,OAAOA,GAEHA,EAAIF,GAASE,IAAMF,GAAOL,EAAiBO,CAAE,KACjDF,EAAME,EAER,CACA,OAAOF,CACR,CAKAP,EAAO,QAAUG,IC/EjB,IAAAQ,EAAAC,EAAA,SAAAC,EAAAC,EAAA,cAsBA,IAAIC,EAAS,QAAS,kCAAmC,EACrDC,EAAkB,QAAS,4CAA6C,EAwB5E,SAASC,EAAMC,EAAGC,EAAGC,EAAQC,EAAS,CACrC,IAAIC,EACAC,EACAC,EACAC,EAEJ,GAAKP,GAAK,EACT,MAAO,KAER,GAAKA,IAAM,GAAKE,IAAW,EAC1B,OAAOD,EAAGE,CAAO,EAIlB,IAFAE,EAAKF,EACLC,EAAMH,EAAGI,CAAG,EACNE,EAAI,EAAGA,EAAIP,EAAGO,IAAM,CAGzB,GAFAF,GAAMH,EACNI,EAAIL,EAAGI,CAAG,EACLR,EAAQS,CAAE,EACd,OAAOA,GAEHA,EAAIF,GAASE,IAAMF,GAAON,EAAiBQ,CAAE,KACjDF,EAAME,EAER,CACA,OAAOF,CACR,CAKAR,EAAO,QAAUG,IC7EjB,IAAAS,EAAAC,EAAA,SAAAC,EAAAC,EAAA,cAsBA,IAAIC,EAAc,QAAS,uDAAwD,EAC/EC,EAAO,IACPC,EAAU,IAKdF,EAAaC,EAAM,UAAWC,CAAQ,EAKtCH,EAAO,QAAUE,ICejB,IAAIE,EAAO,QAAS,MAAO,EAAE,KACzBC,EAAa,QAAS,2BAA4B,EAClDC,EAAU,QAAS,yBAA0B,EAC7CC,EAAO,IAKPC,EACAC,EAAMJ,EAAYD,EAAM,UAAW,aAAc,CAAE,EAClDE,EAASG,CAAI,EACjBD,EAAOD,EAEPC,EAAOC,EAMR,OAAO,QAAUD", - "names": ["require_smax", "__commonJSMin", "exports", "module", "isnanf", "isPositiveZerof", "smax", "N", "x", "stride", "max", "ix", "v", "i", "require_ndarray", "__commonJSMin", "exports", "module", "isnanf", "isPositiveZerof", "smax", "N", "x", "stride", "offset", "max", "ix", "v", "i", "require_main", "__commonJSMin", "exports", "module", "setReadOnly", "smax", "ndarray", "join", "tryRequire", "isError", "main", "smax", "tmp"] + "sources": ["../lib/ndarray.js", "../lib/smax.js", "../lib/main.js", "../lib/index.js"], + "sourcesContent": ["/**\n* @license Apache-2.0\n*\n* Copyright (c) 2020 The Stdlib Authors.\n*\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n* you may not use this file except in compliance with the License.\n* You may obtain a copy of the License at\n*\n* http://www.apache.org/licenses/LICENSE-2.0\n*\n* Unless required by applicable law or agreed to in writing, software\n* distributed under the License is distributed on an \"AS IS\" BASIS,\n* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n* See the License for the specific language governing permissions and\n* limitations under the License.\n*/\n\n'use strict';\n\n// MODULES //\n\nvar isnanf = require( '@stdlib/math-base-assert-is-nanf' );\nvar isPositiveZerof = require( '@stdlib/math-base-assert-is-positive-zerof' );\n\n\n// MAIN //\n\n/**\n* Computes the maximum value of a single-precision floating-point strided array.\n*\n* @param {PositiveInteger} N - number of indexed elements\n* @param {Float32Array} x - input array\n* @param {integer} strideX - stride length\n* @param {NonNegativeInteger} offsetX - starting index\n* @returns {number} maximum value\n*\n* @example\n* var Float32Array = require( '@stdlib/array-float32' );\n*\n* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] );\n*\n* var v = smax( 4, x, 2, 1 );\n* // returns 4.0\n*/\nfunction smax( N, x, strideX, offsetX ) {\n\tvar max;\n\tvar ix;\n\tvar v;\n\tvar i;\n\n\tif ( N <= 0 ) {\n\t\treturn NaN;\n\t}\n\tif ( N === 1 || strideX === 0 ) {\n\t\treturn x[ offsetX ];\n\t}\n\tix = offsetX;\n\tmax = x[ ix ];\n\tfor ( i = 1; i < N; i++ ) {\n\t\tix += strideX;\n\t\tv = x[ ix ];\n\t\tif ( isnanf( v ) ) {\n\t\t\treturn v;\n\t\t}\n\t\tif ( v > max || ( v === max && isPositiveZerof( v ) ) ) {\n\t\t\tmax = v;\n\t\t}\n\t}\n\treturn max;\n}\n\n\n// EXPORTS //\n\nmodule.exports = smax;\n", "/**\n* @license Apache-2.0\n*\n* Copyright (c) 2020 The Stdlib Authors.\n*\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n* you may not use this file except in compliance with the License.\n* You may obtain a copy of the License at\n*\n* http://www.apache.org/licenses/LICENSE-2.0\n*\n* Unless required by applicable law or agreed to in writing, software\n* distributed under the License is distributed on an \"AS IS\" BASIS,\n* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n* See the License for the specific language governing permissions and\n* limitations under the License.\n*/\n\n'use strict';\n\n// MODULES //\n\nvar stride2offset = require( '@stdlib/strided-base-stride2offset' );\nvar ndarray = require( './ndarray.js' );\n\n\n// MAIN //\n\n/**\n* Computes the maximum value of a single-precision floating-point strided array.\n*\n* @param {PositiveInteger} N - number of indexed elements\n* @param {Float32Array} x - input array\n* @param {integer} strideX - stride length\n* @returns {number} maximum value\n*\n* @example\n* var Float32Array = require( '@stdlib/array-float32' );\n*\n* var x = new Float32Array( [ 1.0, -2.0, 2.0 ] );\n*\n* var v = smax( x.length, x, 1 );\n* // returns 2.0\n*/\nfunction smax( N, x, strideX ) {\n\treturn ndarray( N, x, strideX, stride2offset( N, strideX ) );\n}\n\n\n// EXPORTS //\n\nmodule.exports = smax;\n", "/**\n* @license Apache-2.0\n*\n* Copyright (c) 2020 The Stdlib Authors.\n*\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n* you may not use this file except in compliance with the License.\n* You may obtain a copy of the License at\n*\n* http://www.apache.org/licenses/LICENSE-2.0\n*\n* Unless required by applicable law or agreed to in writing, software\n* distributed under the License is distributed on an \"AS IS\" BASIS,\n* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n* See the License for the specific language governing permissions and\n* limitations under the License.\n*/\n\n'use strict';\n\n// MODULES //\n\nvar setReadOnly = require( '@stdlib/utils-define-nonenumerable-read-only-property' );\nvar smax = require( './smax.js' );\nvar ndarray = require( './ndarray.js' );\n\n\n// MAIN //\n\nsetReadOnly( smax, 'ndarray', ndarray );\n\n\n// EXPORTS //\n\nmodule.exports = smax;\n", "/**\n* @license Apache-2.0\n*\n* Copyright (c) 2020 The Stdlib Authors.\n*\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n* you may not use this file except in compliance with the License.\n* You may obtain a copy of the License at\n*\n* http://www.apache.org/licenses/LICENSE-2.0\n*\n* Unless required by applicable law or agreed to in writing, software\n* distributed under the License is distributed on an \"AS IS\" BASIS,\n* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n* See the License for the specific language governing permissions and\n* limitations under the License.\n*/\n\n'use strict';\n\n/**\n* Compute the maximum value of a single-precision floating-point strided array.\n*\n* @module @stdlib/stats-base-smax\n*\n* @example\n* var Float32Array = require( '@stdlib/array-float32' );\n* var smax = require( '@stdlib/stats-base-smax' );\n*\n* var x = new Float32Array( [ 1.0, -2.0, 2.0 ] );\n*\n* var v = smax( x.length, x, 1 );\n* // returns 2.0\n*\n* @example\n* var Float32Array = require( '@stdlib/array-float32' );\n* var smax = require( '@stdlib/stats-base-smax' );\n*\n* var x = new Float32Array( [ 2.0, 1.0, 2.0, -2.0, -2.0, 2.0, 3.0, 4.0 ] );\n*\n* var v = smax.ndarray( 4, x, 2, 1 );\n* // returns 4.0\n*/\n\n// MODULES //\n\nvar join = require( 'path' ).join;\nvar tryRequire = require( '@stdlib/utils-try-require' );\nvar isError = require( '@stdlib/assert-is-error' );\nvar main = require( './main.js' );\n\n\n// MAIN //\n\nvar smax;\nvar tmp = tryRequire( join( __dirname, './native.js' ) );\nif ( isError( tmp ) ) {\n\tsmax = main;\n} else {\n\tsmax = tmp;\n}\n\n\n// EXPORTS //\n\nmodule.exports = smax;\n\n// exports: { \"ndarray\": \"smax.ndarray\" }\n"], + "mappings": "uGAAA,IAAAA,EAAAC,EAAA,SAAAC,EAAAC,EAAA,cAsBA,IAAIC,EAAS,QAAS,kCAAmC,EACrDC,EAAkB,QAAS,4CAA6C,EAsB5E,SAASC,EAAMC,EAAGC,EAAGC,EAASC,EAAU,CACvC,IAAIC,EACAC,EACAC,EACAC,EAEJ,GAAKP,GAAK,EACT,MAAO,KAER,GAAKA,IAAM,GAAKE,IAAY,EAC3B,OAAOD,EAAGE,CAAQ,EAInB,IAFAE,EAAKF,EACLC,EAAMH,EAAGI,CAAG,EACNE,EAAI,EAAGA,EAAIP,EAAGO,IAAM,CAGzB,GAFAF,GAAMH,EACNI,EAAIL,EAAGI,CAAG,EACLR,EAAQS,CAAE,EACd,OAAOA,GAEHA,EAAIF,GAASE,IAAMF,GAAON,EAAiBQ,CAAE,KACjDF,EAAME,EAER,CACA,OAAOF,CACR,CAKAR,EAAO,QAAUG,IC3EjB,IAAAS,EAAAC,EAAA,SAAAC,EAAAC,EAAA,cAsBA,IAAIC,EAAgB,QAAS,oCAAqC,EAC9DC,EAAU,IAqBd,SAASC,EAAMC,EAAGC,EAAGC,EAAU,CAC9B,OAAOJ,EAASE,EAAGC,EAAGC,EAASL,EAAeG,EAAGE,CAAQ,CAAE,CAC5D,CAKAN,EAAO,QAAUG,ICnDjB,IAAAI,EAAAC,EAAA,SAAAC,EAAAC,EAAA,cAsBA,IAAIC,EAAc,QAAS,uDAAwD,EAC/EC,EAAO,IACPC,EAAU,IAKdF,EAAaC,EAAM,UAAWC,CAAQ,EAKtCH,EAAO,QAAUE,ICYjB,IAAIE,EAAO,QAAS,MAAO,EAAE,KACzBC,EAAa,QAAS,2BAA4B,EAClDC,EAAU,QAAS,yBAA0B,EAC7CC,EAAO,IAKPC,EACAC,EAAMJ,EAAYD,EAAM,UAAW,aAAc,CAAE,EAClDE,EAASG,CAAI,EACjBD,EAAOD,EAEPC,EAAOC,EAMR,OAAO,QAAUD", + "names": ["require_ndarray", "__commonJSMin", "exports", "module", "isnanf", "isPositiveZerof", "smax", "N", "x", "strideX", "offsetX", "max", "ix", "v", "i", "require_smax", "__commonJSMin", "exports", "module", "stride2offset", "ndarray", "smax", "N", "x", "strideX", "require_main", "__commonJSMin", "exports", "module", "setReadOnly", "smax", "ndarray", "join", "tryRequire", "isError", "main", "smax", "tmp"] } diff --git a/docs/repl.txt b/docs/repl.txt index 38a7c0a..447df52 100644 --- a/docs/repl.txt +++ b/docs/repl.txt @@ -1,9 +1,9 @@ -{{alias}}( N, x, stride ) +{{alias}}( N, x, strideX ) Computes the maximum value of a single-precision floating-point strided array. - The `N` and `stride` parameters determine which elements in `x` are accessed + The `N` and stride parameters determine which elements in `x` are accessed at runtime. Indexing is relative to the first index. To introduce an offset, use a typed @@ -19,8 +19,8 @@ x: Float32Array Input array. - stride: integer - Index increment. + strideX: integer + Stride Length. 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/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 ) 2.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 ) 2.0 -{{alias}}.ndarray( N, x, stride, offset ) + +{{alias}}.ndarray( N, x, strideX, offsetX ) Computes the maximum value of a single-precision floating-point strided array using alternative indexing semantics. @@ -65,10 +62,10 @@ x: Float32Array Input array. - stride: integer - Index increment. + strideX: integer + Stride Length. - offset: integer + offsetX: integer Starting index. Returns diff --git a/docs/types/index.d.ts b/docs/types/index.d.ts index 454f55e..3553001 100644 --- a/docs/types/index.d.ts +++ b/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 = smax( x.length, x, 1 ); * // returns 2.0 */ - ( N: number, x: Float32Array, stride: number ): number; + ( N: number, x: Float32Array, strideX: number ): number; /** * Computes the maximum value 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 maximum value * * @example @@ -57,7 +57,7 @@ interface Routine { * var v = smax.ndarray( x.length, x, 1, 0 ); * // returns 2.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 maximum value * * @example diff --git a/examples/c/example.c b/examples/c/example.c index 4f24b01..a95b925 100644 --- a/examples/c/example.c +++ b/examples/c/example.c @@ -17,21 +17,20 @@ */ #include "stdlib/stats/base/smax.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 maximum value: - float v = stdlib_strided_smax( N, x, stride ); + float v = stdlib_strided_smax( N, x, strideX ); // Print the result: printf( "max: %f\n", v ); diff --git a/examples/index.js b/examples/index.js index e154dd3..286f1a9 100644 --- a/examples/index.js +++ b/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 smax = 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 = smax( x.length, x, 1 ); diff --git a/include.gypi b/include.gypi index 2fa318f..9212937 100644 --- a/include.gypi +++ b/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 single-precision floating-point strided array. */ -float stdlib_strided_smax( const int64_t N, const float *X, const int64_t stride ); +float API_SUFFIX(stdlib_strided_smax)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX ); + +/** +* Computes the maximum value of a single-precision floating-point strided array using alternative indexing semantics. +*/ +float API_SUFFIX(stdlib_strided_smax_ndarray)( const CBLAS_INT N, const float *X, const CBLAS_INT strideX, const CBLAS_INT offsetX ); #ifdef __cplusplus } diff --git a/lib/index.js b/lib/index.js index b6ddc07..0e37b15 100644 --- a/lib/index.js +++ b/lib/index.js @@ -28,20 +28,17 @@ * var smax = require( '@stdlib/stats-base-smax' ); * * var x = new Float32Array( [ 1.0, -2.0, 2.0 ] ); -* var N = x.length; * -* var v = smax( N, x, 1 ); +* var v = smax( x.length, x, 1 ); * // returns 2.0 * * @example * var Float32Array = require( '@stdlib/array-float32' ); -* var floor = require( '@stdlib/math-base-special-floor' ); * var smax = require( '@stdlib/stats-base-smax' ); * * 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 = smax.ndarray( N, x, 2, 1 ); +* var v = smax.ndarray( 4, x, 2, 1 ); * // returns 4.0 */ diff --git a/lib/ndarray.js b/lib/ndarray.js index ec964fe..7ef0daf 100644 --- a/lib/ndarray.js +++ b/lib/ndarray.js @@ -31,21 +31,19 @@ var isPositiveZerof = require( '@stdlib/math-base-assert-is-positive-zerof' ); * * @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} maximum value * * @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 = smax( N, x, 2, 1 ); +* var v = smax( 4, x, 2, 1 ); * // returns 4.0 */ -function smax( N, x, stride, offset ) { +function smax( N, x, strideX, offsetX ) { var max; var ix; var v; @@ -54,13 +52,13 @@ function smax( 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; max = x[ ix ]; for ( i = 1; i < N; i++ ) { - ix += stride; + ix += strideX; v = x[ ix ]; if ( isnanf( v ) ) { return v; diff --git a/lib/ndarray.native.js b/lib/ndarray.native.js index 15390b3..3a37d51 100644 --- a/lib/ndarray.native.js +++ b/lib/ndarray.native.js @@ -20,8 +20,7 @@ // MODULES // -var Float32Array = require( '@stdlib/array-float32' ); -var addon = require( './smax.native.js' ); +var addon = require( './../src/addon.node' ); // MAIN // @@ -31,27 +30,20 @@ var addon = require( './smax.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} maximum value * * @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 = smax( N, x, 2, 1 ); +* var v = smax( 4, x, 2, 1 ); * // returns 4.0 */ -function smax( 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 smax( N, x, strideX, offsetX ) { + return addon.ndarray( N, x, strideX, offsetX ); } diff --git a/lib/smax.js b/lib/smax.js index 898377f..3027bc7 100644 --- a/lib/smax.js +++ b/lib/smax.js @@ -20,8 +20,8 @@ // MODULES // -var isnanf = require( '@stdlib/math-base-assert-is-nanf' ); -var isPositiveZerof = require( '@stdlib/math-base-assert-is-positive-zerof' ); +var stride2offset = require( '@stdlib/strided-base-stride2offset' ); +var ndarray = require( './ndarray.js' ); // MAIN // @@ -31,47 +31,19 @@ var isPositiveZerof = require( '@stdlib/math-base-assert-is-positive-zerof' ); * * @param {PositiveInteger} N - number of indexed elements * @param {Float32Array} x - input array -* @param {integer} stride - stride length +* @param {integer} strideX - stride length * @returns {number} maximum value * * @example * var Float32Array = require( '@stdlib/array-float32' ); * * var x = new Float32Array( [ 1.0, -2.0, 2.0 ] ); -* var N = x.length; * -* var v = smax( N, x, 1 ); +* var v = smax( x.length, x, 1 ); * // returns 2.0 */ -function smax( 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; - } - max = x[ ix ]; - for ( i = 1; i < N; i++ ) { - ix += stride; - v = x[ ix ]; - if ( isnanf( v ) ) { - return v; - } - if ( v > max || ( v === max && isPositiveZerof( v ) ) ) { - max = v; - } - } - return max; +function smax( N, x, strideX ) { + return ndarray( N, x, strideX, stride2offset( N, strideX ) ); } diff --git a/lib/smax.native.js b/lib/smax.native.js index f1096ca..18d94b7 100644 --- a/lib/smax.native.js +++ b/lib/smax.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} maximum value * * @example * var Float32Array = require( '@stdlib/array-float32' ); * * var x = new Float32Array( [ 1.0, -2.0, 2.0 ] ); -* var N = x.length; * -* var v = smax( N, x, 1 ); +* var v = smax( x.length, x, 1 ); * // returns 2.0 */ -function smax( N, x, stride ) { - return addon( N, x, stride ); +function smax( N, x, strideX ) { + return addon( N, x, strideX ); } diff --git a/manifest.json b/manifest.json index f5bed0f..57e9924 100644 --- a/manifest.json +++ b/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/smax.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-zerof", + "@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", + "@stdlib/math-base-assert-is-positive-zerof" + ] + }, + { + "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", + "@stdlib/math-base-assert-is-positive-zerof" + ] + }, + { + "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", "@stdlib/math-base-assert-is-positive-zerof" ] diff --git a/package.json b/package.json index 0689411..06eb99b 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,15 @@ }, "dependencies": { "@stdlib/assert-is-error": "^0.2.2", + "@stdlib/blas-base-shared": "^0.1.0", "@stdlib/math-base-assert-is-nanf": "^0.2.2", "@stdlib/math-base-assert-is-positive-zerof": "^0.1.3", + "@stdlib/napi-argv": "^0.2.2", + "@stdlib/napi-argv-int64": "^0.2.2", + "@stdlib/napi-argv-strided-float32array": "^0.2.2", + "@stdlib/napi-create-double": "^0.0.2", + "@stdlib/napi-export": "^0.2.2", + "@stdlib/strided-base-stride2offset": "^0.1.0", "@stdlib/utils-define-nonenumerable-read-only-property": "^0.2.2", "@stdlib/utils-library-manifest": "^0.2.2", "@stdlib/utils-try-require": "^0.2.2" @@ -53,10 +60,9 @@ "@stdlib/assert-is-browser": "^0.2.2", "@stdlib/math-base-assert-is-nan": "^0.2.2", "@stdlib/math-base-assert-is-positive-zero": "^0.2.2", - "@stdlib/math-base-special-floor": "^0.2.3", "@stdlib/math-base-special-pow": "^0.3.0", - "@stdlib/math-base-special-round": "^0.3.0", - "@stdlib/random-base-randu": "^0.2.1", + "@stdlib/random-array-discrete-uniform": "^0.2.1", + "@stdlib/random-array-uniform": "^0.2.1", "proxyquire": "^2.0.0", "tape": "git+https://github.com/kgryte/tape.git#fix/globby", "istanbul": "^0.4.1", diff --git a/src/addon.c b/src/addon.c new file mode 100644 index 0000000..efe83f1 --- /dev/null +++ b/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/smax.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_smax( 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_smax_ndarray( N, X, strideX, offsetX ), v ); + return v; +} + +STDLIB_NAPI_MODULE_EXPORT_FCN_WITH_METHOD( addon, "ndarray", addon_method ) diff --git a/src/addon.cpp b/src/addon.cpp deleted file mode 100644 index 99e6555..0000000 --- a/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/smax.h" -#include -#include -#include -#include -#include - -/** -* Add-on namespace. -*/ -namespace stdlib_stats_base_smax { - - /** - * Computes the maximum value 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_smax( 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_smax( 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_smax, NULL, &fcn ); - assert( status == napi_ok ); - return fcn; - } - - NAPI_MODULE( NODE_GYP_MODULE_NAME, Init ) -} // end namespace stdlib_stats_base_smax diff --git a/src/smax.c b/src/main.c similarity index 52% rename from src/smax.c rename to src/main.c index 345a46a..c68f223 100644 --- a/src/smax.c +++ b/src/main.c @@ -19,36 +19,47 @@ #include "stdlib/stats/base/smax.h" #include "stdlib/math/base/assert/is_nanf.h" #include "stdlib/math/base/assert/is_positive_zerof.h" -#include +#include "stdlib/blas/base/shared.h" +#include "stdlib/strided/base/stride2offset.h" /** * Computes the maximum value 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_smax( const int64_t N, const float *X, const int64_t stride ) { - int64_t ix; - int64_t i; +float API_SUFFIX(stdlib_strided_smax)( 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_smax_ndarray)( N, X, strideX, ox ); +} + +/** +* Computes the maximum value 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_smax_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 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; max = X[ ix ]; for ( i = 1; i < N; i++ ) { - ix += stride; + ix += strideX; v = X[ ix ]; if ( stdlib_base_is_nanf( v ) ) { return v; diff --git a/test/test.ndarray.js b/test/test.ndarray.js index fd4f30c..8014753 100644 --- a/test/test.ndarray.js +++ b/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 Float32Array = require( '@stdlib/array-float32' ); @@ -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; @@ -111,15 +109,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = smax( N, x, 2, 0 ); + v = smax( 4, 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; @@ -134,8 +130,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = smax( N, x, -2, 6 ); + v = smax( 4, x, -2, 6 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end(); @@ -154,7 +149,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; @@ -168,9 +162,8 @@ tape( 'the function supports an `offset` parameter', function test( t ) { 3.0, 4.0 // 3 ]); - N = floor( x.length / 2 ); - v = smax( N, x, 2, 1 ); + v = smax( 4, x, 2, 1 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end(); diff --git a/test/test.ndarray.native.js b/test/test.ndarray.native.js index 2758b33..282004c 100644 --- a/test/test.ndarray.native.js +++ b/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 Float32Array = require( '@stdlib/array-float32' ); @@ -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; @@ -120,15 +118,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = smax( N, x, 2, 0 ); + v = smax( 4, 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; @@ -143,8 +139,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = smax( N, x, -2, 6 ); + v = smax( 4, x, -2, 6 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end(); @@ -163,7 +158,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; @@ -177,9 +171,8 @@ tape( 'the function supports an `offset` parameter', opts, function test( t ) { 3.0, 4.0 // 3 ]); - N = floor( x.length / 2 ); - v = smax( N, x, 2, 1 ); + v = smax( 4, x, 2, 1 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end(); diff --git a/test/test.smax.js b/test/test.smax.js index 54f5ad1..0be5e7b 100644 --- a/test/test.smax.js +++ b/test/test.smax.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 Float32Array = require( '@stdlib/array-float32' ); @@ -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; @@ -111,15 +109,13 @@ tape( 'the function supports a `stride` parameter', function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = smax( N, x, 2 ); + v = smax( 4, 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; @@ -134,8 +130,7 @@ tape( 'the function supports a negative `stride` parameter', function test( t ) 2.0 ]); - N = floor( x.length / 2 ); - v = smax( N, x, -2 ); + v = smax( 4, x, -2 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end(); @@ -156,7 +151,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 Float32Array([ @@ -172,9 +166,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 = smax( N, x1, 2 ); + v = smax( 4, x1, 2 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end(); diff --git a/test/test.smax.native.js b/test/test.smax.native.js index 2fb3efd..d7758dc 100644 --- a/test/test.smax.native.js +++ b/test/test.smax.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 Float32Array = require( '@stdlib/array-float32' ); @@ -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; @@ -202,15 +200,13 @@ tape( 'the function supports a `stride` parameter', opts, function test( t ) { 2.0 ]); - N = floor( x.length / 2 ); - v = smax( N, x, 2 ); + v = smax( 4, 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; @@ -225,8 +221,7 @@ tape( 'the function supports a negative `stride` parameter', opts, function test 2.0 ]); - N = floor( x.length / 2 ); - v = smax( N, x, -2 ); + v = smax( 4, x, -2 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end(); @@ -247,7 +242,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 Float32Array([ @@ -263,9 +257,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 = smax( N, x1, 2 ); + v = smax( 4, x1, 2 ); t.strictEqual( v, 4.0, 'returns expected value' ); t.end();