Skip to content

Commit

Permalink
Merge branch 'master' into jh/conjflagsplit
Browse files Browse the repository at this point in the history
  • Loading branch information
Jutho authored Oct 4, 2024
2 parents d6d9982 + c1e37ec commit e68a5a5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 18 deletions.
20 changes: 3 additions & 17 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name = "TensorOperations"
uuid = "6aa20fa7-93e2-5fca-9bc0-fbd0db3c71a2"
authors = [
"Lukas Devos <[email protected]>",
"Maarten Van Damme <[email protected]>",
"Jutho Haegeman <[email protected]>",
]
authors = ["Lukas Devos <[email protected]>", "Maarten Van Damme <[email protected]>", "Jutho Haegeman <[email protected]>"]
version = "5.0.2"

[deps]
Expand Down Expand Up @@ -33,7 +29,7 @@ TensorOperationscuTENSORExt = ["cuTENSOR", "CUDA"]

[compat]
Aqua = "0.6, 0.7, 0.8"
Bumper = "0.6"
Bumper = "0.6, 0.7"
CUDA = "5.4.0"
ChainRulesCore = "1"
ChainRulesTestUtils = "1"
Expand Down Expand Up @@ -64,14 +60,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
cuTENSOR = "011b41b2-24ef-40a8-b3eb-fa098493e9e1"

[targets]
test = [
"Test",
"Random",
"DynamicPolynomials",
"ChainRulesTestUtils",
"CUDA",
"cuTENSOR",
"Aqua",
"Logging",
"Bumper",
]
test = ["Test", "Random", "DynamicPolynomials", "ChainRulesTestUtils", "CUDA", "cuTENSOR", "Aqua", "Logging", "Bumper"]
2 changes: 1 addition & 1 deletion ext/TensorOperationsBumperExt.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function TensorOperations.tensoralloc(::Type{A}, structure, ::Val{istemp},
buf::Union{SlabBuffer,AllocBuffer}) where {A<:AbstractArray,
istemp}
# TODO: remove the `ndims` check if this is fixed in Bumper / StrideArraysCore
if istemp & ndims(A) > 0
if istemp && ndims(A) > 0
return Bumper.alloc!(buf, eltype(A), structure...)
else
return TensorOperations.tensoralloc(A, structure, Val(istemp))
Expand Down

0 comments on commit e68a5a5

Please sign in to comment.