Fix convert (#70)

* fix convert

* fix the fix

* add tests

* two more tests

* Update src/tarray.jl

Co-authored-by: David Widmann <[email protected]>

* david's suggestion

* Update src/tarray.jl

Co-authored-by: David Widmann <[email protected]>

Co-authored-by: David Widmann <[email protected]>

Author: mohamed82008

src/tarray.jl

@@ -88,15 +88,21 @@ function Base.pop!(S::TArray)
 end
 
 function Base.convert(::Type{TArray}, x::Array)
-    res = TArray{typeof(x[1]),ndims(x)}();
+    return convert(TArray{eltype(x),ndims(x)}, x)
+end
+function Base.convert(::Type{TArray{T,N}}, x::Array{T,N}) where {T,N}
+    res = TArray{T,N}()
     n   = n_copies()
     task_local_storage(res.ref, (n,x))
     return res
 end
 
-function Base.convert(::Array, x::Type{TArray})
+function Base.convert(::Type{Array}, S::TArray)
+    return convert(Array{eltype(S), ndims(S)}, S)
+end
+function Base.convert(::Type{Array{T,N}}, S::TArray{T,N}) where {T,N}
     n,d = task_local_storage(S.ref)
-    c = deepcopy(d)
+    c = convert(Array{T, N}, deepcopy(d))
     return c
 end
 

test/tarray.jl

@@ -46,6 +46,12 @@
             ta5[i] = i
         end
         @test Array(ta5) == [1, 2, 3, 4]
+        @test convert(Array, ta5) == [1, 2, 3, 4]
+        @test convert(Array{Int, 1}, ta5) == [1, 2, 3, 4]
+        @test ta5 == convert(TArray, [1, 2, 3, 4])
+        @test ta5 == convert(TArray{Int, 1}, [1, 2, 3, 4])
+        @test_throws MethodError convert(TArray{Int, 2}, [1, 2, 3, 4])
+        @test_throws MethodError convert(Array{Int, 2}, ta5)
 
         @test Array(tzeros(4)) == zeros(4)
 
@@ -60,7 +66,6 @@
         ta7 = TArray{Int, 2}((2, 2))
     end
 
-
     @testset "task copy" begin
         function f()
             t = TArray(Int, 1)