Skip to content

Allow loading of existing models in import_petab_problem #1383

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
dweindl merged 1 commit into from
Jan 28, 2021
Merged

Allow loading of existing models in import_petab_problem #1383

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions python/amici/petab_import.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ def import_petab_problem(
os.makedirs(model_output_dir)

# check if compilation necessary
if not _can_import_model(model_name) or force_compile:
if force_compile or not _can_import_model(model_name, model_output_dir):
# check if folder exists
if os.listdir(model_output_dir) and not force_compile:
raise ValueError(
Expand Down Expand Up @@ -353,13 +353,14 @@ def _create_model_name(folder: str) -> str:
return os.path.split(os.path.normpath(folder))[-1]


def _can_import_model(model_name: str) -> bool:
def _can_import_model(model_name: str, model_output_dir: str) -> bool:
"""
Check whether a module of that name can already be imported.
"""
# try to import (in particular checks version)
try:
model_module = importlib.import_module(model_name)
with amici.add_path(model_output_dir):
model_module = importlib.import_module(model_name)
except ModuleNotFoundError:
return False

Expand Down