From cc11594622443311936a6c8480d8f2b2f9043dba Mon Sep 17 00:00:00 2001
From: Martin Reinecke <martin@mpa-garching.mpg.de>
Date: Mon, 2 Jul 2018 10:28:40 +0200
Subject: [PATCH] fixes
---
nifty5/energies/kl.py | 2 +-
nifty5/minimization/energy.py | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/nifty5/energies/kl.py b/nifty5/energies/kl.py
index 792ad8d4b..7cc988f0f 100644
--- a/nifty5/energies/kl.py
+++ b/nifty5/energies/kl.py
@@ -1,6 +1,6 @@
from builtins import *
from ..minimization.energy import Energy
-from ..utilities import memo
+from ..utilities import memo, my_sum
class SampledKullbachLeiblerDivergence(Energy):
diff --git a/nifty5/minimization/energy.py b/nifty5/minimization/energy.py
index 213466aa4..0104bbbf6 100644
--- a/nifty5/minimization/energy.py
+++ b/nifty5/minimization/energy.py
@@ -130,6 +130,7 @@ class Energy(NiftyMetaBase()):
return None
def makeInvertible(self, controller, preconditioner=None):
+ from .iteration_controller import IterationController
if not isinstance(controller, IterationController):
raise TypeError
return CurvatureInversionEnabler(self, controller, preconditioner)
--
GitLab