Merge branch 'master' into updateHotGym

numenta · Dec 21, 2016 · a313b73 · a313b73
2 parents 863a9d1 + 3d8b77e
commit a313b73
Show file tree

Hide file tree

Showing 229 changed files with 474 additions and 732 deletions.
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ----------------------------------------------------------------------
 # Numenta Platform for Intelligent Computing (NuPIC)
 # Copyright (C) 2013, Numenta, Inc.  Unless you have an agreement

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.5.7
+
+* Remove tests moved to nupic.core and update version to latest bindings release.
+* Update hello_tm.py
+* Removed linux and gcc from Travis build matrix
+* Makes `anomaly_likelihood.py` compliant to Python3
+* Update env vars and paths to simplify the AV configuration and installation.
+* Cleanup references to nupic.bindings and old CI code for manually fetching nupic.bindings since it should be found on PyPI without doing anything special.
+
 ## 0.5.6
 
 * Since manylinux nupic.bindings wheel 0.4.10 has now been released to PyPi, we no longer need to install nupic.bindings from S3.

diff --git a/RELEASE.md b/RELEASE.md
@@ -12,7 +12,9 @@ successfully
 version
 5. Deploy the release in Bamboo. This will:
     - Validate that the Bamboo release number matches the wheel version
-    - Check that release notes are present for the version to be released
     - Push the wheel to PyPI
-    - If successful, push a version tag to the repo
-6. Send announcement to the committer's lounge on discourse.numenta.org that the release is complete.
+6. Create a new Github "Release" at https://github.com/numenta/nupic/releases/new
+    - Along with the creation of the release, there is an option to create a git tag with the release. Name it "X.Y.Z" and point it to the commit SHA for the merged PR described in #2 above.
+    - Release title should be "X.Y.Z"
+    - Release description should be the latest changelog
+7. Send announcement to the committer's lounge on discourse.numenta.org that the release is complete.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.5.7.dev0
+0.5.8.dev0
diff --git a/ci/travis/deploy-wheel-to-s3.py b/ci/travis/deploy-wheel-to-s3.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ----------------------------------------------------------------------
 # Numenta Platform for Intelligent Computing (NuPIC)
 # Copyright (C) 2013, Numenta, Inc.  Unless you have an agreement

diff --git a/ci/travis/script-run-tests.sh b/ci/travis/script-run-tests.sh
@@ -25,11 +25,11 @@ echo Running script-run-tests.sh...
 echo
 
 # Python unit tests and prep for coveralls reporting
-${TRAVIS_BUILD_DIR}/scripts/run_nupic_tests.py -u --coverage --failfast || exit
+python ${TRAVIS_BUILD_DIR}/scripts/run_nupic_tests.py -u --coverage --failfast || exit
 
 mv ${TRAVIS_BUILD_DIR}/.coverage ${TRAVIS_BUILD_DIR}/.coverage_unit
 
 # Python integration tests and prep for coveralls reporting
-${TRAVIS_BUILD_DIR}/scripts/run_nupic_tests.py -i --coverage --failfast || exit
+python ${TRAVIS_BUILD_DIR}/scripts/run_nupic_tests.py -i --coverage --failfast || exit
 
 mv ${TRAVIS_BUILD_DIR}/.coverage ${TRAVIS_BUILD_DIR}/.coverage_integration
diff --git a/examples/bindings/sparse_matrix_how_to.py b/examples/bindings/sparse_matrix_how_to.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 
 # ----------------------------------------------------------------------
 # Numenta Platform for Intelligent Computing (NuPIC)

diff --git a/examples/network/core_encoders_demo.py b/examples/network/core_encoders_demo.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ----------------------------------------------------------------------
 # Numenta Platform for Intelligent Computing (NuPIC)
 # Copyright (C) 2016, Numenta, Inc.  Unless you have an agreement
@@ -70,7 +69,7 @@ def createNetwork():
                       "synPermConnected": 0.1,
                       "synPermActiveInc": 0.0001,
                       "synPermInactiveDec": 0.0005,
-                      "maxBoost": 1.0,
+                      "boostStrength": 0.0,
                     }))
 
   #

diff --git a/examples/network/custom_region_demo.py b/examples/network/custom_region_demo.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ----------------------------------------------------------------------
 # Numenta Platform for Intelligent Computing (NuPIC)
 # Copyright (C) 2015, Numenta, Inc.  Unless you have an agreement

diff --git a/examples/network/hierarchy_network_demo.py b/examples/network/hierarchy_network_demo.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ----------------------------------------------------------------------
 # Numenta Platform for Intelligent Computing (NuPIC)
 # Copyright (C) 2015, Numenta, Inc.  Unless you have an agreement
@@ -66,7 +65,7 @@
              "synPermConnected": 0.1,
              "synPermActiveInc": 0.0001,
              "synPermInactiveDec": 0.0005,
