Skip to content

Commit

Permalink
Merge branch 'develop' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnGoertz committed Feb 2, 2022
2 parents 32935b7 + e924b26 commit f4720b7
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
author = 'John Goertz'

# The full version, including alpha/beta/rc tags
release = '0.1.0'
release = '0.1.4'


# -- General configuration ---------------------------------------------------
Expand Down
7 changes: 6 additions & 1 deletion gumbi/arrays.py
Original file line number Diff line number Diff line change
Expand Up @@ -1339,7 +1339,9 @@ def mvuparray(self, *args, **kwargs) -> MVUncertainParameterArray:

def cov(self, stdzd=True, whiten=1e-10):
"""Covariance matrix (only supported for 0-D MVUParrays)"""
# TODO: numpy versions > 1.19.3 can have bizarre inscrutable errors when handling cov. Monitor for fixes.
# TODO: numpy versions > 1.19.3 can have bizarre inscrutable errors when handling mvup.cov. Monitor for fixes.
if np.__version__ > '1.19.3':
warnings.warn('numpy version >1.19.3 may lead to inscrutable linear algebra errors with mvup.cov. May just be on Windows/WSL. Hopefully fixed soon.')
if self.ndim != 0:
raise NotImplementedError('Multidimensional multivariate covariance calculations are not yet supported.')

Expand All @@ -1355,6 +1357,9 @@ def cov(self, stdzd=True, whiten=1e-10):
@property
def dist(self) -> MultivariateNormalish:
"""Scipy :func:`multivariate_normal` object (only supported for 0-D MVUParrays)"""
# TODO: numpy versions > 1.19.3 can have bizarre inscrutable errors when handling mvup.dist. Monitor for fixes.
if np.__version__ > '1.19.3':
warnings.warn('numpy version >1.19.3 may lead to inscrutable linear algebra errors with mvup.dist. May just be on Windows/WSL. Hopefully fixed soon.')
if self.ndim != 0:
raise NotImplementedError('Multidimensional multivariate distributions are not yet supported.')
return MultivariateNormalish(mean=self.μ, cov=self.cov(stdzd=True))
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pandas>=1.2.3
numpy>=1.15, <=1.19.3 # numpy >1.19.3 leads to inscrutable linear algebra errors with mvup.cov and mvup.dist. May just be on Windows/WSL. Hopefully fixed soon.
numpy>=1.15, #<=1.19.3 # numpy >1.19.3 leads to inscrutable linear algebra errors with mvup.cov and mvup.dist. May just be on Windows/WSL. Hopefully fixed soon.
scipy
seaborn
matplotlib
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from setuptools import find_packages, setup
import pathlib as pl

VERSION = '0.1.3'
VERSION = '0.1.4'
DISTNAME = "gumbi"
DESCRIPTION = "Gaussian Process Model Building Interface"
AUTHOR = "John Goertz"
Expand Down

0 comments on commit f4720b7

Please sign in to comment.