Merge pull request #742 from htm-community/cleanup_exceptions

Cleanup exceptions

Author: breznak

bindings/py/cpp_src/bindings/engine/py_Engine.cpp

@@ -30,15 +30,16 @@ PyBind11 bindings for Engine classes
 #include <pybind11/stl.h>
 
 #include <htm/os/Timer.hpp>
-
 #include <htm/ntypes/Array.hpp>
+#include <htm/utils/Log.hpp>
 
 #include <htm/engine/Link.hpp>
 #include <htm/engine/Network.hpp>
 #include <htm/engine/Region.hpp>
 #include <htm/engine/Input.hpp>
 #include <htm/engine/Spec.hpp>
 #include <htm/types/Sdr.hpp>
+
 #include <plugin/PyBindRegion.hpp>
 #include <plugin/RegisteredRegionImplPy.hpp>
 
@@ -468,13 +469,13 @@ namespace htm_ext
             , py::arg("srcOutput") = "", py::arg("destInput") = ""
             , py::arg("propagationDelay") = 0);
 
-        py::enum_<LogLevel>(m, "LogLevel", py::arithmetic(), "An enumeration of logging levels.")
-                     .value("None", LogLevel::LogLevel_None)        // default
-                     .value("Minimal", LogLevel::LogLevel_Minimal)
-                     .value("Normal",  LogLevel::LogLevel_Normal)
-                     .value("Verbose", LogLevel::LogLevel_Verbose)
+        py::enum_<htm::LogLevel>(m, "LogLevel", "An enumeration of logging levels.")
+                     .value("None",    htm::LogLevel::LogLevel_None)        // default
+                     .value("Minimal", htm::LogLevel::LogLevel_Minimal)
+                     .value("Normal",  htm::LogLevel::LogLevel_Normal)
+                     .value("Verbose", htm::LogLevel::LogLevel_Verbose)
                      .export_values();
-        py_Network.def("setLogLevel", &htm::Network::setLogLevel);
+        py_Network.def_static("setLogLevel", &htm::Network::setLogLevel, py::arg("level") = htm::LogLevel::LogLevel_None);
 
 
         // plugin registration

bindings/py/tests/regions/network_test.py

@@ -292,10 +292,10 @@ def testBuiltInRegions(self):
     """
     This sets up a network with built-in regions.
     """
-    
+    import htm    
     net = engine.Network()
-    net.setLogLevel(engine.Verbose)     # Verbose shows data inputs and outputs while executing.
-    
+    #net.setLogLevel(htm.bindings.engine_internal.LogLevel.Verbose)     # Verbose shows data inputs and outputs while executing.
+
     encoder = net.addRegion("encoder", "ScalarSensor", "{n: 6, w: 2}");
     sp = net.addRegion("sp", "SPRegion", "{columnCount: 200}");
     tm = net.addRegion("tm", "TMRegion", "");
@@ -316,6 +316,8 @@ def testBuiltInRegions(self):
 
     tm_output = tm.getOutputArray("predictedActiveCells")
     sdr = tm_output.getSDR()
+    print(sdr.sparse)
+    print(EXPECTED_RESULT3)
     self.assertTrue(np.array_equal(sdr.sparse, EXPECTED_RESULT3))
 
   def testExecuteCommand1(self):

src/CMakeLists.txt

