Merge pull request #953 from matthieubulte/master

Update usage of DestructuredArgs to use inbounds keyword

Author: ChrisRackauckas

Project.toml

@@ -65,7 +65,7 @@ SciMLBase = "1.3"
 Setfield = "0.7"
 SpecialFunctions = "0.7, 0.8, 0.9, 0.10, 1.0"
 StaticArrays = "0.10, 0.11, 0.12, 1.0"
-SymbolicUtils = "0.10"
+SymbolicUtils = "0.10.1"
 Symbolics = "0.1.14"
 UnPack = "0.1, 1.0"
 Unitful = "1.1"

src/structural_transformation/codegen.jl

@@ -123,7 +123,7 @@ function partitions_dag(s::SystemStructure)
     sparse(I, J, true, n, n)
 end
 
-function gen_nlsolve(sys, eqs, vars)
+function gen_nlsolve(sys, eqs, vars; checkbounds=true)
     @assert !isempty(vars)
     @assert length(eqs) == length(vars)
     rhss = map(x->x.rhs, eqs)
@@ -141,8 +141,8 @@ function gen_nlsolve(sys, eqs, vars)
     fname = gensym("fun")
     f = Func(
         [
-         DestructuredArgs(vars)
-         DestructuredArgs(params)
+         DestructuredArgs(vars, inbounds=!checkbounds)
+         DestructuredArgs(params, inbounds=!checkbounds)
         ],
         [],
         isscalar ? rhss[1] : MakeArray(rhss, SVector)
@@ -160,7 +160,7 @@ function gen_nlsolve(sys, eqs, vars)
 
     [
      fname ← @RuntimeGeneratedFunction(f)
-     DestructuredArgs(vars) ← solver_call
+     DestructuredArgs(vars, inbounds=!checkbounds) ← solver_call
     ]
 end
 
@@ -204,8 +204,8 @@ function build_torn_function(
         Func(
              [
               out
-              DestructuredArgs(states)
-              DestructuredArgs(parameters(sys))
+              DestructuredArgs(states, inbounds=!checkbounds)
+              DestructuredArgs(parameters(sys), inbounds=!checkbounds)
               independent_variable(sys)
              ],
              [],
@@ -221,7 +221,7 @@ function build_torn_function(
         observedfun = let sys = sys, dict = Dict()
             function generated_observed(obsvar, u, p, t)
                 obs = get!(dict, value(obsvar)) do
-                    build_observed_function(sys, obsvar)
+                    build_observed_function(sys, obsvar, checkbounds=checkbounds)
                 end
                 obs(u, p, t)
             end
@@ -256,7 +256,8 @@ end
 function build_observed_function(
         sys, syms;
         expression=false,
-        output_type=Array
+        output_type=Array,
+        checkbounds=true
     )
 
     if (isscalar = !(syms isa Vector))
@@ -292,7 +293,7 @@ function build_observed_function(
         torn_eqs  = map(idxs-> eqs[idxs[3]], subset)
         torn_vars = map(idxs->fullvars[idxs[4]], subset)
 
-        solves = gen_nlsolve.((sys,), torn_eqs, torn_vars)
+        solves = gen_nlsolve.((sys,), torn_eqs, torn_vars; checkbounds=checkbounds)
     else
         solves = []
     end
@@ -307,8 +308,8 @@ function build_observed_function(
 
     ex = Func(
         [
-         DestructuredArgs(diffvars)
-         DestructuredArgs(parameters(sys))
+         DestructuredArgs(diffvars, inbounds=!checkbounds)
+         DestructuredArgs(parameters(sys), inbounds=!checkbounds)
          independent_variable(sys)
         ],
         [],

src/systems/diffeqs/abstractodesystem.jl

@@ -158,17 +158,19 @@ function DiffEqBase.ODEFunction{iip}(sys::AbstractODESystem, dvs = states(sys),
                                      eval_expression = true,
                                      sparse = false, simplify=false,
                                      eval_module = @__MODULE__,
+                                     checkbounds=false,
                                      kwargs...) where {iip}
 
-    f_gen = generate_function(sys, dvs, ps; expression=Val{eval_expression}, expression_module=eval_module, kwargs...)
+    f_gen = generate_function(sys, dvs, ps; expression=Val{eval_expression}, expression_module=eval_module, checkbounds=checkbounds, kwargs...)
     f_oop,f_iip = eval_expression ? (@RuntimeGeneratedFunction(eval_module, ex) for ex in f_gen) : f_gen
     f(u,p,t) = f_oop(u,p,t)
     f(du,u,p,t) = f_iip(du,u,p,t)
 
     if tgrad
         tgrad_gen = generate_tgrad(sys, dvs, ps;
                                    simplify=simplify,
-                                   expression=Val{eval_expression}, expression_module=eval_module, kwargs...)
+                                   expression=Val{eval_expression}, expression_module=eval_module,
+                                   checkbounds=checkbounds, kwargs...)
         tgrad_oop,tgrad_iip = eval_expression ? (@RuntimeGeneratedFunction(eval_module, ex) for ex in tgrad_gen) : tgrad_gen
         _tgrad(u,p,t) = tgrad_oop(u,p,t)
         _tgrad(J,u,p,t) = tgrad_iip(J,u,p,t)
@@ -179,7 +181,8 @@ function DiffEqBase.ODEFunction{iip}(sys::AbstractODESystem, dvs = states(sys),
     if jac
         jac_gen = generate_jacobian(sys, dvs, ps;
                                     simplify=simplify, sparse = sparse,
-                                    expression=Val{eval_expression}, expression_module=eval_module, kwargs...)
+                                    expression=Val{eval_expression}, expression_module=eval_module, 
+                                    checkbounds=checkbounds, kwargs...)
         jac_oop,jac_iip = eval_expression ? (@RuntimeGeneratedFunction(eval_module, ex) for ex in jac_gen) : jac_gen
         _jac(u,p,t) = jac_oop(u,p,t)
         _jac(J,u,p,t) = jac_iip(J,u,p,t)
@@ -194,7 +197,7 @@ function DiffEqBase.ODEFunction{iip}(sys::AbstractODESystem, dvs = states(sys),
     observedfun = let sys = sys, dict = Dict()
         function generated_observed(obsvar, u, p, t)
             obs = get!(dict, value(obsvar)) do
-                build_explicit_observed_function(sys, obsvar)
+                build_explicit_observed_function(sys, obsvar; checkbounds=checkbounds)
             end
             obs(u, p, t)
         end

src/systems/diffeqs/odesystem.jl

@@ -234,7 +234,8 @@ i.e. there are no cycles.
 function build_explicit_observed_function(
         sys, syms;
         expression=false,
-        output_type=Array)
+        output_type=Array,
+        checkbounds=true)
 
     if (isscalar = !(syms isa Vector))
         syms = [syms]
@@ -254,8 +255,8 @@ function build_explicit_observed_function(
 
     ex = Func(
         [
-         DestructuredArgs(states(sys))
-         DestructuredArgs(parameters(sys))
+         DestructuredArgs(states(sys), inbounds=!checkbounds)
+         DestructuredArgs(parameters(sys), inbounds=!checkbounds)
          independent_variable(sys)
         ],
         [],