Skip to content

Commit bc97fa9

Browse files
headlessNodekgryte
andauthored
feat: add C ndarray API and refactor blas/ext/base/dapxsumors
PR-URL: #2934 Co-authored-by: Athan Reines <[email protected]> Reviewed-by: Athan Reines <[email protected]> Signed-off-by: Athan Reines <[email protected]>
1 parent 126c898 commit bc97fa9

File tree

21 files changed

+366
-181
lines changed

21 files changed

+366
-181
lines changed

lib/node_modules/@stdlib/blas/ext/base/dapxsumors/README.md

Lines changed: 132 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License.
2020

2121
# dapxsumors
2222

23-
> Add a constant to each double-precision floating-point strided array element and compute the sum using ordinary recursive summation.
23+
> Add a scalar constant to each double-precision floating-point strided array element and compute the sum using ordinary recursive summation.
2424
2525
<section class="intro">
2626

@@ -36,9 +36,9 @@ limitations under the License.
3636
var dapxsumors = require( '@stdlib/blas/ext/base/dapxsumors' );
3737
```
3838

39-
#### dapxsumors( N, alpha, x, stride )
39+
#### dapxsumors( N, alpha, x, strideX )
4040

41-
Adds a constant to each double-precision floating-point strided array element and computes the sum using ordinary recursive summation.
41+
Adds a scalar constant to each double-precision floating-point strided array element and computes the sum using ordinary recursive summation.
4242

4343
```javascript
4444
var Float64Array = require( '@stdlib/array/float64' );
@@ -53,8 +53,9 @@ var v = dapxsumors( N, 5.0, x, 1 );
5353
The function has the following parameters:
5454

5555
- **N**: number of indexed elements.
56+
- **alpha**: scalar constant.
5657
- **x**: input [`Float64Array`][@stdlib/array/float64].
57-
- **stride**: index increment for `x`.
58+
- **strideX**: index increment for `x`.
5859

5960
The `N` and stride parameters determine which elements in the strided array are accessed at runtime. For example, to access every other element in `x`,
6061

@@ -81,9 +82,9 @@ var v = dapxsumors( 4, 5.0, x1, 2 );
8182
// returns 25.0
8283
```
8384

84-
#### dapxsumors.ndarray( N, alpha, x, stride, offset )
85+
#### dapxsumors.ndarray( N, alpha, x, strideX, offsetX )
8586

86-
Adds a constant to each double-precision floating-point strided array element and computes the sum using ordinary recursive summation and alternative indexing semantics.
87+
Adds a scalar constant to each double-precision floating-point strided array element and computes the sum using ordinary recursive summation and alternative indexing semantics.
8788

8889
```javascript
8990
var Float64Array = require( '@stdlib/array/float64' );
@@ -97,9 +98,9 @@ var v = dapxsumors.ndarray( N, 5.0, x, 1, 0 );
9798

9899
The function has the following additional parameters:
99100

100-
- **offset**: starting index for `x`.
101+
- **offsetX**: starting index for `x`.
101102

102-
While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying `buffer`, the `offset` parameter supports indexing semantics based on a starting index. For example, to access every other value in `x` starting from the second value
103+
While [`typed array`][mdn-typed-array] views mandate a view offset based on the underlying buffer, the offset parameter supports indexing semantics based on a starting index. For example, to access every other value in `x` starting from the second value
103104

104105
```javascript
105106
var Float64Array = require( '@stdlib/array/float64' );
@@ -132,11 +133,12 @@ var v = dapxsumors.ndarray( 4, 5.0, x, 2, 1 );
132133
<!-- eslint no-undef: "error" -->
133134

134135
```javascript
135-
var discreteUniform = require( '@stdlib/random/base/discrete-uniform' ).factory;
136-
var filledarrayBy = require( '@stdlib/array/filled-by' );
136+
var discreteUniform = require( '@stdlib/random/array/discrete-uniform' );
137137
var dapxsumors = require( '@stdlib/blas/ext/base/dapxsumors' );
138138

