julia: Update cholesky example.

julia/examples/cholesky/cholesky.sh

@@ -15,6 +15,6 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
-$(dirname $0)/../execute.sh cholesky/cholesky_native.jl
-$(dirname $0)/../execute.sh cholesky/cholesky_implicit.jl
-$(dirname $0)/../execute.sh cholesky/cholesky_tag.jl
+$(dirname $0)/../execute.sh cholesky/cholesky_native.jl -quickcheck
+$(dirname $0)/../execute.sh cholesky/cholesky_implicit.jl -quickcheck
+$(dirname $0)/../execute.sh cholesky/cholesky_tag.jl -quickcheck

julia/examples/cholesky/cholesky_common.jl

@@ -92,7 +92,7 @@ function check(mat::Matrix{Float32})
         end
     end
 
-    println("Verification successful !")
+    println(stderr, "Verification successful !")
 end
 
 function clean_tags(nblocks)
@@ -138,10 +138,9 @@ function main(size_p :: Int, nblocks :: Int; verify = false, verbose = false)
     starpu_memory_unpin(mat)
 
     flop = (1.0*size_p*size_p*size_p)/3.0
-    println("# size\tms\tGFlops")
     time_ms = (t_end-t_start) / 1e6
     gflops = flop/(time_ms*1000)/1000
-    println("# $size_p\t$time_ms\t$gflops")
+    println("$size_p\t$time_ms\t$gflops")
 
     clean_tags(nblocks)
 

julia/examples/cholesky/cholesky_implicit.jl

@@ -58,7 +58,14 @@ end
 starpu_init()
 starpu_cublas_init()
 
-main(1024, 8, verify = true)
-main(15360, 16)
+println("# size\tms\tGFlops")
+
+if length(ARGS) > 0 && ARGS[1] == "-quickcheck"
+    main(1024, 8, verify = true)
+else
+    for size in 1024:1024:15360
+        main(size, 16)
+    end
+end
 
 starpu_shutdown()

julia/examples/cholesky/cholesky_native.jl

@@ -1,79 +1,11 @@
-using LinearAlgebra.BLAS
-
-function u11(sub11)
-    nx = size(sub11, 1)
-    ld = size(sub11, 1)
-
-    for z in 0:nx-1
-        lambda11::Float32 = sqrt(sub11[z+1,z+1])
-        sub11[z+1,z+1] = lambda11
-        if lambda11 == 0.0f0
-            error("lamda11")
-        end
-
-        X = view(sub11, z+2:z+2+(nx-z-2), z+1)
-        scal!(nx-z-1, 1.0f0/lambda11, X, 1)
-
-        A = view(sub11, z+2:z+2+(nx-z-2), z+2:z+2+(nx-z-2))
-        syr!('L', -1.0f0, X, A)
-    end
-end
-
-function u21(sub11, sub21)
-    trsm!('R', 'L', 'T', 'N', 1.0f0, sub11, sub21)
-end
-
-function u22(left, right, center)
-    gemm!('N', 'T', -1.0f0, left, right, 1.0f0, center)
-end
-
-function get_block(mat :: Matrix{Float32}, m, n, nblocks)
-    dim = size(mat, 1)
-    if dim != size(mat,2)
-        error("mat must be a square matrix")
-    end
-    if dim % nblocks != 0
-        error("dim must be a multiple of nblocks")
-    end
-
-    stride = Int(dim/nblocks)
-
-    return view(mat,
-                m*stride+1:(m+1)*stride,
-                n*stride+1:(n+1)*stride)
-end
-
-function cholesky(mat :: Matrix{Float32}, size, nblocks)
-    for k in 0:nblocks-1
-        sdatakk = get_block(mat, k, k, nblocks)
-        u11(sdatakk)
-
-        for m in k+1:nblocks-1
-            sdatamk = get_block(mat, m, k, nblocks)
-            u21(sdatakk, sdatamk)
-        end
-
-        for m in k+1:nblocks-1
-            sdatamk = get_block(mat, m, k, nblocks)
-
-            for n in k+1:nblocks-1
-                if n <= m
-                    sdatank = get_block(mat, n, k, nblocks)
-                    sdatamn = get_block(mat, m, n, nblocks)
-                    u22(sdatamk, sdatank, sdatamn)
-                end
-            end
-        end
-
-    end
-end
+using LinearAlgebra
 
 function check(mat::Matrix{Float32})
     size_p = size(mat, 1)
 
     for i in 1:size_p
         for j in 1:size_p
-            if j > i
+            if j < i
                 mat[i, j] = 0.0f0
             end
         end
@@ -81,7 +13,7 @@ function check(mat::Matrix{Float32})
 
     test_mat ::Matrix{Float32} = zeros(Float32, size_p, size_p)
 
-    syrk!('L', 'N', 1.0f0, mat, 0.0f0, test_mat)
+    BLAS.syrk!('L', 'T', 1.0f0, mat, 0.0f0, test_mat)
 
     for i in 1:size_p
         for j in 1:size_p
@@ -97,12 +29,11 @@ function check(mat::Matrix{Float32})
         end
     end
 
-    println("Verification successful !")
+    println(stderr, "Verification successful !")
 end
 
-function main(size_p :: Int, nblocks :: Int, display = false)
-    mat :: Matrix{Float32} = zeros(Float32, size_p, size_p)
-
+function main(size_p :: Int; verify = false, verbose = false)
+    mat = zeros(Float32, size_p, size_p)
     # create a simple definite positive symetric matrix
     # Hilbert matrix h(i,j) = 1/(i+j+1)
 
@@ -112,28 +43,37 @@ function main(size_p :: Int, nblocks :: Int, display = false)
         end
     end
 
-    if display
+    if verbose
         display(mat)
     end
 
     t_start = time_ns()
 
-    cholesky(mat, size_p, nblocks)
+    cholesky!(mat)
 
     t_end = time_ns()
 
     flop = (1.0*size_p*size_p*size_p)/3.0
-    println("# size\tms\tGFlops")
     time_ms = (t_end-t_start) / 1e6
     gflops = flop/(time_ms*1000)/1000
-    println("# $size_p\t$time_ms\t$gflops")
+    println("$size_p\t$time_ms\t$gflops")
 
-    if display
+    if verbose
         display(mat)
     end
 
-    check(mat)
+    if verify
+        check(mat)
+    end
 end
 
-main(1024*20, 8)
+println("# size\tms\tGFlops")
+
+if length(ARGS) > 0 && ARGS[1] == "-quickcheck"
+    main(1024, verify = true)
+else
+    for size in 1024:1024:15360
+        main(size)
+    end
+end
 

julia/examples/cholesky/cholesky_tag.jl

@@ -80,7 +80,14 @@ end
 starpu_init()
 starpu_cublas_init()
 
-main(1024, 8, verify = true)
-main(15360, 16)
+println("# size\tms\tGFlops")
+
+if length(ARGS) > 0 && ARGS[1] == "-quickcheck"
+    main(1024, 8, verify = true)
+else
+    for size in 1024:1024:15360
+        main(size, 16)
+    end
+end
 
 starpu_shutdown()