-             "maxBoost": 1.0}
+             "boostStrength": 0.0}
 
 # Parameter dict for TPRegion
 TP_PARAMS = {"verbosity": _VERBOSITY,

diff --git a/examples/network/network_api_demo.py b/examples/network/network_api_demo.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ----------------------------------------------------------------------
 # Numenta Platform for Intelligent Computing (NuPIC)
 # Copyright (C) 2015-2016, Numenta, Inc.  Unless you have an agreement
@@ -55,7 +54,7 @@
     "synPermConnected": 0.1,
     "synPermActiveInc": 0.0001,
     "synPermInactiveDec": 0.0005,
-    "maxBoost": 1.0,
+    "boostStrength": 0.0,
 }
 
 # Config field for TPRegion

diff --git a/examples/network/temporal_anomaly_network_demo.py b/examples/network/temporal_anomaly_network_demo.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ----------------------------------------------------------------------
 # Numenta Platform for Intelligent Computing (NuPIC)
 # Copyright (C) 2015-2016, Numenta, Inc.  Unless you have an agreement

diff --git a/examples/opf/clients/cpu/cpu.py b/examples/opf/clients/cpu/cpu.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ----------------------------------------------------------------------
 # Numenta Platform for Intelligent Computing (NuPIC)
 # Copyright (C) 2013, Numenta, Inc.  Unless you have an agreement

diff --git a/examples/opf/clients/hotgym/anomaly/hotgym_anomaly.py b/examples/opf/clients/hotgym/anomaly/hotgym_anomaly.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ----------------------------------------------------------------------
 # Numenta Platform for Intelligent Computing (NuPIC)
 # Copyright (C) 2013, Numenta, Inc.  Unless you have an agreement

diff --git a/examples/opf/clients/hotgym/anomaly/model_params.py b/examples/opf/clients/hotgym/anomaly/model_params.py
@@ -132,7 +132,10 @@
 
             'synPermInactiveDec': 0.0005,
 
-            'maxBoost': 1.0,
+            # boostStrength controls the strength of boosting. It should be a
+            # a number greater or equal than 0.0. No boosting is applied if
+            # boostStrength=0.0. Boosting encourages efficient usage of columns.
+            'boostStrength': 0.0,
         },
 
         # Controls whether TP is enabled or disabled;

diff --git a/examples/opf/clients/hotgym/anomaly/one_gym/model_params/rec_center_hourly_model_params.py b/examples/opf/clients/hotgym/anomaly/one_gym/model_params/rec_center_hourly_model_params.py
@@ -52,7 +52,7 @@
                    'spParams': { 'columnCount': 2048,
                                  'globalInhibition': 1,
                                  'inputWidth': 0,
-                                 'maxBoost': 2.0,
+                                 'boostStrength': 2.0,
                                  'numActiveColumnsPerInhArea': 40,
                                  'potentialPct': 0.8,
                                  'seed': 1956,

diff --git a/examples/opf/clients/hotgym/anomaly/one_gym/remove_tuesdays.py b/examples/opf/clients/hotgym/anomaly/one_gym/remove_tuesdays.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 import csv
 import shutil
 import datetime
@@ -44,4 +43,4 @@ def run():
 
 
 if __name__ == "__main__":
-  run()
+  run()
diff --git a/examples/opf/clients/hotgym/anomaly/one_gym/run.py b/examples/opf/clients/hotgym/anomaly/one_gym/run.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ----------------------------------------------------------------------
 # Numenta Platform for Intelligent Computing (NuPIC)
 # Copyright (C) 2013, Numenta, Inc.  Unless you have an agreement

diff --git a/examples/opf/clients/hotgym/prediction/one_gym/cleanup.py b/examples/opf/clients/hotgym/prediction/one_gym/cleanup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ----------------------------------------------------------------------
 # Numenta Platform for Intelligent Computing (NuPIC)
 # Copyright (C) 2013, Numenta, Inc.  Unless you have an agreement

diff --git a/examples/opf/clients/hotgym/prediction/one_gym/run.py b/examples/opf/clients/hotgym/prediction/one_gym/run.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ----------------------------------------------------------------------
 # Numenta Platform for Intelligent Computing (NuPIC)
 # Copyright (C) 2013, Numenta, Inc.  Unless you have an agreement

diff --git a/examples/opf/clients/hotgym/prediction/one_gym/swarm.py b/examples/opf/clients/hotgym/prediction/one_gym/swarm.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ----------------------------------------------------------------------
 # Numenta Platform for Intelligent Computing (NuPIC)
 # Copyright (C) 2013, Numenta, Inc.  Unless you have an agreement

diff --git a/examples/opf/clients/hotgym/simple/hotgym.py b/examples/opf/clients/hotgym/simple/hotgym.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ----------------------------------------------------------------------
 # Numenta Platform for Intelligent Computing (NuPIC)
 # Copyright (C) 2013, Numenta, Inc.  Unless you have an agreement

diff --git a/examples/opf/clients/nyctaxi/model_params.py b/examples/opf/clients/nyctaxi/model_params.py
@@ -73,7 +73,7 @@
       "columnCount": 2048,
       "globalInhibition": 1,
       "inputWidth": 0,
-      "maxBoost": 1.0,
+      "boostStrength": 0.0,
       "numActiveColumnsPerInhArea": 40,
       "seed": 1956,
       "spVerbosity": 0,

diff --git a/examples/opf/clients/nyctaxi/nyctaxi_anomaly.py b/examples/opf/clients/nyctaxi/nyctaxi_anomaly.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # ----------------------------------------------------------------------
 # Numenta Platform for Intelligent Computing (NuPIC)
 # Copyright (C) 2016, Numenta, Inc.  Unless you have an agreement

diff --git a/examples/opf/experiments/anomaly/temporal/simple/description.py b/examples/opf/experiments/anomaly/temporal/simple/description.py
@@ -195,13 +195,18 @@
             'synPermActiveInc': 0.05,
 
             'synPermInactiveDec': 0.008,
+
+            # boostStrength controls the strength of boosting. It should be a
+            # a number greater or equal than 0.0. No boosting is applied if
+            # boostStrength=0.0. Boosting encourages efficient usage of columns.
+            'boostStrength': 0.0,
         },
 
         # Controls whether TP is enabled or disabled;
         # TP is necessary for making temporal predictions, such as predicting
         # the next inputs.  Without TP, the model is only capable of
         # reconstructing missing sensor inputs (via SP).