139-
var x = filledarrayBy( 10, 'float32', discreteUniform( 0, 100 ) );
139+
var x = discreteUniform( 10, -100, 100, {
140+
'dtype': 'float64'
141+
});
140142
console.log( x );
141143

142144
var v = dapxsumors( x.length, 5.0, x, 1 );
@@ -147,6 +149,125 @@ console.log( v );
147149

148150
<!-- /.examples -->
149151

152+
<!-- C interface documentation. -->
153+
154+
* * *
155+
156+
<section class="c">
157+
158+
## C APIs
159+
160+
<!-- Section to include introductory text. Make sure to keep an empty line after the intro `section` element and another before the `/section` close. -->
161+
162+
<section class="intro">
163+
164+
</section>
165+
166+
<!-- /.intro -->
167+
168+
<!-- C usage documentation. -->
169+
170+
<section class="usage">
171+
172+
### Usage
173+
174+
```c
175+
#include "stdlib/blas/ext/base/dapxsumors.h"
176+
```
177+
178+
#### stdlib_strided_dapxsumors( N, alpha, \*X, strideX )
179+
180+
Adds a scalar constant to each double-precision floating-point strided array element and computes the sum using ordinary recursive summation.
181+
182+
```c
183+
const double x[] = { 1.0, 2.0, 3.0, 4.0 };
184+
185+
double v = stdlib_strided_dapxsumors( 4, 5.0, x, 1 );
186+
// returns 30.0
187+
```
188+
189+
The function accepts the following arguments:
190+
191+
- **N**: `[in] CBLAS_INT` number of indexed elements.
192+
- **alpha**: `[in] double` scalar constant.
193+
- **X**: `[in] double*` input array.
194+
- **strideX**: `[in] CBLAS_INT` index increment for `X`.
195+
196+
```c
197+
double stdlib_strided_dapxsumors( const CBLAS_INT N, const double alpha, const double *X, const CBLAS_INT strideX );
198+
```
199+
200+
#### stdlib_strided_dapxsumors_ndarray( N, alpha, \*X, strideX, offsetX )
201+
202+
Adds a scalar constant to each double-precision floating-point strided array element and computes the sum using ordinary recursive summation and alternative indexing semantics.
203+
204+
```c
205+
const double x[] = { 1.0, 2.0, 3.0, 4.0 };
206+
207+
double v = stdlib_strided_dapxsumors_ndarray( 4, 5.0, x, 1, 0 );
208+
// returns 30.0
209+
```
210+
211+
The function accepts the following arguments:
212+
213+
- **N**: `[in] CBLAS_INT` number of indexed elements.
214+
- **alpha**: `[in] double` scalar constant.
215+
- **X**: `[in] double*` input array.
216+
- **strideX**: `[in] CBLAS_INT` index increment for `X`.
217+
- **offsetX**: `[in] CBLAS_INT` starting index for `X`.
218+
219+
```c
220+
double stdlib_strided_dapxsumors_ndarray( const CBLAS_INT N, const double alpha, const double *X, const CBLAS_INT strideX, const CBLAS_INT offsetX );
221+
```
222+
223+
</section>
224+
225+
<!-- /.usage -->
226+
227+
<!-- C API usage notes. Make sure to keep an empty line after the `section` element and another before the `/section` close. -->
228+
229+
<section class="notes">
230+
231+
</section>
232+
233+
<!-- /.notes -->
234+
235+
<!-- C API usage examples. -->
236+
237+
<section class="examples">
238+
239+
### Examples
240+
241+
```c
242+
#include "stdlib/blas/ext/base/dapxsumors.h"
243+
#include <stdio.h>
244+
245+
int main( void ) {
246+
// Create a strided array:
247+
const double x[] = { 1.0, -2.0, 3.0, -4.0, 5.0, -6.0, 7.0, -8.0 };
248+
249+
// Specify the number of indexed elements:
250+
const int N = 8;
251+
252+
// Specify a stride:
253+
const int strideX = 1;
254+
255+
// Compute the sum:
256+
double v = stdlib_strided_dapxsumors( N, 5.0, x, strideX );
257+
258+
// Print the result:
259+
printf( "Sum: %lf\n", sum );
260+
}
261+
```
262+
263+
</section>
264+
265+
<!-- /.examples -->
266+
267+
</section>
268+
269+
<!-- /.c -->
270+
150271
<section class="references">
151272
152273
</section>

