From b661065edf735d9822aaa1a647c54ae14856c09e Mon Sep 17 00:00:00 2001 From: Vivek Maurya Date: Sat, 21 Dec 2024 18:55:48 +0530 Subject: [PATCH 1/2] refactor: update stats/base/dnanminabs to follow latest project conventions --- .../stats/base/dnanminabs/include.gypi | 2 +- .../stats/base/dnanminabs/manifest.json | 44 ++++++- .../@stdlib/stats/base/dnanminabs/src/addon.c | 43 +++++++ .../stats/base/dnanminabs/src/addon.cpp | 117 ------------------ 4 files changed, 87 insertions(+), 119 deletions(-) create mode 100644 lib/node_modules/@stdlib/stats/base/dnanminabs/src/addon.c delete mode 100644 lib/node_modules/@stdlib/stats/base/dnanminabs/src/addon.cpp diff --git a/lib/node_modules/@stdlib/stats/base/dnanminabs/include.gypi b/lib/node_modules/@stdlib/stats/base/dnanminabs/include.gypi index 868c5c12e852..26476a8c2655 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanminabs/include.gypi +++ b/lib/node_modules/@stdlib/stats/base/dnanminabs/include.gypi @@ -36,7 +36,7 @@ # Source files: 'src_files': [ - '<(src_dir)/addon.cpp', + '<(src_dir)/addon.c', ' + +/** +* Receives JavaScript callback invocation data. +* +* @param env environment under which the function is invoked +* @param info callback data +* @return Node-API value +*/ +static napi_value addon( napi_env env, napi_callback_info info ) { + STDLIB_NAPI_ARGV( env, info, argv, argc, 3 ); + STDLIB_NAPI_ARGV_INT64( env, N, argv, 0 ); + STDLIB_NAPI_ARGV_INT64( env, stride, argv, 2 ); + STDLIB_NAPI_ARGV_STRIDED_FLOAT64ARRAY( env, X, N, stride, argv, 1 ); + STDLIB_NAPI_CREATE_DOUBLE( env, stdlib_strided_dnanminabs( N, X, stride ), v ); + return v; +} + +STDLIB_NAPI_MODULE_EXPORT_FCN( addon ) \ No newline at end of file diff --git a/lib/node_modules/@stdlib/stats/base/dnanminabs/src/addon.cpp b/lib/node_modules/@stdlib/stats/base/dnanminabs/src/addon.cpp deleted file mode 100644 index e211a23880e7..000000000000 --- a/lib/node_modules/@stdlib/stats/base/dnanminabs/src/addon.cpp +++ /dev/null @@ -1,117 +0,0 @@ -/** -* @license Apache-2.0 -* -* Copyright (c) 2020 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. -*/ - -#include "stdlib/stats/base/dnanminabs.h" -#include -#include -#include -#include -#include - -/** -* Add-on namespace. -*/ -namespace stdlib_stats_base_dnanminabs { - - /** - * Computes the minimum absolute value of a double-precision floating-point strided array, ignoring `NaN` values. - * - * ## Notes - * - * - When called from JavaScript, the function expects three arguments: - * - * - `N`: number of indexed elements - * - `X`: input array - * - `stride`: stride length - */ - napi_value node_dnanminabs( napi_env env, napi_callback_info info ) { - napi_status status; - - size_t argc = 3; - napi_value argv[ 3 ]; - status = napi_get_cb_info( env, info, &argc, argv, nullptr, nullptr ); - assert( status == napi_ok ); - - if ( argc < 3 ) { - napi_throw_error( env, nullptr, "invalid invocation. Must provide 3 arguments." ); - return nullptr; - } - - napi_valuetype vtype0; - status = napi_typeof( env, argv[ 0 ], &vtype0 ); - assert( status == napi_ok ); - if ( vtype0 != napi_number ) { - napi_throw_type_error( env, nullptr, "invalid argument. First argument must be a number." ); - return nullptr; - } - - bool res; - status = napi_is_typedarray( env, argv[ 1 ], &res ); - assert( status == napi_ok ); - if ( res == false ) { - napi_throw_type_error( env, nullptr, "invalid argument. Second argument must be a Float64Array." ); - return nullptr; - } - - napi_valuetype vtype2; - status = napi_typeof( env, argv[ 2 ], &vtype2 ); - assert( status == napi_ok ); - if ( vtype2 != napi_number ) { - napi_throw_type_error( env, nullptr, "invalid argument. Third argument must be a number." ); - return nullptr; - } - - int64_t N; - status = napi_get_value_int64( env, argv[ 0 ], &N ); - assert( status == napi_ok ); - - int64_t stride; - status = napi_get_value_int64( env, argv[ 2 ], &stride ); - assert( status == napi_ok ); - - napi_typedarray_type vtype1; - size_t xlen; - void *X; - status = napi_get_typedarray_info( env, argv[ 1 ], &vtype1, &xlen, &X, nullptr, nullptr ); - assert( status == napi_ok ); - if ( vtype1 != napi_float64_array ) { - napi_throw_type_error( env, nullptr, "invalid argument. Second argument must be a Float64Array." ); - return nullptr; - } - if ( (N-1)*llabs(stride) >= (int64_t)xlen ) { - napi_throw_range_error( env, nullptr, "invalid argument. Second argument has insufficient elements based on the associated stride and the number of indexed elements." ); - return nullptr; - } - - napi_value v; - status = napi_create_double( env, stdlib_strided_dnanminabs( N, (double *)X, stride ), &v ); - assert( status == napi_ok ); - - return v; - } - - napi_value Init( napi_env env, napi_value exports ) { - napi_status status; - napi_value fcn; - status = napi_create_function( env, "exports", NAPI_AUTO_LENGTH, node_dnanminabs, NULL, &fcn ); - assert( status == napi_ok ); - return fcn; - } - - NAPI_MODULE( NODE_GYP_MODULE_NAME, Init ) -} // end namespace stdlib_stats_base_dnanminabs From 55df969f4dcd1ef326b1292a85808f0317aebe39 Mon Sep 17 00:00:00 2001 From: Vivek Maurya Date: Sun, 22 Dec 2024 09:21:02 +0530 Subject: [PATCH 2/2] added new line in addon --- lib/node_modules/@stdlib/stats/base/dnanminabs/manifest.json | 2 -- lib/node_modules/@stdlib/stats/base/dnanminabs/src/addon.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/node_modules/@stdlib/stats/base/dnanminabs/manifest.json b/lib/node_modules/@stdlib/stats/base/dnanminabs/manifest.json index aeebe89d7c21..f8019735fff2 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanminabs/manifest.json +++ b/lib/node_modules/@stdlib/stats/base/dnanminabs/manifest.json @@ -38,7 +38,6 @@ ], "libpath": [], "dependencies": [ - "@stdlib/math/base/special/abs", "@stdlib/math/base/assert/is-nan", "@stdlib/napi/export", "@stdlib/napi/argv", @@ -60,7 +59,6 @@ ], "libpath": [], "dependencies": [ - "@stdlib/math/base/special/abs", "@stdlib/math/base/assert/is-nan" ] }, diff --git a/lib/node_modules/@stdlib/stats/base/dnanminabs/src/addon.c b/lib/node_modules/@stdlib/stats/base/dnanminabs/src/addon.c index 577b4d78f8c3..72c76aa5f68c 100644 --- a/lib/node_modules/@stdlib/stats/base/dnanminabs/src/addon.c +++ b/lib/node_modules/@stdlib/stats/base/dnanminabs/src/addon.c @@ -40,4 +40,4 @@ static napi_value addon( napi_env env, napi_callback_info info ) { return v; } -STDLIB_NAPI_MODULE_EXPORT_FCN( addon ) \ No newline at end of file +STDLIB_NAPI_MODULE_EXPORT_FCN( addon )