diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d1f3458d1..794935d72 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -20,9 +20,6 @@ jobs: - Core version: - '1' - - '1.6' - - '1.7' - - '1.8' include: - version: '1' group: 'LinearSolveHYPRE' diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml index 78d374337..c72a26c11 100644 --- a/.github/workflows/Downstream.yml +++ b/.github/workflows/Downstream.yml @@ -13,7 +13,7 @@ jobs: GROUP: ${{ matrix.package.group }} strategy: matrix: - julia-version: [1,1.6] + julia-version: [1] os: [ubuntu-latest] package: - {user: SciML, repo: OrdinaryDiffEq.jl, group: InterfaceII} diff --git a/Project.toml b/Project.toml index bd50f7730..a61319583 100644 --- a/Project.toml +++ b/Project.toml @@ -16,6 +16,7 @@ KLU = "ef3ab10e-7fda-4108-b977-705223b18434" Krylov = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7" Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" +MKL = "33e6dc65-8f57-5167-99aa-e5a354878fb2" MKL_jll = "856f044c-d86e-5d09-b602-aeab76dc8ba7" PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a" Preferences = "21216c6a-2e73-6563-6e65-726566657250" @@ -83,7 +84,7 @@ SciMLOperators = "0.2, 0.3" Setfield = "0.7, 0.8, 1" Sparspak = "0.3.6" UnPack = "1" -julia = "1.6" +julia = "1.9" [extras] BandedMatrices = "aae01518-5342-5314-be14-df237901396f" diff --git a/src/LinearSolve.jl b/src/LinearSolve.jl index 41b5616ce..2e5cc5071 100644 --- a/src/LinearSolve.jl +++ b/src/LinearSolve.jl @@ -42,6 +42,12 @@ PrecompileTools.@recompile_invalidations begin using SciMLBase using MKL_jll + + import Preferences +end + +if VERSION >= v"1.8" && Preferences.@load_preference("TriggerMKLLBT", true) + using MKL end using Reexport