Skip to content

Commit

Permalink
Merge branch 'main' into LabelledUnitRangeDual
Browse files Browse the repository at this point in the history
  • Loading branch information
ogauthe committed Nov 7, 2024
2 parents f6911ee + 3838f62 commit 71604a7
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 14 deletions.
4 changes: 2 additions & 2 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.3.55"
version = "0.3.56"

[deps]
Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
Expand Down Expand Up @@ -67,7 +67,7 @@ Dictionaries = "0.4"
EllipsisNotation = "1.8"
FillArrays = "1"
Folds = "0.2.8"
Functors = "0.2, 0.3, 0.4"
Functors = "0.2, 0.3, 0.4, 0.5"
GPUArraysCore = "0.1, 0.2"
HDF5 = "0.14, 0.15, 0.16, 0.17"
HalfIntegers = "1"
Expand Down
5 changes: 5 additions & 0 deletions NDTensors/src/lib/UnallocatedArrays/test/Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[deps]
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
NDTensors = "23ae76d9-e61a-49c4-8f12-3f1a16adf9cf"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
7 changes: 4 additions & 3 deletions NDTensors/src/lib/UnallocatedArrays/test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
@eval module $(gensym())
using FillArrays: FillArrays, AbstractFill, Fill, Zeros
using NDTensors: NDTensors
using NDTensors.UnallocatedArrays
using NDTensors.UnallocatedArrays:
UnallocatedFill, UnallocatedZeros, allocate, alloctype, set_alloctype
using LinearAlgebra: norm
using Test: @test, @testset, @test_broken
using Test: @test, @test_broken, @testset

include(joinpath(pkgdir(NDTensors), "test", "NDTensorsTestUtils", "NDTensorsTestUtils.jl"))
using .NDTensorsTestUtils: devices_list
Expand Down Expand Up @@ -247,7 +248,7 @@ end
end

using FillArrays: Fill, Zeros
using NDTensors.UnallocatedArrays
using NDTensors.UnallocatedArrays: UnallocatedFill, UnallocatedZeros
using NDTensors.TypeParameterAccessors:
Position, default_type_parameter, nparameters, set_type_parameter, type_parameter
using Test: @test, @testset
Expand Down
4 changes: 2 additions & 2 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.7.3"
version = "0.7.4"

[deps]
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
Expand Down Expand Up @@ -43,7 +43,7 @@ ChainRulesCore = "1.10"
Compat = "2.1, 3, 4"
Dictionaries = "0.4"
DocStringExtensions = "0.9.3"
Functors = "0.2, 0.3, 0.4"
Functors = "0.2, 0.3, 0.4, 0.5"
HDF5 = "0.14, 0.15, 0.16, 0.17"
IsApprox = "0.1, 1, 2"
LinearAlgebra = "1.6"
Expand Down
14 changes: 7 additions & 7 deletions jenkins/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pipeline {
}
steps {
sh '''
julia -e 'using Pkg; Pkg.activate(temp=true); Pkg.Registry.update(); Pkg.update(); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["cuda"])'
julia -e 'using Pkg: Pkg; Pkg.activate(temp=true); Pkg.Registry.update(); Pkg.update(); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["cuda"])'
'''
}
}
Expand All @@ -51,7 +51,7 @@ pipeline {
}
steps {
sh '''
julia -e 'using Pkg; Pkg.activate(temp=true); Pkg.Registry.update(); Pkg.update(); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["cuda"])'
julia -e 'using Pkg: Pkg; Pkg.activate(temp=true); Pkg.Registry.update(); Pkg.update(); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["cuda"])'
'''
}
}
Expand All @@ -75,7 +75,7 @@ pipeline {
}
steps {
sh '''
julia -e 'using Pkg; Pkg.activate(temp=true); Pkg.Registry.update(); Pkg.update(); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["cutensor"])'
julia -e 'using Pkg: Pkg; Pkg.activate(temp=true); Pkg.Registry.update(); Pkg.update(); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["cutensor"])'
'''
}
}
Expand All @@ -99,7 +99,7 @@ pipeline {
}
steps {
sh '''
julia -e 'using Pkg; Pkg.activate(temp=true); Pkg.Registry.update(); Pkg.update(); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["cutensor"])'
julia -e 'using Pkg: Pkg; Pkg.activate(temp=true); Pkg.Registry.update(); Pkg.update(); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["cutensor"])'
'''
}
}
Expand All @@ -120,7 +120,7 @@ pipeline {
juliaup default lts
'''
sh '''
julia -e 'using Pkg; Pkg.activate(temp=true); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["metal"])'
julia -e 'using Pkg: Pkg; Pkg.activate(temp=true); Pkg.Registry.update(); Pkg.update(); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["metal"])'
'''
}
}
Expand All @@ -141,11 +141,11 @@ pipeline {
juliaup default release
'''
sh '''
julia -e 'using Pkg; Pkg.activate(temp=true); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["metal"])'
julia -e 'using Pkg: Pkg; Pkg.activate(temp=true); Pkg.Registry.update(); Pkg.update(); Pkg.develop(path="./NDTensors"); Pkg.develop(path="."); Pkg.test("NDTensors"; test_args=["metal"])'
'''
}
}
}
}
}
}
}

0 comments on commit 71604a7

Please sign in to comment.