Merge pull request #219 from control-toolbox/develop

Develop

Author: jbcaillau

.github/workflows/Breakage.yml

@@ -20,3 +20,6 @@ jobs:
       pkgname: ${{ matrix.pkgname }}
       pkgpath: ${{ matrix.pkgpath }}
       pkgversion: ${{ matrix.pkgversion }}
+      use_ct_registry: true
+    secrets:
+      SSH_KEY: ${{ secrets.SSH_KEY }}

.github/workflows/Coverage.yml

@@ -8,5 +8,8 @@ on:
 jobs:
   call:
     uses: control-toolbox/CTActions/.github/workflows/coverage.yml@main
+    with:
+      use_ct_registry: true
     secrets:
       codecov-secret: ${{ secrets.CODECOV_TOKEN }}
+      SSH_KEY: ${{ secrets.SSH_KEY }}

Project.toml

@@ -1,13 +1,11 @@
 name = "CTParser"
 uuid = "32681960-a1b1-40db-9bff-a1ca817385d1"
-version = "0.8.3-beta"
+version = "0.8.6"
 authors = ["Jean-Baptiste Caillau <jean-baptiste.caillau@univ-cotedazur.fr>"]
 
 [deps]
 CTBase = "54762871-cc72-4466-b8e8-f6c8b58076cd"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
-ExaModels = "1037b233-b668-4ce9-9b63-f9f681f55dd2"
-LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078"
 OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
 Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
@@ -16,8 +14,6 @@ Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
 [compat]
 CTBase = "0.18"
 DocStringExtensions = "0.9"
-ExaModels = "0.9.3"
-LinearAlgebra = "1"
 MLStyle = "0.4"
 OrderedCollections = "1"
 Parameters = "0.12"

src/CTParser.jl

@@ -22,7 +22,6 @@ using Unicode
 # sources
 include("defaults.jl")
 include("utils.jl")
-include("exa_linalg.jl")
 include("onepass.jl")
 include("initial_guess.jl")
 

src/exa_linalg.jl

@@ -311,7 +311,7 @@ When `log = true`, the macro additionally prints a human-readable
 
 # Returns
 
-- `AbstractOptimalControlInitialGuess`: backend-specific initial guess
+- `AbstractInitialGuess`: backend-specific initial guess
   object produced by the current backend (par défaut `CTModels`).
 
 # Example
@@ -333,7 +333,7 @@ julia> ig = @init ocp begin
            u(t) := t
        end
 
-julia> ig isa CTModels.AbstractOptimalControlInitialGuess
+julia> ig isa CTModels.AbstractInitialGuess
 true
 ```
 """

src/initial_guess.jl

@@ -18,14 +18,13 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Aqua = "0.8"
 BenchmarkTools = "1"
 CTBase = "0.18"
-CTModels = "0.8"
+CTModels = "0.9"
 CUDA = "5"
-ExaModels = "0.9"
 Interpolations = "0.16"
 KernelAbstractions = "0.9"
 LinearAlgebra = "1"
-MadNLP = "0.8"
-MadNLPGPU = "0.7"
+MadNLP = "0.9"
+MadNLPGPU = "0.8"
 NLPModels = "0.21"
 OrderedCollections = "1.8"
 Test = "1.10"

test/Project.toml

@@ -50,14 +50,14 @@ import CTModels:
     criterion,
     Model,
     get_build_examodel
-using ExaModels: ExaModels
+using ExaModels
+using LinearAlgebra
 using MadNLP
 using MadNLPGPU
 using CUDA
 using BenchmarkTools
 using Interpolations
 using NLPModels
-using LinearAlgebra
 
 include("utils.jl")
 
@@ -69,7 +69,7 @@ CTBase.run_tests(;
     args=String.(ARGS),
     testset_name="CTParser tests",
     available_tests=(
-        "suite/test_*",
+        "test_*",
         ),
     filename_builder=name -> "test_$(name).jl",
     funcname_builder=name -> "test_$(name)",

test/runtests.jl

@@ -7,9 +7,5 @@ function test_aqua()
             deps_compat=(ignore=[:LinearAlgebra, :Unicode],),
             piracies=true,
         )
-        # Test ExaLinAlg submodule for type piracy
-        #@testset "ExaLinAlg piracy" begin
-        #    Aqua.test_piracies(CTParser.ExaLinAlg)
-        #end
     end
 end