Skip to content

Commit 9d7f220

Browse files
committed
refactor: use generalized utility
--- 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: na - task: lint_javascript_src status: passed - task: lint_javascript_cli status: na - task: lint_javascript_examples status: passed - task: lint_javascript_tests status: passed - task: lint_javascript_benchmarks status: na - task: lint_python status: na - task: lint_r status: na - task: lint_c_src status: na - task: lint_c_examples status: na - task: lint_c_benchmarks status: na - 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 ---
1 parent 7f54590 commit 9d7f220

File tree

5 files changed

+11
-62
lines changed

5 files changed

+11
-62
lines changed

lib/node_modules/@stdlib/ndarray/base/binary-tiling-block-size/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ var bsize = binaryBlockSize( 'float64', 'float64', 'float64' );
7676
```javascript
7777
var dtypes = require( '@stdlib/ndarray/dtypes' );
7878
var cartesianSquare = require( '@stdlib/array/base/cartesian-square' );
79-
var promotionRules = require( '@stdlib/ndarray/promotion-rules' );
79+
var promoteDataTypes = require( '@stdlib/ndarray/base/promote-dtypes' );
8080
var binaryBlockSize = require( '@stdlib/ndarray/base/binary-tiling-block-size' );
8181

8282
// Generate a list of input ndarray dtype pairs:
@@ -88,8 +88,8 @@ var b;
8888
var i;
8989
console.log( 'block_size, xdtype, ydtype, zdtype' );
9090
for ( i = 0; i < dt.length; i++ ) {
91-
t = promotionRules.apply( null, dt[ i ] );
92-
dt[ i ].push( ( t === -1 ) ? 'generic' : t );
91+
t = promoteDataTypes( dt[ i ] );
92+
dt[ i ].push( ( t === null ) ? 'generic' : t );
9393
b = binaryBlockSize.apply( null, dt[ i ] );
9494
console.log( '%d, %s, %s, %s', b, dt[i][0], dt[i][1], dt[i][2] );
9595
}

lib/node_modules/@stdlib/ndarray/base/binary-tiling-block-size/examples/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
var dtypes = require( '@stdlib/ndarray/dtypes' );
2222
var cartesianSquare = require( '@stdlib/array/base/cartesian-square' );
23-
var promotionRules = require( '@stdlib/ndarray/promotion-rules' );
23+
var promoteDataTypes = require( '@stdlib/ndarray/base/promote-dtypes' );
2424
var binaryBlockSize = require( './../lib' );
2525

2626
// Generate a list of input ndarray dtype pairs:
@@ -32,8 +32,8 @@ var b;
3232
var i;
3333
console.log( 'block_size, xdtype, ydtype, zdtype' );
3434
for ( i = 0; i < dt.length; i++ ) {
35-
t = promotionRules.apply( null, dt[ i ] );
36-
dt[ i ].push( ( t === -1 ) ? 'generic' : t );
35+
t = promoteDataTypes( dt[ i ] );
36+
dt[ i ].push( ( t === null ) ? 'generic' : t );
3737
b = binaryBlockSize.apply( null, dt[ i ] );
3838
console.log( '%d, %s, %s, %s', b, dt[i][0], dt[i][1], dt[i][2] );
3939
}

lib/node_modules/@stdlib/ndarray/base/binary-tiling-block-size/lib/defaults.js

Lines changed: 0 additions & 34 deletions
This file was deleted.

lib/node_modules/@stdlib/ndarray/base/binary-tiling-block-size/lib/main.js

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020

2121
// MODULES //
2222

23-
var bytesPerElement = require( '@stdlib/ndarray/base/bytes-per-element' );
24-
var defaults = require( './defaults.js' );
23+
var blockSize = require( '@stdlib/ndarray/base/tiling-block-size' );
2524

2625

2726
// MAIN //
@@ -39,23 +38,7 @@ var defaults = require( './defaults.js' );
3938
* // returns <number>
4039
*/
4140
function binaryBlockSize( dtypeX, dtypeY, dtypeZ ) {
42-
var nbx;
43-
var nby;
44-
var nbz;
45-
46-
nbx = bytesPerElement( dtypeX );
47-
nby = bytesPerElement( dtypeY );
48-
nbz = bytesPerElement( dtypeZ );
49-
if ( nbx === null || nby === null || nbz === null ) { // e.g., "generic" arrays
50-
return defaults.BLOCK_SIZE_IN_ELEMENTS;
51-
}
52-
if ( nbx > nby && nbx > nbz ) {
53-
return ( defaults.BLOCK_SIZE_IN_BYTES/nbx )|0; // asm type annotation
54-
}
55-
if ( nby > nbz ) {
56-
return ( defaults.BLOCK_SIZE_IN_BYTES/nby )|0; // asm type annotation
57-
}
58-
return ( defaults.BLOCK_SIZE_IN_BYTES/nbz )|0; // asm type annotation
41+
return blockSize( [ dtypeX, dtypeY, dtypeZ ] );
5942
}
6043

6144

lib/node_modules/@stdlib/ndarray/base/binary-tiling-block-size/test/test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var tape = require( 'tape' );
2424
var isPositiveInteger = require( '@stdlib/assert/is-positive-integer' ).isPrimitive;
2525
var dtypes = require( '@stdlib/ndarray/dtypes' );
2626
var cartesianSquare = require( '@stdlib/array/base/cartesian-square' );
27-
var promotionRules = require( '@stdlib/ndarray/promotion-rules' );
27+
var promoteDataTypes = require( '@stdlib/ndarray/base/promote-dtypes' );
2828
var binaryBlockSize = require( './../lib' );
2929

3030

@@ -48,8 +48,8 @@ tape( 'the function returns a block size', function test( t ) {
4848
dt = cartesianSquare( dtypes() );
4949

5050
for ( i = 0; i < dt.length; i++ ) {
51-
pt = promotionRules.apply( null, dt[ i ] );
52-
dt[ i ].push( ( pt === -1 ) ? 'generic' : pt );
51+
pt = promoteDataTypes( dt[ i ] );
52+
dt[ i ].push( ( pt === null ) ? 'generic' : pt );
5353
v = binaryBlockSize( dt[ i ][ 0 ], dt[ i ][ 1 ], dt[ i ][ 2 ] );
5454
t.strictEqual( isPositiveInteger( v ), true, 'returns a positive integer when provided ('+dt[ i ].join( ', ' )+')' );
5555
}

0 commit comments

Comments
 (0)