diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4dd50d9..46c3be8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -30,11 +30,24 @@ jobs: os: - ubuntu-latest - windows-latest + - macos-13 arch: - x64 - - x86 + include: + - version: '1' + os: ubuntu-24.04-arm + arch: arm64 + - version: '1' + os: macos-latest + arch: arm64 steps: - uses: actions/checkout@v4 + - name: Install compilers + uses: fortran-lang/setup-fortran@main + with: + compiler: 'gcc' + version: '14' + if: matrix.os == 'macos-latest' || matrix.os == 'macos-13' - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} diff --git a/Project.toml b/Project.toml index 19e8737..ebba102 100644 --- a/Project.toml +++ b/Project.toml @@ -1,12 +1,11 @@ name = "PRIMA" uuid = "0a7d04aa-8ac2-47b3-b7a7-9dbd6ad661ed" authors = ["Éric Thiébaut and contributors"] -version = "0.2.3" +version = "0.2.4" [deps] LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" PRIMA_jll = "eead6e0c-2d5b-5641-a95c-b722de96d551" -Requires = "ae029012-a4dd-5104-9daa-d747884805df" TypeUtils = "c3b1956e-8857-4d84-9b79-890df85b1e67" [weakdeps] @@ -18,12 +17,11 @@ PRIMACUTEstExt = "CUTEst" PRIMANLPModelsExt = "NLPModels" [compat] -CUTEst = "1.0.1" -NLPModels = "0.21.3" +CUTEst = "1.3.2" +NLPModels = "0.21.5" PRIMA_jll = "0.7.1" -Requires = "1" -TypeUtils = "0.3, 1" -julia = "1.6" +TypeUtils = "1" +julia = "1.10" [extras] CUTEst = "1b53aba6-35b6-5f92-a507-53c67d53f819" diff --git a/ext/PRIMACUTEstExt.jl b/ext/PRIMACUTEstExt.jl index 487e310..d057d40 100644 --- a/ext/PRIMACUTEstExt.jl +++ b/ext/PRIMACUTEstExt.jl @@ -1,10 +1,6 @@ module PRIMACUTEstExt -if isdefined(Base, :get_extension) - using PRIMA, CUTEst -else - using ..PRIMA, ..CUTEst -end +using PRIMA, CUTEst for func in (:uobyqa, :newuoa, :bobyqa, :lincoa, :cobyla, :prima) @eval function PRIMA.$(Symbol(func,"_CUTEst"))(name::AbstractString; kwargs...) diff --git a/ext/PRIMANLPModelsExt.jl b/ext/PRIMANLPModelsExt.jl index 6f5a2eb..cbdc24a 100644 --- a/ext/PRIMANLPModelsExt.jl +++ b/ext/PRIMANLPModelsExt.jl @@ -1,10 +1,6 @@ module PRIMANLPModelsExt -if isdefined(Base, :get_extension) - using PRIMA, NLPModels -else - using ..PRIMA, ..NLPModels -end +using PRIMA, NLPModels # This structure is to wrap a non-linear problem model into a callable object. struct ObjectiveFunction{F<:AbstractNLPModel} <: Function diff --git a/src/PRIMA.jl b/src/PRIMA.jl index 2438e4e..712d312 100644 --- a/src/PRIMA.jl +++ b/src/PRIMA.jl @@ -8,9 +8,6 @@ export bobyqa, cobyla, lincoa, newuoa, prima, uobyqa, issuccess using TypeUtils using LinearAlgebra -isdefined(Base, :get_extension) || using Requires - - #------------------------------------------------------------------------------ # PUBLIC INTERFACE