@@ -167,10 +167,6 @@ set(types_files
 set(utils_files
     htm/utils/GroupBy.hpp
     htm/utils/Log.hpp
-    htm/utils/LoggingException.cpp
-    htm/utils/LoggingException.hpp
-    htm/utils/LogItem.cpp
-    htm/utils/LogItem.hpp
     htm/utils/MovingAverage.cpp
     htm/utils/MovingAverage.hpp
     htm/utils/Random.cpp

src/htm/engine/Input.cpp

@@ -330,7 +330,7 @@ void Input::uninitialize() {
 
 namespace htm {
   std::ostream &operator<<(std::ostream &f, const Input &d) {
-    f << "Input: " << d.getRegion()->getName() << "." << d.getName() << " " << d.getData();
+    f << "Input:  " << d.getRegion()->getName() << "." << d.getName() << " " << d.getData();
     return f;
   }
 }

src/htm/engine/Link.cpp

@@ -27,7 +27,7 @@
 #include <htm/ntypes/BasicType.hpp>
 #include <htm/utils/Log.hpp>
 
-// By calling  LogItem::setLogLevel(LogLevel_Verbose)
+// By calling  Network::setLogLevel(LogLevel_Verbose)
 // you can enable the NTA_DEBUG macros below.
 
 namespace htm {
@@ -187,7 +187,7 @@ void Link::compute() {
   const Array &src = propagationDelay_ ? propagationDelayBuffer_.front() : src_->getData();
   Array &dest = dest_->getData();
 
-  NTA_DEBUG << "Link::compute: " << getMoniker() << "; copying to dest input"
+  NTA_DEBUG << "compute Link: copying " << getMoniker()
               << "; delay=" << propagationDelay_ << "; size=" << src.getCount()
               << " type=" << BasicType::getName(src.getType())
               << " --> " << BasicType::getName(dest.getType()) << std::endl;

src/htm/engine/Network.cpp

@@ -40,19 +40,22 @@ namespace htm {
 
 class RegisteredRegionImpl;
 
+thread_local LogLevel NTA_LOG_LEVEL; 
+
+
 Network::Network() {
   commonInit();
 }
 
 // move constructor
-Network::Network(Network && n) {
+Network::Network(Network &&n) noexcept {
   regions_ = std::move(n.regions_);
   minEnabledPhase_ = n.minEnabledPhase_;
   maxEnabledPhase_ = n.maxEnabledPhase_;
   phaseInfo_ = std::move(n.phaseInfo_);
   callbacks_ = n.callbacks_;
   iteration_ = n.iteration_;
-}  
+}
 
 Network::Network(const std::string& filename) {
   commonInit();

src/htm/engine/Network.hpp

@@ -67,7 +67,7 @@ class Link;
   /**
    * Cannot copy or assign a Network object. But can be moved.
    */
-  Network(Network&&);  // move is allowed
+  Network(Network &&) noexcept; // move is allowed
   Network(const Network&) = delete;
   void operator=(const Network&) = delete;
 
@@ -375,12 +375,14 @@ class Link;
    */
   void resetProfiling();
 
-	/**
-	 * Set one of the debug levels: LogLevel_None = 0, LogLevel_Minimal, LogLevel_Normal, LogLevel_Verbose
+  /**
+   * Set one of the debug levels: LogLevel_None = 0, LogLevel_Minimal, LogLevel_Normal, LogLevel_Verbose
    */
-	void setLogLevel(LogLevel level) {
-	    LogItem::setLogLevel(level);
-	}
+  static LogLevel setLogLevel(LogLevel level) {
+    LogLevel prev = NTA_LOG_LEVEL;
+    NTA_LOG_LEVEL = level;
+    return prev;
+  }
 
 
   /**

src/htm/engine/Output.cpp

@@ -118,7 +118,7 @@ void Output::removeLink(const std::shared_ptr<Link>& link) {
 
 namespace htm {
   std::ostream &operator<<(std::ostream &f, const Output &d) {
-    f << "Output:" << d.getRegion()->getName() << "." << d.getName() << " " << d.getData();
+    f << "Output: " << d.getRegion()->getName() << "." << d.getName() << " " << d.getData();
     return f;
   }
 }

src/htm/engine/RegionImpl.cpp

@@ -243,7 +243,9 @@ std::shared_ptr<Input> RegionImpl::getInput(const std::string &name) const {
 }
 
 std::shared_ptr<Output> RegionImpl::getOutput(const std::string &name) const {
-  return region_->getOutput(name);
+  auto out = region_->getOutput(name);
+  NTA_CHECK(out != nullptr) << "Requested output not found: " << name;
+  return out;
 }
 Dimensions RegionImpl::getInputDimensions(const std::string &name) const {
   return region_->getInputDimensions(name);

src/htm/regions/SPRegion.cpp

@@ -158,7 +158,7 @@ void SPRegion::compute() {
   // Call SpatialPooler compute
   sp_->compute(inputBuffer.getSDR(), args_.learningMode, outputBuffer.getSDR());
 
-
+  // trace facility
   NTA_DEBUG << "compute " << *getOutput("bottomUpOut") << "\n";
 
 }