Bugfix and tests for cusolver/base (#2712)

Author: kshyatt

lib/cusolver/base.jl

@@ -12,73 +12,73 @@ version() = VersionNumber(cusolverGetProperty(CUDA.MAJOR_VERSION),
 
 function Base.convert(::Type{cusolverEigType_t}, typ::Int)
     if typ == 1
-        CUSOLVER_EIG_TYPE_1
+        return CUSOLVER_EIG_TYPE_1
     elseif typ == 2
-        CUSOLVER_EIG_TYPE_2
+        return CUSOLVER_EIG_TYPE_2
     elseif typ == 3
-        CUSOLVER_EIG_TYPE_3
+        return CUSOLVER_EIG_TYPE_3
     else
         throw(ArgumentError("Unknown eigenvalue solver type $typ."))
     end
 end
 
 function Base.convert(::Type{cusolverEigMode_t}, jobz::Char)
     if jobz == 'N'
-        CUSOLVER_EIG_MODE_NOVECTOR
+        return CUSOLVER_EIG_MODE_NOVECTOR
     elseif jobz == 'V'
-        CUSOLVER_EIG_MODE_VECTOR
+        return CUSOLVER_EIG_MODE_VECTOR
     else
         throw(ArgumentError("Unknown eigenvalue solver mode $jobz."))
     end
 end
 
 function Base.convert(::Type{cusolverEigRange_t}, range::Char)
     if range == 'A'
-        CUSOLVER_EIG_RANGE_ALL
+        return CUSOLVER_EIG_RANGE_ALL
     elseif range == 'V'
-        CUSOLVER_EIG_RANGE_V
+        return CUSOLVER_EIG_RANGE_V
     elseif range == 'I'
-        CUSOLVER_EIG_RANGE_I
+        return CUSOLVER_EIG_RANGE_I
     else
         throw(ArgumentError("Unknown eigenvalue solver range $range."))
     end
 end
 
 function Base.convert(::Type{cusolverStorevMode_t}, storev::Char)
     if storev == 'C'
-        CUBLAS_STOREV_COLUMNWISE
+        return CUBLAS_STOREV_COLUMNWISE
     elseif storev == 'R'
-        CUBLAS_STOREV_ROWWISE
+        return CUBLAS_STOREV_ROWWISE
     else
         throw(ArgumentError("Unknown storage mode $storev."))
     end
 end
 
 function Base.convert(::Type{cusolverDirectMode_t}, direct::Char)
     if direct == 'F'
-        CUBLAS_DIRECT_FORWARD
+        return CUBLAS_DIRECT_FORWARD
     elseif direct == 'B'
-        CUBLAS_DIRECT_BACKWARD
+        return CUBLAS_DIRECT_BACKWARD
     else
         throw(ArgumentError("Unknown direction mode $direct."))
     end
 end
 
 function Base.convert(::Type{cusolverIRSRefinement_t}, irs::String)
     if irs == "NOT_SET"
-        CUSOLVER_IRS_REFINE_NOT_SET
+        return CUSOLVER_IRS_REFINE_NOT_SET
     elseif irs == "NONE"
-        CUSOLVER_IRS_REFINE_NONE
+        return CUSOLVER_IRS_REFINE_NONE
     elseif irs == "CLASSICAL"
-        CUSOLVER_IRS_REFINE_CLASSICAL
-    elseif "CLASSICAL_GMRES"
-        CUSOLVER_IRS_REFINE_CLASSICAL_GMRES
-    elseif "GMRES"
-        CUSOLVER_IRS_REFINE_GMRES
-    elseif "GMRES_GMRES"
-        CUSOLVER_IRS_REFINE_GMRES_GMRES
-    elseif "GMRES_NOPCOND"
-        CUSOLVER_IRS_REFINE_GMRES_NOPCOND
+        return CUSOLVER_IRS_REFINE_CLASSICAL
+    elseif irs == "CLASSICAL_GMRES"
+        return CUSOLVER_IRS_REFINE_CLASSICAL_GMRES
+    elseif irs == "GMRES"
+        return CUSOLVER_IRS_REFINE_GMRES
+    elseif irs == "GMRES_GMRES"
+        return CUSOLVER_IRS_REFINE_GMRES_GMRES
+    elseif irs == "GMRES_NOPCOND"
+        return CUSOLVER_IRS_REFINE_GMRES_NOPCOND
     else
         throw(ArgumentError("Unknown iterative refinement solver $irs."))
     end

test/libraries/cusolver/base.jl

@@ -0,0 +1,42 @@
+using CUDA.CUSOLVER
+
+@testset "CUSOLVER helpers and types" begin
+    @test convert(CUSOLVER.cusolverEigType_t, 1) == CUSOLVER.CUSOLVER_EIG_TYPE_1
+    @test convert(CUSOLVER.cusolverEigType_t, 2) == CUSOLVER.CUSOLVER_EIG_TYPE_2
+    @test convert(CUSOLVER.cusolverEigType_t, 3) == CUSOLVER.CUSOLVER_EIG_TYPE_3
+    @test_throws ArgumentError("Unknown eigenvalue solver type 4.") convert(CUSOLVER.cusolverEigType_t, 4)
+
+    @test convert(CUSOLVER.cusolverEigMode_t, 'N') == CUSOLVER.CUSOLVER_EIG_MODE_NOVECTOR
+    @test convert(CUSOLVER.cusolverEigMode_t, 'V') == CUSOLVER.CUSOLVER_EIG_MODE_VECTOR
+    @test_throws ArgumentError("Unknown eigenvalue solver mode A.") convert(CUSOLVER.cusolverEigMode_t, 'A')
+    
+    @test convert(CUSOLVER.cusolverEigRange_t, 'A') == CUSOLVER.CUSOLVER_EIG_RANGE_ALL
+    @test convert(CUSOLVER.cusolverEigRange_t, 'V') == CUSOLVER.CUSOLVER_EIG_RANGE_V
+    @test convert(CUSOLVER.cusolverEigRange_t, 'I') == CUSOLVER.CUSOLVER_EIG_RANGE_I
+    @test_throws ArgumentError("Unknown eigenvalue solver range B.") convert(CUSOLVER.cusolverEigRange_t, 'B')
+    
+    @test convert(CUSOLVER.cusolverStorevMode_t, 'C') == CUSOLVER.CUBLAS_STOREV_COLUMNWISE
+    @test convert(CUSOLVER.cusolverStorevMode_t, 'R') == CUSOLVER.CUBLAS_STOREV_ROWWISE
+    @test_throws ArgumentError("Unknown storage mode A.") convert(CUSOLVER.cusolverStorevMode_t, 'A')
+
+    @test convert(CUSOLVER.cusolverDirectMode_t, 'F') == CUSOLVER.CUBLAS_DIRECT_FORWARD
+    @test convert(CUSOLVER.cusolverDirectMode_t, 'B') == CUSOLVER.CUBLAS_DIRECT_BACKWARD
+    @test_throws ArgumentError("Unknown direction mode A.") convert(CUSOLVER.cusolverDirectMode_t, 'A')
+
+    @test convert(CUSOLVER.cusolverIRSRefinement_t, "NOT_SET")         == CUSOLVER.CUSOLVER_IRS_REFINE_NOT_SET
+    @test convert(CUSOLVER.cusolverIRSRefinement_t, "NONE")            == CUSOLVER.CUSOLVER_IRS_REFINE_NONE
+    @test convert(CUSOLVER.cusolverIRSRefinement_t, "CLASSICAL")       == CUSOLVER.CUSOLVER_IRS_REFINE_CLASSICAL
+    @test convert(CUSOLVER.cusolverIRSRefinement_t, "CLASSICAL_GMRES") == CUSOLVER.CUSOLVER_IRS_REFINE_CLASSICAL_GMRES
+    @test convert(CUSOLVER.cusolverIRSRefinement_t, "GMRES")           == CUSOLVER.CUSOLVER_IRS_REFINE_GMRES
+    @test convert(CUSOLVER.cusolverIRSRefinement_t, "GMRES_GMRES")     == CUSOLVER.CUSOLVER_IRS_REFINE_GMRES_GMRES
+    @test convert(CUSOLVER.cusolverIRSRefinement_t, "GMRES_NOPCOND")   == CUSOLVER.CUSOLVER_IRS_REFINE_GMRES_NOPCOND
+    @test_throws ArgumentError("Unknown iterative refinement solver A.") convert(CUSOLVER.cusolverIRSRefinement_t, "A")
+
+    @test convert(CUSOLVER.cusolverPrecType_t, "R_16F")  == CUSOLVER.CUSOLVER_R_16F
+    @test convert(CUSOLVER.cusolverPrecType_t, "R_16BF") == CUSOLVER.CUSOLVER_R_16BF
+    @test convert(CUSOLVER.cusolverPrecType_t, "R_TF32") == CUSOLVER.CUSOLVER_R_TF32
+    @test convert(CUSOLVER.cusolverPrecType_t, "C_16F")  == CUSOLVER.CUSOLVER_C_16F
+    @test convert(CUSOLVER.cusolverPrecType_t, "C_16BF") == CUSOLVER.CUSOLVER_C_16BF
+    @test convert(CUSOLVER.cusolverPrecType_t, "C_TF32") == CUSOLVER.CUSOLVER_C_TF32
+    @test_throws ArgumentError("cusolverPrecType_t equivalent for input type A does not exist!") convert(CUSOLVER.cusolverPrecType_t, "A")
+end