Skip to content

slim exported swig interface #1425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FFroehlich merged 10 commits into from
Feb 18, 2021
Merged

slim exported swig interface #1425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fe476f8
slim model/abstract model
FFroehlich Feb 9, 2021
6145da2
Merge branch 'develop' into slim_swig
Feb 17, 2021
b526ff6
ignore context managers
FFroehlich Feb 17, 2021
67bc076
Merge branch 'slim_swig' of https://github.com/AMICI-dev/AMICI into s…
FFroehlich Feb 17, 2021
9aebd9e
add ignores for solver
FFroehlich Feb 17, 2021
9388dce
try again to get rid of context managers
FFroehlich Feb 17, 2021
9b2acf6
fixup?
FFroehlich Feb 17, 2021
e21f76c
fixup
FFroehlich Feb 17, 2021
1091bbe
add more model ignores
FFroehlich Feb 17, 2021
be544f8
Update swig/amici.i
Feb 17, 2021
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
36 changes: 36 additions & 0 deletions swig/abstract_model.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,41 @@
%ignore fdJydy;
%ignore fdJydy_colptrs;
%ignore fdJydy_rowvals;
%ignore fJrz;
%ignore fJy;
%ignore fJz;
%ignore fdJrzdsigma;
%ignore fdJrzdz;
%ignore fdJzdsigma;
%ignore fdJzdz;
%ignore fdJydsigma;
%ignore fdeltaqB;
%ignore fdeltasx;
%ignore fdeltax;
%ignore fdeltaxB;
%ignore fdrzdp;
%ignore fdrzdx;
%ignore fdsigmaydp;
%ignore fdsigmazdp;
%ignore fdydp;
%ignore fdydx;
%ignore fdzdp;
%ignore fdzdx;
%ignore frz;
%ignore fsdx0;
%ignore fsigmay;
%ignore fsigmaz;
%ignore fsrz;
%ignore fstau;
%ignore fsz;
%ignore fw;
%ignore fy;
%ignore fz;
%ignore fdwdp;
%ignore fdwdx;
%ignore fx0;
%ignore fx0_fixedParameters;
%ignore fsx0;
%ignore fsx0_fixedParameters;

%include "amici/abstract_model.h"
5 changes: 5 additions & 0 deletions swig/amici.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ wrap_unique_ptr(ExpDataPtr, amici::ExpData)
%naturalvar amici::SimulationParameters::fixedParametersPreequilibration;
%naturalvar amici::SimulationParameters::fixedParametersPresimulation;

%ignore amici::ModelContext;
%ignore amici::ContextManager;
%ignore amici::ModelState;
%ignore amici::ModelStateDerived;

// Include before any other header which uses enums defined there
%include "amici/defines.h"

Expand Down
2 changes: 2 additions & 0 deletions swig/edata.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@
using namespace amici;
%}

%ignore ConditionContext;

// Process symbols in header
%include "amici/edata.h"
1 change: 1 addition & 0 deletions swig/misc.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
%ignore amici::printfToString;
%ignore amici::regexErrorToString;
%ignore amici::writeSlice;
%ignore ContextManager;

// Add necessary symbols to generated header
%{
Expand Down
40 changes: 40 additions & 0 deletions swig/model.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,46 @@ using namespace amici;
%ignore fsx0_fixedParameters;
%ignore get_dxdotdp;
%ignore get_dxdotdp_full;
%ignore checkFinite;
%ignore fJrz;
%ignore fJy;
%ignore fJz;
%ignore fdJrzdsigma;
%ignore fdJrzdz;
%ignore fdJzdsigma;
%ignore fdJzdz;
%ignore fdJydsigma;
%ignore fdeltaqB;
%ignore fdeltasx;
%ignore fdeltax;
%ignore fdeltaxB;
%ignore fdrzdp;
%ignore fdrzdx;
%ignore fdsigmaydp;
%ignore fdsigmazdp;
%ignore fdydp;
%ignore fdydx;
%ignore fdzdp;
%ignore fdzdx;
%ignore frz;
%ignore fsdx0;
%ignore fsigmay;
%ignore fsigmaz;
%ignore fsrz;
%ignore fstau;
%ignore fsz;
%ignore fw;
%ignore fy;
%ignore fz;
%ignore updateHeaviside;
%ignore updateHeavisideB;
%ignore getEventSigma;
%ignore getEventSigmaSensitivity;
%ignore getObservableSigma;
%ignore getObservableSigmaSensitivity;
%ignore getUnobservedEventSensitivity;



%newobject amici::Model::clone;

Expand Down
2 changes: 2 additions & 0 deletions swig/rdata.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@ using namespace amici;
%}

%ignore processSimulationObjects;
%ignore ModelContext;

// Process symbols in header
%include "amici/rdata.h"
14 changes: 14 additions & 0 deletions swig/solver.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,20 @@ using namespace amici;
%ignore setupSteadystate;
%ignore writeSolution;
%ignore writeSolutionB;
%ignore calcIC;
%ignore calcICB;
%ignore sensToggleOff;
%ignore solveB;
%ignore step;
%ignore run;
%ignore runB;
%ignore resetDiagnosis;
%ignore storeDiagnosis;
%ignore storeDiagnosisB;
%ignore turnOffRootFinding;
%ignore getRootInfo;
%ignore updateAndReinitStatesAndSensitivities;


%newobject amici::Solver::clone;
// Process symbols in header
Expand Down