Skip to content

Commit c7aaec2

Browse files
authored
Merge branch 'ITensor:main' into main
2 parents b98a177 + 2b53ddf commit c7aaec2

117 files changed

Lines changed: 624 additions & 6915 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/FormatCheck.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: "Format Check"
2+
3+
on:
4+
push:
5+
branches:
6+
- 'main'
7+
tags: '*'
8+
pull_request:
9+
10+
jobs:
11+
format-check:
12+
name: "Format Check"
13+
uses: "ITensor/ITensorActions/.github/workflows/FormatCheck.yml@main"

.github/workflows/comment_trigger_example.yml

Lines changed: 0 additions & 58 deletions
This file was deleted.

.github/workflows/format_check.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

.github/workflows/format_pr.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/format_suggestions.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ benchmark/mult
1010
benchmark/*.json
1111
docs/Manifest.toml
1212
docs/build/
13+
docs/src/index.md
1314
NDTensors/Manifest.toml
1415
NDTensors/test/Manifest.toml
1516
precompile/tmp

.pre-commit-config.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
ci:
2+
skip: [julia-formatter]
3+
14
repos:
25
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.5.0
6+
rev: v5.0.0
47
hooks:
58
- id: check-merge-conflict
69
- id: check-toml
@@ -10,7 +13,8 @@ repos:
1013
exclude_types: [markdown] # incompatible with Literate.jl
1114
- id: trailing-whitespace
1215
exclude: '.*references/.*\.txt$' # do not check reference TN images
13-
- repo: https://github.com/qiaojunfeng/pre-commit-julia-format
14-
rev: v0.2.0
16+
17+
- repo: "https://github.com/domluna/JuliaFormatter.jl"
18+
rev: v2.1.2
1519
hooks:
16-
- id: julia-format
20+
- id: "julia-formatter"

NDTensors/Project.toml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "NDTensors"
22
uuid = "23ae76d9-e61a-49c4-8f12-3f1a16adf9cf"
33
authors = ["Matthew Fishman <mfishman@flatironinstitute.org>"]
4-
version = "0.4.4"
4+
version = "0.4.9"
55

66
[deps]
77
Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
@@ -19,7 +19,6 @@ InlineStrings = "842dd82b-1e85-43dc-bf29-5d0ee9dffc48"
1919
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
2020
MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
2121
MappedArrays = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900"
22-
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"
2322
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
2423
SimpleTraits = "699a6c99-e7fa-54fc-8d76-47d257e15c1d"
2524
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
@@ -69,7 +68,7 @@ EllipsisNotation = "1.8"
6968
FillArrays = "1"
7069
Folds = "0.2.8"
7170
Functors = "0.2, 0.3, 0.4, 0.5"
72-
GPUArraysCore = "0.1"
71+
GPUArraysCore = "0.1, 0.2"
7372
HDF5 = "0.14, 0.15, 0.16, 0.17"
7473
HalfIntegers = "1"
7574
InlineStrings = "1"
@@ -79,14 +78,13 @@ MacroTools = "0.5"
7978
MappedArrays = "0.4"
8079
Metal = "1"
8180
Octavian = "0.3"
82-
PackageExtensionCompat = "1"
8381
Random = "<0.0.1, 1.10"
8482
SimpleTraits = "0.9.4"
8583
SparseArrays = "<0.0.1, 1.10"
8684
SplitApplyCombine = "1.2.2"
8785
StaticArrays = "0.12, 1.0"
8886
Strided = "2"
89-
StridedViews = "0.2.2, 0.3"
87+
StridedViews = "0.2.2, 0.3, 0.4"
9088
TBLIS = "0.2"
9189
TimerOutputs = "0.5.5"
9290
TupleTools = "1.2.0"

NDTensors/ext/NDTensorsCUDAExt/indexing.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ function Base.getindex(E::Exposed{<:CuArray,<:Adjoint}, i, j)
1616
return (expose(parent(E))[j, i])'
1717
end
1818

19-
Base.any(f, E::Exposed{<:CuArray,<:NDTensors.Tensor}) = any(f, data(unexpose(E)))
19+
function Base.any(f, E::Exposed{<:CuArray,<:NDTensors.Tensor})
20+
return any(f, NDTensors.data(unexpose(E)))
21+
end
2022

2123
function Base.print_array(io::IO, E::Exposed{<:CuArray})
2224
return Base.print_array(io, expose(NDTensors.cpu(E)))

NDTensors/src/NDTensors.jl

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ include("blocksparse/contract.jl")
7272
include("blocksparse/contract_utilities.jl")
7373
include("blocksparse/contract_generic.jl")
7474
include("blocksparse/contract_sequential.jl")
75-
include("blocksparse/contract_folds.jl")
76-
include("blocksparse/contract_threads.jl")
75+
include("blocksparse/contract_threaded.jl")
7776
include("blocksparse/diagblocksparse.jl")
7877
include("blocksparse/similar.jl")
7978
include("blocksparse/combiner.jl")
@@ -221,9 +220,4 @@ end
221220

222221
function backend_octavian end
223222

224-
using PackageExtensionCompat
225-
function __init__()
226-
@require_extensions
227-
end
228-
229223
end # module NDTensors

0 commit comments

Comments
 (0)