From 28e8a720ae9bb36b1b7489df09d74b4643a199ad Mon Sep 17 00:00:00 2001 From: Arno Strouwen Date: Fri, 22 Dec 2023 16:39:51 +0100 Subject: [PATCH 1/2] downgrade CI --- .github/workflows/Downgrade.yml | 31 +++++++++++++++++ Project.toml | 60 ++++++++++++++++----------------- src/LinearSolve.jl | 1 - src/init.jl | 18 +--------- 4 files changed, 61 insertions(+), 49 deletions(-) create mode 100644 .github/workflows/Downgrade.yml diff --git a/.github/workflows/Downgrade.yml b/.github/workflows/Downgrade.yml new file mode 100644 index 000000000..d365424e3 --- /dev/null +++ b/.github/workflows/Downgrade.yml @@ -0,0 +1,31 @@ +name: Downgrade +on: + pull_request: + branches: + - main + paths-ignore: + - 'docs/**' + push: + branches: + - main + paths-ignore: + - 'docs/**' +jobs: + test: + runs-on: ubuntu-latest + strategy: + matrix: + version: ['1'] + group: + - Core + steps: + - uses: actions/checkout@v4 + - uses: julia-actions/setup-julia@v1 + with: + version: ${{ matrix.version }} + - uses: cjdoris/julia-downgrade-compat-action@v1 +# if: ${{ matrix.version == '1.6' }} + with: + skip: Pkg,TOML + - uses: julia-actions/julia-buildpkg@v1 + - uses: julia-actions/julia-runtest@v1 \ No newline at end of file diff --git a/Project.toml b/Project.toml index ba9907272..d92da9de9 100644 --- a/Project.toml +++ b/Project.toml @@ -20,7 +20,6 @@ PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a" Preferences = "21216c6a-2e73-6563-6e65-726566657250" RecursiveFactorization = "f2c3362d-daeb-58d1-803e-2bc74f2840b4" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" -Requires = "ae029012-a4dd-5104-9daa-d747884805df" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" SciMLOperators = "c0aeaf25-5076-4817-a8d5-81caf7dfa961" Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46" @@ -61,51 +60,50 @@ LinearSolveRecursiveArrayToolsExt = "RecursiveArrayTools" [compat] AllocCheck = "0.1" Aqua = "0.8" -ArrayInterface = "7.4.11" -BandedMatrices = "1" -BlockDiagonals = "0.1" +ArrayInterface = "7.7" +BandedMatrices = "1.4" +BlockDiagonals = "0.1.42" CUDA = "5" -ConcreteStructs = "0.2" -DocStringExtensions = "0.9" +ConcreteStructs = "0.2.3" +DocStringExtensions = "0.9.3" EnumX = "1" -Enzyme = "0.11" -EnzymeCore = "0.6" +Enzyme = "0.11.11" +EnzymeCore = "0.6.4" FastAlmostBandedMatrices = "0.1" FastLapackInterface = "2" -FiniteDiff = "2" -ForwardDiff = "0.10" -GPUArraysCore = "0.1" -HYPRE = "1.4.0" -InteractiveUtils = "1.6" +FiniteDiff = "2.21" +ForwardDiff = "0.10.36" +GPUArraysCore = "0.1.5" +HYPRE = "1.5.0" +InteractiveUtils = "1.9" IterativeSolvers = "0.9.3" -JET = "0.8" -KLU = "0.3.0, 0.4" +JET = "0.8.21" +KLU = "0.4.1" KernelAbstractions = "0.9" -Krylov = "0.9" +Krylov = "0.9.5" KrylovKit = "0.6" -Libdl = "1.6" +Libdl = "1.9" LinearAlgebra = "1.9" -MPI = "0.20" +MPI = "0.20.19" Metal = "0.5" MultiFloats = "1" Pardiso = "0.5" Pkg = "1" -PrecompileTools = "1" -Preferences = "1" +PrecompileTools = "1.2" +Preferences = "1.4" Random = "1" -RecursiveArrayTools = "2, 3" -RecursiveFactorization = "0.2.8" -Reexport = "1" -Requires = "1" +RecursiveArrayTools = "3.2" +RecursiveFactorization = "0.2.21" +Reexport = "1.2" SafeTestsets = "0.1" -SciMLBase = "2" -SciMLOperators = "0.3" -Setfield = "1" +SciMLBase = "2.11" +SciMLOperators = "0.3.7" +Setfield = "1.1" SparseArrays = "1.9" -Sparspak = "0.3.6" -StaticArrays = "1" -StaticArraysCore = "1" -Test = "1" +Sparspak = "0.3.9" +StaticArrays = "1.8" +StaticArraysCore = "1.4" +Test = "1.9" UnPack = "1" julia = "1.9" diff --git a/src/LinearSolve.jl b/src/LinearSolve.jl index 572e310e9..fc039d13f 100644 --- a/src/LinearSolve.jl +++ b/src/LinearSolve.jl @@ -23,7 +23,6 @@ PrecompileTools.@recompile_invalidations begin using FastLapackInterface using DocStringExtensions using EnumX - using Requires import InteractiveUtils import StaticArraysCore: StaticArray, SVector, MVector, SMatrix, MMatrix diff --git a/src/init.jl b/src/init.jl index 1291b4556..e10960f1d 100644 --- a/src/init.jl +++ b/src/init.jl @@ -1,19 +1,3 @@ function __init__() - @static if VERSION < v"1.7beta" - blas = BLAS.vendor() - IS_OPENBLAS[] = blas == :openblas64 || blas == :openblas - else - IS_OPENBLAS[] = occursin("openblas", BLAS.get_config().loaded_libs[1].libname) - end - @static if !isdefined(Base, :get_extension) - @require IterativeSolvers="b77e0a4c-d291-57a0-90e8-8db25a27a240" begin - include("../ext/LinearSolveIterativeSolversExt.jl") - end - @require KrylovKit="0b1a1467-8014-51b9-945f-bf0ae24f4b77" begin - include("../ext/LinearSolveKrylovKitExt.jl") - end - @require Enzyme="7da242da-08ed-463a-9acd-ee780be4f1d9" begin - include("../ext/LinearSolveEnzymeExt.jl") - end - end + IS_OPENBLAS[] = occursin("openblas", BLAS.get_config().loaded_libs[1].libname) end From 4cc2075395f5ac27fd2f4bef86aa442f65cac564 Mon Sep 17 00:00:00 2001 From: Arno Strouwen Date: Fri, 22 Dec 2023 18:44:03 +0100 Subject: [PATCH 2/2] loosen bounds --- Project.toml | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Project.toml b/Project.toml index d92da9de9..1ba11e509 100644 --- a/Project.toml +++ b/Project.toml @@ -60,50 +60,50 @@ LinearSolveRecursiveArrayToolsExt = "RecursiveArrayTools" [compat] AllocCheck = "0.1" Aqua = "0.8" -ArrayInterface = "7.7" -BandedMatrices = "1.4" +ArrayInterface = "7.5" +BandedMatrices = "1" BlockDiagonals = "0.1.42" CUDA = "5" -ConcreteStructs = "0.2.3" -DocStringExtensions = "0.9.3" +ConcreteStructs = "0.2" +DocStringExtensions = "0.9" EnumX = "1" -Enzyme = "0.11.11" -EnzymeCore = "0.6.4" +Enzyme = "0.11.10" +EnzymeCore = "0.6.2" FastAlmostBandedMatrices = "0.1" FastLapackInterface = "2" -FiniteDiff = "2.21" -ForwardDiff = "0.10.36" -GPUArraysCore = "0.1.5" -HYPRE = "1.5.0" +FiniteDiff = "2.18" +ForwardDiff = "0.10.13" +GPUArraysCore = "0.1" +HYPRE = "1.4.0" InteractiveUtils = "1.9" IterativeSolvers = "0.9.3" -JET = "0.8.21" -KLU = "0.4.1" +JET = "0.8" +KLU = "0.3.0, 0.4" KernelAbstractions = "0.9" -Krylov = "0.9.5" +Krylov = "0.9" KrylovKit = "0.6" Libdl = "1.9" LinearAlgebra = "1.9" -MPI = "0.20.19" +MPI = "0.20" Metal = "0.5" MultiFloats = "1" Pardiso = "0.5" Pkg = "1" -PrecompileTools = "1.2" +PrecompileTools = "1.1" Preferences = "1.4" Random = "1" -RecursiveArrayTools = "3.2" -RecursiveFactorization = "0.2.21" -Reexport = "1.2" +RecursiveArrayTools = "2.38, 3" +RecursiveFactorization = "0.2.14" +Reexport = "1" SafeTestsets = "0.1" -SciMLBase = "2.11" -SciMLOperators = "0.3.7" -Setfield = "1.1" +SciMLBase = "2" +SciMLOperators = "0.3" +Setfield = "1" SparseArrays = "1.9" -Sparspak = "0.3.9" -StaticArrays = "1.8" -StaticArraysCore = "1.4" -Test = "1.9" +Sparspak = "0.3.6" +StaticArrays = "1.5" +StaticArraysCore = "1.2" +Test = "1" UnPack = "1" julia = "1.9" @@ -133,4 +133,4 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["Aqua", "Test", "IterativeSolvers", "InteractiveUtils", "JET", "KrylovKit", "Pkg", "Random", "SafeTestsets", "MultiFloats", "ForwardDiff", "HYPRE", "MPI", "BlockDiagonals", "Enzyme", "FiniteDiff", "BandedMatrices", "FastAlmostBandedMatrices", "StaticArrays", "AllocCheck"] +test = ["Aqua", "Test", "IterativeSolvers", "InteractiveUtils", "JET", "KrylovKit", "Pkg", "Random", "SafeTestsets", "MultiFloats", "ForwardDiff", "HYPRE", "MPI", "BlockDiagonals", "Enzyme", "FiniteDiff", "BandedMatrices", "FastAlmostBandedMatrices", "StaticArrays", "AllocCheck"] \ No newline at end of file