From 55ac07c47a087d0125f6efe500bfa35ae6ca3b66 Mon Sep 17 00:00:00 2001
From: Scott Linderman <scott.linderman@gmail.com>
Date: Wed, 31 Jul 2019 11:11:26 -0600
Subject: [PATCH] updating to scipy.special.logsumexp
---
pyhsmm/basic/distributions.py | 2 +-
pyhsmm/internals/hmm_states.py | 2 +-
pyhsmm/internals/hsmm_inb_states.py | 2 +-
pyhsmm/internals/hsmm_states.py | 2 +-
pyhsmm/models.py | 2 +-
pyhsmm/parallel.py | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pyhsmm/basic/distributions.py b/pyhsmm/basic/distributions.py
index 940862e..b18ded3 100644
--- a/pyhsmm/basic/distributions.py
+++ b/pyhsmm/basic/distributions.py
@@ -1,6 +1,6 @@
from __future__ import division
import numpy as np
-from scipy.misc import logsumexp
+from scipy.special import logsumexp
from pybasicbayes.distributions import *
from pybasicbayes.models import MixtureDistribution
diff --git a/pyhsmm/internals/hmm_states.py b/pyhsmm/internals/hmm_states.py
index abbf50a..c5dfb7f 100644
--- a/pyhsmm/internals/hmm_states.py
+++ b/pyhsmm/internals/hmm_states.py
@@ -5,7 +5,7 @@ import numpy as np
from numpy import newaxis as na
import abc
import copy
-from scipy.misc import logsumexp
+from scipy.special import logsumexp
from pyhsmm.util.stats import sample_discrete
try:
diff --git a/pyhsmm/internals/hsmm_inb_states.py b/pyhsmm/internals/hsmm_inb_states.py
index e1c6ce2..25c4b85 100644
--- a/pyhsmm/internals/hsmm_inb_states.py
+++ b/pyhsmm/internals/hsmm_inb_states.py
@@ -5,7 +5,7 @@ import numpy as np
import abc
import scipy.stats as stats
import scipy.special as special
-from scipy.misc import logsumexp
+from scipy.special import logsumexp
try:
from ..util.cstats import sample_markov
diff --git a/pyhsmm/internals/hsmm_states.py b/pyhsmm/internals/hsmm_states.py
index a37303e..b06b831 100644
--- a/pyhsmm/internals/hsmm_states.py
+++ b/pyhsmm/internals/hsmm_states.py
@@ -2,7 +2,7 @@ from __future__ import division
from builtins import range, map
import numpy as np
from numpy import newaxis as na
-from scipy.misc import logsumexp
+from scipy.special import logsumexp
from pyhsmm.util.stats import sample_discrete
from pyhsmm.util.general import rle, rcumsum, cumsum
diff --git a/pyhsmm/models.py b/pyhsmm/models.py
index 517e74e..e3b1b9b 100644
--- a/pyhsmm/models.py
+++ b/pyhsmm/models.py
@@ -11,7 +11,7 @@ import matplotlib.pyplot as plt
from matplotlib.gridspec import GridSpec, GridSpecFromSubplotSpec
from matplotlib import cm
from warnings import warn
-from scipy.misc import logsumexp
+from scipy.special import logsumexp
from pyhsmm.basic.abstractions import Model, ModelGibbsSampling, \
ModelEM, ModelMAPEM, ModelMeanField, ModelMeanFieldSVI, ModelParallelTempering
diff --git a/pyhsmm/parallel.py b/pyhsmm/parallel.py
index e430104..89de29c 100644
--- a/pyhsmm/parallel.py
+++ b/pyhsmm/parallel.py
@@ -1,6 +1,6 @@
from __future__ import division
import numpy as np
-from scipy.misc import logsumexp
+from scipy.special import logsumexp
# NOTE: pass arguments through global variables instead of arguments to exploit
# the fact that they're read-only and multiprocessing/joblib uses fork
--
GitLab