Merge branch 'release/1.2.21'

limix · Jul 27, 2017 · e165f44 · e165f44
2 parents 47ee64c + 31f4e41
commit e165f44
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/glimix_core/lmm/scan.py b/glimix_core/lmm/scan.py
@@ -3,7 +3,7 @@
 import logging
 
 from numpy import sum as npsum
-from numpy import append, dot, empty, full, log, zeros
+from numpy import append, dot, empty, full, log, zeros, asarray, isfinite, all
 from numpy.linalg import LinAlgError
 from numpy_sugar.linalg import rsolve, solve
 from tqdm import tqdm
@@ -93,8 +93,12 @@ def fast_scan(self, markers, verbose=True):
         return lmls, effect_sizes
 
     def _fast_scan_chunk(self, markers):
+        markers = asarray(markers, float)
         assert markers.ndim == 2
 
+        if not all(isfinite(markers)):
+            raise ValueError("One or more variants have non-finite value.")
+
         mTQ = [dot(markers.T, Q) for Q in self._QS[0]]
 
         bm = [dot(i, j.T) for (i, j) in zip(self._yTQdiag, mTQ)]

diff --git a/setup.py b/setup.py
@@ -31,7 +31,7 @@ def setup_package():
 
     metadata = dict(
         name='glimix-core',
-        version='1.2.20',
+        version='1.2.21',
         maintainer="Limix Developers",
         maintainer_email="horta@ebi.ac.uk",
         license="MIT",