refactor: update blas/ext/base/sdsapxsum to follow current project …

…conventions PR-URL: #1889 Closes: #1521 --------- Signed-off-by: Athan Reines <[email protected]> Co-authored-by: Athan Reines <[email protected]> Reviewed-by: Athan Reines <[email protected]> Reviewed-by: Philipp Burckhardt <[email protected]>
stdlib-js · Mar 21, 2024 · aebb788 · aebb788 · stdlib-bot · Mar 21, 2024
1 parent bbc3cfc
commit aebb788
Show file tree

Hide file tree

Showing 21 changed files with 203 additions and 319 deletions.
diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/README.md b/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/README.md
@@ -44,9 +44,8 @@ Adds a constant to each single-precision floating-point strided array element an
 var Float32Array = require( '@stdlib/array/float32' );
 
 var x = new Float32Array( [ 1.0, -2.0, 2.0 ] );
-var N = x.length;
 
-var v = sdsapxsum( N, 5.0, x, 1 );
+var v = sdsapxsum( 3, 5.0, x, 1 );
 // returns 16.0
 ```
 
@@ -56,16 +55,14 @@ The function has the following parameters:
 -   **x**: input [`Float32Array`][@stdlib/array/float32].
 -   **stride**: index increment for `x`.
 
-The `N` and `stride` parameters determine which elements in `x` are accessed at runtime. For example, to access every other element in `x`,
+The `N` and `stride` parameters determine which elements in the strided array are accessed at runtime. For example, to access every other element in the strided array,
 
 ```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 = sdsapxsum( N, 5.0, x, 2 );
+var v = sdsapxsum( 4, 5.0, x, 2 );
 // returns 25.0
 ```
 
@@ -75,14 +72,11 @@ 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 = sdsapxsum( N, 5.0, x1, 2 );
+var v = sdsapxsum( 4, 5.0, x1, 2 );
 // returns 25.0
 ```
 
@@ -94,26 +88,23 @@ Adds a constant to each single-precision floating-point strided array element an
 var Float32Array = require( '@stdlib/array/float32' );
 
 var x = new Float32Array( [ 1.0, -2.0, 2.0 ] );
-var N = x.length;
 
-var v = sdsapxsum.ndarray( N, 5.0, x, 1, 0 );
+var v = sdsapxsum.ndarray( 3, 5.0, x, 1, 0 );
 // returns 16.0
 ```
 
 The function has the following additional parameters:
 
 -   **offset**: starting index for `x`.
 
-While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying `buffer`, the `offset` parameter supports indexing semantics based on a starting index. For example, to access 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 access every other value in the strided array starting from the second value
 
 ```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 = sdsapxsum.ndarray( N, 5.0, x, 2, 1 );
+var v = sdsapxsum.ndarray( 4, 5.0, x, 2, 1 );
 // returns 25.0
 ```
 
@@ -139,18 +130,11 @@ var v = sdsapxsum.ndarray( N, 5.0, x, 2, 1 );
 <!-- eslint no-undef: "error" -->
 
 ```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/base/discrete-uniform' ).factory;
+var filledarrayBy = require( '@stdlib/array/filled-by' );
 var sdsapxsum = require( '@stdlib/blas/ext/base/sdsapxsum' );
 
-var x;
-var i;
-
-x = new Float32Array( 10 );
-for ( i = 0; i < x.length; i++ ) {
-    x[ i ] = round( randu()*100.0 );
-}
+var x = filledarrayBy( 10, 'float32', discreteUniform( 0, 100 ) );
 console.log( x );
 
 var v = sdsapxsum( x.length, 5.0, x, 1 );

diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/benchmark/benchmark.js b/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/benchmark/benchmark.js
@@ -21,14 +21,19 @@
 // MODULES //
 
 var bench = require( '@stdlib/bench' );
