Skip to content

Commit

Permalink
refactor: update implementation according to current project conventions
Browse files Browse the repository at this point in the history
Ref: #788
  • Loading branch information
kgryte committed Dec 3, 2023
1 parent 004b244 commit 3272b77
Show file tree
Hide file tree
Showing 18 changed files with 299 additions and 354 deletions.
46 changes: 14 additions & 32 deletions lib/node_modules/@stdlib/blas/base/sasum/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,33 +74,26 @@ The `N` and `stride` parameters determine which elements in `x` are used to comp

```javascript
var Float32Array = require( '@stdlib/array/float32' );
var floor = require( '@stdlib/math/base/special/floor' );

var x = new Float32Array( [ -2.0, 1.0, 3.0, -5.0, 4.0, 0.0, -1.0, -3.0 ] );

var N = floor( x.length / 2 );
var stride = 2;

var sum = sasum( N, x, stride );
var sum = sasum( 4, x, 2 );
// returns 10.0
```

Note that indexing is relative to the first index. To introduce an offset, use [`typed array`][mdn-typed-array] views.

```javascript
var Float32Array = require( '@stdlib/array/float32' );
var floor = require( '@stdlib/math/base/special/floor' );

// Initial array...
// Initial array:
var x0 = new Float32Array( [ 1.0, -2.0, 3.0, -4.0, 5.0, -6.0 ] );

// Create an offset view...
// Create an offset view:
var x1 = new Float32Array( x0.buffer, x0.BYTES_PER_ELEMENT*1 ); // start at 2nd element

var N = floor( x0.length / 2 );

// Sum every other value...
var sum = sasum( N, x1, 2 );
// Sum every other value:
var sum = sasum( 3, x1, 2 );
// returns 12.0
```

Expand Down Expand Up @@ -160,28 +153,17 @@ sum = sasum.ndarray( 3, x, -1, x.length-1 );
<!-- eslint no-undef: "error" -->

```javascript
var round = require( '@stdlib/math/base/special/round' );
var randu = require( '@stdlib/random/base/randu' );
var Float32Array = require( '@stdlib/array/float32' );
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
var sasum = require( '@stdlib/blas/base/sasum' );

var rand;
var sign;
var x;
var i;

x = new Float32Array( 100 );
for ( i = 0; i < x.length; i++ ) {
rand = round( randu()*100.0 );
sign = randu();
if ( sign < 0.5 ) {
sign = -1.0;
} else {
sign = 1.0;
}
x[ i ] = sign * rand;
}
console.log( sasum( x.length, x, 1 ) );
var opts = {
'dtype': 'float32'
};
var x = discreteUniform( 10, -100, 100, opts );
console.log( x );

var out = sasum( x.length, x, 1 );
console.log( out );
```

</section>
Expand Down
18 changes: 9 additions & 9 deletions lib/node_modules/@stdlib/blas/base/sasum/benchmark/benchmark.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,20 @@
// MODULES //

var bench = require( '@stdlib/bench' );
var randu = require( '@stdlib/random/base/randu' );
var uniform = require( '@stdlib/random/array/uniform' );
var 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 sasum = require( './../lib/sasum.js' );


// VARIABLES //

var options = {
'dtype': 'float32'
};


// FUNCTIONS //

