Skip to content

Commit 969032f

Browse files
authored
Merge branch 'master' into higher-ad
2 parents a707073 + 34bae64 commit 969032f

File tree

4 files changed

+23
-6
lines changed

4 files changed

+23
-6
lines changed

.github/workflows/Documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
arch:
2222
- x64
2323
steps:
24-
- uses: actions/checkout@v5
24+
- uses: actions/checkout@v6
2525
- uses: julia-actions/setup-julia@latest
2626
with:
2727
version: ${{ matrix.version }}

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
arch:
3232
- x64
3333
steps:
34-
- uses: actions/checkout@v5
34+
- uses: actions/checkout@v6
3535
- uses: julia-actions/setup-julia@v2
3636
with:
3737
version: ${{ matrix.version }}
@@ -61,7 +61,7 @@ jobs:
6161
arch:
6262
- x64
6363
steps:
64-
- uses: actions/checkout@v5
64+
- uses: actions/checkout@v6
6565
- uses: julia-actions/setup-julia@v2
6666
with:
6767
version: ${{ matrix.version }}

Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "TensorOperations"
22
uuid = "6aa20fa7-93e2-5fca-9bc0-fbd0db3c71a2"
33
authors = ["Lukas Devos <[email protected]>", "Maarten Van Damme <[email protected]>", "Jutho Haegeman <[email protected]>"]
4-
version = "5.3.1"
4+
version = "5.3.2"
55

66
[deps]
77
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
@@ -32,7 +32,7 @@ TensorOperationscuTENSORExt = ["cuTENSOR", "CUDA"]
3232
[compat]
3333
Aqua = "0.6, 0.7, 0.8"
3434
Bumper = "0.6, 0.7"
35-
CUDA = "5.4.0"
35+
CUDA = "5"
3636
ChainRulesCore = "1"
3737
ChainRulesTestUtils = "1"
3838
DynamicPolynomials = "0.5"
@@ -49,7 +49,7 @@ StridedViews = "0.3, 0.4"
4949
Test = "1"
5050
TupleTools = "1.6"
5151
VectorInterface = "0.4.1,0.5"
52-
cuTENSOR = "2.1.1"
52+
cuTENSOR = ">=2.1.1"
5353
julia = "1.8"
5454

5555
[extras]

docs/src/man/indexnotation.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,23 @@ however different strategies to modify this order.
243243
because they share an index label which is next in the `order` list, all other indices
244244
with shared label among them will be contracted, irrespective of their order.
245245

246+
!!! warning "Combining order specifications"
247+
248+
Note that it is currently not possible to combine the NCON style convention of specifying
249+
indices with the use of parentheses. If both are used at the same time, the parentheses
250+
take precedence and the NCON style will be ignored. Any remaining contraction orders
251+
will be evaluated in the default left to right order. For example, in the following
252+
contractions, we have `E1 = A * ((B * D) * C)`, but `E2 = A * ((B * C) * D)`. This is
253+
true even when the parentheses are compatible with the NCON contraction order, as is
254+
the case here.
255+
256+
```julia
257+
@tensor E1[-1 -2 -3; -4] := A[-1 -2 -3; 4 5] * B[4; 1] * C[5; 2] * D[1 2; -4]
258+
@tensor E2[-1 -2 -3; -4] := A[-1 -2 -3; 4 5] * (B[4; 1] * C[5; 2] * D[1 2; -4])
259+
```
260+
261+
Additionally, combining the `order = (...)` keyword with parentheses is currently not supported.
262+
246263
In the case of more complex tensor networks, the optimal contraction order cannot always
247264
easily be guessed or determined on plain sight. It is then useful to be able to optimize the
248265
contraction order automatically, given a model for the complexity of contracting the

0 commit comments

Comments
 (0)