Format

Author: michel2323

lib/mkl/wrappers_sparse.jl

@@ -1,7 +1,7 @@
 function sparse_release_matrix_handle(A::oneAbstractSparseMatrix)
     queue = global_queue(context(A.nzVal), device(A.nzVal))
     m, n = size(A)
-    if m != 0 && n != 0
+    return if m != 0 && n != 0
         handle_ptr = Ref{matrix_handle_t}(A.handle)
         onemklXsparse_release_matrix_handle(sycl_queue(queue), handle_ptr)
     end
@@ -67,15 +67,15 @@ for (fname, elty, intty) in ((:onemklSsparse_set_csr_data   , :Float32   , :Int3
             if m != 0 && n != 0
                 $fname(sycl_queue(queue), handle_ptr[], m, n, 'O', rowPtr, colVal, nzVal)
             end
-            dA = oneSparseMatrixCSR{$elty,$intty}(handle_ptr[], rowPtr, colVal, nzVal, (m,n), nnzA)
+            dA = oneSparseMatrixCSR{$elty, $intty}(handle_ptr[], rowPtr, colVal, nzVal, (m, n), nnzA)
             finalizer(sparse_release_matrix_handle, dA)
             return dA
         end
 
         function oneSparseMatrixCSC(
-            colPtr::oneVector{$intty}, rowVal::oneVector{$intty},
-            nzVal::oneVector{$elty}, dims::NTuple{2, Int}
-        )
+                colPtr::oneVector{$intty}, rowVal::oneVector{$intty},
+                nzVal::oneVector{$elty}, dims::NTuple{2, Int}
+            )
             queue = global_queue(context(nzVal), device(nzVal))
             handle_ptr = Ref{matrix_handle_t}()
             onemklXsparse_init_matrix_handle(handle_ptr)
@@ -85,7 +85,7 @@ for (fname, elty, intty) in ((:onemklSsparse_set_csr_data   , :Float32   , :Int3
             if m != 0 && n != 0
                 $fname(sycl_queue(queue), handle_ptr[], n, m, 'O', colPtr, rowVal, nzVal)  # CSC of A is CSR of Aᵀ
             end
-            dA = oneSparseMatrixCSC{$elty,$intty}(handle_ptr[], colPtr, rowVal, nzVal, dims, nnzA)
+            dA = oneSparseMatrixCSC{$elty, $intty}(handle_ptr[], colPtr, rowVal, nzVal, dims, nnzA)
             finalizer(sparse_release_matrix_handle, dA)
             return dA
         end
@@ -96,7 +96,7 @@ for (fname, elty, intty) in ((:onemklSsparse_set_csr_data   , :Float32   , :Int3
             rowPtr = oneVector{$intty}(At.colptr)
             colVal = oneVector{$intty}(At.rowval)
             nzVal = oneVector{$elty}(At.nzval)
-            return oneSparseMatrixCSR(rowPtr, colVal, nzVal, (m,n))
+            return oneSparseMatrixCSR(rowPtr, colVal, nzVal, (m, n))
         end
 
         function SparseMatrixCSC(A::oneSparseMatrixCSR{$elty, $intty})
@@ -111,7 +111,7 @@ for (fname, elty, intty) in ((:onemklSsparse_set_csr_data   , :Float32   , :Int3
             colPtr = oneVector{$intty}(A.colptr)
             rowVal = oneVector{$intty}(A.rowval)
             nzVal = oneVector{$elty}(A.nzval)
-            return oneSparseMatrixCSC(colPtr, rowVal, nzVal, (m,n))
+            return oneSparseMatrixCSC(colPtr, rowVal, nzVal, (m, n))
         end
 
         function SparseMatrixCSC(A::oneSparseMatrixCSC{$elty, $intty})

src/sorting.jl

@@ -1,3 +1,3 @@
 Base.sort!(x::oneArray; kwargs...) = (AK.sort!(x; kwargs...); return x)
 Base.sortperm!(ix::oneArray, x::oneArray; kwargs...) = (AK.sortperm!(ix, x; kwargs...); return ix)
-Base.sortperm(x::oneArray; kwargs...) = sortperm!(oneArray(1:length(x)), x; kwargs...)
+Base.sortperm(x::oneArray; kwargs...) = sortperm!(oneArray(1:length(x)), x; kwargs...)

test/onemkl.jl

@@ -1093,7 +1093,11 @@ end
                     C = oneSparseMatrixCSR(B.rowPtr, B.colVal, B.nzVal, size(B))
                     A3 = SparseMatrixCSC(C)
                     @test A == A3
+<<<<<<< HEAD
                     D = oneSparseMatrixCSR(oneVector(S[]), oneVector(S[]), oneVector(T[]), (0, 0)) # empty matrix
+=======
+                    D = oneSparseMatrixCSR(S[], S[], T[], (0, 0)) # empty matrix
+>>>>>>> 1a9e6ed (Format)
             end
         end
 
@@ -1108,7 +1112,11 @@ end
                     C = oneSparseMatrixCSC(A.colptr |> oneVector, A.rowval |> oneVector, A.nzval |> oneVector, size(A))
                     A3 = SparseMatrixCSC(C)
                     @test A == A3
+<<<<<<< HEAD
                     D = oneSparseMatrixCSC(oneVector(S[]), oneVector(S[]), oneVector(T[]), (0, 0)) # empty matrix
+=======
+                    D = oneSparseMatrixCSC(S[], S[], T[], (0, 0)) # empty matrix
+>>>>>>> 1a9e6ed (Format)
                 end
             end
 

test/sorting.jl

@@ -7,11 +7,11 @@ using oneAPI
     @test Array(data) == [1, 1, 3, 4, 5]
 
     data_rev = oneArray([3, 1, 4, 1, 5])
-    sort!(data_rev, rev=true)
+    sort!(data_rev, rev = true)
     @test Array(data_rev) == [5, 4, 3, 1, 1]
     data = oneArray([3, 1, 4, 1, 5])
     @test Array(sortperm(data)) == sortperm([3, 1, 4, 1, 5])
 
     data_rev = oneArray([3, 1, 4, 1, 5])
-    @test Array(sortperm(data_rev, rev=true)) == sortperm([3, 1, 4, 1, 5], rev=true)
-end
+    @test Array(sortperm(data_rev, rev = true)) == sortperm([3, 1, 4, 1, 5], rev = true)
+end