Skip to content

Commit

Permalink
Merge pull request #521 from SciML/namespace_Rcall
Browse files Browse the repository at this point in the history
Rename the extension packages and do RCall as well
  • Loading branch information
ChrisRackauckas authored Oct 7, 2023
2 parents a8b39e9 + e69a1ac commit 06d85d6
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 6 deletions.
9 changes: 6 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,14 @@ ZygoteRules = "700de1a5-db45-46bc-99cf-38207098b444"
[weakdeps]
PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d"
RCall = "6f49c342-dc21-5d91-9882-a32aef131414"
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"

[extensions]
PyCallExt = "PyCall"
PythonCallExt = "PythonCall"
ZygoteExt = "Zygote"
SciMLBasePyCallExt = "PyCall"
SciMLBasePythonCallExt = "PythonCall"
SciMLBaseRCallExt = "RCall"
SciMLBaseZygoteExt = "Zygote"

[compat]
ADTypes = "0.1.3, 0.2"
Expand All @@ -55,6 +57,7 @@ FunctionWrappersWrappers = "0.1.3"
IteratorInterfaceExtensions = "^0.1, ^1"
PrecompileTools = "1"
Preferences = "1.3"
RCall = "0.13.18"
RecipesBase = "0.7.0, 0.8, 1.0"
RecursiveArrayTools = "2.33"
Reexport = "1"
Expand Down
2 changes: 1 addition & 1 deletion ext/PyCallExt.jl → ext/SciMLBasePyCallExt.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module PyCallExt
module SciMLBasePyCallExt

using PyCall: PyCall, PyObject, PyAny, pyfunctionret, pyimport, hasproperty
using SciMLBase: SciMLBase, solve
Expand Down
2 changes: 1 addition & 1 deletion ext/PythonCallExt.jl → ext/SciMLBasePythonCallExt.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module PythonCallExt
module SciMLBasePythonCallExt

using PythonCall: Py, PyList, pyimport, hasproperty, pyconvert, pyisinstance, pybuiltins
using SciMLBase: SciMLBase
Expand Down
11 changes: 11 additions & 0 deletions ext/SciMLBaseRCallExt.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module SciMLBaseRCallExt

using RCall: RFunction
using SciMLBase

# Always assume a function from R is not in-place because copy-on-write disallows it!
function SciMLBase.isinplace(f::RFunction, args...; kwargs...)
false
end

end
2 changes: 1 addition & 1 deletion ext/ZygoteExt.jl → ext/SciMLBaseZygoteExt.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module ZygoteExt
module SciMLBaseZygoteExt

using Zygote: pullback
using ZygoteRules: @adjoint
Expand Down

0 comments on commit 06d85d6

Please sign in to comment.