From ccf455b5c8b9ddaf9b0b775df8e4d044c2cfb6d7 Mon Sep 17 00:00:00 2001 From: Daniel Weindl Date: Wed, 22 Nov 2023 09:44:07 +0100 Subject: [PATCH] .. --- python/tests/splines_utils.py | 2 +- tests/benchmark-models/test_petab_benchmark.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/tests/splines_utils.py b/python/tests/splines_utils.py index 0746207ddb..b84fb21dc5 100644 --- a/python/tests/splines_utils.py +++ b/python/tests/splines_utils.py @@ -16,7 +16,7 @@ import petab import sympy as sp from amici.gradient_check import _check_results -from amici.petab_import import import_petab_problem +from amici.petab.petab_import import import_petab_problem from amici.petab_objective import EDATAS, LLH, RDATAS, SLLH, simulate_petab from amici.sbml_utils import ( add_compartment, diff --git a/tests/benchmark-models/test_petab_benchmark.py b/tests/benchmark-models/test_petab_benchmark.py index 0b3c6d80e0..c23e5b8b03 100755 --- a/tests/benchmark-models/test_petab_benchmark.py +++ b/tests/benchmark-models/test_petab_benchmark.py @@ -3,12 +3,12 @@ from pathlib import Path import amici -import amici.petab_import import amici.petab_objective import numpy as np import pandas as pd import petab import pytest +from amici.petab.petab_import import import_petab_problem from fiddy import MethodId, get_derivative from fiddy.derivative_check import NumpyIsCloseDerivativeCheck from fiddy.extensions.amici import simulate_petab_to_cached_functions @@ -81,7 +81,7 @@ def test_benchmark_gradient(model, scale): parameter_ids = list(parameter_df_free.index) # Setup AMICI objects. - amici_model = amici.petab_import.import_petab_problem( + amici_model = import_petab_problem( petab_problem, model_output_dir=benchmark_outdir / model, )