-        'tpEnable' : True,
+        'tpEnable': True,
 
         'tpParams': {
             # TP diagnostic output verbosity control;

diff --git a/examples/opf/experiments/classification/base_category/description.py b/examples/opf/experiments/classification/base_category/description.py
@@ -190,6 +190,11 @@
             'synPermActiveInc': 0.05,
 
             'synPermInactiveDec': 0.008,
+
+            # boostStrength controls the strength of boosting. It should be a
+            # a number greater or equal than 0.0. No boosting is applied if
+            # boostStrength=0.0. Boosting encourages efficient usage of columns.
+            'boostStrength': 0.0,
         },
 
         # Controls whether TP is enabled or disabled;

diff --git a/examples/opf/experiments/classification/base_scalar/description.py b/examples/opf/experiments/classification/base_scalar/description.py
@@ -192,6 +192,11 @@
             'synPermActiveInc': 0.05,
 
             'synPermInactiveDec': 0.008,
+
+            # boostStrength controls the strength of boosting. It should be a
+            # a number greater or equal than 0.0. No boosting is applied if
+            # boostStrength=0.0. Boosting encourages efficient usage of columns.
+            'boostStrength': 0.0,
         },
 
         # Controls whether TP is enabled or disabled;

diff --git a/examples/opf/experiments/classification/makeDatasets.py b/examples/opf/experiments/classification/makeDatasets.py
@@ -1,4 +1,3 @@
-#! /usr/bin/env python
 # ----------------------------------------------------------------------
 # Numenta Platform for Intelligent Computing (NuPIC)
 # Copyright (C) 2013, Numenta, Inc.  Unless you have an agreement

diff --git a/examples/opf/experiments/missing_record/base/description.py b/examples/opf/experiments/missing_record/base/description.py
@@ -212,6 +212,11 @@
             'synPermActiveInc': 0.1,
 
             'synPermInactiveDec': 0.01,
+
+            # boostStrength controls the strength of boosting. It should be a
+            # a number greater or equal than 0.0. No boosting is applied if
+            # boostStrength=0.0. Boosting encourages efficient usage of columns.
+            'boostStrength': 10.0,
         },
 
         # Controls whether TP is enabled or disabled;

diff --git a/examples/opf/experiments/missing_record/make_datasets.py b/examples/opf/experiments/missing_record/make_datasets.py
@@ -1,4 +1,3 @@
-#! /usr/bin/env python
 # ----------------------------------------------------------------------
 # Numenta Platform for Intelligent Computing (NuPIC)
 # Copyright (C) 2013, Numenta, Inc.  Unless you have an agreement

diff --git a/examples/opf/experiments/multistep/base/description.py b/examples/opf/experiments/multistep/base/description.py
@@ -198,6 +198,11 @@
             'synPermActiveInc': 0.1,
 
             'synPermInactiveDec': 0.01,
+
+            # boostStrength controls the strength of boosting. It should be a
+            # a number greater or equal than 0.0. No boosting is applied if
+            # boostStrength=0.0. Boosting encourages efficient usage of columns.
+            'boostStrength': 0.0,
         },
 
         # Controls whether TP is enabled or disabled;

diff --git a/examples/opf/experiments/multistep/base/permutations_simple_3.py b/examples/opf/experiments/multistep/base/permutations_simple_3.py
@@ -1,4 +1,3 @@
-#! /usr/bin/env python
 # ----------------------------------------------------------------------
 # Numenta Platform for Intelligent Computing (NuPIC)
 # Copyright (C) 2013, Numenta, Inc.  Unless you have an agreement