Skip to content

Commit 6308dd1

Browse files
tsung-wei-huangtsung-wei-huang
committed
Merge branch 'dev'
2 parents 87a08ac + 06f945c commit 6308dd1

22 files changed

Lines changed: 295 additions & 59 deletions

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ at an individual scope.
4343

4444
| [Taskflow Composition](#composable-tasking) |
4545
| :---------------: |
46-
|![](image/framework.png)|
46+
|![](image/framework.svg)|
4747

4848
Cpp-Taskflow supports heterogeneous tasking for you to
4949
accelerate a wide range of scientific computing applications

‎docs/framework.svg‎

Lines changed: 47 additions & 29 deletions
Loading

‎docs/index.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ <h2><a class="anchor" id="StaticDynamicTasking"></a>
113113
<p>Cpp-Taskflow has a unified interface for both <em>static</em> tasking and <em>dynamic</em> tasking, allowing users to quickly master our parallel task programming model in a natural idiom.</p>
114114
<table width="100%">
115115
<tr>
116+
<td align="center">Static Tasking </td><td align="center">Dynamic Tasking </td></tr>
117+
<tr>
116118
<td><div class="image">
117119
<object type="image/svg+xml" data="static_graph.svg" width="100%</td>">static_graph.svg</object>
118120
</div>

‎doxygen/QuickStart.dox‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ Cpp-Taskflow has a unified interface for both @em static tasking and @em dynamic
1818
allowing users to quickly master our parallel task programming model in a natural idiom.
1919

2020
<table width="100%">
21+
<tr>
22+
<td align="center">Static Tasking</td>
23+
<td align="center">Dynamic Tasking</td>
24+
</tr>
2125
<tr>
2226
<td>@image html images/static_graph.svg width=100%</td>
2327
<td>@image html images/dynamic_graph.svg width=100%</td>

doxygen/cookbook/Chapter6-todo renamed to doxygen/cookbook/Chapter7-todo

File renamed without changes.

‎doxygen/cookbook/era_multicore.jpg‎

-70.9 KB
Binary file not shown.

‎doxygen/cookbook/loop-level-parallelism.jpeg‎

-737 KB
Binary file not shown.

‎doxygen/cookbook/nested_subflow.png‎

-125 KB
Binary file not shown.

‎doxygen/cookbook/parallel_for1.png‎

-46.2 KB
Binary file not shown.

‎doxygen/cookbook/parallel_for2.png‎

-84.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)