diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 1c04d75a..3616280f 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -20,7 +20,7 @@ jobs: with: python-version: "3.10" - name: Install dependencies - run: pip install 'model_api/python/.[docs]' + run: pip install 'src/python/.[docs]' - name: Install and Generate Doxygen uses: mattnotmitt/doxygen-action@v1.9.8 - name: Build Docs diff --git a/.github/workflows/pre_commit.yml b/.github/workflows/pre_commit.yml index a7b0b860..74fe28ea 100644 --- a/.github/workflows/pre_commit.yml +++ b/.github/workflows/pre_commit.yml @@ -30,7 +30,7 @@ jobs: - name: Install clang-format run: sudo apt-get install -y clang-format-10 - name: Install dependencies - run: pip install 'model_api/python/.[full]' + run: pip install 'src/python/.[full]' - name: Run pre-commit checks run: pre-commit run --all-files Unit-Tests: @@ -43,6 +43,6 @@ jobs: with: python-version: "3.9" - name: Install dependencies - run: pip install 'model_api/python/.[tests,ovms]' + run: pip install 'src/python/.[tests,ovms]' - name: Run python unit tests run: pytest tests/python/unit diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 71a3132a..35a7a23a 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -24,20 +24,20 @@ jobs: python -m pip install --upgrade build - name: Build sdist run: | - sed -i '/omz_tools/d' model_api/python/pyproject.toml - python -m build --sdist model_api/python/ + sed -i '/omz_tools/d' src/python/pyproject.toml + python -m build --sdist src/python/ - uses: actions/upload-artifact@v4 with: name: artifact-sdist - path: model_api/python/dist/*.tar.gz + path: src/python/dist/*.tar.gz - name: Build wheel run: | - sed -i '/omz_tools/d' model_api/python/pyproject.toml - python -m build --wheel model_api/python/ + sed -i '/omz_tools/d' src/python/pyproject.toml + python -m build --wheel src/python/ - uses: actions/upload-artifact@v4 with: name: artifact-wheel - path: model_api/python/dist/*.whl + path: src/python/dist/*.whl publish_package: name: Publish package @@ -52,7 +52,7 @@ jobs: - name: Download artifacts uses: actions/download-artifact@v4 with: - path: model_api/python/dist + path: src/python/dist pattern: artifact-* merge-multiple: true # to determine where to publish the package distribution to PyPI or TestPyPI @@ -67,7 +67,7 @@ jobs: uses: svenstaro/upload-release-action@04733e069f2d7f7f0b4aebc4fbdbce8613b03ccd # v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: model_api/python/dist/* + file: src/python/dist/* tag: ${{ github.ref }} overwrite: true file_glob: true diff --git a/.github/workflows/test_accuracy.yml b/.github/workflows/test_accuracy.yml index e4584c1c..e91d479d 100644 --- a/.github/workflows/test_accuracy.yml +++ b/.github/workflows/test_accuracy.yml @@ -25,7 +25,7 @@ jobs: run: | source venv/bin/activate python -m pip install --upgrade pip - pip install model_api/python/[tests,build] --extra-index-url https://download.pytorch.org/whl/cpu + pip install src/python/[tests,build] --extra-index-url https://download.pytorch.org/whl/cpu - name: Prepare test data run: | source venv/bin/activate @@ -37,7 +37,7 @@ jobs: DATA=data pytest --data=./data tests/python/accuracy/test_YOLOv8.py - name: Install CPP dependencies run: | - sudo bash model_api/cpp/install_dependencies.sh + sudo bash src/cpp/install_dependencies.sh - name: Build CPP Test run: | pip install nanobind==2.4.0 diff --git a/.github/workflows/test_precommit.yml b/.github/workflows/test_precommit.yml index 6084a799..71bf2d1d 100644 --- a/.github/workflows/test_precommit.yml +++ b/.github/workflows/test_precommit.yml @@ -27,7 +27,7 @@ jobs: run: | source venv/bin/activate python -m pip install --upgrade pip - pip install model_api/python/[tests,ovms] --extra-index-url https://download.pytorch.org/whl/cpu + pip install src/python/[tests,ovms] --extra-index-url https://download.pytorch.org/whl/cpu - name: Prepare test data run: | source venv/bin/activate @@ -35,7 +35,7 @@ jobs: - name: Run test run: | source venv/bin/activate - pytest --data=./data tests/python/funtional + pytest --data=./data tests/python/functional CPP-Code-Quality: name: CPP-Code-Quality runs-on: ubuntu-latest @@ -46,7 +46,7 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN}} # missingInclude: cppcheck can't find stl, openvino, opencv - other_options: --suppress=missingInclude -Imodel_api/cpp/models/include -Imodel_api/cpp/utils/include -Imodel_api/cpp/pipelines/include --check-config + other_options: --suppress=missingInclude -Isrc/cpp/models/include -Isrc/cpp/utils/include -Isrc/cpp/pipelines/include --check-config CPP-Precommit: runs-on: ubuntu-22.04 steps: @@ -63,9 +63,9 @@ jobs: run: | source venv/bin/activate python -m pip install --upgrade pip - pip install model_api/python/[tests,build] --extra-index-url https://download.pytorch.org/whl/cpu + pip install src/python/[tests,build] --extra-index-url https://download.pytorch.org/whl/cpu - sudo bash model_api/cpp/install_dependencies.sh + sudo bash src/cpp/install_dependencies.sh - name: Prepare test data run: | source venv/bin/activate @@ -98,7 +98,7 @@ jobs: run: | source venv/Scripts/activate python -m pip install --upgrade pip - pip install model_api/python/[tests,build] --extra-index-url https://download.pytorch.org/whl/cpu + pip install src/python/[tests,build] --extra-index-url https://download.pytorch.org/whl/cpu curl https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.6/windows/w_openvino_toolkit_windows_2024.6.0.17404.4c0f47d2335_x86_64.zip --output w_openvino_toolkit_windows.zip unzip w_openvino_toolkit_windows.zip rm w_openvino_toolkit_windows.zip @@ -114,7 +114,7 @@ jobs: shell: bash run: | mkdir build && cd build - MSYS_NO_PATHCONV=1 cmake ../examples/cpp/ -DOpenVINO_DIR=$GITHUB_WORKSPACE/w_openvino_toolkit_windows_2024.6.0.17404.4c0f47d2335_x86_64/runtime/cmake -DOpenCV_DIR=$GITHUB_WORKSPACE/opencv/opencv/build -DCMAKE_CXX_FLAGS=/WX -DENABLE_PY_BINDINGS=OFF + MSYS_NO_PATHCONV=1 cmake ../examples/cpp/ -DOpenVINO_DIR=$GITHUB_WORKSPACE/w_openvino_toolkit_windows_2024.6.0.17404.4c0f47d2335_x86_64/runtime/cmake -DOpenCV_DIR=$GITHUB_WORKSPACE/opencv/opencv/build -DCMAKE_CXX_FLAGS=/WX cmake --build . --config Release -j $((`nproc`*2+2)) - name: Run sync sample shell: cmd @@ -146,7 +146,7 @@ jobs: - name: serving_api run: | python -m pip install --upgrade pip - python -m pip install model_api/python/[ovms,tests] + python -m pip install src/python/[ovms,tests] python -c "from model_api.models import DetectionModel; DetectionModel.create_model('ssd_mobilenet_v1_fpn_coco').save('ovms_models/ssd_mobilenet_v1_fpn_coco/1/ssd_mobilenet_v1_fpn_coco.xml')" docker run -d --rm -v $GITHUB_WORKSPACE/ovms_models/:/models -p 8000:8000 openvino/model_server:latest --model_path /models/ssd_mobilenet_v1_fpn_coco/ --model_name ssd_mobilenet_v1_fpn_coco --rest_port 8000 --log_level DEBUG --target_device CPU python tests/cpp/precommit/prepare_data.py -d data -p tests/cpp/precommit/public_scope.json diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt index a8a295ec..2fe5a7fd 100644 --- a/examples/cpp/CMakeLists.txt +++ b/examples/cpp/CMakeLists.txt @@ -92,7 +92,8 @@ endmacro() find_package(OpenCV REQUIRED COMPONENTS imgcodecs) -add_subdirectory(../../model_api/cpp ${Samples_BINARY_DIR}/model_api/cpp) +set (ENABLE_PY_BINDINGS OFF) +add_subdirectory(../../src/cpp ${Samples_BINARY_DIR}/src/cpp) add_example(NAME asynchronous_api SOURCES ./asynchronous_api/main.cpp DEPENDENCIES model_api) add_example(NAME synchronous_api SOURCES ./synchronous_api/main.cpp DEPENDENCIES model_api) diff --git a/examples/cpp/asynchronous_api/README.md b/examples/cpp/asynchronous_api/README.md index 92636712..88e44483 100644 --- a/examples/cpp/asynchronous_api/README.md +++ b/examples/cpp/asynchronous_api/README.md @@ -13,8 +13,8 @@ This example demonstrates how to use a C++ API of OpenVINO Model API for asynchr - Install third party dependencies by running the following script: ```bash - chmod +x ../../../model_api/cpp/install_dependencies.sh - sudo ../../../model_api/cpp/install_dependencies.sh + chmod +x ../../../src/cpp/install_dependencies.sh + sudo ../../../src/cpp/install_dependencies.sh ``` - Build example: diff --git a/examples/cpp/synchronous_api/README.md b/examples/cpp/synchronous_api/README.md index ceda9bd9..d391467f 100644 --- a/examples/cpp/synchronous_api/README.md +++ b/examples/cpp/synchronous_api/README.md @@ -11,8 +11,8 @@ This example demonstrates how to use a C++ API of OpenVINO Model API for synchro - Install third party dependencies by running the following script: ```bash - chmod +x ../../../model_api/cpp/install_dependencies.sh - sudo ../../../model_api/cpp/install_dependencies.sh + chmod +x ../../../src/cpp/install_dependencies.sh + sudo ../../../src/cpp/install_dependencies.sh ``` - Build example: diff --git a/model_api/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt similarity index 100% rename from model_api/cpp/CMakeLists.txt rename to src/cpp/CMakeLists.txt diff --git a/model_api/cpp/adapters/include/adapters/inference_adapter.h b/src/cpp/adapters/include/adapters/inference_adapter.h similarity index 100% rename from model_api/cpp/adapters/include/adapters/inference_adapter.h rename to src/cpp/adapters/include/adapters/inference_adapter.h diff --git a/model_api/cpp/adapters/include/adapters/openvino_adapter.h b/src/cpp/adapters/include/adapters/openvino_adapter.h similarity index 100% rename from model_api/cpp/adapters/include/adapters/openvino_adapter.h rename to src/cpp/adapters/include/adapters/openvino_adapter.h diff --git a/model_api/cpp/adapters/src/openvino_adapter.cpp b/src/cpp/adapters/src/openvino_adapter.cpp similarity index 100% rename from model_api/cpp/adapters/src/openvino_adapter.cpp rename to src/cpp/adapters/src/openvino_adapter.cpp diff --git a/model_api/cpp/cmake/model_apiConfig.cmake b/src/cpp/cmake/model_apiConfig.cmake similarity index 100% rename from model_api/cpp/cmake/model_apiConfig.cmake rename to src/cpp/cmake/model_apiConfig.cmake diff --git a/model_api/cpp/install_dependencies.sh b/src/cpp/install_dependencies.sh similarity index 100% rename from model_api/cpp/install_dependencies.sh rename to src/cpp/install_dependencies.sh diff --git a/model_api/cpp/models/include/models/anomaly_model.h b/src/cpp/models/include/models/anomaly_model.h similarity index 100% rename from model_api/cpp/models/include/models/anomaly_model.h rename to src/cpp/models/include/models/anomaly_model.h diff --git a/model_api/cpp/models/include/models/classification_model.h b/src/cpp/models/include/models/classification_model.h similarity index 100% rename from model_api/cpp/models/include/models/classification_model.h rename to src/cpp/models/include/models/classification_model.h diff --git a/model_api/cpp/models/include/models/detection_model.h b/src/cpp/models/include/models/detection_model.h similarity index 100% rename from model_api/cpp/models/include/models/detection_model.h rename to src/cpp/models/include/models/detection_model.h diff --git a/model_api/cpp/models/include/models/detection_model_ext.h b/src/cpp/models/include/models/detection_model_ext.h similarity index 100% rename from model_api/cpp/models/include/models/detection_model_ext.h rename to src/cpp/models/include/models/detection_model_ext.h diff --git a/model_api/cpp/models/include/models/detection_model_ssd.h b/src/cpp/models/include/models/detection_model_ssd.h similarity index 100% rename from model_api/cpp/models/include/models/detection_model_ssd.h rename to src/cpp/models/include/models/detection_model_ssd.h diff --git a/model_api/cpp/models/include/models/detection_model_yolo.h b/src/cpp/models/include/models/detection_model_yolo.h similarity index 100% rename from model_api/cpp/models/include/models/detection_model_yolo.h rename to src/cpp/models/include/models/detection_model_yolo.h diff --git a/model_api/cpp/models/include/models/detection_model_yolov3_onnx.h b/src/cpp/models/include/models/detection_model_yolov3_onnx.h similarity index 100% rename from model_api/cpp/models/include/models/detection_model_yolov3_onnx.h rename to src/cpp/models/include/models/detection_model_yolov3_onnx.h diff --git a/model_api/cpp/models/include/models/detection_model_yolox.h b/src/cpp/models/include/models/detection_model_yolox.h similarity index 100% rename from model_api/cpp/models/include/models/detection_model_yolox.h rename to src/cpp/models/include/models/detection_model_yolox.h diff --git a/model_api/cpp/models/include/models/image_model.h b/src/cpp/models/include/models/image_model.h similarity index 100% rename from model_api/cpp/models/include/models/image_model.h rename to src/cpp/models/include/models/image_model.h diff --git a/model_api/cpp/models/include/models/input_data.h b/src/cpp/models/include/models/input_data.h similarity index 100% rename from model_api/cpp/models/include/models/input_data.h rename to src/cpp/models/include/models/input_data.h diff --git a/model_api/cpp/models/include/models/instance_segmentation.h b/src/cpp/models/include/models/instance_segmentation.h similarity index 100% rename from model_api/cpp/models/include/models/instance_segmentation.h rename to src/cpp/models/include/models/instance_segmentation.h diff --git a/model_api/cpp/models/include/models/internal_model_data.h b/src/cpp/models/include/models/internal_model_data.h similarity index 100% rename from model_api/cpp/models/include/models/internal_model_data.h rename to src/cpp/models/include/models/internal_model_data.h diff --git a/model_api/cpp/models/include/models/keypoint_detection.h b/src/cpp/models/include/models/keypoint_detection.h similarity index 100% rename from model_api/cpp/models/include/models/keypoint_detection.h rename to src/cpp/models/include/models/keypoint_detection.h diff --git a/model_api/cpp/models/include/models/model_base.h b/src/cpp/models/include/models/model_base.h similarity index 100% rename from model_api/cpp/models/include/models/model_base.h rename to src/cpp/models/include/models/model_base.h diff --git a/model_api/cpp/models/include/models/results.h b/src/cpp/models/include/models/results.h similarity index 100% rename from model_api/cpp/models/include/models/results.h rename to src/cpp/models/include/models/results.h diff --git a/model_api/cpp/models/include/models/segmentation_model.h b/src/cpp/models/include/models/segmentation_model.h similarity index 100% rename from model_api/cpp/models/include/models/segmentation_model.h rename to src/cpp/models/include/models/segmentation_model.h diff --git a/model_api/cpp/models/src/anomaly_model.cpp b/src/cpp/models/src/anomaly_model.cpp similarity index 100% rename from model_api/cpp/models/src/anomaly_model.cpp rename to src/cpp/models/src/anomaly_model.cpp diff --git a/model_api/cpp/models/src/classification_model.cpp b/src/cpp/models/src/classification_model.cpp similarity index 100% rename from model_api/cpp/models/src/classification_model.cpp rename to src/cpp/models/src/classification_model.cpp diff --git a/model_api/cpp/models/src/detection_model.cpp b/src/cpp/models/src/detection_model.cpp similarity index 100% rename from model_api/cpp/models/src/detection_model.cpp rename to src/cpp/models/src/detection_model.cpp diff --git a/model_api/cpp/models/src/detection_model_ext.cpp b/src/cpp/models/src/detection_model_ext.cpp similarity index 100% rename from model_api/cpp/models/src/detection_model_ext.cpp rename to src/cpp/models/src/detection_model_ext.cpp diff --git a/model_api/cpp/models/src/detection_model_ssd.cpp b/src/cpp/models/src/detection_model_ssd.cpp similarity index 100% rename from model_api/cpp/models/src/detection_model_ssd.cpp rename to src/cpp/models/src/detection_model_ssd.cpp diff --git a/model_api/cpp/models/src/detection_model_yolo.cpp b/src/cpp/models/src/detection_model_yolo.cpp similarity index 100% rename from model_api/cpp/models/src/detection_model_yolo.cpp rename to src/cpp/models/src/detection_model_yolo.cpp diff --git a/model_api/cpp/models/src/detection_model_yolov3_onnx.cpp b/src/cpp/models/src/detection_model_yolov3_onnx.cpp similarity index 100% rename from model_api/cpp/models/src/detection_model_yolov3_onnx.cpp rename to src/cpp/models/src/detection_model_yolov3_onnx.cpp diff --git a/model_api/cpp/models/src/detection_model_yolox.cpp b/src/cpp/models/src/detection_model_yolox.cpp similarity index 100% rename from model_api/cpp/models/src/detection_model_yolox.cpp rename to src/cpp/models/src/detection_model_yolox.cpp diff --git a/model_api/cpp/models/src/image_model.cpp b/src/cpp/models/src/image_model.cpp similarity index 100% rename from model_api/cpp/models/src/image_model.cpp rename to src/cpp/models/src/image_model.cpp diff --git a/model_api/cpp/models/src/instance_segmentation.cpp b/src/cpp/models/src/instance_segmentation.cpp similarity index 100% rename from model_api/cpp/models/src/instance_segmentation.cpp rename to src/cpp/models/src/instance_segmentation.cpp diff --git a/model_api/cpp/models/src/keypoint_detection.cpp b/src/cpp/models/src/keypoint_detection.cpp similarity index 100% rename from model_api/cpp/models/src/keypoint_detection.cpp rename to src/cpp/models/src/keypoint_detection.cpp diff --git a/model_api/cpp/models/src/model_base.cpp b/src/cpp/models/src/model_base.cpp similarity index 100% rename from model_api/cpp/models/src/model_base.cpp rename to src/cpp/models/src/model_base.cpp diff --git a/model_api/cpp/models/src/segmentation_model.cpp b/src/cpp/models/src/segmentation_model.cpp similarity index 100% rename from model_api/cpp/models/src/segmentation_model.cpp rename to src/cpp/models/src/segmentation_model.cpp diff --git a/model_api/cpp/py_bindings/CMakeLists.txt b/src/cpp/py_bindings/CMakeLists.txt similarity index 100% rename from model_api/cpp/py_bindings/CMakeLists.txt rename to src/cpp/py_bindings/CMakeLists.txt diff --git a/model_api/cpp/py_bindings/py_base.cpp b/src/cpp/py_bindings/py_base.cpp similarity index 100% rename from model_api/cpp/py_bindings/py_base.cpp rename to src/cpp/py_bindings/py_base.cpp diff --git a/model_api/cpp/py_bindings/py_classificaiton.cpp b/src/cpp/py_bindings/py_classificaiton.cpp similarity index 100% rename from model_api/cpp/py_bindings/py_classificaiton.cpp rename to src/cpp/py_bindings/py_classificaiton.cpp diff --git a/model_api/cpp/py_bindings/py_utils.cpp b/src/cpp/py_bindings/py_utils.cpp similarity index 100% rename from model_api/cpp/py_bindings/py_utils.cpp rename to src/cpp/py_bindings/py_utils.cpp diff --git a/model_api/cpp/py_bindings/py_utils.hpp b/src/cpp/py_bindings/py_utils.hpp similarity index 100% rename from model_api/cpp/py_bindings/py_utils.hpp rename to src/cpp/py_bindings/py_utils.hpp diff --git a/model_api/cpp/py_bindings/py_vision_api.cpp b/src/cpp/py_bindings/py_vision_api.cpp similarity index 100% rename from model_api/cpp/py_bindings/py_vision_api.cpp rename to src/cpp/py_bindings/py_vision_api.cpp diff --git a/model_api/cpp/tilers/include/tilers/detection.h b/src/cpp/tilers/include/tilers/detection.h similarity index 100% rename from model_api/cpp/tilers/include/tilers/detection.h rename to src/cpp/tilers/include/tilers/detection.h diff --git a/model_api/cpp/tilers/include/tilers/instance_segmentation.h b/src/cpp/tilers/include/tilers/instance_segmentation.h similarity index 100% rename from model_api/cpp/tilers/include/tilers/instance_segmentation.h rename to src/cpp/tilers/include/tilers/instance_segmentation.h diff --git a/model_api/cpp/tilers/include/tilers/semantic_segmentation.h b/src/cpp/tilers/include/tilers/semantic_segmentation.h similarity index 100% rename from model_api/cpp/tilers/include/tilers/semantic_segmentation.h rename to src/cpp/tilers/include/tilers/semantic_segmentation.h diff --git a/model_api/cpp/tilers/include/tilers/tiler_base.h b/src/cpp/tilers/include/tilers/tiler_base.h similarity index 100% rename from model_api/cpp/tilers/include/tilers/tiler_base.h rename to src/cpp/tilers/include/tilers/tiler_base.h diff --git a/model_api/cpp/tilers/src/detection.cpp b/src/cpp/tilers/src/detection.cpp similarity index 100% rename from model_api/cpp/tilers/src/detection.cpp rename to src/cpp/tilers/src/detection.cpp diff --git a/model_api/cpp/tilers/src/instance_segmentation.cpp b/src/cpp/tilers/src/instance_segmentation.cpp similarity index 100% rename from model_api/cpp/tilers/src/instance_segmentation.cpp rename to src/cpp/tilers/src/instance_segmentation.cpp diff --git a/model_api/cpp/tilers/src/semantic_segmentation.cpp b/src/cpp/tilers/src/semantic_segmentation.cpp similarity index 100% rename from model_api/cpp/tilers/src/semantic_segmentation.cpp rename to src/cpp/tilers/src/semantic_segmentation.cpp diff --git a/model_api/cpp/tilers/src/tiler_base.cpp b/src/cpp/tilers/src/tiler_base.cpp similarity index 100% rename from model_api/cpp/tilers/src/tiler_base.cpp rename to src/cpp/tilers/src/tiler_base.cpp diff --git a/model_api/cpp/utils/include/utils/args_helper.hpp b/src/cpp/utils/include/utils/args_helper.hpp similarity index 100% rename from model_api/cpp/utils/include/utils/args_helper.hpp rename to src/cpp/utils/include/utils/args_helper.hpp diff --git a/model_api/cpp/utils/include/utils/async_infer_queue.hpp b/src/cpp/utils/include/utils/async_infer_queue.hpp similarity index 100% rename from model_api/cpp/utils/include/utils/async_infer_queue.hpp rename to src/cpp/utils/include/utils/async_infer_queue.hpp diff --git a/model_api/cpp/utils/include/utils/common.hpp b/src/cpp/utils/include/utils/common.hpp similarity index 100% rename from model_api/cpp/utils/include/utils/common.hpp rename to src/cpp/utils/include/utils/common.hpp diff --git a/model_api/cpp/utils/include/utils/image_utils.h b/src/cpp/utils/include/utils/image_utils.h similarity index 100% rename from model_api/cpp/utils/include/utils/image_utils.h rename to src/cpp/utils/include/utils/image_utils.h diff --git a/model_api/cpp/utils/include/utils/kuhn_munkres.hpp b/src/cpp/utils/include/utils/kuhn_munkres.hpp similarity index 100% rename from model_api/cpp/utils/include/utils/kuhn_munkres.hpp rename to src/cpp/utils/include/utils/kuhn_munkres.hpp diff --git a/model_api/cpp/utils/include/utils/nms.hpp b/src/cpp/utils/include/utils/nms.hpp similarity index 100% rename from model_api/cpp/utils/include/utils/nms.hpp rename to src/cpp/utils/include/utils/nms.hpp diff --git a/model_api/cpp/utils/include/utils/ocv_common.hpp b/src/cpp/utils/include/utils/ocv_common.hpp similarity index 100% rename from model_api/cpp/utils/include/utils/ocv_common.hpp rename to src/cpp/utils/include/utils/ocv_common.hpp diff --git a/model_api/cpp/utils/include/utils/performance_metrics.hpp b/src/cpp/utils/include/utils/performance_metrics.hpp similarity index 100% rename from model_api/cpp/utils/include/utils/performance_metrics.hpp rename to src/cpp/utils/include/utils/performance_metrics.hpp diff --git a/model_api/cpp/utils/include/utils/slog.hpp b/src/cpp/utils/include/utils/slog.hpp similarity index 100% rename from model_api/cpp/utils/include/utils/slog.hpp rename to src/cpp/utils/include/utils/slog.hpp diff --git a/model_api/cpp/utils/src/args_helper.cpp b/src/cpp/utils/src/args_helper.cpp similarity index 100% rename from model_api/cpp/utils/src/args_helper.cpp rename to src/cpp/utils/src/args_helper.cpp diff --git a/model_api/cpp/utils/src/async_infer_queue.cpp b/src/cpp/utils/src/async_infer_queue.cpp similarity index 100% rename from model_api/cpp/utils/src/async_infer_queue.cpp rename to src/cpp/utils/src/async_infer_queue.cpp diff --git a/model_api/cpp/utils/src/image_utils.cpp b/src/cpp/utils/src/image_utils.cpp similarity index 100% rename from model_api/cpp/utils/src/image_utils.cpp rename to src/cpp/utils/src/image_utils.cpp diff --git a/model_api/cpp/utils/src/kuhn_munkres.cpp b/src/cpp/utils/src/kuhn_munkres.cpp similarity index 100% rename from model_api/cpp/utils/src/kuhn_munkres.cpp rename to src/cpp/utils/src/kuhn_munkres.cpp diff --git a/model_api/cpp/utils/src/nms.cpp b/src/cpp/utils/src/nms.cpp similarity index 100% rename from model_api/cpp/utils/src/nms.cpp rename to src/cpp/utils/src/nms.cpp diff --git a/model_api/python/README.md b/src/python/README.md similarity index 100% rename from model_api/python/README.md rename to src/python/README.md diff --git a/model_api/python/docs/action_classification.md b/src/python/docs/action_classification.md similarity index 100% rename from model_api/python/docs/action_classification.md rename to src/python/docs/action_classification.md diff --git a/model_api/python/docs/keypoint_detection.md b/src/python/docs/keypoint_detection.md similarity index 100% rename from model_api/python/docs/keypoint_detection.md rename to src/python/docs/keypoint_detection.md diff --git a/model_api/python/docs/visual_prompting.md b/src/python/docs/visual_prompting.md similarity index 100% rename from model_api/python/docs/visual_prompting.md rename to src/python/docs/visual_prompting.md diff --git a/model_api/python/model_api/__init__.py b/src/python/model_api/__init__.py similarity index 100% rename from model_api/python/model_api/__init__.py rename to src/python/model_api/__init__.py diff --git a/model_api/python/model_api/adapters/__init__.py b/src/python/model_api/adapters/__init__.py similarity index 100% rename from model_api/python/model_api/adapters/__init__.py rename to src/python/model_api/adapters/__init__.py diff --git a/model_api/python/model_api/adapters/inference_adapter.py b/src/python/model_api/adapters/inference_adapter.py similarity index 100% rename from model_api/python/model_api/adapters/inference_adapter.py rename to src/python/model_api/adapters/inference_adapter.py diff --git a/model_api/python/model_api/adapters/onnx_adapter.md b/src/python/model_api/adapters/onnx_adapter.md similarity index 100% rename from model_api/python/model_api/adapters/onnx_adapter.md rename to src/python/model_api/adapters/onnx_adapter.md diff --git a/model_api/python/model_api/adapters/onnx_adapter.py b/src/python/model_api/adapters/onnx_adapter.py similarity index 100% rename from model_api/python/model_api/adapters/onnx_adapter.py rename to src/python/model_api/adapters/onnx_adapter.py diff --git a/model_api/python/model_api/adapters/openvino_adapter.py b/src/python/model_api/adapters/openvino_adapter.py similarity index 100% rename from model_api/python/model_api/adapters/openvino_adapter.py rename to src/python/model_api/adapters/openvino_adapter.py diff --git a/model_api/python/model_api/adapters/ovms_adapter.md b/src/python/model_api/adapters/ovms_adapter.md similarity index 100% rename from model_api/python/model_api/adapters/ovms_adapter.md rename to src/python/model_api/adapters/ovms_adapter.md diff --git a/model_api/python/model_api/adapters/ovms_adapter.py b/src/python/model_api/adapters/ovms_adapter.py similarity index 100% rename from model_api/python/model_api/adapters/ovms_adapter.py rename to src/python/model_api/adapters/ovms_adapter.py diff --git a/model_api/python/model_api/adapters/utils.py b/src/python/model_api/adapters/utils.py similarity index 100% rename from model_api/python/model_api/adapters/utils.py rename to src/python/model_api/adapters/utils.py diff --git a/model_api/python/model_api/models/__init__.py b/src/python/model_api/models/__init__.py similarity index 100% rename from model_api/python/model_api/models/__init__.py rename to src/python/model_api/models/__init__.py diff --git a/model_api/python/model_api/models/action_classification.py b/src/python/model_api/models/action_classification.py similarity index 100% rename from model_api/python/model_api/models/action_classification.py rename to src/python/model_api/models/action_classification.py diff --git a/model_api/python/model_api/models/anomaly.py b/src/python/model_api/models/anomaly.py similarity index 100% rename from model_api/python/model_api/models/anomaly.py rename to src/python/model_api/models/anomaly.py diff --git a/model_api/python/model_api/models/classification.py b/src/python/model_api/models/classification.py similarity index 100% rename from model_api/python/model_api/models/classification.py rename to src/python/model_api/models/classification.py diff --git a/model_api/python/model_api/models/detection_model.py b/src/python/model_api/models/detection_model.py similarity index 100% rename from model_api/python/model_api/models/detection_model.py rename to src/python/model_api/models/detection_model.py diff --git a/model_api/python/model_api/models/image_model.py b/src/python/model_api/models/image_model.py similarity index 100% rename from model_api/python/model_api/models/image_model.py rename to src/python/model_api/models/image_model.py diff --git a/model_api/python/model_api/models/instance_segmentation.py b/src/python/model_api/models/instance_segmentation.py similarity index 100% rename from model_api/python/model_api/models/instance_segmentation.py rename to src/python/model_api/models/instance_segmentation.py diff --git a/model_api/python/model_api/models/keypoint_detection.py b/src/python/model_api/models/keypoint_detection.py similarity index 100% rename from model_api/python/model_api/models/keypoint_detection.py rename to src/python/model_api/models/keypoint_detection.py diff --git a/model_api/python/model_api/models/model.py b/src/python/model_api/models/model.py similarity index 100% rename from model_api/python/model_api/models/model.py rename to src/python/model_api/models/model.py diff --git a/model_api/python/model_api/models/result/__init__.py b/src/python/model_api/models/result/__init__.py similarity index 100% rename from model_api/python/model_api/models/result/__init__.py rename to src/python/model_api/models/result/__init__.py diff --git a/model_api/python/model_api/models/result/anomaly.py b/src/python/model_api/models/result/anomaly.py similarity index 100% rename from model_api/python/model_api/models/result/anomaly.py rename to src/python/model_api/models/result/anomaly.py diff --git a/model_api/python/model_api/models/result/base.py b/src/python/model_api/models/result/base.py similarity index 100% rename from model_api/python/model_api/models/result/base.py rename to src/python/model_api/models/result/base.py diff --git a/model_api/python/model_api/models/result/classification.py b/src/python/model_api/models/result/classification.py similarity index 100% rename from model_api/python/model_api/models/result/classification.py rename to src/python/model_api/models/result/classification.py diff --git a/model_api/python/model_api/models/result/detection.py b/src/python/model_api/models/result/detection.py similarity index 100% rename from model_api/python/model_api/models/result/detection.py rename to src/python/model_api/models/result/detection.py diff --git a/model_api/python/model_api/models/result/keypoint.py b/src/python/model_api/models/result/keypoint.py similarity index 100% rename from model_api/python/model_api/models/result/keypoint.py rename to src/python/model_api/models/result/keypoint.py diff --git a/model_api/python/model_api/models/result/segmentation.py b/src/python/model_api/models/result/segmentation.py similarity index 100% rename from model_api/python/model_api/models/result/segmentation.py rename to src/python/model_api/models/result/segmentation.py diff --git a/model_api/python/model_api/models/result/utils.py b/src/python/model_api/models/result/utils.py similarity index 100% rename from model_api/python/model_api/models/result/utils.py rename to src/python/model_api/models/result/utils.py diff --git a/model_api/python/model_api/models/result/visual_prompting.py b/src/python/model_api/models/result/visual_prompting.py similarity index 100% rename from model_api/python/model_api/models/result/visual_prompting.py rename to src/python/model_api/models/result/visual_prompting.py diff --git a/model_api/python/model_api/models/sam_models.py b/src/python/model_api/models/sam_models.py similarity index 100% rename from model_api/python/model_api/models/sam_models.py rename to src/python/model_api/models/sam_models.py diff --git a/model_api/python/model_api/models/segmentation.py b/src/python/model_api/models/segmentation.py similarity index 100% rename from model_api/python/model_api/models/segmentation.py rename to src/python/model_api/models/segmentation.py diff --git a/model_api/python/model_api/models/ssd.py b/src/python/model_api/models/ssd.py similarity index 100% rename from model_api/python/model_api/models/ssd.py rename to src/python/model_api/models/ssd.py diff --git a/model_api/python/model_api/models/types.py b/src/python/model_api/models/types.py similarity index 100% rename from model_api/python/model_api/models/types.py rename to src/python/model_api/models/types.py diff --git a/model_api/python/model_api/models/utils.py b/src/python/model_api/models/utils.py similarity index 100% rename from model_api/python/model_api/models/utils.py rename to src/python/model_api/models/utils.py diff --git a/model_api/python/model_api/models/visual_prompting.py b/src/python/model_api/models/visual_prompting.py similarity index 100% rename from model_api/python/model_api/models/visual_prompting.py rename to src/python/model_api/models/visual_prompting.py diff --git a/model_api/python/model_api/models/yolo.py b/src/python/model_api/models/yolo.py similarity index 100% rename from model_api/python/model_api/models/yolo.py rename to src/python/model_api/models/yolo.py diff --git a/model_api/python/model_api/performance_metrics.py b/src/python/model_api/performance_metrics.py similarity index 100% rename from model_api/python/model_api/performance_metrics.py rename to src/python/model_api/performance_metrics.py diff --git a/model_api/python/model_api/pipelines/__init__.py b/src/python/model_api/pipelines/__init__.py similarity index 100% rename from model_api/python/model_api/pipelines/__init__.py rename to src/python/model_api/pipelines/__init__.py diff --git a/model_api/python/model_api/pipelines/async_pipeline.py b/src/python/model_api/pipelines/async_pipeline.py similarity index 100% rename from model_api/python/model_api/pipelines/async_pipeline.py rename to src/python/model_api/pipelines/async_pipeline.py diff --git a/model_api/python/model_api/tilers/__init__.py b/src/python/model_api/tilers/__init__.py similarity index 100% rename from model_api/python/model_api/tilers/__init__.py rename to src/python/model_api/tilers/__init__.py diff --git a/model_api/python/model_api/tilers/detection.py b/src/python/model_api/tilers/detection.py similarity index 100% rename from model_api/python/model_api/tilers/detection.py rename to src/python/model_api/tilers/detection.py diff --git a/model_api/python/model_api/tilers/instance_segmentation.py b/src/python/model_api/tilers/instance_segmentation.py similarity index 100% rename from model_api/python/model_api/tilers/instance_segmentation.py rename to src/python/model_api/tilers/instance_segmentation.py diff --git a/model_api/python/model_api/tilers/semantic_segmentation.py b/src/python/model_api/tilers/semantic_segmentation.py similarity index 100% rename from model_api/python/model_api/tilers/semantic_segmentation.py rename to src/python/model_api/tilers/semantic_segmentation.py diff --git a/model_api/python/model_api/tilers/tiler.py b/src/python/model_api/tilers/tiler.py similarity index 100% rename from model_api/python/model_api/tilers/tiler.py rename to src/python/model_api/tilers/tiler.py diff --git a/model_api/python/model_api/visualizer/__init__.py b/src/python/model_api/visualizer/__init__.py similarity index 100% rename from model_api/python/model_api/visualizer/__init__.py rename to src/python/model_api/visualizer/__init__.py diff --git a/model_api/python/model_api/visualizer/layout/__init__.py b/src/python/model_api/visualizer/layout/__init__.py similarity index 100% rename from model_api/python/model_api/visualizer/layout/__init__.py rename to src/python/model_api/visualizer/layout/__init__.py diff --git a/model_api/python/model_api/visualizer/layout/flatten.py b/src/python/model_api/visualizer/layout/flatten.py similarity index 100% rename from model_api/python/model_api/visualizer/layout/flatten.py rename to src/python/model_api/visualizer/layout/flatten.py diff --git a/model_api/python/model_api/visualizer/layout/hstack.py b/src/python/model_api/visualizer/layout/hstack.py similarity index 100% rename from model_api/python/model_api/visualizer/layout/hstack.py rename to src/python/model_api/visualizer/layout/hstack.py diff --git a/model_api/python/model_api/visualizer/layout/layout.py b/src/python/model_api/visualizer/layout/layout.py similarity index 100% rename from model_api/python/model_api/visualizer/layout/layout.py rename to src/python/model_api/visualizer/layout/layout.py diff --git a/model_api/python/model_api/visualizer/primitive.py b/src/python/model_api/visualizer/primitive.py similarity index 100% rename from model_api/python/model_api/visualizer/primitive.py rename to src/python/model_api/visualizer/primitive.py diff --git a/model_api/python/model_api/visualizer/scene/__init__.py b/src/python/model_api/visualizer/scene/__init__.py similarity index 100% rename from model_api/python/model_api/visualizer/scene/__init__.py rename to src/python/model_api/visualizer/scene/__init__.py diff --git a/model_api/python/model_api/visualizer/scene/anomaly.py b/src/python/model_api/visualizer/scene/anomaly.py similarity index 100% rename from model_api/python/model_api/visualizer/scene/anomaly.py rename to src/python/model_api/visualizer/scene/anomaly.py diff --git a/model_api/python/model_api/visualizer/scene/classification.py b/src/python/model_api/visualizer/scene/classification.py similarity index 100% rename from model_api/python/model_api/visualizer/scene/classification.py rename to src/python/model_api/visualizer/scene/classification.py diff --git a/model_api/python/model_api/visualizer/scene/detection.py b/src/python/model_api/visualizer/scene/detection.py similarity index 100% rename from model_api/python/model_api/visualizer/scene/detection.py rename to src/python/model_api/visualizer/scene/detection.py diff --git a/model_api/python/model_api/visualizer/scene/keypoint.py b/src/python/model_api/visualizer/scene/keypoint.py similarity index 100% rename from model_api/python/model_api/visualizer/scene/keypoint.py rename to src/python/model_api/visualizer/scene/keypoint.py diff --git a/model_api/python/model_api/visualizer/scene/scene.py b/src/python/model_api/visualizer/scene/scene.py similarity index 100% rename from model_api/python/model_api/visualizer/scene/scene.py rename to src/python/model_api/visualizer/scene/scene.py diff --git a/model_api/python/model_api/visualizer/scene/segmentation.py b/src/python/model_api/visualizer/scene/segmentation.py similarity index 100% rename from model_api/python/model_api/visualizer/scene/segmentation.py rename to src/python/model_api/visualizer/scene/segmentation.py diff --git a/model_api/python/model_api/visualizer/scene/visual_prompting.py b/src/python/model_api/visualizer/scene/visual_prompting.py similarity index 100% rename from model_api/python/model_api/visualizer/scene/visual_prompting.py rename to src/python/model_api/visualizer/scene/visual_prompting.py diff --git a/model_api/python/model_api/visualizer/visualizer.py b/src/python/model_api/visualizer/visualizer.py similarity index 100% rename from model_api/python/model_api/visualizer/visualizer.py rename to src/python/model_api/visualizer/visualizer.py diff --git a/model_api/python/pyproject.toml b/src/python/pyproject.toml similarity index 100% rename from model_api/python/pyproject.toml rename to src/python/pyproject.toml diff --git a/tests/cpp/accuracy/CMakeLists.txt b/tests/cpp/accuracy/CMakeLists.txt index 28e2917c..57aa5705 100644 --- a/tests/cpp/accuracy/CMakeLists.txt +++ b/tests/cpp/accuracy/CMakeLists.txt @@ -66,7 +66,7 @@ include(../cmake/common.cmake) find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs) find_package(OpenVINO REQUIRED COMPONENTS Runtime) -add_subdirectory(../../../model_api/cpp ${tests_BINARY_DIR}/model_api/cpp) +add_subdirectory(../../../src/cpp ${tests_BINARY_DIR}/model_api/cpp) add_test(NAME test_accuracy SOURCES test_accuracy.cpp DEPENDENCIES model_api) add_test(NAME test_YOLOv8 SOURCES test_YOLOv8.cpp DEPENDENCIES model_api) diff --git a/tests/cpp/precommit/CMakeLists.txt b/tests/cpp/precommit/CMakeLists.txt index a7306cc0..a10ed1b6 100644 --- a/tests/cpp/precommit/CMakeLists.txt +++ b/tests/cpp/precommit/CMakeLists.txt @@ -65,7 +65,7 @@ include(../cmake/common.cmake) find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs) find_package(OpenVINO REQUIRED COMPONENTS Runtime) -add_subdirectory(../../../model_api/cpp ${tests_BINARY_DIR}/model_api/cpp) +add_subdirectory(../../../src/cpp ${tests_BINARY_DIR}/model_api/cpp) add_test(NAME test_sanity SOURCES test_sanity.cpp DEPENDENCIES model_api) add_test(NAME test_model_config SOURCES test_model_config.cpp DEPENDENCIES model_api) diff --git a/tests/python/funtional/__init__.py b/tests/python/functional/__init__.py similarity index 100% rename from tests/python/funtional/__init__.py rename to tests/python/functional/__init__.py diff --git a/tests/python/funtional/conftest.py b/tests/python/functional/conftest.py similarity index 100% rename from tests/python/funtional/conftest.py rename to tests/python/functional/conftest.py diff --git a/tests/python/funtional/test_load.py b/tests/python/functional/test_load.py similarity index 100% rename from tests/python/funtional/test_load.py rename to tests/python/functional/test_load.py diff --git a/tests/python/funtional/test_save.py b/tests/python/functional/test_save.py similarity index 100% rename from tests/python/funtional/test_save.py rename to tests/python/functional/test_save.py