Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ab5dbf5
Текущая ветка: ONNX-Model-Parser
AlKurpiakov Apr 12, 2025
9eb09a6
Текущая ветка: ONNX-Model-Parser
AlKurpiakov Apr 12, 2025
f051a74
Текущая ветка: ONNX-Model-Parser
AlKurpiakov Apr 12, 2025
be3a143
Текущая ветка: ONNX-Model-Parser
AlKurpiakov Apr 29, 2025
02b7e35
Текущая ветка: ONNX-Model-Parser
AlKurpiakov Apr 29, 2025
cdd7ff7
Текущая ветка: ONNX-Model-Parser
AlKurpiakov Apr 29, 2025
554db69
Текущая ветка: ONNX-Model-Parser
AlKurpiakov Apr 29, 2025
6977b62
Текущая ветка: ONNX-Model-Parser
AlKurpiakov Apr 29, 2025
4c948ba
Текущая ветка: ONNX-Model-Parser
AlKurpiakov Apr 29, 2025
6d9ece4
Текущая ветка: ONNX-Model-Parser
AlKurpiakov Apr 29, 2025
7ac774e
Текущая ветка: ONNX-Model-Parser
AlKurpiakov Apr 29, 2025
96ea4d2
Текущая ветка: ONNX-Model-Parser
AlKurpiakov Apr 29, 2025
0ea25ea
Текущая ветка: ONNX-Model-Parser
AlKurpiakov Apr 29, 2025
97c7d81
Текущая ветка: ONNX-Model-Parser
AlKurpiakov Apr 29, 2025
b9b143e
Текущая ветка: ONNX-Model-Parser
AlKurpiakov Apr 29, 2025
02adfb2
Текущая ветка: ONNX-Model-Parser
AlKurpiakov Apr 29, 2025
a00ccf7
Apply suggestions from code review
AlKurpiakov May 16, 2025
be78e1d
Apply suggestions from code review
AlKurpiakov May 16, 2025
523e8c6
Apply suggestions from code review
AlKurpiakov May 16, 2025
4961374
Apply suggestions from code review
AlKurpiakov May 16, 2025
b6fa564
Delete app/frontend/README.md
AlKurpiakov May 16, 2025
6fa0e8e
Update CMakeLists.txt
AlKurpiakov May 16, 2025
9de6597
Update CMakeLists.txt
AlKurpiakov May 16, 2025
c63661e
Update main.cpp
AlKurpiakov May 16, 2025
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
9 changes: 9 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get install -y cmake ninja-build ccache scons
sudo apt-get install python3-dev libprotobuf-dev protobuf-compiler
python -m pip install --upgrade pip
python -m pip install -r requirements.txt
- name: ccache
uses: hendrikmuhs/[email protected]
with:
Expand All @@ -38,6 +41,9 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get install -y cmake ninja-build ccache scons
sudo apt-get install python3-dev libprotobuf-dev protobuf-compiler
python -m pip install --upgrade pip
python -m pip install -r requirements.txt
- name: ccache
uses: hendrikmuhs/[email protected]
with:
Expand Down Expand Up @@ -82,6 +88,9 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get install -y cmake ninja-build ccache gcovr lcov scons
sudo apt-get install python3-dev libprotobuf-dev protobuf-compiler
python -m pip install --upgrade pip
python -m pip install -r requirements.txt
- uses: actions/checkout@v4
with:
submodules: true
Expand Down
1 change: 1 addition & 0 deletions app/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
add_subdirectory(example)
add_subdirectory(frontend)
51 changes: 51 additions & 0 deletions app/frontend/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
cmake_minimum_required(VERSION 3.10)
project(ModelParser)

find_package(Protobuf REQUIRED)
set(ONNX_GENERATED_DIR "${CMAKE_SOURCE_DIR}/app/frontend/build/generated")


set(SETUP_SCRIPT "${CMAKE_SOURCE_DIR}/app/frontend/GetModel.sh")

set(GENERATED_FILES
"${ONNX_GENERATED_DIR}/onnx.pb.cc"
"${ONNX_GENERATED_DIR}/onnx.pb.h"
"${ONNX_GENERATED_DIR}/yolo11x.onnx"
)


add_custom_command(
OUTPUT ${GENERATED_FILES}
COMMAND ${CMAKE_COMMAND} -E make_directory "${ONNX_GENERATED_DIR}"
COMMAND ${CMAKE_COMMAND} -E chdir ${ONNX_GENERATED_DIR} bash ${SETUP_SCRIPT} "${ONNX_GENERATED_DIR}"
WORKING_DIRECTORY "${ONNX_GENERATED_DIR}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We cannot set directory to ${ONNX_GENERATED_DIR} path before it is created, it also creates an error. I suggest removing this line as well (by default it will use current directory, it is ok for us, mkdir will work perfectly in this case, but for script execution it is a problem.

So it seems we will need to add cd to the newly created directory in that case to avoid troubles:

    COMMAND ${CMAKE_COMMAND} -E make_directory "${ONNX_GENERATED_DIR}"
    COMMAND ${CMAKE_COMMAND} -E chdir ${ONNX_GENERATED_DIR} bash ${SETUP_SCRIPT} "${ONNX_GENERATED_DIR}"

DEPENDS ${SETUP_SCRIPT}
COMMENT "Create directory, generate ONNX-files and get YOLO model"
)

add_custom_target(generate_output ALL
DEPENDS ${GENERATED_FILES}
)

set(ONNX_GENERATED_DIR "${CMAKE_SOURCE_DIR}/app/frontend/build/generated")

set_source_files_properties(
"${ONNX_GENERATED_DIR}/onnx.pb.cc"
"${ONNX_GENERATED_DIR}/onnx.pb.h"
"${ONNX_GENERATED_DIR}/yolo11x.onnx"
PROPERTIES GENERATED TRUE
)

add_executable(ModelParser
main.cpp
"${ONNX_GENERATED_DIR}/onnx.pb.cc"
)
add_dependencies(ModelParser generate_output)
target_include_directories(ModelParser PRIVATE
"${ONNX_GENERATED_DIR}"
${Protobuf_INCLUDE_DIRS}
)

target_link_libraries(ModelParser
${Protobuf_LIBRARIES}
)
4 changes: 4 additions & 0 deletions app/frontend/GetModel.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

protoc --proto_path=3rdparty/onnx/onnx --cpp_out=$1 onnx.proto
yolo export model=$1/yolo11x.pt format=onnx
35 changes: 35 additions & 0 deletions app/frontend/main.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#include <fstream>
#include <iostream>
#include <string>
#include <vector>

#include "./generated/onnx.pb.h"

int main() {
std::ifstream model_file("generated/yolo11x.onnx", std::ios::binary);

if (!model_file.is_open()) {
std::cerr << "Failed to open model" << std::endl;
return 1;
}

onnx::ModelProto model;
if (!model.ParseFromIstream(&model_file)) {
std::cerr << "Model parsing error" << std::endl;
return 1;
}
model_file.close();

std::vector<std::string> layer;

for (int i = 0; i < model.graph().node_size(); ++i) {
const onnx::NodeProto& node = model.graph().node(i);
layer.emplace_back(node.op_type());
}

for (auto it : layer) {
std::cout << it << std::endl;
}

return 0;
}
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ultralytics >= 8.3.107
Loading