Make region file names snake_case (part 7) #3640

rhyolight · 2017-05-22T18:10:42Z

Do not merge. Tests are failing. Posting here to show the example.

…te the builtin regions registration to demonstrate failure witnessed by Matt

…nit__.py to match the renamed module to demonstrate that the class name of the python region may differ from its module name, as long as it's registered using the correct module name.

rhyolight · 2017-05-22T18:12:05Z

src/nupic/engine/__init__.py

@@ -49,7 +49,7 @@
    ("nupic.regions.KNNClassifierRegion", "KNNClassifierRegion"),
    ("nupic.regions.PluggableEncoderSensor", "PluggableEncoderSensor"),
    ("nupic.regions.PyRegion", "PyRegion"),
-    ("nupic.regions.RecordSensor", "RecordSensor"),


@vitaly-krugl @scottpurdy Here I have updated the region registration, but still getting a test error:

> python tests/unit/nupic/regions/record_sensor_region_test.py

ERR: CHECK FAILED: "pClass && PyType_Check(pClass)" [/Users/mtaylor/nta/nupic.core/src/nupic/py_support/PyHelpers.cpp line 656] WARN: PyRegion::createSpec failed: 0x7fff521cddd8 EERR: CHECK FAILED: "pClass && PyType_Check(pClass)" [/Users/mtaylor/nta/nupic.core/src/nupic/py_support/PyHelpers.cpp line 656] WARN: PyRegion::createSpec failed: 0x7fff521cddd8 EERR: CHECK FAILED: "pClass && PyType_Check(pClass)" [/Users/mtaylor/nta/nupic.core/src/nupic/py_support/PyHelpers.cpp line 656] WARN: PyRegion::createSpec failed: 0x7fff521cdf48 E ====================================================================== ERROR: testActValueOut (__main__.RecordSensorRegionTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "tests/unit/nupic/regions/record_sensor_region_test.py", line 118, in testActValueOut network = _createNetwork() File "tests/unit/nupic/regions/record_sensor_region_test.py", line 36, in _createNetwork network.addRegion('sensor', 'py.record_sensor', '{}') File "/Users/mtaylor/nta/nupic/src/nupic/engine/__init__.py", line 641, in addRegion engine_internal.Network.addRegion(self, name, nodeType, nodeParams) File "/Users/mtaylor/nta/nupic.core/bindings/py/src/nupic/bindings/engine_internal.py", line 1167, in addRegion return _engine_internal.Network_addRegion(self, *args, **kwargs) AttributeError: 'module' object has no attribute 'record_sensor' ====================================================================== ERROR: testBucketIdxOut (__main__.RecordSensorRegionTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "tests/unit/nupic/regions/record_sensor_region_test.py", line 111, in testBucketIdxOut network = _createNetwork() File "tests/unit/nupic/regions/record_sensor_region_test.py", line 36, in _createNetwork network.addRegion('sensor', 'py.record_sensor', '{}') File "/Users/mtaylor/nta/nupic/src/nupic/engine/__init__.py", line 641, in addRegion engine_internal.Network.addRegion(self, name, nodeType, nodeParams) File "/Users/mtaylor/nta/nupic.core/bindings/py/src/nupic/bindings/engine_internal.py", line 1167, in addRegion return _engine_internal.Network_addRegion(self, *args, **kwargs) AttributeError: 'module' object has no attribute 'record_sensor' ====================================================================== ERROR: testVaryingNumberOfCategories (__main__.RecordSensorRegionTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "tests/unit/nupic/regions/record_sensor_region_test.py", line 72, in testVaryingNumberOfCategories "sensor", "py.record_sensor", "{'numCategories': 2}") File "/Users/mtaylor/nta/nupic/src/nupic/engine/__init__.py", line 641, in addRegion engine_internal.Network.addRegion(self, name, nodeType, nodeParams) File "/Users/mtaylor/nta/nupic.core/bindings/py/src/nupic/bindings/engine_internal.py", line 1167, in addRegion return _engine_internal.Network_addRegion(self, *args, **kwargs) AttributeError: 'module' object has no attribute 'record_sensor' ---------------------------------------------------------------------- Ran 3 tests in 0.005s FAILED (errors=3)

I think it should be:

("nupic.regions.record_sensor", "RecordSensor"),

Tried that first, same problem.

@rhyolight: @scottpurdy is right. See my PR that demonstrated the same change that you're attempting to make and built successfully in all environments: https://github.com/numenta/nupic/pull/3632/files.

Please compare your changes against my PR or reopen my PR and use it, instead.

See other comments on a few of the places that need to be updated to "py.RecordSensor". Can you change this back to my suggestion so I can see everything in context. I'm not sure which permutations you tried.

…-RecordSensor-region-module-demo

scottpurdy · 2017-05-22T21:23:53Z

docs/examples/network/example-create-regions.py

@@ -1,7 +1,7 @@
 import json

 # Add a sensor region, set its encoder and data source.
-network.addRegion("sensor", "py.RecordSensor", json.dumps({"verbosity": 0}))
+network.addRegion("sensor", "py.record_sensor", json.dumps({"verbosity": 0}))


This should be "py.RecordSensor"

scottpurdy · 2017-05-22T21:24:10Z

examples/network/custom_region_demo.py

@@ -68,7 +68,7 @@ def createNetwork(dataSource):
  # Our input is sensor data from the gym file. The RecordSensor region
  # allows us to specify a file record stream as the input source via the
  # dataSource attribute.
-  network.addRegion("sensor", "py.RecordSensor",
+  network.addRegion("sensor", "py.record_sensor",


"py.RecordSensor"

scottpurdy · 2017-05-22T21:24:15Z

examples/network/hierarchy_network_demo.py

@@ -135,7 +135,7 @@ def createRecordSensor(network, name, dataSource):
  """

  # Specific type of region. Possible options can be found in /nupic/regions/
-  regionType = "py.RecordSensor"
+  regionType = "py.record_sensor"


"py.RecordSensor"

rhyolight · 2017-05-22T21:26:34Z

@scottpurdy Figured it out, thanks. I changed the wrong strings.

vitaly-krugl

LGTM, assuming tests pass.

vitaly-krugl · 2017-05-22T21:08:18Z

src/nupic/engine/__init__.py

@@ -49,7 +49,7 @@
    ("nupic.regions.KNNClassifierRegion", "KNNClassifierRegion"),
    ("nupic.regions.PluggableEncoderSensor", "PluggableEncoderSensor"),
    ("nupic.regions.PyRegion", "PyRegion"),
-    ("nupic.regions.RecordSensor", "RecordSensor"),


@rhyolight: @scottpurdy is right. See my PR that demonstrated the same change that you're attempting to make and built successfully in all environments: https://github.com/numenta/nupic/pull/3632/files.

Please compare your changes against my PR or reopen my PR and use it, instead.

vitaly-krugl · 2017-05-22T21:16:32Z

docs/examples/network/complete-network-example.py

@@ -58,7 +58,7 @@ def createNetwork(dataSource):
  network = Network()

  # Add a sensor region.
-  network.addRegion("sensor", "py.RecordSensor", '{}')
+  network.addRegion("sensor", "py.record_sensor", '{}')


@rhyolight, this change and othes like it are the culprit. You should leave them alone. "py.RecordSensor" refers to the class name, not the module name. The registration logic then locates the module name that matches the class name.

rhyolight · 2017-05-22T23:12:09Z

@scottpurdy @vitaly-krugl Ok guys. I'm going to add the rest of the region name changes to this PR. More commits coming.

renamed: src/nupic/regions/KNNClassifierRegion.py -> src/nupic/regions/knn_classifier_region.py renamed: src/nupic/regions/PluggableEncoderSensor.py -> src/nupic/regions/pluggable_encoder_sensor.py renamed: src/nupic/regions/SDRClassifierRegion.py -> src/nupic/regions/sdr_classifier_region.py

renamed: src/nupic/regions/SPRegion.py -> src/nupic/regions/sp_region.py renamed: src/nupic/regions/TMRegion.py -> src/nupic/regions/tm_region.py

RecordSensorFilter -> record_sensor_filters SVMClassifierNode -> svm_classifier_node TestRegion -> test_region UnimportableNode -> unimportable_node

rhyolight · 2017-05-23T22:11:23Z

@scottpurdy or @vitaly-krugl This is ready for final review.

scottpurdy

Great work!

Vitaly Kruglikov added 2 commits May 16, 2017 13:17

NUP-2386 Renamed RecordSensor.py to record_sensor.py, but didn't upda…

6a53633

…te the builtin regions registration to demonstrate failure witnessed by Matt

NUP-2386 Updated module name of the RecordSensor region in engine/__i…

78b181a

…nit__.py to match the renamed module to demonstrate that the class name of the python region may differ from its module name, as long as it's registered using the correct module name.

rhyolight commented May 22, 2017

View reviewed changes

Merge branch 'master' of github.com:numenta/nupic into nup2386-rename…

a2f567c

…-RecordSensor-region-module-demo

scottpurdy reviewed May 22, 2017

View reviewed changes

Removed a comment

404c031

rhyolight force-pushed the snake_case_7 branch from 61e18a6 to 404c031 Compare May 22, 2017 21:25

vitaly-krugl approved these changes May 22, 2017

View reviewed changes

rhyolight changed the title ~~WIP Move RecordSensor.py --> record_sensor.py~~ Make region file names snake_case (part 7) May 23, 2017

rhyolight added 10 commits May 23, 2017 11:12

Merge branch 'master' of github.com:numenta/nupic into snake_case_7

577240d

Moved AnomalyRegion.py => anomaly_region.py

3e67e7a

Updated errant AnomalyLikelihoodRegion namespace in docs"

3d27100

Moved CLAClassifierRegion.py => cla_classifier_region.py

40b92a0

Moved KNNAnomalyClassifierRegion.py -> knn_anomaly_classifier_region.py

ff2699a

Moved nupic.regions.Spec -> nupic.regions.spec

4731f29

Renamed sp and tm regions

5364a55

renamed: src/nupic/regions/SPRegion.py -> src/nupic/regions/sp_region.py renamed: src/nupic/regions/TMRegion.py -> src/nupic/regions/tm_region.py

More region renaming

fb8cd5d

RecordSensorFilter -> record_sensor_filters SVMClassifierNode -> svm_classifier_node TestRegion -> test_region UnimportableNode -> unimportable_node

Updated docs readme with new region namespaces

4ec163f

Merge branch 'master' of github.com:numenta/nupic into snake_case_7

7b8a7c6

scottpurdy approved these changes May 24, 2017

View reviewed changes

rhyolight merged commit acd3e00 into numenta:master May 24, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make region file names snake_case (part 7) #3640

Make region file names snake_case (part 7) #3640

rhyolight commented May 22, 2017 •

edited

Loading

rhyolight May 22, 2017

scottpurdy May 22, 2017

rhyolight May 22, 2017

vitaly-krugl May 22, 2017

scottpurdy May 22, 2017

scottpurdy May 22, 2017

scottpurdy May 22, 2017

scottpurdy May 22, 2017

rhyolight commented May 22, 2017

vitaly-krugl left a comment

vitaly-krugl May 22, 2017

vitaly-krugl May 22, 2017

rhyolight commented May 22, 2017

rhyolight commented May 23, 2017

scottpurdy left a comment

Make region file names snake_case (part 7) #3640

Make region file names snake_case (part 7) #3640

Conversation

rhyolight commented May 22, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rhyolight commented May 22, 2017

vitaly-krugl left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rhyolight commented May 22, 2017

rhyolight commented May 23, 2017

scottpurdy left a comment

Choose a reason for hiding this comment

rhyolight commented May 22, 2017 •

edited

Loading