Merge pull request numenta#1579 from david-ragazzi/build_extensions

Pythonic build: Switch from cmake to distutils extensions for nupic installation
mihail911 · Jan 19, 2015 · 83de484 · 83de484
2 parents 7d68372 + 92ac498
commit 83de484
Show file tree

Hide file tree

Showing 5 changed files with 599 additions and 132 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,9 @@ test.out
 *.swp
 *.coverage*
 
+# build
+build/
+
 # personalized nupic configuration file
 .nupic_config
 
@@ -63,16 +66,11 @@ extensions/core/
 experimental/
 
 # nupic bindings swig libraries
-nupic/bindings/*engine_internal.*
-nupic/bindings/*algorithms.*
-nupic/bindings/*iorange.*
-nupic/bindings/*math.*
-nupic/bindings/*.cxx
-nupic/bindings/proto/*.capnp
+nupic/bindings/
+~nupic/bindings/*.i
 
 # Pip stuff
 dist/
 nupic.egg-info/
 nupic/*cpp_region.*
 temp/
-
diff --git a/ci/travis/install-osx.sh b/ci/travis/install-osx.sh
@@ -32,7 +32,7 @@ python --version
 
 # Build NuPIC
 cd ${TRAVIS_BUILD_DIR}
-python setup.py install --user
+ARCHFLAGS="-arch x86_64" python setup.py install --user
 
 # Show nupic installation folder by trying to import nupic, if works, it prints
 # the absolute path of nupic.__file__, which the installation folder itself.

diff --git a/extensions/compare_nupic_core_version.cpp b/extensions/compare_nupic_core_version.cpp
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,3 @@
+[build_ext]
+inplace=1
+