-var randu = require( '@stdlib/random/base/randu' );
+var uniform = require( '@stdlib/random/base/uniform' ).factory;
+var filledarrayBy = require( '@stdlib/array/filled-by' );
 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 sdsapxsum = require( './../lib/sdsapxsum.js' );
 
 
+// VARIABLES //
+
+var rand = uniform( -10.0, 10.0 );
+
+
 // FUNCTIONS //
 
 /**
@@ -39,13 +44,7 @@ var sdsapxsum = require( './../lib/sdsapxsum.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 = filledarrayBy( len, 'float32', rand );
 	return benchmark;
 
 	function benchmark( b ) {

diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/benchmark/benchmark.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/benchmark/benchmark.native.js
@@ -22,10 +22,10 @@
 
 var resolve = require( 'path' ).resolve;
 var bench = require( '@stdlib/bench' );
-var randu = require( '@stdlib/random/base/randu' );
+var uniform = require( '@stdlib/random/base/uniform' ).factory;
+var filledarrayBy = require( '@stdlib/array/filled-by' );
 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 +36,7 @@ var sdsapxsum = tryRequire( resolve( __dirname, './../lib/sdsapxsum.native.js' )
 var opts = {
 	'skip': ( sdsapxsum instanceof Error )
 };
+var rand = uniform( -10.0, 10.0 );
 
 
 // FUNCTIONS //
@@ -48,13 +49,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 = filledarrayBy( len, 'float32', rand );
 	return benchmark;
 
 	function benchmark( b ) {

diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/benchmark/benchmark.ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/benchmark/benchmark.ndarray.js
@@ -21,14 +21,19 @@
 // MODULES //
 
 var bench = require( '@stdlib/bench' );
-var randu = require( '@stdlib/random/base/randu' );
+var uniform = require( '@stdlib/random/base/uniform' ).factory;
+var filledarrayBy = require( '@stdlib/array/filled-by' );
 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 sdsapxsum = require( './../lib/ndarray.js' );
 
 
+// VARIABLES //
+
+var rand = uniform( -10.0, 10.0 );
+
+
 // FUNCTIONS //
 
 /**
@@ -39,13 +44,7 @@ var sdsapxsum = 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 = filledarrayBy( len, 'float32', rand );
 	return benchmark;
 
 	function benchmark( b ) {

diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/benchmark/benchmark.ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/benchmark/benchmark.ndarray.native.js
@@ -22,10 +22,10 @@
 
 var resolve = require( 'path' ).resolve;
 var bench = require( '@stdlib/bench' );
-var randu = require( '@stdlib/random/base/randu' );
+var uniform = require( '@stdlib/random/base/uniform' ).factory;
+var filledarrayBy = require( '@stdlib/array/filled-by' );
 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 +36,7 @@ var sdsapxsum = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' ) )
 var opts = {
 	'skip': ( sdsapxsum instanceof Error )
 };
+var rand = uniform( -10.0, 10.0 );
 
 
 // FUNCTIONS //
@@ -48,13 +49,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 = filledarrayBy( len, 'float32', rand );
 	return benchmark;
 
 	function benchmark( b ) {

diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/docs/repl.txt b/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/docs/repl.txt
@@ -3,8 +3,8 @@
     Adds a constant to each single-precision floating-point strided array
     element and computes the sum using extended accumulation.
 
-    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.
@@ -39,19 +39,16 @@
 
     // 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, 5.0, x, stride )
+    > {{alias}}( 3, 5.0, x, 2 )
     16.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, 5.0, x1, stride )
+    > {{alias}}( 3, 5.0, x1, 2 )
     14.0
 
+
 {{alias}}.ndarray( N, alpha, x, stride, offset )
     Adds a constant to each single-precision floating-point strided array
     element and computes the sum using extended accumulation and alternative
@@ -91,9 +88,8 @@
     16.0
 
     // Using offset parameter:
-    > var x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] );
-    > var N = {{alias:@stdlib/math/base/special/floor}}( x.length / 2 );
-    > {{alias}}.ndarray( N, 5.0, x, 2, 1 )
+    > x = new {{alias:@stdlib/array/float32}}( [ 1.0, -2.0, 3.0, 2.0, 5.0, -1.0 ] );
+    > {{alias}}.ndarray( 3, 5.0, x, 2, 1 )
     14.0
 
     See Also

diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/examples/index.js b/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/examples/index.js
@@ -18,18 +18,11 @@
 
 '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/base/discrete-uniform' ).factory;
+var filledarrayBy = require( '@stdlib/array/filled-by' );
 var sdsapxsum = require( './../lib' );
 
-var x;
-var i;
-
-x = new Float32Array( 10 );
-for ( i = 0; i < x.length; i++ ) {
-	x[ i ] = round( randu()*100.0 );
-}
+var x = filledarrayBy( 10, 'float32', discreteUniform( 0, 100 ) );
 console.log( x );
 
 var v = sdsapxsum( x.length, 5.0, x, 1 );

diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/include.gypi b/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/include.gypi
@@ -36,7 +36,7 @@
 
     # Source files:
     'src_files': [
-      '<(src_dir)/addon.cpp',
+      '<(src_dir)/addon.c',
       '<!@(node -e "var arr = require(\'@stdlib/utils/library-manifest\')(\'./manifest.json\',{},{\'basedir\':process.cwd(),\'paths\':\'posix\'}).src; for ( var i = 0; i < arr.length; i++ ) { console.log( arr[ i ] ); }")',
     ],
 

diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/lib/index.js b/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/lib/index.js
@@ -28,20 +28,17 @@
 * var sdsapxsum = require( '@stdlib/blas/ext/base/sdsapxsum' );
 *
 * var x = new Float32Array( [ 1.0, -2.0, 2.0 ] );
-* var N = x.length;
 *
-* var v = sdsapxsum( N, 5.0, x, 1 );
+* var v = sdsapxsum( 3, 5.0, x, 1 );
 * // returns 16.0
 *
 * @example
 * var Float32Array = require( '@stdlib/array/float32' );
-* var floor = require( '@stdlib/math/base/special/floor' );
 * var sdsapxsum = require( '@stdlib/blas/ext/base/sdsapxsum' );
 *
 * 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 = sdsapxsum.ndarray( N, 5.0, x, 2, 1 );
+* var v = sdsapxsum.ndarray( 4, 5.0, x, 2, 1 );
 * // returns 25.0
 */
 

diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/lib/ndarray.js b/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/lib/ndarray.js
@@ -37,12 +37,10 @@ var sdsapxsumpw = require( '@stdlib/blas/ext/base/sdsapxsumpw' ).ndarray;
 *
 * @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 = sdsapxsum( N, 5.0, x, 2, 1 );
+* var v = sdsapxsum( 4, 5.0, x, 2, 1 );
 * // returns 25.0
 */
 function sdsapxsum( N, alpha, x, stride, offset ) {

diff --git a/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/lib/ndarray.native.js b/lib/node_modules/@stdlib/blas/ext/base/sdsapxsum/lib/ndarray.native.js
@@ -20,7 +20,8 @@
 
 // MODULES //
 
-var Float32Array = require( '@stdlib/array/float32' );
+var minViewBufferIndex = require( '@stdlib/strided/base/min-view-buffer-index' );
+var offsetView = require( '@stdlib/strided/base/offset-view' );
 var addon = require( './sdsapxsum.native.js' );
 
 
@@ -38,20 +39,16 @@ var addon = require( './sdsapxsum.native.js' );
 *
 * @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 = sdsapxsum( N, 5.0, x, 2, 1 );
+* var v = sdsapxsum( 4, 5.0, x, 2, 1 );
 * // returns 25.0
 */
 function sdsapxsum( N, alpha, 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
+	offset = minViewBufferIndex( N, stride, offset );
+	view = offsetView( x, offset );
 	return addon( N, alpha, view, stride );
 }