Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,10 @@ updates:
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
ignore:
- dependency-name: "crate-ci/typos"
update-types: ["version-update:semver-patch", "version-update:semver-minor"]
- package-ecosystem: "julia"
directories:
- "/"
- "/docs"
- "/test"
schedule:
interval: "daily"
groups:
Expand Down
25 changes: 7 additions & 18 deletions .github/workflows/Downgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,11 @@ on:
paths-ignore:
- 'docs/**'
jobs:
test:
downgrade:
if: false
runs-on: ubuntu-latest
strategy:
matrix:
downgrade_mode: ['alldeps']
julia-version: ['1.10']
steps:
- uses: actions/checkout@v6
- uses: julia-actions/setup-julia@v2
with:
version: ${{ matrix.julia-version }}
- uses: julia-actions/julia-downgrade-compat@v2
with:
skip: Pkg,TOML
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
with:
ALLOW_RERESOLVE: false
name: "Downgrade"
uses: "SciML/.github/.github/workflows/downgrade.yml@v1"
with:
julia-version: "1.10"
skip: "Pkg,TOML"
secrets: "inherit"
49 changes: 8 additions & 41 deletions .github/workflows/Downstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,10 @@ on:

jobs:
test:
name: ${{ matrix.package.repo }}/${{ matrix.package.group }}/${{ matrix.julia-version }}
runs-on: ${{ matrix.os }}
env:
GROUP: ${{ matrix.package.group }}
name: ${{ matrix.package.repo }}/${{ matrix.package.group }}
strategy:
fail-fast: false
matrix:
julia-version: [1]
os: [ubuntu-latest]
package:
- {user: SciML, repo: MethodOfLines.jl, group: Components}
- {user: SciML, repo: MethodOfLines.jl, group: Sol_Interface}
Expand All @@ -33,38 +28,10 @@ jobs:
- {user: SciML, repo: PDESystemLibrary.jl, group: MOL}
- {user: SciML, repo: NeuralPDE.jl, group: NNPDE1}
- {user: SciML, repo: NeuralPDE.jl, group: NNPDE2}
steps:
- uses: actions/checkout@v6
- uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.julia-version }}
arch: x64
- uses: julia-actions/julia-buildpkg@latest
- name: Clone Downstream
uses: actions/checkout@v6
with:
repository: ${{ matrix.package.user }}/${{ matrix.package.repo }}
path: downstream
- name: Load this and run the downstream tests
shell: julia --color=yes --project=downstream {0}
run: |
using Pkg
try
# force it to use this PR's version of the package
Pkg.develop(PackageSpec(path=".")) # resolver may fail with main deps
Pkg.update()
Pkg.test(coverage=true) # resolver may fail with test time deps
catch err
err isa Pkg.Resolve.ResolverError || rethrow()
# If we can't resolve that means this is incompatible by SemVer and this is fine
# It means we marked this as a breaking change, so we don't need to worry about
# Mistakenly introducing a breaking change, as we have intentionally made one
@info "Not compatible with this release. No problem." exception=err
exit(0) # Exit immediately, as a success
end
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v5
with:
files: lcov.info
token: ${{ secrets.CODECOV_TOKEN }}
fail_ci_if_error: true
uses: "SciML/.github/.github/workflows/downstream.yml@v1"
with:
julia-version: "1"
owner: "${{ matrix.package.user }}"
repo: "${{ matrix.package.repo }}"
group: "${{ matrix.package.group }}"
secrets: "inherit"
12 changes: 3 additions & 9 deletions .github/workflows/FormatCheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ on:

jobs:
runic:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: julia-actions/setup-julia@v2
with:
version: '1'
- uses: fredrikekre/runic-action@v1
with:
version: '1'
name: "Runic"
uses: "SciML/.github/.github/workflows/runic.yml@v1"
secrets: "inherit"
10 changes: 3 additions & 7 deletions .github/workflows/SpellCheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ on: [pull_request]

