Update to TypeParameterAccessors v0.2 (#10)

Author: lkdvos

Project.toml

@@ -1,7 +1,7 @@
 name = "UnallocatedArrays"
 uuid = "43c9e47c-e622-40fb-bf18-a09fc8c466b6"
 authors = ["ITensor developers <support@itensor.org> and contributors"]
-version = "0.1.0"
+version = "0.1.1"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
@@ -12,6 +12,6 @@ UnspecifiedTypes = "42b3faec-625b-4613-8ddc-352bf9672b8d"
 [compat]
 Adapt = "4.1.1"
 FillArrays = "1.13.0"
-TypeParameterAccessors = "0.1"
+TypeParameterAccessors = "0.2.1"
 UnspecifiedTypes = "0.1.0"
 julia = "1.10"

src/UnallocatedArrays.jl

@@ -5,8 +5,8 @@ using TypeParameterAccessors:
   Position,
   set_eltype,
   set_ndims,
-  set_type_parameter,
-  type_parameter
+  set_type_parameters,
+  type_parameters
 using FillArrays:
   AbstractFill,
   FillArrays,

src/abstractfill/abstractfill.jl

@@ -12,10 +12,3 @@ end
 
 axestype(T::Type{<:AbstractArray}) = type_parameter(axestype)
 set_axestype(T::Type{<:AbstractFill}, ax::Type) = s(T, axestype, ax)
-
-# TODO: fix piracy by migrating this
-TypeParameterAccessors.position(::Type{<:AbstractFill}, ::typeof(alloctype)) = Position(4)
-TypeParameterAccessors.position(::Type{<:AbstractFill}, ::typeof(axestype)) = Position(3)
-function TypeParameterAccessors.default_type_parameters(::Type{<:AbstractFill})
-  return (Float64, 0, Tuple{})
-end

src/abstractunallocatedarray.jl

@@ -21,7 +21,24 @@ function Base.adjoint(a::UnallocatedArray)
 end
 
 function set_alloctype(T::Type{<:UnallocatedArray}, alloc::Type{<:AbstractArray})
-  return set_type_parameter(T, alloctype, alloc)
+  return set_type_parameters(T, alloctype, alloc)
+end
+
+## TypeParameterAccessors
+
+for T in (:UnallocatedFill, :UnallocatedZeros)
+  @eval begin
+    TypeParameterAccessors.position(::Type{<:$T}, ::typeof(eltype)) = Position(1)
+    TypeParameterAccessors.position(::Type{<:$T}, ::typeof(ndims)) = Position(2)
+    TypeParameterAccessors.position(::Type{<:$T}, ::typeof(axes)) = Position(3)
+    function TypeParameterAccessors.position(::Type{<:$T}, ::typeof(alloctype))
+      return Position(4)
+    end
+
+    function TypeParameterAccessors.default_type_parameters(::Type{<:$T})
+      return (Float64, 1, Tuple{Base.OneTo{Int}}, Vector{Float64})
+    end
+  end
 end
 
 ## This overloads the definition defined in `FillArrays.jl`

test/test_aqua.jl

@@ -3,5 +3,5 @@ using Aqua: Aqua
 using Test: @testset
 
 @testset "Code quality (Aqua.jl)" begin
-  Aqua.test_all(UnallocatedArrays; piracies=false)
+  Aqua.test_all(UnallocatedArrays)
 end

test/test_defaults.jl

@@ -5,72 +5,72 @@
 using FillArrays: Fill, Zeros
 using UnallocatedArrays: UnallocatedFill, UnallocatedZeros
 using TypeParameterAccessors:
-  Position, default_type_parameter, nparameters, set_type_parameter, type_parameter
+  Position, default_type_parameters, nparameters, set_type_parameters, type_parameters
 using Test: @test, @testset
 
 #@testset "SetParameters" begin
 @testset "Testing $typ" for typ in (Fill, Zeros)
-  t1 = default_type_parameter(typ, Position{1}())
-  t2 = default_type_parameter(typ, Position{2}())
-  t3 = default_type_parameter(typ, Position{3}())
+  t1 = default_type_parameters(typ, Position(1))
+  t2 = default_type_parameters(typ, Position(2))
+  t3 = default_type_parameters(typ, Position(3))
   t4 = Any
   ft1 = typ{t1}
   ft2 = typ{t1,t2}
   ft3 = typ{t1,t2,t3}
 
   ## check 1 parameter specified
-  ftn1 = set_type_parameter(ft1, Position{1}(), t4)
-  ftn2 = set_type_parameter(ft1, Position{2}(), t4)
-  ftn3 = set_type_parameter(ft1, Position{3}(), t4)
+  ftn1 = set_type_parameters(ft1, Position{1}(), t4)
+  ftn2 = set_type_parameters(ft1, Position{2}(), t4)
+  ftn3 = set_type_parameters(ft1, Position{3}(), t4)
   @test ftn1 == typ{t4}
   @test ftn2 == typ{t1,t4}
   @test ftn3 == typ{t1,<:Any,t4}
 
   ## check 2 parameters specified
-  ftn1 = set_type_parameter(ft2, Position{1}(), t4)
-  ftn2 = set_type_parameter(ft2, Position{2}(), t4)
-  ftn3 = set_type_parameter(ft2, Position{3}(), t4)
+  ftn1 = set_type_parameters(ft2, Position{1}(), t4)
+  ftn2 = set_type_parameters(ft2, Position{2}(), t4)
+  ftn3 = set_type_parameters(ft2, Position{3}(), t4)
   @test ftn1 == typ{t4,t2}
   @test ftn2 == typ{t1,t4}
   @test ftn3 == typ{t1,t2,t4}
 
   ## check 3 parameters specified
-  ftn1 = set_type_parameter(ft3, Position{1}(), t4)
-  ftn2 = set_type_parameter(ft3, Position{2}(), t4)
-  ftn3 = set_type_parameter(ft3, Position{3}(), t4)
+  ftn1 = set_type_parameters(ft3, Position{1}(), t4)
+  ftn2 = set_type_parameters(ft3, Position{2}(), t4)
+  ftn3 = set_type_parameters(ft3, Position{3}(), t4)
   @test ftn1 == typ{t4,t2,t3}
   @test ftn2 == typ{t1,t4,t3}
   @test ftn3 == typ{t1,t2,t4}
 
-  @test type_parameter(ft3, Position{1}()) == t1
-  @test type_parameter(ft3, Position{2}()) == t2
-  @test type_parameter(ft3, Position{3}()) == t3
+  @test type_parameters(ft3, Position{1}()) == t1
+  @test type_parameters(ft3, Position{2}()) == t2
+  @test type_parameters(ft3, Position{3}()) == t3
 
   @test nparameters(ft3) == 3
 end
 
 @testset "Testing $typ" for typ in (UnallocatedFill, UnallocatedZeros)
-  t1 = default_type_parameter(typ, Position{1}())
-  t2 = default_type_parameter(typ, Position{2}())
-  t3 = default_type_parameter(typ, Position{3}())
-  t4 = default_type_parameter(typ, Position{4}())
+  t1 = default_type_parameters(typ, Position(1))
+  t2 = default_type_parameters(typ, Position(2))
+  t3 = default_type_parameters(typ, Position(3))
+  t4 = default_type_parameters(typ, Position(4))
   t5 = Any
   ft = typ{t1,t2,t3,t4}
 
   ## check 4 parameters specified
-  ftn1 = set_type_parameter(ft, Position{1}(), t5)
-  ftn2 = set_type_parameter(ft, Position{2}(), t5)
-  ftn3 = set_type_parameter(ft, Position{3}(), t5)
-  ftn4 = set_type_parameter(ft, Position{4}(), t5)
+  ftn1 = set_type_parameters(ft, Position{1}(), t5)
+  ftn2 = set_type_parameters(ft, Position{2}(), t5)
+  ftn3 = set_type_parameters(ft, Position{3}(), t5)
+  ftn4 = set_type_parameters(ft, Position{4}(), t5)
   @test ftn1 == typ{t5,t2,t3,t4}
   @test ftn2 == typ{t1,t5,t3,t4}
   @test ftn3 == typ{t1,t2,t5,t4}
   @test ftn4 == typ{t1,t2,t3,t5}
 
-  @test type_parameter(ft, Position{1}()) == t1
-  @test type_parameter(ft, Position{2}()) == t2
-  @test type_parameter(ft, Position{3}()) == t3
-  @test type_parameter(ft, Position{4}()) == t4
+  @test type_parameters(ft, Position{1}()) == t1
+  @test type_parameters(ft, Position{2}()) == t2
+  @test type_parameters(ft, Position{3}()) == t3
+  @test type_parameters(ft, Position{4}()) == t4
 
   @test nparameters(ft) == 4
 end