Skip to content

Commit 35ade26

Browse files
committed
Apply feedback, remove docker files
1 parent dd7383c commit 35ade26

File tree

10 files changed

+14
-94
lines changed

10 files changed

+14
-94
lines changed

examples/cpp/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ endmacro()
9292

9393
find_package(OpenCV REQUIRED COMPONENTS imgcodecs)
9494

95-
set(ENABLE_PY_BINDINGS OFF)
9695
add_subdirectory(../../src/cpp ${Samples_BINARY_DIR}/src/cpp)
9796

9897
add_example(NAME asynchronous_api SOURCES ./asynchronous_api/main.cpp DEPENDENCIES model_api)

src/cpp/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
cmake_minimum_required(VERSION 3.26)
66

7-
# option(ENABLE_PY_BINDINGS "Enables building python bindings package" ON)
8-
97
# Multi config generators such as Visual Studio ignore CMAKE_BUILD_TYPE. Multi config generators are configured with
108
# CMAKE_CONFIGURATION_TYPES, but limiting options in it completely removes such build options
119
get_property(GENERATOR_IS_MULTI_CONFIG_VAR GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
@@ -77,10 +75,6 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "^GNU|(Apple)?Clang$")
7775
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
7876
endif()
7977

80-
#if (ENABLE_PY_BINDINGS)
81-
# add_subdirectory(py_bindings)
82-
#endif()
83-
8478
include(GenerateExportHeader)
8579

8680
generate_export_header(model_api)

src/cpp/py_bindings/Dockerfile.ubuntu

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/cpp/py_bindings/Dockerfile_test.ubuntu

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/cpp/py_bindings/README.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/cpp/py_bindings/pyproject.toml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,20 @@ requires = ["scikit-build-core >=0.4.3", "nanobind >=1.3.2"]
33
build-backend = "scikit_build_core.build"
44

55
[project]
6-
name = "vision_api"
7-
version = "0.0.1"
8-
description = "set of wrapper classes for particular tasks and model architectures, simplifying data preprocess and postprocess as well as routine procedures"
9-
readme = "README.md"
10-
requires-python = ">=3.8"
6+
name = "openvino_model_api"
7+
version = "0.3.0.2"
8+
requires-python = ">=3.9"
119
authors = [
12-
{ name = "Ronald Hecker", email = "[email protected]" },
10+
{name = "Intel(R) Corporation"},
1311
]
14-
classifiers = [
15-
"License :: BSD",
12+
maintainers = [
13+
{name = "Intel(R) Corporation"},
1614
]
17-
# Optional: runtime dependency specification
18-
dependencies = [
19-
"openvino>=2025.0",
20-
"opencv-python-headless",
15+
description = "Model API: model wrappers and pipelines for inference with OpenVINO"
16+
readme = "../../python/README.md"
17+
classifiers = [
18+
"License :: OSI Approved :: Apache Software License",
19+
"Programming Language :: Python :: 3.9"
2120
]
2221

2322
[project.urls]

src/cpp/py_bindings/src/vision_api/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#!/usr/bin/env python3
1+
# Copyright (C) 2024 Intel Corporation
2+
# SPDX-License-Identifier: Apache-2.0
23

34
try:
45
from openvino import Core

tests/cpp/accuracy/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ include(../cmake/common.cmake)
6767

6868
find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs)
6969

70-
set(ENABLE_PY_BINDINGS ON)
7170
add_subdirectory(../../../src/cpp ${tests_BINARY_DIR}/model_api/cpp)
7271

7372
add_test(NAME test_accuracy SOURCES test_accuracy.cpp DEPENDENCIES model_api)

tests/cpp/accuracy/test_bindings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def test_classification_models(data: str, classification_configs):
4848
cpp_model = ClassificationModel.create_model(name, preload=True)
4949

5050
image_path = Path(data) / next(iter(model_data["test_data"]))["image"]
51-
image = cv2.imread(str(image_path))
51+
image = cv2.cvtColor(cv2.imread(image_path), cv2.COLOR_BGR2RGB)
5252

5353
py_result = model(image)
5454
cpp_result = cpp_model(image)

tests/cpp/precommit/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ include(../cmake/common.cmake)
6666

6767
find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs)
6868

69-
set(ENABLE_PY_BINDINGS OFF)
7069
add_subdirectory(../../../src/cpp ${tests_BINARY_DIR}/model_api/cpp)
7170

7271
add_test(NAME test_sanity SOURCES test_sanity.cpp DEPENDENCIES model_api)

0 commit comments

Comments
 (0)