Skip to content

[pull] main from ChunelFeng:main #261

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

Merged
pull merged 1 commit into from
Oct 31, 2025
Merged

[pull] main from ChunelFeng:main #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/GraphCtrl/GraphElement/_GEngine/GDynamicEngine/GDynamicEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ CStatus GDynamicEngine::setup(const GSortedGElementPtrSet& elements) {
"it is not a dag struct");
mark(elements);
calcShape(elements);
analysisDagType(elements);
analysisDagType();
CGRAPH_FUNCTION_END
}

Expand Down Expand Up @@ -81,7 +81,7 @@ CVoid GDynamicEngine::mark(const GSortedGElementPtrSet& elements) {
}


CVoid GDynamicEngine::analysisDagType(const GSortedGElementPtrSet& elements) {
CVoid GDynamicEngine::analysisDagType() {
if (total_element_arr_.empty()
|| (front_element_arr_.size() == 1 && total_element_arr_.size() - 1 == linked_size_)) {
/**
Expand Down
2 changes: 1 addition & 1 deletion src/GraphCtrl/GraphElement/_GEngine/GDynamicEngine/GDynamicEngine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class GDynamicEngine : public GEngine {
* 分析当前的信息，主要用于区分dag的类型
* @return
*/
CVoid analysisDagType(const GSortedGElementPtrSet& elements);
CVoid analysisDagType();

/**
* 解析纯并行的情况下，元素矩阵
Expand Down
59 changes: 30 additions & 29 deletions xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,36 @@ elseif is_plat("linux") then
end

tutorial_list = {
"T00-HelloCGraph",
"T01-Simple",
"T02-Cluster",
"T03-Region",
"T04-Complex",
"T05-Param",
"T06-Condition",
"T07-MultiPipeline",
"T08-Template",
"T09-Aspect",
"T10-AspectParam",
"T11-Singleton",
"T12-Function",
"T13-Daemon",
"T14-Hold",
"T15-ElementParam",
"T16-MessageSendRecv",
"T17-MessagePubSub",
"T18-Event",
"T19-Cancel",
"T20-Suspend",
"T21-MultiCondition",
"T22-Timeout",
"T23-Some",
"T24-Fence",
"T25-Coordinator",
"T26-Mutable",
"T27-Trim",
"T28-Stage",
"T00-HelloCGraph",
"T01-Simple",
"T02-Cluster",
"T03-Region",
"T04-Complex",
"T05-Param",
"T06-Condition",
"T07-MultiPipeline",
"T08-Template",
"T09-Aspect",
"T10-AspectParam",
"T11-Singleton",
"T12-Function",
"T13-Daemon",
"T14-Hold",
"T15-ElementParam",
"T16-MessageSendRecv",
"T17-MessagePubSub",
"T18-Event",
"T19-Cancel",
"T20-Suspend",
"T21-MultiCondition",
"T22-Timeout",
"T23-Some",
"T24-Fence",
"T25-Coordinator",
"T26-Mutable",
"T27-Trim",
"T28-Stage",
"T29-Storage",
}

-- add tutorial target one by one
Expand Down
Loading