Repo layout refactoring (#253)

* Move sources * Update samples CMake * Rename python tests * Update workflows after renaming * Update paths
openvinotoolkit · Jan 16, 2025 · 6e7d108 · 6e7d108
1 parent e97b12c
commit 6e7d108
Show file tree

Hide file tree

Showing 139 changed files with 29 additions and 28 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -27,15 +27,15 @@ 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
           python tests/cpp/precommit/prepare_data.py -d data -p tests/cpp/precommit/public_scope.json
       - 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
@@ -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
@@ -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
@@ -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 → src/cpp/CMakeLists.txt b/model_api/cpp/CMakeLists.txt → src/cpp/CMakeLists.txt
diff --git a/...ters/include/adapters/inference_adapter.h → ...ters/include/adapters/inference_adapter.h b/...ters/include/adapters/inference_adapter.h → ...ters/include/adapters/inference_adapter.h
diff --git a/...pters/include/adapters/openvino_adapter.h → ...pters/include/adapters/openvino_adapter.h b/...pters/include/adapters/openvino_adapter.h → ...pters/include/adapters/openvino_adapter.h
diff --git a/...api/cpp/adapters/src/openvino_adapter.cpp → src/cpp/adapters/src/openvino_adapter.cpp b/...api/cpp/adapters/src/openvino_adapter.cpp → src/cpp/adapters/src/openvino_adapter.cpp
diff --git a/model_api/cpp/cmake/model_apiConfig.cmake → src/cpp/cmake/model_apiConfig.cmake b/model_api/cpp/cmake/model_apiConfig.cmake → src/cpp/cmake/model_apiConfig.cmake
diff --git a/model_api/cpp/install_dependencies.sh → src/cpp/install_dependencies.sh b/model_api/cpp/install_dependencies.sh → src/cpp/install_dependencies.sh
diff --git a/...cpp/models/include/models/anomaly_model.h → ...cpp/models/include/models/anomaly_model.h b/...cpp/models/include/models/anomaly_model.h → ...cpp/models/include/models/anomaly_model.h
diff --git a/...els/include/models/classification_model.h → ...els/include/models/classification_model.h b/...els/include/models/classification_model.h → ...els/include/models/classification_model.h
diff --git a/...p/models/include/models/detection_model.h → ...p/models/include/models/detection_model.h b/...p/models/include/models/detection_model.h → ...p/models/include/models/detection_model.h
diff --git a/...dels/include/models/detection_model_ext.h → ...dels/include/models/detection_model_ext.h b/...dels/include/models/detection_model_ext.h → ...dels/include/models/detection_model_ext.h
diff --git a/...dels/include/models/detection_model_ssd.h → ...dels/include/models/detection_model_ssd.h b/...dels/include/models/detection_model_ssd.h → ...dels/include/models/detection_model_ssd.h
diff --git a/...els/include/models/detection_model_yolo.h → ...els/include/models/detection_model_yolo.h b/...els/include/models/detection_model_yolo.h → ...els/include/models/detection_model_yolo.h
diff --git a/...lude/models/detection_model_yolov3_onnx.h → ...lude/models/detection_model_yolov3_onnx.h b/...lude/models/detection_model_yolov3_onnx.h → ...lude/models/detection_model_yolov3_onnx.h
diff --git a/...ls/include/models/detection_model_yolox.h → ...ls/include/models/detection_model_yolox.h b/...ls/include/models/detection_model_yolox.h → ...ls/include/models/detection_model_yolox.h
diff --git a/...i/cpp/models/include/models/image_model.h → src/cpp/models/include/models/image_model.h b/...i/cpp/models/include/models/image_model.h → src/cpp/models/include/models/image_model.h
diff --git a/...pi/cpp/models/include/models/input_data.h → src/cpp/models/include/models/input_data.h b/...pi/cpp/models/include/models/input_data.h → src/cpp/models/include/models/input_data.h
diff --git a/...ls/include/models/instance_segmentation.h → ...ls/include/models/instance_segmentation.h b/...ls/include/models/instance_segmentation.h → ...ls/include/models/instance_segmentation.h
diff --git a/...dels/include/models/internal_model_data.h → ...dels/include/models/internal_model_data.h b/...dels/include/models/internal_model_data.h → ...dels/include/models/internal_model_data.h
diff --git a/...odels/include/models/keypoint_detection.h → ...odels/include/models/keypoint_detection.h b/...odels/include/models/keypoint_detection.h → ...odels/include/models/keypoint_detection.h
diff --git a/...pi/cpp/models/include/models/model_base.h → src/cpp/models/include/models/model_base.h b/...pi/cpp/models/include/models/model_base.h → src/cpp/models/include/models/model_base.h
diff --git a/...l_api/cpp/models/include/models/results.h → src/cpp/models/include/models/results.h b/...l_api/cpp/models/include/models/results.h → src/cpp/models/include/models/results.h
diff --git a/...odels/include/models/segmentation_model.h → ...odels/include/models/segmentation_model.h b/...odels/include/models/segmentation_model.h → ...odels/include/models/segmentation_model.h
diff --git a/model_api/cpp/models/src/anomaly_model.cpp → src/cpp/models/src/anomaly_model.cpp b/model_api/cpp/models/src/anomaly_model.cpp → src/cpp/models/src/anomaly_model.cpp
diff --git a/...i/cpp/models/src/classification_model.cpp → src/cpp/models/src/classification_model.cpp b/...i/cpp/models/src/classification_model.cpp → src/cpp/models/src/classification_model.cpp
diff --git a/model_api/cpp/models/src/detection_model.cpp → src/cpp/models/src/detection_model.cpp b/model_api/cpp/models/src/detection_model.cpp → src/cpp/models/src/detection_model.cpp
diff --git a/...pi/cpp/models/src/detection_model_ext.cpp → src/cpp/models/src/detection_model_ext.cpp b/...pi/cpp/models/src/detection_model_ext.cpp → src/cpp/models/src/detection_model_ext.cpp
diff --git a/...pi/cpp/models/src/detection_model_ssd.cpp → src/cpp/models/src/detection_model_ssd.cpp b/...pi/cpp/models/src/detection_model_ssd.cpp → src/cpp/models/src/detection_model_ssd.cpp
diff --git a/...i/cpp/models/src/detection_model_yolo.cpp → src/cpp/models/src/detection_model_yolo.cpp b/...i/cpp/models/src/detection_model_yolo.cpp → src/cpp/models/src/detection_model_yolo.cpp
diff --git a/...odels/src/detection_model_yolov3_onnx.cpp → ...odels/src/detection_model_yolov3_onnx.cpp b/...odels/src/detection_model_yolov3_onnx.cpp → ...odels/src/detection_model_yolov3_onnx.cpp
diff --git a/.../cpp/models/src/detection_model_yolox.cpp → src/cpp/models/src/detection_model_yolox.cpp b/.../cpp/models/src/detection_model_yolox.cpp → src/cpp/models/src/detection_model_yolox.cpp
diff --git a/model_api/cpp/models/src/image_model.cpp → src/cpp/models/src/image_model.cpp b/model_api/cpp/models/src/image_model.cpp → src/cpp/models/src/image_model.cpp
diff --git a/.../cpp/models/src/instance_segmentation.cpp → src/cpp/models/src/instance_segmentation.cpp b/.../cpp/models/src/instance_segmentation.cpp → src/cpp/models/src/instance_segmentation.cpp
diff --git a/...api/cpp/models/src/keypoint_detection.cpp → src/cpp/models/src/keypoint_detection.cpp b/...api/cpp/models/src/keypoint_detection.cpp → src/cpp/models/src/keypoint_detection.cpp
diff --git a/model_api/cpp/models/src/model_base.cpp → src/cpp/models/src/model_base.cpp b/model_api/cpp/models/src/model_base.cpp → src/cpp/models/src/model_base.cpp
diff --git a/...api/cpp/models/src/segmentation_model.cpp → src/cpp/models/src/segmentation_model.cpp b/...api/cpp/models/src/segmentation_model.cpp → src/cpp/models/src/segmentation_model.cpp
diff --git a/model_api/cpp/py_bindings/CMakeLists.txt → src/cpp/py_bindings/CMakeLists.txt b/model_api/cpp/py_bindings/CMakeLists.txt → src/cpp/py_bindings/CMakeLists.txt
diff --git a/model_api/cpp/py_bindings/py_base.cpp → src/cpp/py_bindings/py_base.cpp b/model_api/cpp/py_bindings/py_base.cpp → src/cpp/py_bindings/py_base.cpp
diff --git a/...api/cpp/py_bindings/py_classificaiton.cpp → src/cpp/py_bindings/py_classificaiton.cpp b/...api/cpp/py_bindings/py_classificaiton.cpp → src/cpp/py_bindings/py_classificaiton.cpp
diff --git a/model_api/cpp/py_bindings/py_utils.cpp → src/cpp/py_bindings/py_utils.cpp b/model_api/cpp/py_bindings/py_utils.cpp → src/cpp/py_bindings/py_utils.cpp
diff --git a/model_api/cpp/py_bindings/py_utils.hpp → src/cpp/py_bindings/py_utils.hpp b/model_api/cpp/py_bindings/py_utils.hpp → src/cpp/py_bindings/py_utils.hpp
diff --git a/model_api/cpp/py_bindings/py_vision_api.cpp → src/cpp/py_bindings/py_vision_api.cpp b/model_api/cpp/py_bindings/py_vision_api.cpp → src/cpp/py_bindings/py_vision_api.cpp
diff --git a/...api/cpp/tilers/include/tilers/detection.h → src/cpp/tilers/include/tilers/detection.h b/...api/cpp/tilers/include/tilers/detection.h → src/cpp/tilers/include/tilers/detection.h
diff --git a/...rs/include/tilers/instance_segmentation.h → ...rs/include/tilers/instance_segmentation.h b/...rs/include/tilers/instance_segmentation.h → ...rs/include/tilers/instance_segmentation.h
diff --git a/...rs/include/tilers/semantic_segmentation.h → ...rs/include/tilers/semantic_segmentation.h b/...rs/include/tilers/semantic_segmentation.h → ...rs/include/tilers/semantic_segmentation.h
diff --git a/...pi/cpp/tilers/include/tilers/tiler_base.h → src/cpp/tilers/include/tilers/tiler_base.h b/...pi/cpp/tilers/include/tilers/tiler_base.h → src/cpp/tilers/include/tilers/tiler_base.h
diff --git a/model_api/cpp/tilers/src/detection.cpp → src/cpp/tilers/src/detection.cpp b/model_api/cpp/tilers/src/detection.cpp → src/cpp/tilers/src/detection.cpp
diff --git a/.../cpp/tilers/src/instance_segmentation.cpp → src/cpp/tilers/src/instance_segmentation.cpp b/.../cpp/tilers/src/instance_segmentation.cpp → src/cpp/tilers/src/instance_segmentation.cpp
diff --git a/.../cpp/tilers/src/semantic_segmentation.cpp → src/cpp/tilers/src/semantic_segmentation.cpp b/.../cpp/tilers/src/semantic_segmentation.cpp → src/cpp/tilers/src/semantic_segmentation.cpp
diff --git a/model_api/cpp/tilers/src/tiler_base.cpp → src/cpp/tilers/src/tiler_base.cpp b/model_api/cpp/tilers/src/tiler_base.cpp → src/cpp/tilers/src/tiler_base.cpp
diff --git a/...i/cpp/utils/include/utils/args_helper.hpp → src/cpp/utils/include/utils/args_helper.hpp b/...i/cpp/utils/include/utils/args_helper.hpp → src/cpp/utils/include/utils/args_helper.hpp
diff --git a/...utils/include/utils/async_infer_queue.hpp → ...utils/include/utils/async_infer_queue.hpp b/...utils/include/utils/async_infer_queue.hpp → ...utils/include/utils/async_infer_queue.hpp
diff --git a/model_api/cpp/utils/include/utils/common.hpp → src/cpp/utils/include/utils/common.hpp b/model_api/cpp/utils/include/utils/common.hpp → src/cpp/utils/include/utils/common.hpp
diff --git a/...api/cpp/utils/include/utils/image_utils.h → src/cpp/utils/include/utils/image_utils.h b/...api/cpp/utils/include/utils/image_utils.h → src/cpp/utils/include/utils/image_utils.h
diff --git a/.../cpp/utils/include/utils/kuhn_munkres.hpp → src/cpp/utils/include/utils/kuhn_munkres.hpp b/.../cpp/utils/include/utils/kuhn_munkres.hpp → src/cpp/utils/include/utils/kuhn_munkres.hpp
diff --git a/model_api/cpp/utils/include/utils/nms.hpp → src/cpp/utils/include/utils/nms.hpp b/model_api/cpp/utils/include/utils/nms.hpp → src/cpp/utils/include/utils/nms.hpp
diff --git a/...pi/cpp/utils/include/utils/ocv_common.hpp → src/cpp/utils/include/utils/ocv_common.hpp b/...pi/cpp/utils/include/utils/ocv_common.hpp → src/cpp/utils/include/utils/ocv_common.hpp
diff --git a/...ils/include/utils/performance_metrics.hpp → ...ils/include/utils/performance_metrics.hpp b/...ils/include/utils/performance_metrics.hpp → ...ils/include/utils/performance_metrics.hpp
diff --git a/model_api/cpp/utils/include/utils/slog.hpp → src/cpp/utils/include/utils/slog.hpp b/model_api/cpp/utils/include/utils/slog.hpp → src/cpp/utils/include/utils/slog.hpp
diff --git a/model_api/cpp/utils/src/args_helper.cpp → src/cpp/utils/src/args_helper.cpp b/model_api/cpp/utils/src/args_helper.cpp → src/cpp/utils/src/args_helper.cpp
diff --git a/...l_api/cpp/utils/src/async_infer_queue.cpp → src/cpp/utils/src/async_infer_queue.cpp b/...l_api/cpp/utils/src/async_infer_queue.cpp → src/cpp/utils/src/async_infer_queue.cpp
diff --git a/model_api/cpp/utils/src/image_utils.cpp → src/cpp/utils/src/image_utils.cpp b/model_api/cpp/utils/src/image_utils.cpp → src/cpp/utils/src/image_utils.cpp
diff --git a/model_api/cpp/utils/src/kuhn_munkres.cpp → src/cpp/utils/src/kuhn_munkres.cpp b/model_api/cpp/utils/src/kuhn_munkres.cpp → src/cpp/utils/src/kuhn_munkres.cpp
diff --git a/model_api/cpp/utils/src/nms.cpp → src/cpp/utils/src/nms.cpp b/model_api/cpp/utils/src/nms.cpp → src/cpp/utils/src/nms.cpp
diff --git a/model_api/python/README.md → src/python/README.md b/model_api/python/README.md → src/python/README.md
diff --git a/..._api/python/docs/action_classification.md → src/python/docs/action_classification.md b/..._api/python/docs/action_classification.md → src/python/docs/action_classification.md
diff --git a/model_api/python/docs/keypoint_detection.md → src/python/docs/keypoint_detection.md b/model_api/python/docs/keypoint_detection.md → src/python/docs/keypoint_detection.md
diff --git a/model_api/python/docs/visual_prompting.md → src/python/docs/visual_prompting.md b/model_api/python/docs/visual_prompting.md → src/python/docs/visual_prompting.md
diff --git a/model_api/python/model_api/__init__.py → src/python/model_api/__init__.py b/model_api/python/model_api/__init__.py → src/python/model_api/__init__.py
diff --git a/...api/python/model_api/adapters/__init__.py → src/python/model_api/adapters/__init__.py b/...api/python/model_api/adapters/__init__.py → src/python/model_api/adapters/__init__.py
diff --git a/...n/model_api/adapters/inference_adapter.py → ...n/model_api/adapters/inference_adapter.py b/...n/model_api/adapters/inference_adapter.py → ...n/model_api/adapters/inference_adapter.py
diff --git a/...python/model_api/adapters/onnx_adapter.md → ...python/model_api/adapters/onnx_adapter.md b/...python/model_api/adapters/onnx_adapter.md → ...python/model_api/adapters/onnx_adapter.md
diff --git a/...python/model_api/adapters/onnx_adapter.py → ...python/model_api/adapters/onnx_adapter.py b/...python/model_api/adapters/onnx_adapter.py → ...python/model_api/adapters/onnx_adapter.py
diff --git a/...on/model_api/adapters/openvino_adapter.py → ...on/model_api/adapters/openvino_adapter.py b/...on/model_api/adapters/openvino_adapter.py → ...on/model_api/adapters/openvino_adapter.py
diff --git a/...python/model_api/adapters/ovms_adapter.md → ...python/model_api/adapters/ovms_adapter.md b/...python/model_api/adapters/ovms_adapter.md → ...python/model_api/adapters/ovms_adapter.md
diff --git a/...python/model_api/adapters/ovms_adapter.py → ...python/model_api/adapters/ovms_adapter.py b/...python/model_api/adapters/ovms_adapter.py → ...python/model_api/adapters/ovms_adapter.py
diff --git a/model_api/python/model_api/adapters/utils.py → src/python/model_api/adapters/utils.py b/model_api/python/model_api/adapters/utils.py → src/python/model_api/adapters/utils.py
diff --git a/...l_api/python/model_api/models/__init__.py → src/python/model_api/models/__init__.py b/...l_api/python/model_api/models/__init__.py → src/python/model_api/models/__init__.py
diff --git a/...model_api/models/action_classification.py → ...model_api/models/action_classification.py b/...model_api/models/action_classification.py → ...model_api/models/action_classification.py
diff --git a/model_api/python/model_api/models/anomaly.py → src/python/model_api/models/anomaly.py b/model_api/python/model_api/models/anomaly.py → src/python/model_api/models/anomaly.py
diff --git a/...python/model_api/models/classification.py → ...python/model_api/models/classification.py b/...python/model_api/models/classification.py → ...python/model_api/models/classification.py
diff --git a/...ython/model_api/models/detection_model.py → ...ython/model_api/models/detection_model.py b/...ython/model_api/models/detection_model.py → ...ython/model_api/models/detection_model.py
diff --git a/...pi/python/model_api/models/image_model.py → src/python/model_api/models/image_model.py b/...pi/python/model_api/models/image_model.py → src/python/model_api/models/image_model.py
diff --git a/...model_api/models/instance_segmentation.py → ...model_api/models/instance_segmentation.py b/...model_api/models/instance_segmentation.py → ...model_api/models/instance_segmentation.py
diff --git a/...on/model_api/models/keypoint_detection.py → ...on/model_api/models/keypoint_detection.py b/...on/model_api/models/keypoint_detection.py → ...on/model_api/models/keypoint_detection.py
diff --git a/model_api/python/model_api/models/model.py → src/python/model_api/models/model.py b/model_api/python/model_api/models/model.py → src/python/model_api/models/model.py
diff --git a/...ython/model_api/models/result/__init__.py → ...ython/model_api/models/result/__init__.py b/...ython/model_api/models/result/__init__.py → ...ython/model_api/models/result/__init__.py
diff --git a/...python/model_api/models/result/anomaly.py → ...python/model_api/models/result/anomaly.py b/...python/model_api/models/result/anomaly.py → ...python/model_api/models/result/anomaly.py
diff --git a/...pi/python/model_api/models/result/base.py → src/python/model_api/models/result/base.py b/...pi/python/model_api/models/result/base.py → src/python/model_api/models/result/base.py
diff --git a/...model_api/models/result/classification.py → ...model_api/models/result/classification.py b/...model_api/models/result/classification.py → ...model_api/models/result/classification.py
diff --git a/...thon/model_api/models/result/detection.py → ...thon/model_api/models/result/detection.py b/...thon/model_api/models/result/detection.py → ...thon/model_api/models/result/detection.py
diff --git a/...ython/model_api/models/result/keypoint.py → ...ython/model_api/models/result/keypoint.py b/...ython/model_api/models/result/keypoint.py → ...ython/model_api/models/result/keypoint.py
diff --git a/...n/model_api/models/result/segmentation.py → ...n/model_api/models/result/segmentation.py b/...n/model_api/models/result/segmentation.py → ...n/model_api/models/result/segmentation.py
diff --git a/...i/python/model_api/models/result/utils.py → src/python/model_api/models/result/utils.py b/...i/python/model_api/models/result/utils.py → src/python/model_api/models/result/utils.py
diff --git a/...del_api/models/result/visual_prompting.py → ...del_api/models/result/visual_prompting.py b/...del_api/models/result/visual_prompting.py → ...del_api/models/result/visual_prompting.py
diff --git a/...api/python/model_api/models/sam_models.py → src/python/model_api/models/sam_models.py b/...api/python/model_api/models/sam_models.py → src/python/model_api/models/sam_models.py
diff --git a/...i/python/model_api/models/segmentation.py → src/python/model_api/models/segmentation.py b/...i/python/model_api/models/segmentation.py → src/python/model_api/models/segmentation.py
diff --git a/model_api/python/model_api/models/ssd.py → src/python/model_api/models/ssd.py b/model_api/python/model_api/models/ssd.py → src/python/model_api/models/ssd.py
diff --git a/model_api/python/model_api/models/types.py → src/python/model_api/models/types.py b/model_api/python/model_api/models/types.py → src/python/model_api/models/types.py
diff --git a/model_api/python/model_api/models/utils.py → src/python/model_api/models/utils.py b/model_api/python/model_api/models/utils.py → src/python/model_api/models/utils.py
diff --git a/...thon/model_api/models/visual_prompting.py → ...thon/model_api/models/visual_prompting.py b/...thon/model_api/models/visual_prompting.py → ...thon/model_api/models/visual_prompting.py
diff --git a/model_api/python/model_api/models/yolo.py → src/python/model_api/models/yolo.py b/model_api/python/model_api/models/yolo.py → src/python/model_api/models/yolo.py
diff --git a/...i/python/model_api/performance_metrics.py → src/python/model_api/performance_metrics.py b/...i/python/model_api/performance_metrics.py → src/python/model_api/performance_metrics.py
diff --git a/...pi/python/model_api/pipelines/__init__.py → src/python/model_api/pipelines/__init__.py b/...pi/python/model_api/pipelines/__init__.py → src/python/model_api/pipelines/__init__.py
diff --git a/...hon/model_api/pipelines/async_pipeline.py → ...hon/model_api/pipelines/async_pipeline.py b/...hon/model_api/pipelines/async_pipeline.py → ...hon/model_api/pipelines/async_pipeline.py
diff --git a/...l_api/python/model_api/tilers/__init__.py → src/python/model_api/tilers/__init__.py b/...l_api/python/model_api/tilers/__init__.py → src/python/model_api/tilers/__init__.py
diff --git a/..._api/python/model_api/tilers/detection.py → src/python/model_api/tilers/detection.py b/..._api/python/model_api/tilers/detection.py → src/python/model_api/tilers/detection.py
diff --git a/...model_api/tilers/instance_segmentation.py → ...model_api/tilers/instance_segmentation.py b/...model_api/tilers/instance_segmentation.py → ...model_api/tilers/instance_segmentation.py
diff --git a/...model_api/tilers/semantic_segmentation.py → ...model_api/tilers/semantic_segmentation.py b/...model_api/tilers/semantic_segmentation.py → ...model_api/tilers/semantic_segmentation.py
diff --git a/model_api/python/model_api/tilers/tiler.py → src/python/model_api/tilers/tiler.py b/model_api/python/model_api/tilers/tiler.py → src/python/model_api/tilers/tiler.py
diff --git a/...i/python/model_api/visualizer/__init__.py → src/python/model_api/visualizer/__init__.py b/...i/python/model_api/visualizer/__init__.py → src/python/model_api/visualizer/__init__.py
diff --git a/...n/model_api/visualizer/layout/__init__.py → ...n/model_api/visualizer/layout/__init__.py b/...n/model_api/visualizer/layout/__init__.py → ...n/model_api/visualizer/layout/__init__.py
diff --git a/...on/model_api/visualizer/layout/flatten.py → ...on/model_api/visualizer/layout/flatten.py b/...on/model_api/visualizer/layout/flatten.py → ...on/model_api/visualizer/layout/flatten.py
diff --git a/...hon/model_api/visualizer/layout/hstack.py → ...hon/model_api/visualizer/layout/hstack.py b/...hon/model_api/visualizer/layout/hstack.py → ...hon/model_api/visualizer/layout/hstack.py
diff --git a/...hon/model_api/visualizer/layout/layout.py → ...hon/model_api/visualizer/layout/layout.py b/...hon/model_api/visualizer/layout/layout.py → ...hon/model_api/visualizer/layout/layout.py
diff --git a/.../python/model_api/visualizer/primitive.py → src/python/model_api/visualizer/primitive.py b/.../python/model_api/visualizer/primitive.py → src/python/model_api/visualizer/primitive.py
diff --git a/...on/model_api/visualizer/scene/__init__.py → ...on/model_api/visualizer/scene/__init__.py b/...on/model_api/visualizer/scene/__init__.py → ...on/model_api/visualizer/scene/__init__.py
diff --git a/...hon/model_api/visualizer/scene/anomaly.py → ...hon/model_api/visualizer/scene/anomaly.py b/...hon/model_api/visualizer/scene/anomaly.py → ...hon/model_api/visualizer/scene/anomaly.py
diff --git a/...el_api/visualizer/scene/classification.py → ...el_api/visualizer/scene/classification.py b/...el_api/visualizer/scene/classification.py → ...el_api/visualizer/scene/classification.py
diff --git a/...n/model_api/visualizer/scene/detection.py → ...n/model_api/visualizer/scene/detection.py b/...n/model_api/visualizer/scene/detection.py → ...n/model_api/visualizer/scene/detection.py
diff --git a/...on/model_api/visualizer/scene/keypoint.py → ...on/model_api/visualizer/scene/keypoint.py b/...on/model_api/visualizer/scene/keypoint.py → ...on/model_api/visualizer/scene/keypoint.py
diff --git a/...ython/model_api/visualizer/scene/scene.py → ...ython/model_api/visualizer/scene/scene.py b/...ython/model_api/visualizer/scene/scene.py → ...ython/model_api/visualizer/scene/scene.py
diff --git a/...odel_api/visualizer/scene/segmentation.py → ...odel_api/visualizer/scene/segmentation.py b/...odel_api/visualizer/scene/segmentation.py → ...odel_api/visualizer/scene/segmentation.py
diff --git a/..._api/visualizer/scene/visual_prompting.py → ..._api/visualizer/scene/visual_prompting.py b/..._api/visualizer/scene/visual_prompting.py → ..._api/visualizer/scene/visual_prompting.py
diff --git a/...python/model_api/visualizer/visualizer.py → ...python/model_api/visualizer/visualizer.py b/...python/model_api/visualizer/visualizer.py → ...python/model_api/visualizer/visualizer.py
diff --git a/model_api/python/pyproject.toml → src/python/pyproject.toml b/model_api/python/pyproject.toml → src/python/pyproject.toml
diff --git 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
@@ -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 → tests/python/functional/__init__.py b/tests/python/funtional/__init__.py → tests/python/functional/__init__.py
diff --git a/tests/python/funtional/conftest.py → tests/python/functional/conftest.py b/tests/python/funtional/conftest.py → tests/python/functional/conftest.py
diff --git a/tests/python/funtional/test_load.py → tests/python/functional/test_load.py b/tests/python/funtional/test_load.py → tests/python/functional/test_load.py
diff --git a/tests/python/funtional/test_save.py → tests/python/functional/test_save.py b/tests/python/funtional/test_save.py → tests/python/functional/test_save.py