Skip to content

Commit

Permalink
Merge branch 'main' into kmp5/refactor/fillarrays_redo
Browse files Browse the repository at this point in the history
  • Loading branch information
kmp5VT authored Sep 14, 2023
2 parents be980d3 + dcfff20 commit 5fcdc5d
Show file tree
Hide file tree
Showing 6 changed files with 281 additions and 127 deletions.
2 changes: 1 addition & 1 deletion ITensorGPU/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Adapt = "3.5"
CUDA = "4.0"
Combinatorics = "1.0.2"
Functors = "0.2, 0.3, 0.4"
HDF5 = "0.15.7, 0.16"
HDF5 = "0.15.7, 0.16, 0.17"
ITensors = "= 0.3.37"
NDTensors = "0.1.50"
SimpleTraits = "0.9.4"
Expand Down
27 changes: 14 additions & 13 deletions NDTensors/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "NDTensors"
uuid = "23ae76d9-e61a-49c4-8f12-3f1a16adf9cf"
authors = ["Matthew Fishman <[email protected]>"]
version = "0.2.10"
version = "0.2.11"

[deps]
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
Expand All @@ -22,14 +22,26 @@ Strided = "5e0ebb24-38b0-5f93-81fe-25c709ecae67"
TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
TupleTools = "9d95972d-f1c8-5527-a6e0-b4b365fa01f6"

[weakdeps]
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
Metal = "dde4c033-4e86-420c-a63e-0dd931031962"
Octavian = "6fd5a793-0b7e-452c-907f-f8bfe9c57db4"
TBLIS = "48530278-0828-4a49-9772-0f3830dfa1e9"

[extensions]
NDTensorsCUDAExt = "CUDA"
NDTensorsMetalExt = "Metal"
NDTensorsOctavianExt = "Octavian"
NDTensorsTBLISExt = "TBLIS"

[compat]
Adapt = "3.5"
Compat = "4.9"
Dictionaries = "0.3.5"
FLoops = "0.2.1"
Folds = "0.2.8"
Functors = "0.2, 0.3, 0.4"
HDF5 = "0.14, 0.15, 0.16"
HDF5 = "0.14, 0.15, 0.16, 0.17"
Requires = "1.1"
SimpleTraits = "0.9.4"
SplitApplyCombine = "1.2.2"
Expand All @@ -39,14 +51,3 @@ TimerOutputs = "0.5.5"
TupleTools = "1.2.0"
julia = "1.6"

[weakdeps]
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
Metal = "dde4c033-4e86-420c-a63e-0dd931031962"
Octavian = "6fd5a793-0b7e-452c-907f-f8bfe9c57db4"
TBLIS = "48530278-0828-4a49-9772-0f3830dfa1e9"

[extensions]
NDTensorsCUDAExt = "CUDA"
NDTensorsMetalExt = "Metal"
NDTensorsTBLISExt = "TBLIS"
NDTensorsOctavianExt = "Octavian"
2 changes: 1 addition & 1 deletion NDTensors/src/dense/tensoralgebra/contract.jl
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ function _contract!(

#tC = similar(CM)
#_gemm!(tA, tB, El(α), AM, BM, El(β), CM)
mul!(CM, AM, BM, El(α), El(β))
@strided mul!(CM, AM, BM, El(α), El(β))

if props.permuteC
Cr = reshape(CM, props.newCrange)
Expand Down
6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "ITensors"
uuid = "9136182c-28ba-11e9-034c-db9fb085ebd5"
authors = ["Matthew Fishman <[email protected]>", "Miles Stoudenmire <[email protected]>"]
version = "0.3.42"
version = "0.3.43"

[deps]
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
Expand Down Expand Up @@ -39,11 +39,11 @@ Compat = "2.1, 3, 4"
Dictionaries = "0.3.5"
DocStringExtensions = "0.9.3"
Functors = "0.2, 0.3, 0.4"
HDF5 = "0.14, 0.15, 0.16"
HDF5 = "0.14, 0.15, 0.16, 0.17"
IsApprox = "0.1"
KrylovKit = "0.4.2, 0.5, 0.6"
LinearMaps = "3"
NDTensors = "0.1, 0.2"
NDTensors = "0.2.11"
PackageCompiler = "1.0.0, 2"
Requires = "1.1"
SerializedElementArrays = "0.1"
Expand Down
Loading

0 comments on commit 5fcdc5d

Please sign in to comment.