Merge 39a43a1 into 2eb20ed

SciML · May 18, 2022 · 0486961 · 0486961
2 parents 2eb20ed + 39a43a1
commit 0486961
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -25,6 +25,7 @@ jobs:
       - uses: actions/cache@v1
         env:
           cache-name: cache-artifacts
+          GROUP: ${{ matrix.group }}
         with:
           path: ~/.julia/artifacts
           key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}

diff --git a/lib/LinearSolvePardiso/src/LinearSolvePardiso.jl b/lib/LinearSolvePardiso/src/LinearSolvePardiso.jl
@@ -2,7 +2,7 @@ module LinearSolvePardiso
 
 using Pardiso, LinearSolve, SciMLBase
 
-Base.@kwdef struct PardisoJL <: SciMLBase.SciMLLinearSolveAlgorithm
+Base.@kwdef struct PardisoJL <: LinearSolve.SciMLLinearSolveAlgorithm
     nprocs::Union{Int,Nothing} = nothing
     solver_type::Union{Int,Pardiso.Solver,Nothing} = nothing
     matrix_type::Union{Int,Pardiso.MatrixType,Nothing} = nothing

diff --git a/src/default.jl b/src/default.jl
@@ -9,7 +9,7 @@ function defaultalg(A,b)
     # Special case on Arrays: avoid BLAS for RecursiveFactorization.jl when
     # it makes sense according to the benchmarks, which is dependent on
     # whether MKL or OpenBLAS is being used
-    if (A === nothing && b isa AbstractGPUArray) || A isa Matrix
+    if (A === nothing && b isa GPUArrays.AbstractGPUArray) || A isa Matrix
         if (A === nothing || eltype(A) <: Union{Float32,Float64,ComplexF32,ComplexF64}) &&
                     ArrayInterface.can_setindex(b)
             if length(b) <= 10
@@ -39,7 +39,7 @@ function defaultalg(A,b)
 
     # This catches the case where A is a CuMatrix
     # Which does not have LU fully defined
-    elseif A isa AbstractGPUArray || b isa AbstractGPUArray
+    elseif A isa GPUArrays.AbstractGPUArray || b isa GPUArrays.AbstractGPUArray
         alg = QRFactorization(false)
 
     # Not factorizable operator, default to only using A*x
@@ -100,7 +100,7 @@ function SciMLBase.solve(cache::LinearCache, alg::Nothing,
 
     # This catches the case where A is a CuMatrix
     # Which does not have LU fully defined
-    elseif A isa AbstractGPUArray
+    elseif A isa GPUArrays.AbstractGPUArray
         alg = QRFactorization(false)
         SciMLBase.solve(cache, alg, args...; kwargs...)
 
@@ -158,7 +158,7 @@ function init_cacheval(alg::Nothing, A, b, u, Pl, Pr, maxiters, abstol, reltol,
 
     # This catches the case where A is a CuMatrix
     # Which does not have LU fully defined
-    elseif A isa AbstractGPUArray
+    elseif A isa GPUArrays.AbstractGPUArray
         alg = QRFactorization(false)
         init_cacheval(alg, A, b, u, Pl, Pr, maxiters, abstol, reltol, verbose)