Integrate blis/ops14todo into master

nikoma · May 4, 2016 · 225f4c8 · 225f4c8
2 parents ecfb7fb + 9d04eda
commit 225f4c8
Show file tree

Hide file tree

Showing 64 changed files with 9,738 additions and 2,067 deletions.
diff --git a/contrib/Python/cntk/__init__.py b/contrib/Python/cntk/__init__.py
@@ -8,8 +8,8 @@
 
 from .context import *
 from .graph import *
-from .objectives import *
 from . import ops
-from .optimizer import *
+from .sgd import *
 from .reader import UCIFastReader, CNTKTextFormatReader
-from .ops.variables_and_parameters import *
+from .ops import *
+from .utils.eval import eval
diff --git a/contrib/Python/cntk/context.py b/contrib/Python/cntk/context.py
diff --git a/contrib/Python/cntk/examples/Eval/eval.py b/contrib/Python/cntk/examples/Eval/eval.py