Skip to content

Commit 51e9e67

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 6ebb5c9 commit 51e9e67

File tree

5 files changed

+11
-81
lines changed

5 files changed

+11
-81
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ The function supports the following arguments:
8484
```javascript
8585
var dtypes = require( '@stdlib/ndarray/dtypes' );
8686
var cartesianPower = require( '@stdlib/array/base/cartesian-power' );
87-
var promotionRules = require( '@stdlib/ndarray/promotion-rules' );
87+
var promoteDataTypes = require( '@stdlib/ndarray/base/promote-dtypes' );
8888
var quaternaryBlockSize = require( '@stdlib/ndarray/base/quaternary-tiling-block-size' );
8989

9090
// Generate a list of input ndarray dtype quadruplets:
@@ -96,8 +96,8 @@ var b;
9696
var i;
9797
console.log( 'block_size, xdtype, ydtype, zdtype, wdtype, udtype' );
9898
for ( i = 0; i < dt.length; i++ ) {
99-
t = promotionRules.apply( null, dt[ i ] );
100-
dt[ i ].push( ( t === -1 ) ? 'generic' : t );
99+
t = promoteDataTypes( dt[ i ] );
100+
dt[ i ].push( ( t === null ) ? 'generic' : t );
101101
b = quaternaryBlockSize.apply( null, dt[ i ] );
102102
console.log( '%d, %s, %s, %s, %s, %s', b, dt[i][0], dt[i][1], dt[i][2], dt[i][3], dt[i][4] );
103103
}

lib/node_modules/@stdlib/ndarray/base/quaternary-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 cartesianPower = require( '@stdlib/array/base/cartesian-power' );
23-
var promotionRules = require( '@stdlib/ndarray/promotion-rules' );
23+
var promoteDataTypes = require( '@stdlib/ndarray/base/promote-dtypes' );
2424
var quaternaryBlockSize = require( './../lib' );
2525

2626
// Generate a list of input ndarray dtype quadruplets:
@@ -32,8 +32,8 @@ var b;
3232
var i;
3333
console.log( 'block_size, xdtype, ydtype, zdtype, wdtype, udtype' );
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 = quaternaryBlockSize.apply( null, dt[ i ] );
3838
console.log( '%d, %s, %s, %s, %s, %s', b, dt[i][0], dt[i][1], dt[i][2], dt[i][3], dt[i][4] );
3939
}

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

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

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

Lines changed: 2 additions & 38 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 //
@@ -41,42 +40,7 @@ var defaults = require( './defaults.js' );
4140
* // returns <number>
4241
*/
4342
function quaternaryBlockSize( dtypeX, dtypeY, dtypeZ, dtypeW, dtypeU ) {
44-
var nbx;
45-
var nby;
46-
var nbz;
47-
var nbw;
48-
var nbu;
49-
var max;
50-
51-
nbx = bytesPerElement( dtypeX );
52-
nby = bytesPerElement( dtypeY );
53-
nbz = bytesPerElement( dtypeZ );
54-
nbw = bytesPerElement( dtypeW );
55-
nbu = bytesPerElement( dtypeU );
56-
if (
57-
nbx === null ||
58-
nby === null ||
59-
nbz === null ||
60-
nbw === null ||
61-
nbu === null
62-
) { // e.g., "generic" arrays
63-
return defaults.BLOCK_SIZE_IN_ELEMENTS;
64-
}
65-
// Find the largest element size among all five arrays...
66-
max = nbx;
67-
if ( nby > max ) {
68-
max = nby;
69-
}
70-
if ( nbz > max ) {
71-
max = nbz;
72-
}
73-
if ( nbw > max ) {
74-
max = nbw;
75-
}
76-
if ( nbu > max ) {
77-
max = nbu;
78-
}
79-
return ( defaults.BLOCK_SIZE_IN_BYTES/max )|0; // asm type annotation
43+
return blockSize( [ dtypeX, dtypeY, dtypeZ, dtypeW, dtypeU ] );
8044
}
8145

8246

lib/node_modules/@stdlib/ndarray/base/quaternary-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 cartesianPower = require( '@stdlib/array/base/cartesian-power' );
27-
var promotionRules = require( '@stdlib/ndarray/promotion-rules' );
27+
var promoteDataTypes = require( '@stdlib/ndarray/base/promote-dtypes' );
2828
var quaternaryBlockSize = require( './../lib' );
2929

3030

@@ -48,8 +48,8 @@ tape( 'the function returns a block size', function test( t ) {
4848
dt = cartesianPower( dtypes(), 4 );
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 = quaternaryBlockSize( dt[ i ][ 0 ], dt[ i ][ 1 ], dt[ i ][ 2 ], dt[ i ][ 3 ], dt[ i ][ 4 ] ); // eslint-disable-line max-len
5454
t.strictEqual( isPositiveInteger( v ), true, 'returns a positive integer when provided ('+dt[ i ].join( ', ' )+')' );
5555
}

0 commit comments

Comments
 (0)