Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 0 additions & 10 deletions .github/workflows/pip4linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,3 @@ jobs:
run: |
cd python
python setup.py bdist_wheel --plat-name manylinux2014_x86_64

- name: Upload to pypi when release
if: github.event_name == 'release' && github.event.action == 'published'
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_PYCGRAPH_TOKEN }}
run: |
cd python
twine check dist/*
twine upload --verbose --skip-existing dist/*
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<img align="right" src="https://github.com/ChunelFeng/CGraph/blob/main/doc/image/CGraph%20Author.jpg" width="256px">

><b>CGraph</b> is a cross-platform <b>D</b>irected <b>A</b>cyclic <b>G</b>raph framework based on pure C++ without any 3rd-party dependencies.</br></br>
>You, with it, can <b>build your own operators simply, and describe any running schedules</b> as you need, such as dependence, parallelling, aggregation, conditional and so on. Python APIs are also supported to build your pipeline.</br></br>
>Tutorials and contact information are show as follows. Please <b>get in touch with us for free</b> if you need more about this repository.
>You, with it, can <b>build your own operators simply, and describe any running schedules</b> as you need, such as dependence, parallelling, aggregation, conditional and so on. <b>Python APIs</b> are also supported to build your pipeline.</br></br>
>Tutorials and contact information are shown as follows. Please <b>get in touch with us for free</b> if you need more about this repository.

## 一. 简介

Expand All @@ -31,7 +31,7 @@
![CGraph Skeleton](https://github.com/ChunelFeng/CGraph/blob/main/doc/image/CGraph%20Skeleton.jpg)
<br>

本工程使用纯C++11标准库编写,无任何第三方依赖,并且提供`Python`版本。兼容`MacOS`、`Linux`、`Windows`和`Android`系统,支持通过 `CLion`、`VSCode`、`Xcode`、`Visual Studio`、`Code::Blocks`、`Qt Creator`等多款IDE进行本地编译和二次开发,具体编译方式请参考 [CGraph 编译说明](https://github.com/ChunelFeng/CGraph/blob/main/COMPILE.md ) <br>
本工程使用纯C++11标准库编写,无任何第三方依赖,并且提供`Python`版本:`PyCGraph`。兼容`MacOS`、`Linux`、`Windows`和`Android`系统,支持本地编译和二次开发。编译方法和`PyCGraph`安装方法,请参考 [CGraph 编译说明](https://github.com/ChunelFeng/CGraph/blob/main/COMPILE.md ) <br>

详细功能介绍和用法,请参考 [一面之猿网](http://www.chunel.cn/) 中的文章内容。相关视频在B站持续更新中,欢迎观看和交流:<br>
* [【B站视频】CGraph 入门篇](https://www.bilibili.com/video/BV1mk4y1v7XJ) <br>
Expand Down Expand Up @@ -165,6 +165,7 @@ if __name__ == '__main__':
* [GraphANNS](https://github.com/whenever5225/GraphANNS) : Graph-based Approximate Nearest Neighbor Search Working off CGraph
* [CThreadPool](https://github.com/ChunelFeng/CThreadPool) : 一个简单好用、功能强大、性能优异、跨平台的C++线程池
* [CGraph-lite](https://github.com/ChunelFeng/CGraph-lite) : head-only, simplest CGraph, with DAG executor and param translate function
* [PyCGraph-example](https://github.com/ChunelFeng/PyCGraph-example) : A useful list of how cool to use PyCGraph
* [awesome-cpp](https://github.com/fffaraz/awesome-cpp) : A curated list of awesome C++ (or C) frameworks, libraries, resources, and shiny things. Inspired by awesome-... stuff.
* [awesome-workflow-engines](https://github.com/meirwah/awesome-workflow-engines) : A curated list of awesome open source workflow engines
* [taskflow](https://github.com/taskflow/taskflow) : A General-purpose Parallel and Heterogeneous Task Programming System
Expand Down
2 changes: 1 addition & 1 deletion src/GraphCtrl/GraphElement/GElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ CStatus GElement::addDependGElements(const GElementPtrSet& elements) {

for (GElementPtr element: elements) {
CGRAPH_ASSERT_NOT_NULL(element)
CGRAPH_RETURN_ERROR_STATUS_BY_CONDITION((element->belong_ != this->belong_), \
CGRAPH_RETURN_ERROR_STATUS_BY_CONDITION((element->belong_ != this->belong_), \
element->getName() + " cannot depend because not same belong info")
if (this == element) {
continue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ CVoid GDynamicEngine::afterElementRun(GElementPtr element) {
element->done_ = true;
if (!element->run_before_.empty() && cur_status_.isOK()) {
if (internal::GElementShape::LINKABLE == element->shape_) {
process(*(element->run_before_.begin()), true);
process(element->run_before_.front(), true);
} else if (internal::GElementShape::ROOT == element->shape_) {
for (CSize i = 0; i < element->run_before_.size(); i++) {
process(element->run_before_[i], i == element->run_before_.size() - 1);
Expand Down
Loading