Skip to content

Commit 8b832ca

Browse files
authored
Remove MATLAB leftovers (#2961)
Related to #2727.
1 parent f51bb60 commit 8b832ca

File tree

7 files changed

+15
-27
lines changed

7 files changed

+15
-27
lines changed

cmake/AmiciFindBLAS.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Find a BLAS
22
#
3-
# AMICI requires BLAS, currently Intel MKL, CBLAS or MATLAB BLAS can be used.
4-
# The latter is not supported via CMake yet.
3+
# AMICI requires BLAS, currently at least Intel MKL, CBLAS can be used.
54
#
65
# This module defines the BLAS::BLAS IMPORTED target.
76

doc/.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
_build/
22
_doxyoutput_amici_cpp/
3-
_doxyoutput_amici_matlab/
43
_exhale_cpp_api/
5-
_exhale_matlab_api/
64
examples/example_presimulation/model_presimulation/
75
generated/
86
build_doxygen/

doc/README.md

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@ The documentation comprises:
2222
* Python API documentation of Python generated via SWIG (doxygen-style comments
2323
translated to docstrings by SWIG)
2424
* C++ API documentation (doxygen -> exhale -> breathe -> sphinx)
25-
* Matlab API documentation (mtocpp -> doxygen -> exhale -> breathe -> sphinx)
2625

2726
### Doxygen-only (legacy)
2827

2928
(Parts of the) AMICI documentation can also be directly created using
3029
[doxygen](http://www.doxygen.nl/) directly. It combines Markdown files from
31-
`doc/` and in-source documentation from the C++ and Matlab source files.
30+
`doc/` and in-source documentation from the C++ source files.
3231

3332
The documentation is generated by running
3433

@@ -40,15 +39,8 @@ The resulting HTML and PDF documentation will be created in
4039

4140
#### Doxygen configuration
4241

43-
The main doxygen configuration file is located in
44-
`matlab/mtoc/config/Doxyfile.template`. Edit this file for inclusion or
45-
exclusion of additional files.
46-
47-
#### Matlab documentation
48-
49-
Matlab documentation is processed by
50-
[mtoc++](https://www.morepas.org/software/mtocpp/docs/tools.html).
51-
This is configured in `matlab/mtoc/config`.
42+
The main doxygen configuration file is located in `doc/Doxyfile.template`.
43+
Edit this file for inclusion or exclusion of additional files.
5244

5345
## Writing documentation
5446

@@ -62,13 +54,13 @@ Graphics for documentation are kept in `doc/gfx/`.
6254
### When using Markdown
6355

6456
* Note that there are some incompatibilities of GitHub Markdown and Doxygen
65-
Markdown. Ideally documentation should be written in a format compatible with
57+
Markdown. Ideally, documentation should be written in a format compatible with
6658
both.
67-
This affects for example images links which currently cause trouble in
59+
This affects, for example, image links which currently cause trouble in
6860
Doxygen.
6961

7062
* Where possible, relative links are preferred over absolute links. However,
71-
they should work with both Github and Doxygen and ideally with local files
63+
they should work with both GitHub and Doxygen and ideally with local files
7264
for offline use.
7365

7466
* Please stick to the limit of 80 characters per line for readability of raw

python/sdist/amici/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,13 +239,13 @@ def import_model_module(
239239

240240
module_path = Path(model_root, module_name, "__init__.py")
241241

242-
# We may want to import a matlab-generated model where the extension
242+
# We may want to import an externally compiled model where the extension
243243
# is in a different directory. This is not a regular use case. It's only
244244
# used in the amici tests and can be removed at any time.
245245
# The models (currently) use the default swig-import and require
246246
# modifying sys.path.
247-
module_path_matlab = Path(model_root, f"{module_name}.py")
248-
if not module_path.is_file() and module_path_matlab.is_file():
247+
module_path_external = Path(model_root, f"{module_name}.py")
248+
if not module_path.is_file() and module_path_external.is_file():
249249
with set_path(model_root):
250250
# prevent segfaults under pytest
251251
# see also:
@@ -257,7 +257,7 @@ def import_model_module(
257257
category=DeprecationWarning,
258258
message="builtin type .* has no __module__ attribute",
259259
)
260-
return _module_from_path(module_name, module_path_matlab)
260+
return _module_from_path(module_name, module_path_external)
261261

262262
module = _module_from_path(module_name, module_path)
263263
module._self = module

python/sdist/amici/de_export.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,7 @@ def __init__(
240240
@log_execution_time("generating cpp code", logger)
241241
def generate_model_code(self) -> None:
242242
"""
243-
Generates the native C++ code for the loaded model and a Matlab
244-
script that can be run to compile a mex file from the C++ code
243+
Generates the model code (Python package + C++ extension).
245244
"""
246245
with _monkeypatched(
247246
sp.Pow, "_eval_derivative", _custom_pow_eval_derivative

python/sdist/amici/sbml_import.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,8 @@ def sbml2amici(
301301
constructor.
302302
303303
The resulting model can be imported as a regular Python module (if
304-
`compile=True`), or used from Matlab or C++ as described in the
305-
documentation of the respective AMICI interface.
304+
`compile=True`), or used from C++ as described in the documentation of
305+
AMICI's C++ interface.
306306
307307
Note that this generates model ODEs for changes in concentrations, not
308308
amounts unless the `hasOnlySubstanceUnits` attribute has been

python/tests/test_pregenerated_models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python3
22

3-
"""Run simulations with Matlab-AMICI pre-generated models and verify using
3+
"""Run simulations with pre-generated models and verify using
44
saved expectations."""
55

66
import os

0 commit comments

Comments
 (0)