From 27c65003d25bcf79825c8847fe173254e225ed44 Mon Sep 17 00:00:00 2001
From: Mike Croucher <Michael.P.Croucher@googlemail.com>
Date: Wed, 1 Apr 2015 13:23:06 +0100
Subject: [PATCH] Working in Py2 but broken in Py3

---
 GPy/util/choleskies.py | 104 ++++++++++++++++++++---------------------
 GPy/util/misc.py       |   2 +-
 2 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/GPy/util/choleskies.py b/GPy/util/choleskies.py
index 7e068933..b64beae1 100644
--- a/GPy/util/choleskies.py
+++ b/GPy/util/choleskies.py
@@ -2,7 +2,7 @@
 # Licensed under the GNU GPL version 3.0
 
 import numpy as np
-#from scipy import weave
+from scipy import weave
 from . import linalg
 
 def safe_root(N):
@@ -12,58 +12,58 @@ def safe_root(N):
         raise ValueError("N is not square!")
     return j
 
-#def flat_to_triang(flat):
-#    """take a matrix N x D and return a M X M x D array where
-#
-#    N = M(M+1)/2
-#
-#    the lower triangluar portion of the d'th slice of the result is filled by the d'th column of flat.
-#    """
-#    N, D = flat.shape
-#    M = (-1 + safe_root(8*N+1))/2
-#    ret = np.zeros((M, M, D))
-#    flat = np.ascontiguousarray(flat)
-#
-#    code = """
-#    int count = 0;
-#    for(int m=0; m<M; m++)
-#    {
-#      for(int mm=0; mm<=m; mm++)
-#      {
-#        for(int d=0; d<D; d++)
-#        {
-#          ret[d + m*D*M + mm*D] = flat[count];
-#          count++;
-#        }
-#      }
-#    }
-#    """
-#   weave.inline(code, ['flat', 'ret', 'D', 'M'])
-#    return ret
+def flat_to_triang(flat):
+    """take a matrix N x D and return a M X M x D array where
 
-#def triang_to_flat(L):
-#    M, _, D = L.shape
-#
-#    L = np.ascontiguousarray(L) # should do nothing if L was created by flat_to_triang
-#
-#    N = M*(M+1)/2
-#    flat = np.empty((N, D))
-#    code = """
-#    int count = 0;
-#    for(int m=0; m<M; m++)
-#    {
-#      for(int mm=0; mm<=m; mm++)
-#      {
-#        for(int d=0; d<D; d++)
-#        {
-#          flat[count] = L[d + m*D*M + mm*D];
-#          count++;
-#        }
-#      }
-#    }
-#    """
-#    weave.inline(code, ['flat', 'L', 'D', 'M'])
-#    return flat
+    N = M(M+1)/2
+
+    the lower triangluar portion of the d'th slice of the result is filled by the d'th column of flat.
+    """
+    N, D = flat.shape
+    M = (-1 + safe_root(8*N+1))/2
+    ret = np.zeros((M, M, D))
+    flat = np.ascontiguousarray(flat)
+
+    code = """
+    int count = 0;
+    for(int m=0; m<M; m++)
+    {
+      for(int mm=0; mm<=m; mm++)
+      {
+        for(int d=0; d<D; d++)
+        {
+          ret[d + m*D*M + mm*D] = flat[count];
+          count++;
+        }
+      }
+    }
+    """
+    weave.inline(code, ['flat', 'ret', 'D', 'M'])
+    return ret
+
+def triang_to_flat(L):
+    M, _, D = L.shape
+
+    L = np.ascontiguousarray(L) # should do nothing if L was created by flat_to_triang
+
+    N = M*(M+1)/2
+    flat = np.empty((N, D))
+    code = """
+    int count = 0;
+    for(int m=0; m<M; m++)
+    {
+      for(int mm=0; mm<=m; mm++)
+      {
+        for(int d=0; d<D; d++)
+        {
+          flat[count] = L[d + m*D*M + mm*D];
+          count++;
+        }
+      }
+    }
+    """
+    weave.inline(code, ['flat', 'L', 'D', 'M'])
+    return flat
 
 def triang_to_cov(L):
     return np.dstack([np.dot(L[:,:,i], L[:,:,i].T) for i in range(L.shape[-1])])
diff --git a/GPy/util/misc.py b/GPy/util/misc.py
index 2db61ef0..66b7b3b9 100644
--- a/GPy/util/misc.py
+++ b/GPy/util/misc.py
@@ -24,7 +24,7 @@ def chain_1(df_dg, dg_dx):
     if np.all(dg_dx==1.):
         return df_dg
     if len(df_dg) > 1 and df_dg.shape[-1] > 1:
-        import ipdb; ipdb.set_trace()  # XXX BREAKPOINT
+        #import ipdb; ipdb.set_trace()  # XXX BREAKPOINT
         raise NotImplementedError('Not implemented for matricies yet')
     return df_dg * dg_dx