-
-
Notifications
You must be signed in to change notification settings - Fork 907
feat: add ndarray/base/fill
#2817
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 3 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
7cde0c9
feat: add ndarray/base/fill
headlessNode 706a8cb
Merge branch 'stdlib-js:develop' into ndarray-base-fill
headlessNode bb0812f
bench: add 2d benchmarks
headlessNode 442b07d
fix: fix README title
headlessNode 4a640d1
Merge branch 'stdlib-js:develop' into ndarray-base-fill
headlessNode f549edf
bench: add benchmarks
headlessNode 11ed742
fix: apply suggested change
headlessNode abc891b
test: add 0d tests
headlessNode e0aeb10
Merge branch 'develop' of https://github.com/stdlib-js/stdlib into pr…
kgryte 5b6213f
bench: use different fill values for each iteration and remove unnece…
kgryte bdde6ae
fix: ensure support for complex number arrays
kgryte 6ff376e
test: update tests and fix description
kgryte d121e98
test: add tests for generic arrays
kgryte 88677ca
docs: update examples
kgryte 2a27ee3
docs: update examples and fix description
kgryte e991175
test: add tests
kgryte 2150169
docs: add notes
kgryte File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,151 @@ | ||
<!-- | ||
|
||
@license Apache-2.0 | ||
|
||
Copyright (c) 2024 The Stdlib Authors. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
|
||
--> | ||
|
||
# Fill | ||
|
||
> Fill an input ndarray with a specified value. | ||
|
||
<section class="intro"> | ||
|
||
</section> | ||
|
||
<!-- /.intro --> | ||
|
||
<section class="usage"> | ||
|
||
## Usage | ||
|
||
```javascript | ||
var fill = require( '@stdlib/ndarray/base/fill' ); | ||
``` | ||
|
||
#### fill( x, value ) | ||
|
||
Fill an input ndarray with a specified value. | ||
|
||
<!-- eslint-disable max-len --> | ||
|
||
```javascript | ||
var Float64Array = require( '@stdlib/array/float64' ); | ||
|
||
// Create data buffer: | ||
var xbuf = new Float64Array( [ 1.0, 2.0, 3.0, 4.0, 5.0, 6.0 ] ); | ||
|
||
// Define the shape of the input array: | ||
var shape = [ 3, 1, 2 ]; | ||
|
||
// Define the array strides: | ||
var sx = [ 2, 2, 1 ]; | ||
|
||
// Define the index offset: | ||
var ox = 0; | ||
|
||
// Create the input ndarray-like object: | ||
var x = { | ||
'dtype': 'float64', | ||
'data': xbuf, | ||
'shape': shape, | ||
'strides': sx, | ||
'offset': ox, | ||
'order': 'row-major' | ||
}; | ||
|
||
fill( x, 10.0 ); | ||
|
||
console.log( x.data ); | ||
// => <Float64Array>[ 10.0, 10.0, 10.0, 10.0, 10.0, 10.0 ] | ||
``` | ||
|
||
The function accepts the following arguments: | ||
|
||
- **x**: array-like object containing an input ndarray. | ||
- **value**: scalar value | ||
|
||
A provided ndarray should be an object with the following properties: | ||
|
||
- **dtype**: data type. | ||
- **data**: data buffer. | ||
- **shape**: dimensions. | ||
- **strides**: stride lengths. | ||
- **offset**: index offset. | ||
- **order**: specifies whether an ndarray is row-major (C-style) or column major (Fortran-style). | ||
|
||
</section> | ||
|
||
<!-- /.usage --> | ||
|
||
<section class="notes"> | ||
|
||
## Notes | ||
|
||
- For very high-dimensional ndarrays which are non-contiguous, one should consider copying the underlying data to contiguous memory before assigning elements in order to achieve better performance. | ||
|
||
</section> | ||
|
||
<!-- /.notes --> | ||
|
||
<section class="examples"> | ||
|
||
## Examples | ||
|
||
<!-- eslint no-undef: "error" --> | ||
|
||
```javascript | ||
var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory; | ||
var filledarrayBy = require( '@stdlib/array/filled-by' ); | ||
var ndarray2array = require( '@stdlib/ndarray/base/to-array' ); | ||
var fill = require( '@stdlib/ndarray/base/fill' ); | ||
|
||
var N = 10; | ||
var shape = [ 5, 2 ]; | ||
var x = { | ||
'dtype': 'generic', | ||
'data': filledarrayBy( N, 'generic', discreteUniform( -100, 100 ) ), | ||
'shape': shape, | ||
'strides': [ 2, 1 ], | ||
'offset': 0, | ||
'order': 'row-major' | ||
}; | ||
|
||
fill( x, 10.0 ); | ||
console.log( ndarray2array( x.data, x.shape, x.strides, x.offset, x.order ) ); | ||
``` | ||
|
||
</section> | ||
|
||
<!-- /.examples --> | ||
|
||
<!-- Section for related `stdlib` packages. Do not manually edit this section, as it is automatically populated. --> | ||
|
||
<section class="related"> | ||
|
||
</section> | ||
|
||
<!-- /.related --> | ||
|
||
<section class="links"> | ||
|
||
<!-- <related-links> --> | ||
|
||
<!-- </related-links> --> | ||
|
||
</section> | ||
|
||
<!-- /.links --> |
119 changes: 119 additions & 0 deletions
119
lib/node_modules/@stdlib/ndarray/base/fill/benchmark/benchmark.1d_columnmajor.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,119 @@ | ||
/** | ||
* @license Apache-2.0 | ||
* | ||
* Copyright (c) 2024 The Stdlib Authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
'use strict'; | ||
|
||
// MODULES // | ||
|
||
var bench = require( '@stdlib/bench' ); | ||
var isnan = require( '@stdlib/math/base/assert/is-nan' ); | ||
var pow = require( '@stdlib/math/base/special/pow' ); | ||
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' ); | ||
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' ); | ||
var pkg = require( './../package.json' ).name; | ||
var fill = require( './../lib' ); | ||
|
||
|
||
// VARIABLES // | ||
|
||
var types = [ 'float64' ]; | ||
var order = 'column-major'; | ||
var value = 10.0; | ||
|
||
/** | ||
* Creates a benchmark function. | ||
* | ||
* @private | ||
* @param {PositiveInteger} len - ndarray length | ||
* @param {NonNegativeIntegerArray} shape - ndarray shape | ||
* @param {string} xtype - input ndarray data type | ||
* @returns {Function} benchmark function | ||
*/ | ||
function createBenchmark( len, shape, xtype ) { | ||
var x; | ||
|
||
x = discreteUniform( len, -100, 100 ); | ||
x = { | ||
'dtype': xtype, | ||
'data': x, | ||
'shape': shape, | ||
'strides': shape2strides( shape, order ), | ||
'offset': 0, | ||
'order': order | ||
}; | ||
return benchmark; | ||
|
||
/** | ||
* Benchmark function. | ||
* | ||
* @private | ||
* @param {Benchmark} b - benchmark instance | ||
*/ | ||
function benchmark( b ) { | ||
var i; | ||
|
||
b.tic(); | ||
for ( i = 0; i < b.iterations; i++ ) { | ||
fill( x, value ); | ||
if ( isnan( x.data[ i%len ] ) ) { | ||
b.fail( 'should not return NaN' ); | ||
} | ||
} | ||
b.toc(); | ||
if ( isnan( x.data[ i%len ] ) ) { | ||
b.fail( 'should not return NaN' ); | ||
} | ||
b.pass( 'benchmark finished' ); | ||
b.end(); | ||
} | ||
} | ||
|
||
|
||
// MAIN // | ||
|
||
/** | ||
* Main execution sequence. | ||
* | ||
* @private | ||
*/ | ||
function main() { | ||
var len; | ||
var min; | ||
var max; | ||
var sh; | ||
var t1; | ||
var f; | ||
var i; | ||
var j; | ||
|
||
min = 1; // 10^min | ||
max = 6; // 10^max | ||
|
||
for ( j = 0; j < types.length; j++ ) { | ||
t1 = types[ j ]; | ||
for ( i = min; i <= max; i++ ) { | ||
len = pow( 10, i ); | ||
|
||
sh = [ len ]; | ||
f = createBenchmark( len, sh, t1 ); | ||
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f ); | ||
} | ||
} | ||
} | ||
|
||
main(); |
119 changes: 119 additions & 0 deletions
119
lib/node_modules/@stdlib/ndarray/base/fill/benchmark/benchmark.1d_rowmajor.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,119 @@ | ||
/** | ||
* @license Apache-2.0 | ||
* | ||
* Copyright (c) 2024 The Stdlib Authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
'use strict'; | ||
|
||
// MODULES // | ||
|
||
var bench = require( '@stdlib/bench' ); | ||
var isnan = require( '@stdlib/math/base/assert/is-nan' ); | ||
var pow = require( '@stdlib/math/base/special/pow' ); | ||
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' ); | ||
var shape2strides = require( '@stdlib/ndarray/base/shape2strides' ); | ||
var pkg = require( '@stdlib/ndarray/base/fill/package.json' ).name; | ||
var fill = require( '@stdlib/ndarray/base/fill/lib' ); | ||
|
||
|
||
// VARIABLES // | ||
|
||
var types = [ 'float64' ]; | ||
var order = 'row-major'; | ||
var value = 10.0; | ||
|
||
/** | ||
* Creates a benchmark function. | ||
* | ||
* @private | ||
* @param {PositiveInteger} len - ndarray length | ||
* @param {NonNegativeIntegerArray} shape - ndarray shape | ||
* @param {string} xtype - input ndarray data type | ||
* @returns {Function} benchmark function | ||
*/ | ||
function createBenchmark( len, shape, xtype ) { | ||
var x; | ||
|
||
x = discreteUniform( len, -100, 100 ); | ||
x = { | ||
'dtype': xtype, | ||
'data': x, | ||
'shape': shape, | ||
'strides': shape2strides( shape, order ), | ||
'offset': 0, | ||
'order': order | ||
}; | ||
return benchmark; | ||
|
||
/** | ||
* Benchmark function. | ||
* | ||
* @private | ||
* @param {Benchmark} b - benchmark instance | ||
*/ | ||
function benchmark( b ) { | ||
var i; | ||
|
||
b.tic(); | ||
for ( i = 0; i < b.iterations; i++ ) { | ||
fill( x, value ); | ||
if ( isnan( x.data[ i%len ] ) ) { | ||
b.fail( 'should not return NaN' ); | ||
} | ||
} | ||
b.toc(); | ||
if ( isnan( x.data[ i%len ] ) ) { | ||
b.fail( 'should not return NaN' ); | ||
} | ||
b.pass( 'benchmark finished' ); | ||
b.end(); | ||
} | ||
} | ||
|
||
|
||
// MAIN // | ||
|
||
/** | ||
* Main execution sequence. | ||
* | ||
* @private | ||
*/ | ||
function main() { | ||
var len; | ||
var min; | ||
var max; | ||
var sh; | ||
var t1; | ||
var f; | ||
var i; | ||
var j; | ||
|
||
min = 1; // 10^min | ||
max = 6; // 10^max | ||
|
||
for ( j = 0; j < types.length; j++ ) { | ||
t1 = types[ j ]; | ||
for ( i = min; i <= max; i++ ) { | ||
len = pow( 10, i ); | ||
|
||
sh = [ len ]; | ||
f = createBenchmark( len, sh, t1 ); | ||
bench( pkg+':ndims='+sh.length+',len='+len+',shape=['+sh.join(',')+'],xorder='+order+',xtype='+t1, f ); | ||
} | ||
} | ||
} | ||
|
||
main(); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.