Merge pull request Pyomo#2443 from blnicho/daesim-pypy

Enable Pyomo.DAE Simulator tests on PyPy

Author: jsiirola

.github/workflows/test_pr_and_main.yml

@@ -33,7 +33,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python: [3.7, 3.8, 3.9, '3.10', pypy-3.9]
+        python: [3.7, 3.8, 3.9, '3.10']
         other: [""]
         category: [""]
 
@@ -100,17 +100,19 @@ jobs:
           PYENV: pip
           PACKAGES: pyutilib
 
+        - os: ubuntu-latest
+          python: pypy-3.9
+          skip_doctest: 1
+          TARGET: linux
+          PYENV: pip
+
         - os: windows-latest
           python: 3.8
           other: /pip
           skip_doctest: 1
           TARGET: win
           PYENV: pip
 
-        exclude:
-        - {os: macos-latest, python: pypy-3.9}
-        - {os: windows-latest, python: pypy-3.9}
-
     steps:
     - name: Checkout Pyomo source
       uses: actions/checkout@v3

pyomo/dae/simulator.py

@@ -24,19 +24,6 @@
     numpy as np, numpy_available, scipy, scipy_available, attempt_import,
 )
 
-# Check integrator availability
-# scipy_available = True
-# try:
-#     import platform
-#     if platform.python_implementation() == "PyPy":  # pragma:nocover
-#         # scipy is importable into PyPy, but ODE integrators don't work. (2/18)
-#         raise ImportError
-#     import scipy.integrate as scipy
-# except ImportError:
-#     scipy_available = False
-import platform
-is_pypy = platform.python_implementation() == "PyPy"
-
 casadi_intrinsic = {}
 def _finalize_casadi(casadi, available):
     if available:
@@ -406,11 +393,6 @@ def __init__(self, m, package='scipy'):
                     "The scipy module is not available. "
                     "You may build the Simulator object but you will not "
                     "be able to run the simulation.")
-            elif is_pypy:
-                logger.warning(
-                    "The scipy ODE integrators do not work in pypy. "
-                    "You may build the Simulator object but you will not "
-                    "be able to run the simulation.")
         else:
             if not casadi_available:
                 # Initializing the simulator for use with casadi requires
@@ -885,9 +867,6 @@ def simulate(self, numpoints=None, tstep=None, integrator=None,
             if not scipy_available:
                 raise ValueError("The scipy module is not available. "
                                  "Cannot simulate the model.")
-            if is_pypy:
-                raise ValueError("The scipy ODE integrators do not work "
-                                 "under pypy. Cannot simulate the model.")
             tsim, profile = self._simulate_with_scipy(initcon, tsim, switchpts,
                                                       varying_inputs,
                                                       integrator,

pyomo/dae/tests/test_simulator.py

@@ -20,7 +20,6 @@
 from pyomo.dae import ContinuousSet, DerivativeVar
 from pyomo.dae.diffvar import DAE_Error
 from pyomo.dae.simulator import (
-    is_pypy,
     scipy_available,
     casadi,
     casadi_available,
@@ -42,9 +41,6 @@
 currdir = dirname(abspath(__file__))
 exdir = normpath(join(currdir, '..', '..', '..', 'examples', 'dae'))
 
-# We will skip tests unless we have scipy and not running in pypy
-scipy_available = scipy_available and not is_pypy
-
 
 class TestSimulator(unittest.TestCase):
     """

setup.py

@@ -222,6 +222,7 @@ def _print_deps(self, deplist):
             'sphinxcontrib-jsmath',
             'sphinxcontrib-napoleon',
             'numpy', # Needed by autodoc for pynumero
+            'scipy',
         ],
         'optional': [
             'dill',      # No direct use, but improves lambda pickle
@@ -234,6 +235,7 @@ def _print_deps(self, deplist):
             'pint',      # units
             'python-louvain', # community_detection
             'pyyaml',    # core
+            'scipy',
             'sympy',     # differentiation
             'xlrd',      # dataportals
             'z3-solver', # community_detection
@@ -248,7 +250,6 @@ def _print_deps(self, deplist):
             'casadi; implementation_name!="pypy"',  # dae
             'numdifftools; implementation_name!="pypy"', # pynumero
             'pandas; implementation_name!="pypy"',
-            'scipy; implementation_name!="pypy"',
             'seaborn; implementation_name!="pypy"',   # parmest.graphics
         ],
     },