Skip to content

Commit d923b6e

Browse files
kgrytekgryte
committed
refactor: avoid mutating the list of views
--- 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: na - 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: na - task: lint_javascript_tests status: na - 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: na - task: lint_typescript_tests status: na - task: lint_license_headers status: passed ---
1 parent bd6213b commit d923b6e

File tree

20 files changed

+182
-90
lines changed

20 files changed

+182
-90
lines changed

‎lib/node_modules/@stdlib/ndarray/base/unary-strided1d/lib/10d.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
// MODULES //
2424

25+
var copyIndexed = require( '@stdlib/array/base/copy-indexed' );
2526
var isRowMajor = require( '@stdlib/ndarray/base/assert/is-row-major-string' );
2627
var incrementOffsets = require( './increment_offsets.js' );
2728
var setViewOffsets = require( './set_view_offsets.js' );
@@ -197,6 +198,7 @@ function unary10d( fcn, arrays, views, shape, stridesX, stridesY, strategyX, str
197198
var i8;
198199
var i9;
199200
var y;
201+
var v;
200202
var i;
201203

202204
// Note on variable naming convention: S#, dv#, i# where # corresponds to the loop number, with `0` being the innermost loop...
@@ -339,6 +341,9 @@ function unary10d( fcn, arrays, views, shape, stridesX, stridesY, strategyX, str
339341
// Resolve a list of pointers to the first indexed elements in the respective ndarrays:
340342
iv = offsets( arrays );
341343

344+
// Shallow copy the list of views to an internal array so that we can update with reshaped views without impacting the original list of views:
345+
v = copyIndexed( views );
346+
342347
// Iterate over the loop dimensions...
343348
for ( i9 = 0; i9 < S9; i9++ ) {
344349
for ( i8 = 0; i8 < S8; i8++ ) {
@@ -351,10 +356,10 @@ function unary10d( fcn, arrays, views, shape, stridesX, stridesY, strategyX, str
351356
for ( i1 = 0; i1 < S1; i1++ ) {
352357
for ( i0 = 0; i0 < S0; i0++ ) {
353358
setViewOffsets( views, iv );
354-
views[ 0 ] = strategyX.input( views[ 0 ] );
355-
views[ 1 ] = strategyY.input( views[ 1 ] );
356-
fcn( views, opts );
357-
strategyY.output( y );
359+
v[ 0 ] = strategyX.input( views[ 0 ] );
360+
v[ 1 ] = strategyY.input( views[ 1 ] );
361+
fcn( v, opts );
362+
strategyY.output( views[ 1 ] );
358363
incrementOffsets( iv, dv0 );
359364
}
360365
incrementOffsets( iv, dv1 );

‎lib/node_modules/@stdlib/ndarray/base/unary-strided1d/lib/10d_blocked.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
var loopOrder = require( '@stdlib/ndarray/base/unary-loop-interchange-order' );
2626
var blockSize = require( '@stdlib/ndarray/base/unary-tiling-block-size' );
2727
var takeIndexed = require( '@stdlib/array/base/take-indexed' );
28+
var copyIndexed = require( '@stdlib/array/base/copy-indexed' );
2829
var zeros = require( '@stdlib/array/base/zeros' );
2930
var incrementOffsets = require( './increment_offsets.js' );
3031
var setViewOffsets = require( './set_view_offsets.js' );
@@ -224,6 +225,7 @@ function blockedunary10d( fcn, arrays, views, shape, stridesX, stridesY, strateg
224225
var N;
225226
var x;
226227
var y;
228+
var v;
227229
var o;
228230
var k;
229231

@@ -272,6 +274,9 @@ function blockedunary10d( fcn, arrays, views, shape, stridesX, stridesY, strateg
272274
dv9 = zeros( N );
273275
iv = zeros( N );
274276

277+
// Shallow copy the list of views to an internal array so that we can update with reshaped views without impacting the original list of views:
278+
v = copyIndexed( views );
279+
275280
// Iterate over blocks...
276281
for ( j9 = sh[9]; j9 > 0; ) {
277282
if ( j9 < bsize ) {
@@ -405,10 +410,10 @@ function blockedunary10d( fcn, arrays, views, shape, stridesX, stridesY, strateg
405410
for ( i1 = 0; i1 < s1; i1++ ) {
406411
for ( i0 = 0; i0 < s0; i0++ ) {
407412
setViewOffsets( views, iv );
408-
views[ 0 ] = strategyX.input( views[ 0 ] );
409-
views[ 1 ] = strategyY.input( views[ 1 ] );
410-
fcn( views, opts );
411-
strategyY.output( y );
413+
v[ 0 ] = strategyX.input( views[ 0 ] );
414+
v[ 1 ] = strategyY.input( views[ 1 ] );
415+
fcn( v, opts );
416+
strategyY.output( views[ 1 ] );
412417
incrementOffsets( iv, dv0 );
413418
}
414419
incrementOffsets( iv, dv1 );

‎lib/node_modules/@stdlib/ndarray/base/unary-strided1d/lib/1d.js‎

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

2121
// MODULES //
2222

23+
var copyIndexed = require( '@stdlib/array/base/copy-indexed' );
2324
var incrementOffsets = require( './increment_offsets.js' );
2425
var setViewOffsets = require( './set_view_offsets.js' );
2526
var offsets = require( './offsets.js' );
@@ -165,14 +166,11 @@ function unary1d( fcn, arrays, views, shape, stridesX, stridesY, strategyX, stra
165166
var S0;
166167
var iv;
167168
var i0;
168-
var y;
169+
var v;
169170
var i;
170171

171172
// Note on variable naming convention: S#, dv#, i# where # corresponds to the loop number, with `0` being the innermost loop...
172173

173-
// Resolve the output ndarray:
174-
y = arrays[ 1 ];
175-
176174
// Extract loop variables for purposes of loop interchange: dimensions and loop offset (pointer) increments...
177175
S0 = shape[ 0 ];
178176
dv0 = [
@@ -185,13 +183,16 @@ function unary1d( fcn, arrays, views, shape, stridesX, stridesY, strategyX, stra
185183
// Resolve a list of pointers to the first indexed elements in the respective ndarrays:
186184
iv = offsets( arrays );
187185

186+
// Shallow copy the list of views to an internal array so that we can update with reshaped views without impacting the original list of views:
187+
v = copyIndexed( views );
188+
188189
// Iterate over the loop dimensions...
189190
for ( i0 = 0; i0 < S0; i0++ ) {
190191
setViewOffsets( views, iv );
191-
views[ 0 ] = strategyX.input( views[ 0 ] );
192-
views[ 1 ] = strategyY.input( views[ 1 ] );
193-
fcn( views, opts );
194-
strategyY.output( y );
192+
v[ 0 ] = strategyX.input( views[ 0 ] );
193+
v[ 1 ] = strategyY.input( views[ 1 ] );
194+
fcn( v, opts );
195+
strategyY.output( views[ 1 ] );
195196
incrementOffsets( iv, dv0 );
196197
}
197198
}

‎lib/node_modules/@stdlib/ndarray/base/unary-strided1d/lib/2d.js‎

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

2121
// MODULES //
2222

23+
var copyIndexed = require( '@stdlib/array/base/copy-indexed' );
2324
var isRowMajor = require( '@stdlib/ndarray/base/assert/is-row-major-string' );
2425
var incrementOffsets = require( './increment_offsets.js' );
2526
var setViewOffsets = require( './set_view_offsets.js' );
@@ -171,6 +172,7 @@ function unary2d( fcn, arrays, views, shape, stridesX, stridesY, strategyX, stra
171172
var i0;
172173
var i1;
173174
var y;
175+
var v;
174176
var i;
175177

176178
// Note on variable naming convention: S#, dv#, i# where # corresponds to the loop number, with `0` being the innermost loop...
@@ -217,14 +219,17 @@ function unary2d( fcn, arrays, views, shape, stridesX, stridesY, strategyX, stra
217219
// Resolve a list of pointers to the first indexed elements in the respective ndarrays:
218220
iv = offsets( arrays );
219221

222+
// Shallow copy the list of views to an internal array so that we can update with reshaped views without impacting the original list of views:
223+
v = copyIndexed( views );
224+
220225
// Iterate over the loop dimensions...
221226
for ( i1 = 0; i1 < S1; i1++ ) {
222227
for ( i0 = 0; i0 < S0; i0++ ) {
223228
setViewOffsets( views, iv );
224-
views[ 0 ] = strategyX.input( views[ 0 ] );
225-
views[ 1 ] = strategyY.input( views[ 1 ] );
226-
fcn( views, opts );
227-
strategyY.output( y );
229+
v[ 0 ] = strategyX.input( views[ 0 ] );
230+
v[ 1 ] = strategyY.input( views[ 1 ] );
231+
fcn( v, opts );
232+
strategyY.output( views[ 1 ] );
228233
incrementOffsets( iv, dv0 );
229234
}
230235
incrementOffsets( iv, dv1 );

‎lib/node_modules/@stdlib/ndarray/base/unary-strided1d/lib/2d_blocked.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
var loopOrder = require( '@stdlib/ndarray/base/unary-loop-interchange-order' );
2424
var blockSize = require( '@stdlib/ndarray/base/unary-tiling-block-size' );
2525
var takeIndexed = require( '@stdlib/array/base/take-indexed' );
26+
var copyIndexed = require( '@stdlib/array/base/copy-indexed' );
2627
var zeros = require( '@stdlib/array/base/zeros' );
2728
var incrementOffsets = require( './increment_offsets.js' );
2829
var setViewOffsets = require( './set_view_offsets.js' );
@@ -182,6 +183,7 @@ function blockedunary2d( fcn, arrays, views, shape, stridesX, stridesY, strategy
182183
var N;
183184
var x;
184185
var y;
186+
var v;
185187
var o;
186188
var k;
187189

@@ -214,6 +216,9 @@ function blockedunary2d( fcn, arrays, views, shape, stridesX, stridesY, strategy
214216
dv1 = zeros( N );
215217
iv = zeros( N );
216218

219+
// Shallow copy the list of views to an internal array so that we can update with reshaped views without impacting the original list of views:
220+
v = copyIndexed( views );
221+
217222
// Iterate over blocks...
218223
for ( j1 = sh[1]; j1 > 0; ) {
219224
if ( j1 < bsize ) {
@@ -243,10 +248,10 @@ function blockedunary2d( fcn, arrays, views, shape, stridesX, stridesY, strategy
243248
for ( i1 = 0; i1 < s1; i1++ ) {
244249
for ( i0 = 0; i0 < s0; i0++ ) {
245250
setViewOffsets( views, iv );
246-
views[ 0 ] = strategyX.input( views[ 0 ] );
247-
views[ 1 ] = strategyY.input( views[ 1 ] );
248-
fcn( views, opts );
249-
strategyY.output( y );
251+
v[ 0 ] = strategyX.input( views[ 0 ] );
252+
v[ 1 ] = strategyY.input( views[ 1 ] );
253+
fcn( v, opts );
254+
strategyY.output( views[ 1 ] );
250255
incrementOffsets( iv, dv0 );
251256
}
252257
incrementOffsets( iv, dv1 );

‎lib/node_modules/@stdlib/ndarray/base/unary-strided1d/lib/3d.js‎

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

2121
// MODULES //
2222

23+
var copyIndexed = require( '@stdlib/array/base/copy-indexed' );
2324
var isRowMajor = require( '@stdlib/ndarray/base/assert/is-row-major-string' );
2425
var incrementOffsets = require( './increment_offsets.js' );
2526
var setViewOffsets = require( './set_view_offsets.js' );
@@ -174,6 +175,7 @@ function unary3d( fcn, arrays, views, shape, stridesX, stridesY, strategyX, stra
174175
var i1;
175176
var i2;
176177
var y;
178+
var v;
177179
var i;
178180

179181
// Note on variable naming convention: S#, dv#, i# where # corresponds to the loop number, with `0` being the innermost loop...
@@ -232,15 +234,18 @@ function unary3d( fcn, arrays, views, shape, stridesX, stridesY, strategyX, stra
232234
// Resolve a list of pointers to the first indexed elements in the respective ndarrays:
233235
iv = offsets( arrays );
234236

237+
// Shallow copy the list of views to an internal array so that we can update with reshaped views without impacting the original list of views:
238+
v = copyIndexed( views );
239+
235240
// Iterate over the loop dimensions...
236241
for ( i2 = 0; i2 < S2; i2++ ) {
237242
for ( i1 = 0; i1 < S1; i1++ ) {
238243
for ( i0 = 0; i0 < S0; i0++ ) {
239244
setViewOffsets( views, iv );
240-
views[ 0 ] = strategyX.input( views[ 0 ] );
241-
views[ 1 ] = strategyY.input( views[ 1 ] );
242-
fcn( views, opts );
243-
strategyY.output( y );
245+
v[ 0 ] = strategyX.input( views[ 0 ] );
246+
v[ 1 ] = strategyY.input( views[ 1 ] );
247+
fcn( v, opts );
248+
strategyY.output( views[ 1 ] );
244249
incrementOffsets( iv, dv0 );
245250
}
246251
incrementOffsets( iv, dv1 );

‎lib/node_modules/@stdlib/ndarray/base/unary-strided1d/lib/3d_blocked.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
var loopOrder = require( '@stdlib/ndarray/base/unary-loop-interchange-order' );
2626
var blockSize = require( '@stdlib/ndarray/base/unary-tiling-block-size' );
2727
var takeIndexed = require( '@stdlib/array/base/take-indexed' );
28+
var copyIndexed = require( '@stdlib/array/base/copy-indexed' );
2829
var zeros = require( '@stdlib/array/base/zeros' );
2930
var incrementOffsets = require( './increment_offsets.js' );
3031
var setViewOffsets = require( './set_view_offsets.js' );
@@ -189,6 +190,7 @@ function blockedunary3d( fcn, arrays, views, shape, stridesX, stridesY, strategy
189190
var N;
190191
var x;
191192
var y;
193+
var v;
192194
var o;
193195
var k;
194196

@@ -223,6 +225,9 @@ function blockedunary3d( fcn, arrays, views, shape, stridesX, stridesY, strategy
223225
dv2 = zeros( N );
224226
iv = zeros( N );
225227

228+
// Shallow copy the list of views to an internal array so that we can update with reshaped views without impacting the original list of views:
229+
v = copyIndexed( views );
230+
226231
// Iterate over blocks...
227232
for ( j2 = sh[2]; j2 > 0; ) {
228233
if ( j2 < bsize ) {
@@ -265,10 +270,10 @@ function blockedunary3d( fcn, arrays, views, shape, stridesX, stridesY, strategy
265270
for ( i1 = 0; i1 < s1; i1++ ) {
266271
for ( i0 = 0; i0 < s0; i0++ ) {
267272
setViewOffsets( views, iv );
268-
views[ 0 ] = strategyX.input( views[ 0 ] );
269-
views[ 1 ] = strategyY.input( views[ 1 ] );
270-
fcn( views, opts );
271-
strategyY.output( y );
273+
v[ 0 ] = strategyX.input( views[ 0 ] );
274+
v[ 1 ] = strategyY.input( views[ 1 ] );
275+
fcn( v, opts );
276+
strategyY.output( views[ 1 ] );
272277
incrementOffsets( iv, dv0 );
273278
}
274279
incrementOffsets( iv, dv1 );

‎lib/node_modules/@stdlib/ndarray/base/unary-strided1d/lib/4d.js‎

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

2121
// MODULES //
2222

23+
var copyIndexed = require( '@stdlib/array/base/copy-indexed' );
2324
var isRowMajor = require( '@stdlib/ndarray/base/assert/is-row-major-string' );
2425
var incrementOffsets = require( './increment_offsets.js' );
2526
var setViewOffsets = require( './set_view_offsets.js' );
@@ -177,6 +178,7 @@ function unary4d( fcn, arrays, views, shape, stridesX, stridesY, strategyX, stra
177178
var i2;
178179
var i3;
179180
var y;
181+
var v;
180182
var i;
181183

182184
// Note on variable naming convention: S#, dv#, i# where # corresponds to the loop number, with `0` being the innermost loop...
@@ -247,16 +249,19 @@ function unary4d( fcn, arrays, views, shape, stridesX, stridesY, strategyX, stra
247249
// Resolve a list of pointers to the first indexed elements in the respective ndarrays:
248250
iv = offsets( arrays );
249251

252+
// Shallow copy the list of views to an internal array so that we can update with reshaped views without impacting the original list of views:
253+
v = copyIndexed( views );
254+
250255
// Iterate over the loop dimensions...
251256
for ( i3 = 0; i3 < S3; i3++ ) {
252257
for ( i2 = 0; i2 < S2; i2++ ) {
253258
for ( i1 = 0; i1 < S1; i1++ ) {
254259
for ( i0 = 0; i0 < S0; i0++ ) {
255260
setViewOffsets( views, iv );
256-
views[ 0 ] = strategyX.input( views[ 0 ] );
257-
views[ 1 ] = strategyY.input( views[ 1 ] );
258-
fcn( views, opts );
259-
strategyY.output( y );
261+
v[ 0 ] = strategyX.input( views[ 0 ] );
262+
v[ 1 ] = strategyY.input( views[ 1 ] );
263+
fcn( v, opts );
264+
strategyY.output( views[ 1 ] );
260265
incrementOffsets( iv, dv0 );
261266
}
262267
incrementOffsets( iv, dv1 );

‎lib/node_modules/@stdlib/ndarray/base/unary-strided1d/lib/4d_blocked.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
var loopOrder = require( '@stdlib/ndarray/base/unary-loop-interchange-order' );
2626
var blockSize = require( '@stdlib/ndarray/base/unary-tiling-block-size' );
2727
var takeIndexed = require( '@stdlib/array/base/take-indexed' );
28+
var copyIndexed = require( '@stdlib/array/base/copy-indexed' );
2829
var zeros = require( '@stdlib/array/base/zeros' );
2930
var incrementOffsets = require( './increment_offsets.js' );
3031
var setViewOffsets = require( './set_view_offsets.js' );
@@ -194,6 +195,7 @@ function blockedunary4d( fcn, arrays, views, shape, stridesX, stridesY, strategy
194195
var N;
195196
var x;
196197
var y;
198+
var v;
197199
var o;
198200
var k;
199201

@@ -230,6 +232,9 @@ function blockedunary4d( fcn, arrays, views, shape, stridesX, stridesY, strategy
230232
dv3 = zeros( N );
231233
iv = zeros( N );
232234

235+
// Shallow copy the list of views to an internal array so that we can update with reshaped views without impacting the original list of views:
236+
v = copyIndexed( views );
237+
233238
// Iterate over blocks...
234239
for ( j3 = sh[3]; j3 > 0; ) {
235240
if ( j3 < bsize ) {
@@ -285,10 +290,10 @@ function blockedunary4d( fcn, arrays, views, shape, stridesX, stridesY, strategy
285290
for ( i1 = 0; i1 < s1; i1++ ) {
286291
for ( i0 = 0; i0 < s0; i0++ ) {
287292
setViewOffsets( views, iv );
288-
views[ 0 ] = strategyX.input( views[ 0 ] );
289-
views[ 1 ] = strategyY.input( views[ 1 ] );
290-
fcn( views, opts );
291-
strategyY.output( y );
293+
v[ 0 ] = strategyX.input( views[ 0 ] );
294+
v[ 1 ] = strategyY.input( views[ 1 ] );
295+
fcn( v, opts );
296+
strategyY.output( views[ 1 ] );
292297
incrementOffsets( iv, dv0 );
293298
}
294299
incrementOffsets( iv, dv1 );

0 commit comments

Comments
 (0)