Merge pull request #2256 from david-ragazzi/rename_cppregion

Fix 2255: Rename CppRegion to PyRegion
numenta · Jun 30, 2015 · 3605956 · 3605956
2 parents df85929 + 56a0ab5
commit 3605956
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -71,5 +71,5 @@ nupic/bindings/proto/*.capnp
 # Pip stuff
 dist/
 nupic.egg-info/
-nupic/*cpp_region.*
+nupic/*py_region.*
 temp/
diff --git a/.nupic_modules b/.nupic_modules
@@ -1,3 +1,3 @@
 # Default nupic.core dependencies (override in optional .nupic_config)
 NUPIC_CORE_REMOTE = 'git://github.com/numenta/nupic.core.git'
-NUPIC_CORE_COMMITISH = 'cb55ebd9633923040176db0c041945f190d69800'
+NUPIC_CORE_COMMITISH = '140a176ef1f53bb5014e60cec5a26ecc0498d23e'
diff --git a/extensions/cpp_region/PyRegion.cpp → extensions/py_region/PyRegion.cpp b/extensions/cpp_region/PyRegion.cpp → extensions/py_region/PyRegion.cpp
@@ -20,7 +20,7 @@
  * ---------------------------------------------------------------------
  */
 
-#include <cpp_region/PyRegion.hpp>
+#include <py_region/PyRegion.hpp>
 #include <numpy/arrayobject.h>
 #include <iostream>
 #include <sstream>

diff --git a/extensions/cpp_region/PyRegion.hpp → extensions/py_region/PyRegion.hpp b/extensions/cpp_region/PyRegion.hpp → extensions/py_region/PyRegion.hpp
diff --git a/extensions/cpp_region/README → extensions/py_region/README b/extensions/cpp_region/README → extensions/py_region/README
diff --git a/...ns/cpp_region/unittests/PyHelpersTest.cpp → ...ons/py_region/unittests/PyHelpersTest.cpp b/...ns/cpp_region/unittests/PyHelpersTest.cpp → ...ons/py_region/unittests/PyHelpersTest.cpp
diff --git a/...ns/cpp_region/unittests/PyHelpersTest.hpp → ...ons/py_region/unittests/PyHelpersTest.hpp b/...ns/cpp_region/unittests/PyHelpersTest.hpp → ...ons/py_region/unittests/PyHelpersTest.hpp
diff --git a/setup.py b/setup.py
@@ -412,18 +412,18 @@ def getExtensionModules(nupicCoreReleaseDir, platform, bitness, cmdOptions=None)
 
   extensions = []
 
-  libDynamicCppRegion = Extension(
-    "nupic." + getLibPrefix(platform) + "cpp_region",
+  libDynamicPyRegion = Extension(
+    "nupic." + getLibPrefix(platform) + "py_region",
     extra_compile_args=commonCompileFlags,
     define_macros=commonDefines,
     extra_link_args=commonLinkFlags,
     include_dirs=commonIncludeDirs,
     libraries=commonLibraries,
     sources=pythonSupportSources +
-      ["extensions/cpp_region/PyRegion.cpp",
-       "extensions/cpp_region/unittests/PyHelpersTest.cpp"],
+      ["extensions/py_region/PyRegion.cpp",
+       "extensions/py_region/unittests/PyHelpersTest.cpp"],
     extra_objects=commonObjects)
-  extensions.append(libDynamicCppRegion)
+  extensions.append(libDynamicPyRegion)
 
   #
   # SWIG
@@ -625,8 +625,8 @@ def postProcess():
   shutil.copy(
     nupicCoreReleaseDir + "/bin/py_region_test", REPO_DIR + "/bin"
   )
-  # Copy cpp_region located at build dir into source dir
-  shutil.copy(buildDir + "/nupic/" + getLibPrefix(platform) + "cpp_region" +
+  # Copy py_region located at build dir into source dir
+  shutil.copy(buildDir + "/nupic/" + getLibPrefix(platform) + "py_region" +
               getSharedLibExtension(platform), REPO_DIR + "/nupic")
 
 options = getCommandLineOptions()