Skip to content
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.

Sign up for GitHub

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

Fix codestyle remarks #77

Merged
merged 2 commits into from
Dec 18, 2023
Merged

Fix codestyle remarks #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59d5596
Review remarks fixes
vishniakov-nikolai Dec 18, 2023
24c2ebb
Remove extra structure in samples
vishniakov-nikolai Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions samples/js/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/assets
2 changes: 0 additions & 2 deletions samples/js/assets/datasets/.gitignore
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions samples/js/assets/images/.gitignore
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions samples/js/assets/models/.gitignore
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions samples/js/assets/text/.gitignore
View file
Open in desktop

This file was deleted.

18 changes: 17 additions & 1 deletion samples/js/node/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const path = require('node:path');
const { cv } = require('opencv-wasm');
const { createWriteStream } = require('node:fs');
const { mkdir, stat } = require('node:fs/promises');
const { HttpsProxyAgent } = require('https-proxy-agent');

const {
Expand Down Expand Up @@ -114,9 +115,12 @@ function transform(arr, { width, height }, order) {
return [].concat(...val);
}

function downloadFile(url, filename, destination) {
async function downloadFile(url, filename, destination) {
const { env } = process;
const timeout = 5000;

await applyFolderPath(destination);

const fullPath = path.resolve(destination, filename);
const file = createWriteStream(fullPath);
const protocolString = new URL(url).protocol === 'https:' ? 'https' : 'http';
Expand Down Expand Up @@ -314,3 +318,15 @@ function tril(matrix, k = 0) {

return result;
}

async function applyFolderPath(dirPath) {
try {
await stat(dirPath);

return;
} catch(err) {
if (err.code !== 'ENOENT') throw err;

await mkdir(dirPath, { recursive: true });
}
}
12 changes: 6 additions & 6 deletions samples/js/node/notebooks/003-hello-segmentation.nnb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{
"language": "typescript",
"source": [
"const {\n getImageData, \n displayArrayAsImage, \n arrayToImageData,\n transform,\n downloadFile,\n} = require('../helpers');\n\nconst { cv } = require('opencv-wasm');\nconst { display } = require('node-kernel');\n\nconst { addon: ov } = require('openvinojs-node'); "
"const {\n getImageData, \n displayArrayAsImage, \n arrayToImageData,\n transform,\n downloadFile,\n} = require('../helpers');\n\nconst { cv } = require('opencv-wasm');\nconst { display } = require('node-kernel');\n\nconst { addon: ov } = require('openvinojs-node'); \n"
],
"outputs": []
},
Expand All @@ -31,7 +31,7 @@
{
"language": "typescript",
"source": [
"const baseArtifactsDir = '../../assets/models';\n\nconst modelName = 'road-segmentation-adas-0001';\nconst modelXMLName = `${modelName}.xml`;\nconst modelBINName = `${modelName}.bin`;\n\nconst modelXMLPath = baseArtifactsDir + '/' + modelXMLName;\n\nconst baseURL = 'https://storage.openvinotoolkit.org/repositories/open_model_zoo/2022.3/models_bin/1/road-segmentation-adas-0001/FP32/';\n\n\nawait downloadFile(baseURL + modelXMLName, modelXMLName, baseArtifactsDir);\nawait downloadFile(baseURL + modelBINName, modelBINName, baseArtifactsDir);"
"const baseArtifactsDir = '../../assets/models';\n\nconst modelName = 'road-segmentation-adas-0001';\nconst modelXMLName = `${modelName}.xml`;\nconst modelBINName = `${modelName}.bin`;\n\nconst modelXMLPath = baseArtifactsDir + '/' + modelXMLName;\n\nconst baseURL = 'https://storage.openvinotoolkit.org/repositories/open_model_zoo/2022.3/models_bin/1/road-segmentation-adas-0001/FP32/';\n\n\nawait downloadFile(baseURL + modelXMLName, modelXMLName, baseArtifactsDir);\nawait downloadFile(baseURL + modelBINName, modelBINName, baseArtifactsDir);\n"
],
"outputs": [
{
Expand Down Expand Up @@ -59,7 +59,7 @@
{
"language": "typescript",
"source": [
"const baseImagesDir = '../../assets/images';\nconst imgUrl = 'https://storage.openvinotoolkit.org/repositories/openvino_notebooks/data/data/image/empty_road_mapillary.jpg';\n\nawait downloadFile(imgUrl, 'empty_road_mapillary.jpg', baseImagesDir);"
"const baseImagesDir = '../../assets/images';\nconst imgUrl = 'https://storage.openvinotoolkit.org/repositories/openvino_notebooks/data/data/image/empty_road_mapillary.jpg';\n\nawait downloadFile(imgUrl, 'empty_road_mapillary.jpg', baseImagesDir);\n"
],
"outputs": [
{
Expand All @@ -86,7 +86,7 @@
{
"language": "typescript",
"source": [
"const core = new ov.Core();\nconst model = await core.readModel(modelXMLPath);\nconst compiledModel = await core.compileModel(model, 'CPU');\n\nconst inputLayer = compiledModel.input(0);\nconst outputLayer = compiledModel.output(0);"
"const core = new ov.Core();\nconst model = await core.readModel(modelXMLPath);\nconst compiledModel = await core.compileModel(model, 'CPU');\n\nconst inputLayer = compiledModel.input(0);\nconst outputLayer = compiledModel.output(0);\n"
],
"outputs": []
},
Expand All @@ -100,7 +100,7 @@
{
"language": "typescript",
"source": [
"const imgData = await getImageData('../../assets/images/empty_road_mapillary.jpg');\n\nconst originalImage = cv.matFromImageData(imgData);\nconst { cols: originalWidth, rows: originalHeight } = originalImage;\n\nconst image = new cv.Mat();\ncv.cvtColor(originalImage, image, cv.COLOR_RGBA2RGB);\ncv.cvtColor(image, image, cv.COLOR_BGR2RGB); \n\nconst [B, C, H, W] = inputLayer.shape;\n\ncv.resize(image, image, new cv.Size(W, H));\n\nconst inputImage = transform(image.data, { width: W, height: H }, [0, 1, 2]); // NHWC to NCHW\n\ndisplayArrayAsImage(originalImage.data, originalWidth, originalHeight, display);"
"const imgData = await getImageData('../../assets/images/empty_road_mapillary.jpg');\n\nconst originalImage = cv.matFromImageData(imgData);\nconst { cols: originalWidth, rows: originalHeight } = originalImage;\n\nconst image = new cv.Mat();\ncv.cvtColor(originalImage, image, cv.COLOR_RGBA2RGB);\ncv.cvtColor(image, image, cv.COLOR_BGR2RGB); \n\nconst [B, C, H, W] = inputLayer.shape;\n\ncv.resize(image, image, new cv.Size(W, H));\n\nconst inputImage = transform(image.data, { width: W, height: H }, [0, 1, 2]); // NHWC to NCHW\n\ndisplayArrayAsImage(originalImage.data, originalWidth, originalHeight, display);\n"
],
"outputs": [
{
Expand Down Expand Up @@ -146,7 +146,7 @@
{
"language": "typescript",
"source": [
"const alpha = 0.3;\n\nconst pixelsAsImageData = arrayToImageData(pixels, W, H);\nconst mask = cv.matFromImageData(pixelsAsImageData);\n\ncv.resize(mask, mask, new cv.Size(originalWidth, originalHeight));\n\ncv.addWeighted(mask, alpha, originalImage, 1 - alpha, 0, mask);\n\ndisplayArrayAsImage(mask.data, originalWidth, originalHeight, display);"
"const alpha = 0.3;\n\nconst pixelsAsImageData = arrayToImageData(pixels, W, H);\nconst mask = cv.matFromImageData(pixelsAsImageData);\n\ncv.resize(mask, mask, new cv.Size(originalWidth, originalHeight));\n\ncv.addWeighted(mask, alpha, originalImage, 1 - alpha, 0, mask);\n\ndisplayArrayAsImage(mask.data, originalWidth, originalHeight, display);\n"
],
"outputs": [
{
Expand Down
8 changes: 4 additions & 4 deletions samples/js/node/notebooks/004-hello-detection.nnb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{
"language": "typescript",
"source": [
"const { cv } = require('opencv-wasm');\nconst { display } = require('node-kernel');\nconst { transform, getImageData, displayArrayAsImage, downloadFile } = require('../helpers.js');\n\nconst { addon: ov } = require('openvinojs-node'); "
"const { cv } = require('opencv-wasm');\nconst { display } = require('node-kernel');\nconst { transform, getImageData, displayArrayAsImage, downloadFile } = require('../helpers.js');\n\nconst { addon: ov } = require('openvinojs-node'); \n"
],
"outputs": []
},
Expand All @@ -31,7 +31,7 @@
{
"language": "typescript",
"source": [
"const baseArtifactsDir = '../../assets/models';\n\nconst modelName = 'horizontal-text-detection-0001';\nconst modelXMLName = `${modelName}.xml`;\nconst modelBINName = `${modelName}.bin`;\n\nconst modelXMLPath = baseArtifactsDir + '/' + modelXMLName;\n\nconst baseURL = 'https://storage.openvinotoolkit.org/repositories/open_model_zoo/2022.3/models_bin/1/horizontal-text-detection-0001/FP32/';\n\nawait downloadFile(baseURL + modelXMLName, modelXMLName, baseArtifactsDir);\nawait downloadFile(baseURL + modelBINName, modelBINName, baseArtifactsDir);"
"const baseArtifactsDir = '../../assets/models';\n\nconst modelName = 'horizontal-text-detection-0001';\nconst modelXMLName = `${modelName}.xml`;\nconst modelBINName = `${modelName}.bin`;\n\nconst modelXMLPath = baseArtifactsDir + '/' + modelXMLName;\n\nconst baseURL = 'https://storage.openvinotoolkit.org/repositories/open_model_zoo/2022.3/models_bin/1/horizontal-text-detection-0001/FP32/';\n\nawait downloadFile(baseURL + modelXMLName, modelXMLName, baseArtifactsDir);\nawait downloadFile(baseURL + modelBINName, modelBINName, baseArtifactsDir);\n"
],
"outputs": [
{
Expand Down Expand Up @@ -59,7 +59,7 @@
{
"language": "typescript",
"source": [
"const baseImagesDir = '../../assets/images';\nconst imgUrl = 'https://storage.openvinotoolkit.org/repositories/openvino_notebooks/data/data/image/intel_rnb.jpg';\n\nawait downloadFile(imgUrl, 'intel_rnb.jpg', baseImagesDir);"
"const baseImagesDir = '../../assets/images';\nconst imgUrl = 'https://storage.openvinotoolkit.org/repositories/openvino_notebooks/data/data/image/intel_rnb.jpg';\n\nawait downloadFile(imgUrl, 'intel_rnb.jpg', baseImagesDir);\n"
],
"outputs": [
{
Expand All @@ -86,7 +86,7 @@
{
"language": "typescript",
"source": [
"const core = new ov.Core();\nconst model = await core.readModel(modelXMLPath);\nconst compiledModel = await core.compileModel(model, 'CPU');\n\nconst inputLayer = compiledModel.input(0);\nconst outputLayer = compiledModel.output('boxes');"
"const core = new ov.Core();\nconst model = await core.readModel(modelXMLPath);\nconst compiledModel = await core.compileModel(model, 'CPU');\n\nconst inputLayer = compiledModel.input(0);\nconst outputLayer = compiledModel.output('boxes');\n"
],
"outputs": []
},
Expand Down
2 changes: 1 addition & 1 deletion samples/js/node/notebooks/213-question-answering.nnb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
"Question: What is the term for a task that generally lends itself to being solved by a computer?",
"Answer: A computational problem",
"Score: 0.5286847737759395",
"Time: 0.046014048s",
"Time: 0.045163961s",
""
]
}
Expand Down
42 changes: 21 additions & 21 deletions src/bindings/js/node/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,27 @@ FetchContent_Declare(
FetchContent_MakeAvailable(node-addon-api)

add_library(${PROJECT_NAME} SHARED
src/node_output.cpp
src/async_reader.cpp
src/preprocess/preprocess.cpp
src/preprocess/pre_post_process_wrap.cpp
src/preprocess/preprocess_steps.cpp
src/preprocess/input_info.cpp
src/preprocess/output_info.cpp
src/preprocess/input_tensor_info.cpp
src/preprocess/output_tensor_info.cpp
src/preprocess/input_model_info.cpp
src/preprocess/resize_algorithm.cpp
src/errors.cpp
src/helper.cpp
src/tensor.cpp
src/infer_request.cpp
src/compiled_model.cpp
src/core_wrap.cpp
src/model_wrap.cpp
src/addon.cpp
src/element_type.cpp
src/partial_shape_wrap.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/node_output.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/async_reader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/preprocess/preprocess.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/preprocess/pre_post_process_wrap.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/preprocess/preprocess_steps.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/preprocess/input_info.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/preprocess/output_info.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/preprocess/input_tensor_info.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/preprocess/output_tensor_info.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/preprocess/input_model_info.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/preprocess/resize_algorithm.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/errors.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/helper.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/tensor.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/infer_request.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/compiled_model.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/core_wrap.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/model_wrap.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/addon.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/element_type.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/partial_shape_wrap.cpp
)

target_include_directories(${PROJECT_NAME} PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion src/bindings/js/node/src/preprocess/resize_algorithm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Napi::Value enumResizeAlgorithm(const Napi::CallbackInfo& info) {
auto enumObj = Napi::Object::New(info.Env());
std::vector<Napi::PropertyDescriptor> pds;

std::array<std::string, 3> resizeAlgorithms = {"RESIZE_LINEAR", "RESIZE_CUBIC", "RESIZE_NEAREST"};
static const std::array<std::string, 3> resizeAlgorithms = {"RESIZE_LINEAR", "RESIZE_CUBIC", "RESIZE_NEAREST"};

for (auto& algorithm : resizeAlgorithms) {
pds.push_back(
Expand Down
Loading