Skip to content

Commit

Permalink
Merge pull request #239 from SciML/ap/deps
Browse files Browse the repository at this point in the history
Remove Packages that are no longer needed in 1.10
  • Loading branch information
ChrisRackauckas authored Feb 26, 2024
2 parents b79f2e1 + 0f21d64 commit 0cdfd8a
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 15 deletions.
1 change: 0 additions & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ jobs:
- Core
version:
- '1'
- '1.6'
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Downstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
GROUP: ${{ matrix.package.group }}
strategy:
matrix:
julia-version: [1,1.6]
julia-version: [1]
os: [ubuntu-latest]
package:
- {user: SciML, repo: SciMLBase.jl, group: InterfaceII}
Expand Down
12 changes: 5 additions & 7 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
name = "SciMLOperators"
uuid = "c0aeaf25-5076-4817-a8d5-81caf7dfa961"
authors = ["Vedant Puri <[email protected]>"]
version = "0.3.7"
version = "0.3.8"

[deps]
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
Lazy = "50d2b5c4-7a5e-59d5-8109-a42b560f39c0"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
Tricks = "410a4b4d-49e4-4fbc-ab6d-cb71b17b3775"

[compat]
ArrayInterface = "7"
DocStringExtensions = "0.8, 0.9"
Lazy = "0.15"
LinearAlgebra = "1.6"
MacroTools = "0.5"
Setfield = "0.8, 1"
StaticArraysCore = "1"
SparseArrays = "1.6"
Tricks = "0.1.6"
julia = "1.6"
StaticArraysCore = "1"
julia = "1.10"
3 changes: 1 addition & 2 deletions src/SciMLOperators.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ using LinearAlgebra
import SparseArrays
import StaticArraysCore
import ArrayInterface
import Tricks: static_hasmethod
import Lazy: @forward
import MacroTools: @forward
import Setfield: @set!

# overload
Expand Down
8 changes: 4 additions & 4 deletions src/func.jl
Original file line number Diff line number Diff line change
Expand Up @@ -265,15 +265,15 @@ function FunctionOperator(op,
# evaluation signatures

_isinplace = if isinplace === nothing
Val(static_hasmethod(op, typeof((output, input, p, _t))))
Val(hasmethod(op, typeof((output, input, p, _t))))
elseif isinplace isa Bool
Val(isinplace)
else
isinplace
end

_outofplace = if outofplace === nothing
Val(static_hasmethod(op, typeof((input, p, _t))))
Val(hasmethod(op, typeof((input, p, _t))))
elseif outofplace isa Bool
Val(outofplace)
else
Expand Down Expand Up @@ -342,7 +342,7 @@ end

@inline __has_mul5(::Nothing, y, x, p, t) = Val(true)
@inline function __has_mul5(f::F, y, x, p, t) where {F}
return Val(static_hasmethod(f, typeof((y, x, p, t, t, t))))
return Val(hasmethod(f, typeof((y, x, p, t, t, t))))
end
@inline __and_val(vs...) = mapreduce(_unwrap_val, *, vs)

Expand Down Expand Up @@ -542,7 +542,7 @@ function Base.resize!(L::FunctionOperator, n::Integer)
end

for op in getops(L)
if static_hasmethod(resize!, typeof((op, n)))
if hasmethod(resize!, typeof((op, n)))
resize!(op, n)
end
end
Expand Down

2 comments on commit 0cdfd8a

@avik-pal
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/101761

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.3.8 -m "<description of version>" 0cdfd8af2e8d2da04ab8e1cff9225a723865d980
git push origin v0.3.8

Please sign in to comment.