-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
feat: add blas/ext/join
#9009
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
feat: add blas/ext/join
#9009
Changes from 13 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
25f3c66
feat: add blas/ext/join
headlessNode f24e125
refactor: apply suggestions from code review
headlessNode a21b835
Merge branch 'stdlib-js:develop' into j-b
headlessNode a25a3a4
chore: apply suggestion from code review
headlessNode a945261
fix: lint error
headlessNode 7df7541
bench: use consistent dtype between benchmarks
kgryte 5b6b5c0
fix: increase type specificity
kgryte 14fc1ac
fix: allow non-"generic" output ndarrays
kgryte 7007cf4
test: fix return values
kgryte ea35c4e
refactor: apply suggestions from code review
headlessNode fb8208b
fix: lint error
headlessNode 65307cf
Merge branch 'develop' of https://github.com/stdlib-js/stdlib into pr…
kgryte cbaa8ea
chore: refactor and clean-up
kgryte d4b30d8
refactor: apply suggestions from code review
headlessNode a92b378
fix: lint errror
headlessNode d12ed27
Apply suggestions from code review
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,211 @@ | ||
| <!-- | ||
|
|
||
| @license Apache-2.0 | ||
|
|
||
| Copyright (c) 2025 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. | ||
|
|
||
| --> | ||
|
|
||
| # join | ||
|
|
||
| > Return an [ndarray][@stdlib/ndarray/ctor] created by joining elements using a separator along one or more [ndarray][@stdlib/ndarray/ctor] dimensions. | ||
|
|
||
| <section class="usage"> | ||
|
|
||
| ## Usage | ||
|
|
||
| ```javascript | ||
| var join = require( '@stdlib/blas/ext/join' ); | ||
| ``` | ||
|
|
||
| #### join( x\[, options] ) | ||
|
|
||
| Returns an [ndarray][@stdlib/ndarray/ctor] created by joining elements using a separator along one or more [ndarray][@stdlib/ndarray/ctor] dimensions. | ||
|
|
||
| ```javascript | ||
| var array = require( '@stdlib/ndarray/array' ); | ||
|
|
||
| // Create an input ndarray: | ||
| var x = array( [ 1.0, 2.0, 3.0, 4.0, 5.0, 6.0 ] ); | ||
| // returns <ndarray> | ||
|
|
||
| // Perform operation: | ||
| var out = join( x ); | ||
| // returns <ndarray>[ '1,2,3,4,5,6' ] | ||
| ``` | ||
|
|
||
| The function has the following parameters: | ||
|
|
||
| - **x**: input [ndarray][@stdlib/ndarray/ctor]. | ||
| - **options**: function options (_optional_). | ||
|
|
||
| The function accepts the following options: | ||
|
|
||
| - **sep**: separator. May be either a scalar value or an [ndarray][@stdlib/ndarray/ctor] having a "generic" [data type][@stdlib/ndarray/dtypes]. If provided an [ndarray][@stdlib/ndarray/ctor], the value must have a shape which is [broadcast-compatible][@stdlib/ndarray/base/broadcast-shapes] with the complement of the shape defined by `options.dims`. For example, given the input shape `[2, 3, 4]` and `options.dims=[0]`, an [ndarray][@stdlib/ndarray/ctor] separator value must have a shape which is [broadcast-compatible][@stdlib/ndarray/base/broadcast-shapes] with the shape `[3, 4]`. Similarly, when performing the operation over all elements in a provided input [ndarray][@stdlib/ndarray/ctor], an [ndarray][@stdlib/ndarray/ctor] separator value must be a zero-dimensional [ndarray][@stdlib/ndarray/ctor]. Default: `,`. | ||
| - **dims**: list of dimensions over which to perform operation. If not provided, the function performs the operation over all elements in a provided input [ndarray][@stdlib/ndarray/ctor]. | ||
| - **keepdims**: boolean indicating whether the reduced dimensions should be included in the returned [ndarray][@stdlib/ndarray/ctor] as singleton dimensions. Default: `false`. | ||
|
|
||
| By default, the function joins [ndarray][@stdlib/ndarray/ctor] elements by using `,` as a separator. To perform the operation with a different separator, provide a `sep` option. | ||
|
|
||
| ```javascript | ||
| var array = require( '@stdlib/ndarray/array' ); | ||
|
|
||
| var x = array( [ 1.0, 2.0, 3.0, 4.0, 5.0, 6.0 ] ); | ||
|
|
||
| var out = join( x, { | ||
| 'sep': '|' | ||
| }); | ||
| // returns <ndarray>[ '1|2|3|4|5|6' ] | ||
| ``` | ||
|
|
||
| By default, the function performs the operation over all elements in a provided input [ndarray][@stdlib/ndarray/ctor]. To perform the operation over specific dimensions, provide a `dims` option. | ||
|
|
||
| ```javascript | ||
| var array = require( '@stdlib/ndarray/array' ); | ||
|
|
||
| var x = array( [ [ 1.0, 2.0 ], [ 3.0, 4.0 ] ] ); | ||
|
|
||
| var out = join( x, { | ||
| 'dims': [ 0 ] | ||
| }); | ||
| // returns <ndarray>[ '1,3', '2,4' ] | ||
|
|
||
| out = join( x, { | ||
| 'dims': [ 1 ] | ||
| }); | ||
| // returns <ndarray>[ '1,2', '3,4' ] | ||
|
|
||
| out = join( x, { | ||
| 'dims': [ 0, 1 ] | ||
| }); | ||
| // returns <ndarray>[ '1,2,3,4' ] | ||
| ``` | ||
|
|
||
| By default, the function excludes reduced dimensions from the output [ndarray][@stdlib/ndarray/ctor]. To include the reduced dimensions as singleton dimensions, set the `keepdims` option to `true`. | ||
|
|
||
| ```javascript | ||
| var array = require( '@stdlib/ndarray/array' ); | ||
|
|
||
| var x = array( [ [ 1.0, 2.0 ], [ 3.0, 4.0 ] ] ); | ||
|
|
||
| var opts = { | ||
| 'dims': [ 0 ], | ||
| 'keepdims': true | ||
| }; | ||
|
|
||
| var out = join( x, opts ); | ||
| // returns <ndarray>[ [ '1,3', '2,4' ] ] | ||
| ``` | ||
|
|
||
| #### join.assign( x, out\[, options] ) | ||
|
|
||
| Joins elements of an input [ndarray][@stdlib/ndarray/ctor] using a separator along one or more [ndarray][@stdlib/ndarray/ctor] dimensions and assigns results to a provided output [ndarray][@stdlib/ndarray/ctor]. | ||
|
|
||
| ```javascript | ||
| var array = require( '@stdlib/ndarray/array' ); | ||
| var scalar2ndarray = require( '@stdlib/ndarray/from-ndarray' ); | ||
|
|
||
| var x = array( [ 1.0, 2.0, 3.0, 4.0 ] ); | ||
| var y = scalar2ndarray( '', { | ||
| 'dtype': 'generic' | ||
| }); | ||
|
|
||
| var out = join.assign( x, y ); | ||
| // returns <ndarray>[ '1,2,3,4' ] | ||
|
|
||
| var bool = ( out === y ); | ||
| // returns true | ||
| ``` | ||
|
|
||
| The method has the following parameters: | ||
|
|
||
| - **x**: input [ndarray][@stdlib/ndarray/ctor]. | ||
| - **out**: output [ndarray][@stdlib/ndarray/ctor]. | ||
| - **options**: function options (_optional_). | ||
|
|
||
| The method accepts the following options: | ||
|
|
||
| - **sep**: separator. May be either a scalar value or an [ndarray][@stdlib/ndarray/ctor] having a "generic" [data type][@stdlib/ndarray/dtypes]. If provided an [ndarray][@stdlib/ndarray/ctor], the value must have a shape which is [broadcast-compatible][@stdlib/ndarray/base/broadcast-shapes] with the complement of the shape defined by `options.dims`. For example, given the input shape `[2, 3, 4]` and `options.dims=[0]`, an [ndarray][@stdlib/ndarray/ctor] separator value must have a shape which is [broadcast-compatible][@stdlib/ndarray/base/broadcast-shapes] with the shape `[3, 4]`. Similarly, when performing the operation over all elements in a provided input [ndarray][@stdlib/ndarray/ctor], an [ndarray][@stdlib/ndarray/ctor] separator value must be a zero-dimensional [ndarray][@stdlib/ndarray/ctor]. Default: `,`. | ||
| - **dims**: list of dimensions over which to perform operation. If not provided, the function performs the operation over all elements in a provided input [ndarray][@stdlib/ndarray/ctor]. | ||
|
|
||
| </section> | ||
|
|
||
| <!-- /.usage --> | ||
|
|
||
| <section class="notes"> | ||
|
|
||
| ## Notes | ||
|
|
||
| - Setting the `keepdims` option to `true` can be useful when wanting to ensure that the output [ndarray][@stdlib/ndarray/ctor] is [broadcast-compatible][@stdlib/ndarray/base/broadcast-shapes] with ndarrays having the same shape as the input [ndarray][@stdlib/ndarray/ctor]. | ||
|
|
||
| </section> | ||
|
|
||
| <!-- /.notes --> | ||
|
|
||
| <section class="examples"> | ||
|
|
||
| ## Examples | ||
|
|
||
| <!-- eslint no-undef: "error" --> | ||
|
|
||
| ```javascript | ||
| var discreteUniform = require( '@stdlib/random/array/discrete-uniform' ); | ||
| var ndarray2array = require( '@stdlib/ndarray/to-array' ); | ||
| var ndarray = require( '@stdlib/ndarray/ctor' ); | ||
| var join = require( '@stdlib/blas/ext/join' ); | ||
|
|
||
| // Generate an array of random numbers: | ||
| var xbuf = discreteUniform( 10, 0, 20, { | ||
| 'dtype': 'float64' | ||
| }); | ||
|
|
||
| // Wrap in an ndarray: | ||
| var x = new ndarray( 'float64', xbuf, [ 5, 2 ], [ 2, 1 ], 0, 'row-major' ); | ||
| console.log( ndarray2array( x ) ); | ||
|
|
||
| // Perform operation: | ||
| var out = join( x, { | ||
| 'dims': [ -1 ] | ||
| }); | ||
|
|
||
| // Print the results: | ||
| console.log( ndarray2array( out ) ); | ||
| ``` | ||
|
|
||
| </section> | ||
|
|
||
| <!-- /.examples --> | ||
|
|
||
| <!-- Section for related `stdlib` packages. Do not manually edit this section, as it is automatically populated. --> | ||
|
|
||
| <section class="related"> | ||
|
|
||
| </section> | ||
|
|
||
| <!-- /.related --> | ||
|
|
||
| <!-- Section for all links. Make sure to keep an empty line after the `section` element and another before the `/section` close. --> | ||
|
|
||
| <section class="links"> | ||
|
|
||
| [@stdlib/ndarray/ctor]: https://github.com/stdlib-js/stdlib/tree/develop/lib/node_modules/%40stdlib/ndarray/ctor | ||
|
|
||
| [@stdlib/ndarray/dtypes]: https://github.com/stdlib-js/stdlib/tree/develop/lib/node_modules/%40stdlib/ndarray/dtypes | ||
|
|
||
| [@stdlib/ndarray/base/broadcast-shapes]: https://github.com/stdlib-js/stdlib/tree/develop/lib/node_modules/%40stdlib/ndarray/base/broadcast-shapes | ||
|
|
||
| </section> | ||
|
|
||
| <!-- /.links --> |
114 changes: 114 additions & 0 deletions
114
lib/node_modules/@stdlib/blas/ext/join/benchmark/benchmark.assign.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,114 @@ | ||
| /** | ||
| * @license Apache-2.0 | ||
| * | ||
| * Copyright (c) 2025 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 uniform = require( '@stdlib/random/array/uniform' ); | ||
| var empty = require( '@stdlib/ndarray/empty' ); | ||
| var ndarray = require( '@stdlib/ndarray/base/ctor' ); | ||
| var format = require( '@stdlib/string/format' ); | ||
| var pkg = require( './../package.json' ).name; | ||
| var join = require( './../lib' ); | ||
|
|
||
|
|
||
| // VARIABLES // | ||
|
|
||
| var options = { | ||
| 'dtype': 'float64' | ||
| }; | ||
|
|
||
|
|
||
| // FUNCTIONS // | ||
|
|
||
| /** | ||
| * Creates a benchmark function. | ||
| * | ||
| * @private | ||
| * @param {PositiveInteger} len - array length | ||
| * @returns {Function} benchmark function | ||
| */ | ||
| function createBenchmark( len ) { | ||
| var out; | ||
| var x; | ||
|
|
||
| x = uniform( len, -50.0, 50.0, options ); | ||
| x = new ndarray( options.dtype, x, [ len ], [ 1 ], 0, 'row-major' ); | ||
|
|
||
| out = empty( [], { | ||
| 'dtype': 'generic' | ||
| }); | ||
|
|
||
| return benchmark; | ||
|
|
||
| /** | ||
| * Benchmark function. | ||
| * | ||
| * @private | ||
| * @param {Benchmark} b - benchmark instance | ||
| */ | ||
| function benchmark( b ) { | ||
| var o; | ||
| var i; | ||
|
|
||
| b.tic(); | ||
| for ( i = 0; i < b.iterations; i++ ) { | ||
| o = join.assign( x, out ); | ||
| if ( typeof o !== 'object' ) { | ||
| b.fail( 'should return an ndarray' ); | ||
| } | ||
| } | ||
| b.toc(); | ||
| if ( isnan( o.get() ) ) { | ||
| 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 f; | ||
| var i; | ||
|
|
||
| min = 1; // 10^min | ||
| max = 6; // 10^max | ||
|
|
||
| for ( i = min; i <= max; i++ ) { | ||
| len = pow( 10, i ); | ||
| f = createBenchmark( len ); | ||
| bench( format( '%s:assign:dtype=%s,len=%d', pkg, options.dtype, len ), f ); | ||
| } | ||
| } | ||
|
|
||
| main(); | ||
Oops, something went wrong.
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.