For scipy v>= 0.18, get logsumexp from scipy.special; fixes #364

jobovy · Nov 28, 2018 · dde3790 · dde3790
1 parent f3b6dcc
commit dde3790
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/galpy/df/streamdf.py b/galpy/df/streamdf.py
@@ -8,8 +8,10 @@
                  for v in scipy.__version__.split('.')]
 if _SCIPY_VERSION[0] < 1 and _SCIPY_VERSION[1] < 10: #pragma: no cover
     from scipy.maxentropy import logsumexp
-else:
+elif _SCIPY_VERSION[0] < 1 and _SCIPY_VERSION[1] < 19:
     from scipy.misc import logsumexp
+else: #pragma: no cover
+    from scipy.special import logsumexp
 from galpy.orbit import Orbit
 from .df import df, _APY_LOADED
 from galpy.util import bovy_coords, fast_cholesky_invert, \

diff --git a/galpy/orbit/FullOrbit.py b/galpy/orbit/FullOrbit.py
@@ -7,8 +7,10 @@
                  for v in scipy.__version__.split('.')]
 if _SCIPY_VERSION[0] < 1 and _SCIPY_VERSION[1] < 10: #pragma: no cover
     from scipy.maxentropy import logsumexp
-else:
+elif _SCIPY_VERSION[0] < 1 and _SCIPY_VERSION[1] < 19:
     from scipy.misc import logsumexp
+else: #pragma: no cover
+    from scipy.special import logsumexp
 from galpy.potential.Potential import _evaluateRforces, _evaluatezforces,\
     evaluatePotentials, _evaluatephiforces, evaluateDensities, _check_c
 from galpy.potential.DissipativeForce import _isDissipative

diff --git a/galpy/potential/DiskSCFPotential.py b/galpy/potential/DiskSCFPotential.py
@@ -3,7 +3,15 @@
 ###############################################################################
 import copy
 import numpy
-from scipy.misc import logsumexp
+import scipy
+_SCIPY_VERSION= [int(v.split('rc')[0])
+                 for v in scipy.__version__.split('.')]
+if _SCIPY_VERSION[0] < 1 and _SCIPY_VERSION[1] < 10: #pragma: no cover
+    from scipy.maxentropy import logsumexp
+elif _SCIPY_VERSION[0] < 1 and _SCIPY_VERSION[1] < 19:
+    from scipy.misc import logsumexp
+else: #pragma: no cover
+    from scipy.special import logsumexp
 from .Potential import Potential, _APY_LOADED
 from .SCFPotential import SCFPotential, \
     scf_compute_coeffs_axi, scf_compute_coeffs