From 8f857a47e207f26f667842fd83f2cc04393b10f3 Mon Sep 17 00:00:00 2001 From: Anant Thazhemadam Date: Thu, 2 May 2024 21:33:50 +0530 Subject: [PATCH 1/6] ci: update tests workflow to use centralised reusable workflow --- .github/workflows/CI.yml | 52 ------------------------------------- .github/workflows/Tests.yml | 35 +++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 52 deletions(-) delete mode 100644 .github/workflows/CI.yml create mode 100644 .github/workflows/Tests.yml diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml deleted file mode 100644 index fab5888ee..000000000 --- a/.github/workflows/CI.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: CI -on: - pull_request: - branches: - - master - paths-ignore: - - 'docs/**' - push: - branches: - - master - paths-ignore: - - 'docs/**' -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - group: - - Core - - DataDrivenDMD - - DataDrivenSR - - DataDrivenSparse - - DataDrivenLux - version: - - '1' - steps: - - uses: actions/checkout@v4 - - uses: julia-actions/setup-julia@v2 - with: - version: ${{ matrix.version }} - - uses: actions/cache@v4 - env: - cache-name: cache-artifacts - with: - path: ~/.julia/artifacts - key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }} - restore-keys: | - ${{ runner.os }}-test-${{ env.cache-name }}- - ${{ runner.os }}-test- - ${{ runner.os }}- - - uses: julia-actions/julia-buildpkg@v1 - - uses: julia-actions/julia-runtest@v1 - env: - GROUP: ${{ matrix.group }} - - uses: julia-actions/julia-processcoverage@v1 - with: - directories: src,lib/DataDrivenDMD/src,lib/DataDrivenSparse/src,lib/DataDrivenSR/src,lib/DataDrivenLux/src - - uses: codecov/codecov-action@v3 - with: - files: lcov.info - flags: ${{ matrix.group }} diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml new file mode 100644 index 000000000..c299e8c30 --- /dev/null +++ b/.github/workflows/Tests.yml @@ -0,0 +1,35 @@ +name: "Tests" + +on: + pull_request: + branches: + - master + paths-ignore: + - 'docs/**' + push: + branches: + - master + paths-ignore: + - 'docs/**' + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ github.ref_name != github.event.repository.default_branch || github.ref != 'refs/tags/v*' }} + +jobs: + tests: + name: "Tests" + strategy: + fail-fast: false + matrix: + group: + - Core + - DataDrivenDMD + - DataDrivenSR + - DataDrivenSparse + - DataDrivenLux + uses: "SciML/.github/.github/workflows/tests.yml@v1" + with: + group: "${{ matrix.group }}" + coverage-directories: "src, lib/DataDrivenDMD/src, lib/DataDrivenSparse/src, lib/DataDrivenSR/src, lib/DataDrivenLux/src" + secrets: "inherit" From b116957d6b174b7e03120b844c628eb70b9d2004 Mon Sep 17 00:00:00 2001 From: Anant Thazhemadam Date: Mon, 29 Jul 2024 21:17:20 +0200 Subject: [PATCH 2/6] ci(format-check): automatically comment formatting suggestions on PRs --- .github/workflows/FormatCheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/FormatCheck.yml b/.github/workflows/FormatCheck.yml index c240796cc..6185015c4 100644 --- a/.github/workflows/FormatCheck.yml +++ b/.github/workflows/FormatCheck.yml @@ -10,4 +10,4 @@ on: jobs: format-check: name: "Format Check" - uses: "SciML/.github/.github/workflows/format-check.yml@v1" + uses: "SciML/.github/.github/workflows/format-suggestions-on-pr.yml@v1" From c9674feb44896e73629834441770b4003d08e766 Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Wed, 31 Jul 2024 05:17:54 -0400 Subject: [PATCH 3/6] Update type.jl --- src/problem/type.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/problem/type.jl b/src/problem/type.jl index 75195caf5..b4adee884 100644 --- a/src/problem/type.jl +++ b/src/problem/type.jl @@ -334,7 +334,7 @@ function Base.getindex(p::AbstractDataDrivenProblem, i = :, j = :) end function (b::Basis{<:Any, <:Any})(p::AbstractDataDrivenProblem{<:Any, <:Any, <:Any}) - @unpack f = b + f = ModelingToolkit.get_f(b) _apply_vec_function(f, get_implicit_data(p), get_oop_args(p)...) end From 95008cb7a1239e992e84a806c15a1097c5fa0100 Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Wed, 31 Jul 2024 06:23:54 -0400 Subject: [PATCH 4/6] Update type.jl --- src/problem/type.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/problem/type.jl b/src/problem/type.jl index b4adee884..2040311a2 100644 --- a/src/problem/type.jl +++ b/src/problem/type.jl @@ -334,7 +334,7 @@ function Base.getindex(p::AbstractDataDrivenProblem, i = :, j = :) end function (b::Basis{<:Any, <:Any})(p::AbstractDataDrivenProblem{<:Any, <:Any, <:Any}) - f = ModelingToolkit.get_f(b) + f = getfield(b, :f) _apply_vec_function(f, get_implicit_data(p), get_oop_args(p)...) end From abfb0166e3b0effa436ffbe53e0779dea8cd58bb Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Wed, 31 Jul 2024 08:05:48 -0400 Subject: [PATCH 5/6] Update type.jl --- src/problem/type.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/problem/type.jl b/src/problem/type.jl index 2040311a2..08f2173b7 100644 --- a/src/problem/type.jl +++ b/src/problem/type.jl @@ -340,7 +340,7 @@ end function (b::Basis{<:Any, <:Any})(res::AbstractMatrix, p::AbstractDataDrivenProblem{<:Any, <:Any, <:Any}) - @unpack f = b + getfield(b, :f) _apply_vec_function!(f, res, get_implicit_data(p), get_oop_args(p)...) end From ccc986cf94464752f510f96d40bebd84bc4808c3 Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Wed, 31 Jul 2024 11:12:20 -0400 Subject: [PATCH 6/6] Update src/problem/type.jl --- src/problem/type.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/problem/type.jl b/src/problem/type.jl index 08f2173b7..764da1f5f 100644 --- a/src/problem/type.jl +++ b/src/problem/type.jl @@ -340,7 +340,7 @@ end function (b::Basis{<:Any, <:Any})(res::AbstractMatrix, p::AbstractDataDrivenProblem{<:Any, <:Any, <:Any}) - getfield(b, :f) + f = getfield(b, :f) _apply_vec_function!(f, res, get_implicit_data(p), get_oop_args(p)...) end