Skip to content

[pull] main from ChunelFeng:main #232

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 2 commits into from
Jun 15, 2025
Merged

[pull] main from ChunelFeng:main #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85ffcfc
[chg] remove PyCGraph for python v3.1.13 windows workflow error
ChunelFeng Jun 15, 2025
e5ebd03
[tag] v3.1.1
ChunelFeng Jun 15, 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
3 changes: 1 addition & 2 deletions .github/workflows/pip4win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ jobs:
"3.9",
"3.10",
"3.11",
"3.12",
"3.13",]
"3.12",]

runs-on: ${{ matrix.platform }}

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ message("* * * * * * * * * * * * * * * * * * * * * * * * * * * * *")

cmake_minimum_required(VERSION 3.5.0)

project(CGraph VERSION 3.1.0)
project(CGraph VERSION 3.1.1)

# CGraph默认使用C++11版本，推荐使用C++17版本。暂不支持C++11以下版本
set(CMAKE_CXX_STANDARD 11)
Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
----

## 二. 入门Demo
> C++ 版本
> <b>C++ 版本</b>
```cpp
#include "CGraph.h"

Expand Down Expand Up @@ -94,7 +94,7 @@ int main() {
<br>
如上图所示，图结构执行的时候，首先执行`a`节点。`a`节点执行完毕后，并行执行`b`和`c`节点。`b`和`c`节点全部执行完毕后，再执行`d`节点。

> Python 版本
> <b>Python 版本</b>

```python
import time
Expand Down Expand Up @@ -128,7 +128,7 @@ if __name__ == '__main__':
pipeline.process()
```

> 其他版本
> <b>其他版本</b>

* [CsCGraph](https://github.com/ChunelFeng/CsCGraph) : A CSharp native, CGraph-API-liked DAG project
* [JaCGraph](https://github.com/ChunelFeng/JaCGraph) : A Java native, CGraph-API-liked DAG project
Expand Down Expand Up @@ -399,7 +399,7 @@ if __name__ == '__main__':
* 提供 Python 和 C++ 混合编程功能
* 提供 Python 打包功能，支持 `pip3 install PyCGraph` 安装

[2025.06.14 - v3.1.1 - Chunel]
[2025.06.15 - v3.1.1 - Chunel]
* 提供 C# 和 Java 版本
* 提供 `CODE_OF_CONDUCT.md` 文档

Expand Down
2 changes: 1 addition & 1 deletion python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import pybind11

__PYCGRAPH_NAME__ = "PyCGraph"
__PYCGRAPH_VERSION__ = "3.1.0"
__PYCGRAPH_VERSION__ = "3.1.1"
__PYCGRAPH_AUTHOR__ = "Chunel"
__PYCGRAPH_AUTHOR_EMAIL__ = "chunel@foxmail.com"
__PYCGRAPH_DESCRIPTION__ = "CGraph with python api wrapper by pybind11"
Expand Down
2 changes: 1 addition & 1 deletion xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set_project("CGraph")

-- set project version
set_version("3.1.0")
set_version("3.1.1")

-- set language: c++11
set_languages("c++11")
Expand Down
Loading