Skip to content

Commit

Permalink
[NDTensors] Remove ITensors dependency from tests (#1553)
Browse files Browse the repository at this point in the history
* [NDTensors] Remove `ITensors` dependency from tests

* [NDTensors] Bump to v0.3.47

* [ITensors] Move NDTensorsMappedArraysExt test to ITensors testsuite

* [ITensors] Bump to v0.6.23
  • Loading branch information
mtfishman authored Oct 25, 2024
1 parent 5fb4696 commit 8a2abce
Show file tree
Hide file tree
Showing 15 changed files with 40 additions and 124 deletions.
2 changes: 1 addition & 1 deletion 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.3.46"
version = "0.3.47"

[deps]
Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
Expand Down
4 changes: 0 additions & 4 deletions NDTensors/test/ITensors/Project.toml

This file was deleted.

6 changes: 0 additions & 6 deletions NDTensors/test/ITensors/TestITensorDMRG/Project.toml

This file was deleted.

20 changes: 0 additions & 20 deletions NDTensors/test/ITensors/TestITensorDMRG/TestITensorDMRG.jl

This file was deleted.

35 changes: 0 additions & 35 deletions NDTensors/test/ITensors/TestITensorDMRG/dmrg.jl

This file was deleted.

37 changes: 0 additions & 37 deletions NDTensors/test/ITensors/runtests.jl

This file was deleted.

5 changes: 2 additions & 3 deletions NDTensors/test/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Dictionaries = "85a47980-9c8c-11e8-2b9f-f7ca1fa99fb4"
EllipsisNotation = "da5c29d0-fa7d-589e-88eb-ea29b0a81949"
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
GPUArraysCore = "46192b85-c4d5-4398-a991-12ede77f4527"
ITensors = "9136182c-28ba-11e9-034c-db9fb085ebd5"
JLArrays = "27aeb0d3-9eb9-45fb-866b-73c2ecf80fcb"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
MappedArrays = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900"
Expand All @@ -23,12 +22,12 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"

[compat]
cuTENSOR = "2.0"
Metal = "1.1.0"
cuTENSOR = "2.0"

[extras]
AMDGPU = "21141c5a-9bdb-4563-92ae-f87d6854732e"
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
cuTENSOR = "011b41b2-24ef-40a8-b3eb-fa098493e9e1"
Metal = "dde4c033-4e86-420c-a63e-0dd931031962"
TBLIS = "48530278-0828-4a49-9772-0f3830dfa1e9"
cuTENSOR = "011b41b2-24ef-40a8-b3eb-fa098493e9e1"
12 changes: 0 additions & 12 deletions NDTensors/test/ext/runtests.jl

This file was deleted.

2 changes: 1 addition & 1 deletion NDTensors/test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using SafeTestsets: @safetestset
filenames = filter(readdir(@__DIR__)) do f
startswith("test_")(f) && endswith(".jl")(f)
end
for dir in ["lib", "ext", "ITensors"]
for dir in ["lib"]
push!(filenames, joinpath(dir, "runtests.jl"))
end
@testset "Test $(@__DIR__)/$filename" for filename in filenames
Expand Down
34 changes: 31 additions & 3 deletions NDTensors/test/test_combiner.jl
Original file line number Diff line number Diff line change
@@ -1,12 +1,40 @@
@eval module $(gensym())
using NDTensors
using Test: @testset, @test, @test_throws
using GPUArraysCore: @allowscalar
using NDTensors:
NDTensors,
Block,
BlockOffsets,
BlockSparse,
BlockSparseTensor,
Combiner,
Dense,
DenseTensor,
contract,
dim,
dims,
tensor
include("NDTensorsTestUtils/NDTensorsTestUtils.jl")
using .NDTensorsTestUtils: devices_list, is_supported_eltype
using Test: @testset, @test, @test_throws

# Testing generic block indices
using ITensors: QN, Index
struct Index{Space}
space::Space
end
NDTensors.dim(i::Index) = sum(b -> last(b), i.space)
NDTensors.nblocks(i::Index) = length(i.space)
NDTensors.blockdim(i::Index, block::Integer) = last(i.space[block])
function NDTensors.outer(i1::Index, i2::Index)
return Index(vec(
map(Iterators.product(i1.space, i2.space)) do (b1, b2)
return first(b1) + first(b2) => last(b1) * last(b2)
end,
))
end
NDTensors.permuteblocks(i::Index, perm::Vector{Int}) = Index(i.space[perm])

struct QN end
Base.:+(q1::QN, q2::QN) = QN()

@testset "CombinerTensor basic functionality" begin
@testset "test device: $dev, eltype: $elt" for dev in devices_list(copy(ARGS)),
Expand Down
2 changes: 1 addition & 1 deletion 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.6.22"
version = "0.6.23"

[deps]
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
Expand Down
1 change: 1 addition & 0 deletions test/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ ITensors = "9136182c-28ba-11e9-034c-db9fb085ebd5"
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
KrylovKit = "0b1a1467-8014-51b9-945f-bf0ae24f4b77"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
MappedArrays = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900"
NDTensors = "23ae76d9-e61a-49c4-8f12-3f1a16adf9cf"
OptimKit = "77e91f04-9b3b-57a6-a776-40b61faaebe0"
PackageCompiler = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[deps]
ITensors = "9136182c-28ba-11e9-034c-db9fb085ebd5"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
MappedArrays = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900"
NDTensors = "23ae76d9-e61a-49c4-8f12-3f1a16adf9cf"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
File renamed without changes.
1 change: 1 addition & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ ITensors.disable_threaded_blocksparse()
"ext/ITensorsChainRulesCoreExt",
"ext/ITensorsPackageCompilerExt",
"ext/ITensorsVectorInterfaceExt",
"ext/NDTensorsMappedArraysExt",
]
@time for dir in dirs
println("\nTest $(@__DIR__)/$(dir)")
Expand Down

4 comments on commit 8a2abce

@mtfishman
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register subdir=NDTensors

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/118018

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a NDTensors-v0.3.47 -m "<description of version>" 8a2abcec67c8c4b4e518c3873d0dddd2624cb9cf
git push origin NDTensors-v0.3.47

@mtfishman
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/118019

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.6.23 -m "<description of version>" 8a2abcec67c8c4b4e518c3873d0dddd2624cb9cf
git push origin v0.6.23

Please sign in to comment.