Merge pull request #213 from JuliaGPU/tb/more_typevars

Support array types with more typevars.

Author: maleadt

.gitlab-ci.yml

@@ -1,31 +1,64 @@
-variables:
-  CI_IMAGE_TAG: 'plain'
-
 include:
-  - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/common.yml'
-  - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_v1.0.yml'
-  - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_v1.1.yml'
-  - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_v1.2.yml'
-  - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_v1.3.yml'
-  - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/test_dev.yml'
-  - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v4/coverage_v1.2.yml'
-
-test:dev:
-  allow_failure: true
+  - 'https://raw.githubusercontent.com/JuliaGPU/gitlab-ci/master/templates/v6.yml'
 
-coverage:
+
+# Julia versions
+
+julia:1.0:
+  extends:
+    - .julia:1.0
+    - .test
+
+julia:1.1:
+  extends:
+    - .julia:1.1
+    - .test
+
+julia:1.2:
+  extends:
+    - .julia:1.2
+    - .test
+
+julia:1.3:
+  extends:
+    - .julia:1.3
+    - .test
+
+julia:nightly:
+  extends:
+    - .julia:nightly
+    - .test
   allow_failure: true
-  only:
-    - master
+
+
+# reverse tests
+
+# NOTE: reverse testing is tricky because of Manifests. we instantiate both, give priority
+#       to this package's Manifest, and manually run tests outside of the test environment.
+#       that means we have to manually install CuArrays' test dependencies though.
 
 cuarrays:
-  stage: test
-  image: "juliagpu/julia:v1.2-cuda"
+  extends: .julia:1.2
+  tags:
+    - nvidia
+    - sm_75
+  image: juliagpu/cuda:10.1-cudnn7-cutensor-devel-ubuntu18.04
   script:
-    - mkdir $JULIA_DEPOT_PATH # Pkg3.jl#325
+    - export CUARRAYS="$HOME/.julia/dev/CuArrays"
     - julia -e 'using Pkg;
-                Pkg.develop(PackageSpec(path=pwd()));
-                Pkg.build();
-                Pkg.add(PackageSpec(name="CuArrays", rev="master"));
-                Pkg.test("CuArrays");'
+                Pkg.develop("CuArrays");'
+    - julia --project -e 'using Pkg;
+                          Pkg.instantiate()'
+    - julia --project=$CUARRAYS -e 'using Pkg;
+                                    Pkg.instantiate();
+                                    Pkg.add(["FFTW", "ForwardDiff"])'
+    - JULIA_LOAD_PATH=".:$CUARRAYS::" julia $CUARRAYS/test/runtests.jl
   allow_failure: true
+
+
+# other tasks
+
+coverage:
+  extends:
+    - .julia:1.2
+    - .coverage

src/testsuite/io.jl

@@ -8,7 +8,7 @@ function test_io(AT)
 
           show(io, MIME("text/plain"), A)
           seekstart(io)
-          @test String(take!(io)) == "1-element $AT{Int64,1}:\n 1"
+          @test occursin(Regex("^1-element $AT{Int64,1.*}:\n 1\$"), String(take!(io)))
 
           show(io, A)
           seekstart(io)
@@ -19,7 +19,7 @@ function test_io(AT)
 
           show(io, MIME("text/plain"), B)
           seekstart(io)
-          @test String(take!(io)) == "2×2 $AT{Int64,2}:\n 1  2\n 3  4"
+          @test occursin(Regex("^2×2 $AT{Int64,2.*}:\n 1  2\n 3  4\$"), String(take!(io)))
 
           show(io, B)
           seekstart(io)
@@ -29,8 +29,8 @@ function test_io(AT)
           show(io, MIME("text/plain"), A')
           seekstart(io)
           msg = String(take!(io)) # the printing of Adjoint depends on global state
-          @test msg == "1×1 Adjoint{Int64,$AT{Int64,1}}:\n 1" ||
-                msg == "1×1 LinearAlgebra.Adjoint{Int64,$AT{Int64,1}}:\n 1"
+          @test occursin(Regex("^1×1 Adjoint{Int64,$AT{Int64,1.*}}:\n 1\$"), msg) ||
+                occursin(Regex("^1×1 LinearAlgebra.Adjoint{Int64,$AT{Int64,1.*}}:\n 1\$"), msg)
         end
     end
 end

src/testsuite/mapreduce.jl

@@ -45,7 +45,7 @@ function test_mapreduce(AT)
         @testset "any all ==" begin
             for Ac in ([false, false], [false, true], [true, true])
                 A = AT(Ac)
-                @test typeof(A) == AT{Bool,1}
+                @test A isa AT{Bool,1}
                 @test any(A) == any(Ac)
                 @test all(A) == all(Ac)
                 @test A == copy(A)