lib/node_modules/@stdlib/blas/ext/base/dapxsumors/benchmark/benchmark.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
// MODULES //
2222

2323
var bench = require( '@stdlib/bench' );
24-
var uniform = require( '@stdlib/random/base/uniform' ).factory;
25-
var filledarrayBy = require( '@stdlib/array/filled-by' );
24+
var uniform = require( '@stdlib/random/array/uniform' );
2625
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2726
var pow = require( '@stdlib/math/base/special/pow' );
2827
var pkg = require( './../package.json' ).name;
@@ -31,7 +30,9 @@ var dapxsumors = require( './../lib/dapxsumors.js' );
3130

3231
// VARIABLES //
3332

34-
var rand = uniform( -100.0, 100.0 );
33+
var options = {
34+
'dtype': 'float64'
35+
};
3536

3637

3738
// FUNCTIONS //
@@ -44,7 +45,7 @@ var rand = uniform( -100.0, 100.0 );
4445
* @returns {Function} benchmark function
4546
*/
4647
function createBenchmark( len ) {
47-
var x = filledarrayBy( len, 'float64', rand );
48+
var x = uniform( len, -100, 100, options );
4849
return benchmark;
4950

5051
function benchmark( b ) {

lib/node_modules/@stdlib/blas/ext/base/dapxsumors/benchmark/benchmark.native.js

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

2323
var resolve = require( 'path' ).resolve;
2424
var bench = require( '@stdlib/bench' );
25-
var uniform = require( '@stdlib/random/base/uniform' ).factory;
26-
var filledarrayBy = require( '@stdlib/array/filled-by' );
25+
var uniform = require( '@stdlib/random/array/uniform' );
2726
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2827
var pow = require( '@stdlib/math/base/special/pow' );
2928
var tryRequire = require( '@stdlib/utils/try-require' );
@@ -36,7 +35,9 @@ var dapxsumors = tryRequire( resolve( __dirname, './../lib/dapxsumors.native.js'
3635
var opts = {
3736
'skip': ( dapxsumors instanceof Error )
3837
};
39-
var rand = uniform( -100.0, 100.0 );
38+
var options = {
39+
'dtype': 'float64'
40+
};
4041

4142

4243
// FUNCTIONS //
@@ -49,7 +50,7 @@ var rand = uniform( -100.0, 100.0 );
4950
* @returns {Function} benchmark function
5051
*/
5152
function createBenchmark( len ) {
52-
var x = filledarrayBy( len, 'float64', rand );
53+
var x = uniform( len, -100, 100, options );
5354
return benchmark;
5455

5556
function benchmark( b ) {

lib/node_modules/@stdlib/blas/ext/base/dapxsumors/benchmark/benchmark.ndarray.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
// MODULES //
2222

2323
var bench = require( '@stdlib/bench' );
24-
var uniform = require( '@stdlib/random/base/uniform' ).factory;
25-
var filledarrayBy = require( '@stdlib/array/filled-by' );
24+
var uniform = require( '@stdlib/random/base/uniform' );
2625
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2726
var pow = require( '@stdlib/math/base/special/pow' );
2827
var pkg = require( './../package.json' ).name;
@@ -31,7 +30,9 @@ var dapxsumors = require( './../lib/ndarray.js' );
3130

3231
// VARIABLES //
3332

34-
var rand = uniform( -100.0, 100.0 );
33+
var options = {
34+
'dtype': 'float64'
35+
};
3536

3637

3738
// FUNCTIONS //
@@ -44,7 +45,7 @@ var rand = uniform( -100.0, 100.0 );
4445
* @returns {Function} benchmark function
4546
*/
4647
function createBenchmark( len ) {
47-
var x = filledarrayBy( len, 'float64', rand );
48+
var x = uniform( len, -100, 100, options );
4849
return benchmark;
4950

5051
function benchmark( b ) {

lib/node_modules/@stdlib/blas/ext/base/dapxsumors/benchmark/benchmark.ndarray.native.js

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

2323
var resolve = require( 'path' ).resolve;
2424
var bench = require( '@stdlib/bench' );
25-
var uniform = require( '@stdlib/random/base/uniform' ).factory;
26-
var filledarrayBy = require( '@stdlib/array/filled-by' );
25+
var uniform = require( '@stdlib/random/array/uniform' );
2726
var isnan = require( '@stdlib/math/base/assert/is-nan' );
2827
var pow = require( '@stdlib/math/base/special/pow' );
2928
var tryRequire = require( '@stdlib/utils/try-require' );
@@ -36,7 +35,9 @@ var dapxsumors = tryRequire( resolve( __dirname, './../lib/ndarray.native.js' )
3635
var opts = {
3736
'skip': ( dapxsumors instanceof Error )
3837
};
39-
var rand = uniform( -100.0, 100.0 );
38+
var options = {
39+
'dtype': 'float64'
40+
};
4041

4142

4243
// FUNCTIONS //
@@ -49,7 +50,7 @@ var rand = uniform( -100.0, 100.0 );
4950
* @returns {Function} benchmark function
5051
*/
5152
function createBenchmark( len ) {
52-
var x = filledarrayBy( len, 'float64', rand );
53+
var x = uniform( len, -100, 100, options );
5354
return benchmark;
5455

5556
function benchmark( b ) {

lib/node_modules/@stdlib/blas/ext/base/dapxsumors/benchmark/c/benchmark.length.c

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static double rand_double( void ) {
9494
* @param len array length
9595
* @return elapsed time in seconds
9696
*/
97-
static double benchmark( int iterations, int len ) {
97+
static double benchmark1( int iterations, int len ) {
9898
double elapsed;
9999
double x[ len ];
100100
double v;
@@ -120,6 +120,39 @@ static double benchmark( int iterations, int len ) {
120120
return elapsed;
121121
}
122122

123+
/**
124+
* Runs a benchmark.
125+
*
126+
* @param iterations number of iterations
127+
* @param len array length
128+
* @return elapsed time in seconds
129+
*/
130+
static double benchmark2( int iterations, int len ) {
131+
double elapsed;
132+
double x[ len ];
133+
double v;
134+
double t;
135+
int i;
136+
137+
for ( i = 0; i < len; i++ ) {
138+
x[ i ] = ( rand_double() * 20000.0 ) - 10000.0;
139+
}
140+
v = 0.0;
141+
t = tic();
142+
for ( i = 0; i < iterations; i++ ) {
143+
v = stdlib_strided_dapxsumors_ndarray( len, 5.0, x, 1, 0 );
144+
if ( v != v ) {
145+
printf( "should not return NaN\n" );
146+
break;
147+
}
148+
}
149+
elapsed = tic() - t;
150+
if ( v != v ) {
151+
printf( "should not return NaN\n" );
152+
}
153+
return elapsed;
154+
}
155+
123156
/**
124157
* Main execution sequence.
125158
*/
@@ -142,7 +175,18 @@ int main( void ) {
142175
for ( j = 0; j < REPEATS; j++ ) {
143176
count += 1;
144177
printf( "# c::%s:len=%d\n", NAME, len );
145-
elapsed = benchmark( iter, len );
178+
elapsed = benchmark1( iter, len );
179+
print_results( iter, elapsed );
180+
printf( "ok %d benchmark finished\n", count );
181+
}
182+
}
183+
for ( i = MIN; i <= MAX; i++ ) {
184+
len = pow( 10, i );
185+
iter = ITERATIONS / pow( 10, i-1 );
186+
for ( j = 0; j < REPEATS; j++ ) {
187+
count += 1;
188+
printf( "# c::%s:ndarray:len=%d\n", NAME, len );
189+
elapsed = benchmark2( iter, len );
146190
print_results( iter, elapsed );
147191
printf( "ok %d benchmark finished\n", count );
148192
}

0 commit comments

Comments
 (0)