jobs:
typos-check:
name: Spell Check with Typos
runs-on: ubuntu-latest
steps:
- name: Checkout Actions Repository
uses: actions/checkout@v6
- name: Check spelling
uses: crate-ci/typos@v1.18.0
name: "Spell Check with Typos"
uses: "SciML/.github/.github/workflows/spellcheck.yml@v1"
secrets: "inherit"
8 changes: 4 additions & 4 deletions src/discretization_state.jl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ end
function generate_system(
disc_state::EquationState, s, u0, tspan, metadata,
disc::AbstractEquationSystemDiscretization;
checks=true
checks = true
)
discvars = get_discvars(s)
t = get_time(disc)
Expand Down Expand Up @@ -69,9 +69,9 @@ end
function SciMLBase.discretize(
pdesys::PDESystem,
discretization::AbstractEquationSystemDiscretization;
analytic = nothing, checks=true, kwargs...
analytic = nothing, checks = true, kwargs...
)
sys, tspan = SciMLBase.symbolic_discretize(pdesys, discretization; checks=checks)
sys, tspan = SciMLBase.symbolic_discretize(pdesys, discretization; checks = checks)
return try
simpsys = mtkcompile(sys)
if tspan === nothing
Expand All @@ -94,7 +94,7 @@ function SciMLBase.discretize(
ps_raw = get_ps(mol_metadata.pdesys)
if ps_raw !== nothing && ps_raw !== SciMLBase.NullParameters() && !isempty(ps_raw)
# get_ps may return Pairs (e.g. [v => 0.5]); extract parameter values
param_vals = Dict{Any,Any}()
param_vals = Dict{Any, Any}()
if first(ps_raw) isa Pair
for p in ps_raw
param_vals[first(p)] = last(p)
Expand Down
2 changes: 1 addition & 1 deletion src/interface_defaults.jl
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ function generate_system(
disc_state::AbstractDiscretizationState, s::AbstractDiscreteSpace,
u0, tspan, metadata::AbstractDiscretizationMetadata,
discretization::AbstractDiscretization;
checks=true
checks = true
)
return nothing
end
Expand Down
2 changes: 1 addition & 1 deletion src/make_pdesys_compatible.jl
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ function handle_complex(pdesys)
half = n_eqs ÷ 2
eqs = vcat(
[_replace_ops(eq.lhs, redvmaps_dict) ~ _replace_ops(eq.rhs, redvmaps_dict) for eq in eqs_flat[1:half]],
[_replace_ops(eq.lhs, imdvmaps_dict) ~ _replace_ops(eq.rhs, imdvmaps_dict) for eq in eqs_flat[half+1:end]]
[_replace_ops(eq.lhs, imdvmaps_dict) ~ _replace_ops(eq.rhs, imdvmaps_dict) for eq in eqs_flat[(half + 1):end]]
)
else
# Odd number of equations - just rename all with real maps
Expand Down
4 changes: 2 additions & 2 deletions src/symbolic_discretize.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function cardinalize_eqs!(pdesys)
return
end

function SciMLBase.symbolic_discretize(pdesys::PDESystem, discretization::AbstractDiscretization; checks=true)
function SciMLBase.symbolic_discretize(pdesys::PDESystem, discretization::AbstractDiscretization; checks = true)
t = get_time(discretization)
pdesys, complexmap = handle_complex(pdesys)
cardinalize_eqs!(pdesys)
Expand Down Expand Up @@ -96,5 +96,5 @@ function SciMLBase.symbolic_discretize(pdesys::PDESystem, discretization::Abstra
# Pass u0 to generate_metadata for storage (needed for MTK v11 compatibility)
metadata = generate_metadata(s, discretization, pdesys, boundarymap, complexmap, u0)

return generate_system(disc_state, s, u0, tspan, metadata, discretization; checks=checks)
return generate_system(disc_state, s, u0, tspan, metadata, discretization; checks = checks)
end
Loading