/**
Expand All @@ -39,13 +45,7 @@ var sasum = require( './../lib/sasum.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()*20000.0 ) - 10000.0;
}
var x = uniform( len, -100.0, 100.0, options );
return benchmark;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@

var resolve = require( 'path' ).resolve;
var bench = require( '@stdlib/bench' );
var randu = require( '@stdlib/random/base/randu' );
var uniform = require( '@stdlib/random/array/uniform' );
var 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;

Expand All @@ -36,6 +35,9 @@ var sasum = tryRequire( resolve( __dirname, './../lib/sasum.native.js' ) );
var opts = {
'skip': ( sasum instanceof Error )
};
var options = {
'dtype': 'float32'
};


// FUNCTIONS //
Expand All @@ -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()*20000.0 ) - 10000.0;
}
var x = uniform( len, -100.0, 100.0, options );
return benchmark;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,20 @@
// MODULES //

var bench = require( '@stdlib/bench' );
var randu = require( '@stdlib/random/base/randu' );
var uniform = require( '@stdlib/random/array/uniform' );
var 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 sasum = require( './../lib/ndarray.js' );


// VARIABLES //

var options = {
'dtype': 'float32'
};


// FUNCTIONS //

/**
Expand All @@ -39,13 +45,7 @@ var sasum = 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()*20000.0 ) - 10000.0;
}
var x = uniform( len, -100.0, 100.0, options );
return benchmark;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@

var resolve = require( 'path' ).resolve;
var bench = require( '@stdlib/bench' );
var randu = require( '@stdlib/random/base/randu' );
var uniform = require( '@stdlib/random/array/uniform' );
var 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;

Expand All @@ -36,6 +35,9 @@ var sasum = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' ) );
var opts = {
'skip': ( sasum instanceof Error )
};
var options = {
'dtype': 'float32'
};


// FUNCTIONS //
Expand All @@ -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()*20000.0 ) - 10000.0;
}
var x = uniform( len, -100.0, 100.0, options );
return benchmark;

/**
Expand Down
27 changes: 8 additions & 19 deletions lib/node_modules/@stdlib/blas/base/sasum/examples/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,14 @@

'use strict';

var round = require( '@stdlib/math/base/special/round' );
var randu = require( '@stdlib/random/base/randu' );
var Float32Array = require( '@stdlib/array/float32' );
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
var sasum = require( './../lib' );

var rand;
var sign;
var x;
var i;
var opts = {
'dtype': 'float32'
};
var x = discreteUniform( 10, -100, 100, opts );
console.log( x );

x = new Float32Array( 100 );
for ( i = 0; i < x.length; i++ ) {
rand = round( randu()*100.0 );
sign = randu();
if ( sign < 0.5 ) {
sign = -1.0;
} else {
sign = 1.0;
}
x[ i ] = sign * rand;
}
console.log( sasum( x.length, x, 1 ) );
var out = sasum( x.length, x, 1 );
console.log( out );
2 changes: 1 addition & 1 deletion lib/node_modules/@stdlib/blas/base/sasum/include.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

# Source files:
'src_files': [
'<(src_dir)/addon.cpp',
'<(src_dir)/addon.c',
'<!@(node -e "var arr = require(\'@stdlib/utils/library-manifest\')(\'./manifest.json\',{\'os\':\'<(OS)\',\'blas\':\'<(blas)\'},{\'basedir\':process.cwd(),\'paths\':\'posix\'}).src; for ( var i = 0; i < arr.length; i++ ) { console.log( arr[ i ] ); }")',
],

Expand Down
4 changes: 2 additions & 2 deletions lib/node_modules/@stdlib/blas/base/sasum/lib/ndarray.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

// MODULES //

var abs = require( '@stdlib/math/base/special/abs' );
var absf = require( '@stdlib/math/base/special/absf' );
var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' );


Expand Down Expand Up @@ -54,7 +54,7 @@ function sasum( N, x, stride, offset ) {
}
ix = offset;
for ( i = 0; i < N; i++ ) {
sum = float64ToFloat32( sum + abs( x[ix] ) );
sum = float64ToFloat32( sum + absf( x[ix] ) );
ix += stride;
}
return sum;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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( './sasum.native.js' );


Expand All @@ -45,11 +46,11 @@ var addon = require( './sasum.native.js' );
*/
function sasum( N, x, stride, offset ) {
var view;
offset = minViewBufferIndex( N, stride, offset );
if ( stride < 0 ) {
stride *= -1;
offset -= (N-1) * stride;
}
view = new Float32Array( x.buffer, x.byteOffset+(x.BYTES_PER_ELEMENT*offset), x.length-offset ); // eslint-disable-line max-len
view = offsetView( x, offset );
return addon( N, view, stride );
}

Expand Down
4 changes: 2 additions & 2 deletions lib/node_modules/@stdlib/blas/base/sasum/lib/sasum.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

// MODULES //

var abs = require( '@stdlib/math/base/special/abs' );
var absf = require( '@stdlib/math/base/special/absf' );
var float64ToFloat32 = require( '@stdlib/number/float64/base/to-float32' );


Expand Down Expand Up @@ -52,7 +52,7 @@ function sasum( N, x, stride ) {
}
N *= stride;
for ( i = 0; i < N; i += stride ) {
sum = float64ToFloat32( sum + abs( x[i] ) );
sum = float64ToFloat32( sum + absf( x[i] ) );
}
return sum;
}
Expand Down
Loading

0 comments on commit 3272b77

Please sign in to comment.