Skip to content

Enable simulation timeouts #347

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
BryanRumsey merged 3 commits into from
Mar 1, 2023
Merged

Enable simulation timeouts #347

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d7b5c4
Merge pull request #327 from StochSS/develop
briandrawert Dec 22, 2022
7b2dd09
Merge pull request #336 from StochSS/develop
seanebum Feb 9, 2023
2054296
Fixes #253, timeout only counts execution time, compile time is ignored.
briandrawert Feb 14, 2023
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
4 changes: 1 addition & 3 deletions spatialpy/solvers/solver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

import numpy

from spatialpy.core.spatialpyerror import ModelError, SimulationError, SimulationTimeout
from spatialpy.core.spatialpyerror import ModelError, SimulationError

def _read_from_stdout(stdout ,verbose=True):
try:
Expand Down Expand Up @@ -536,7 +536,6 @@ def run(self, number_of_trajectories=1, seed=None, timeout=None,
:returns: A SpatialPy Result object containing spatial and time series data from simulation.
:rtype: spatialpy.Result.Result | list(spatialpy.Result.Result)

:raises SimulationTimeout: Simulation exceeded timeout.
:raises SimulationError: Simulation execution failed.
"""
from spatialpy.core.result import Result # pylint: disable=import-outside-toplevel
Expand Down Expand Up @@ -587,7 +586,6 @@ def run(self, number_of_trajectories=1, seed=None, timeout=None,
result.timeout = True
# send signal to the process group
os.killpg(process.pid, signal.SIGINT)
raise SimulationTimeout("SpatialPy solver timeout exceded.") from err
except OSError as err:
print(f"Error, execution of solver raised an exception: {err}")
print(f"cmd = {solver_cmd}")
Expand Down