Skip to content
This repository has been archived by the owner on Sep 1, 2023. It is now read-only.

Pythonic build: Switch from cmake to distutils extensions for nupic installation #1579

Merged
merged 15 commits into from
Jan 19, 2015
Merged

Pythonic build: Switch from cmake to distutils extensions for nupic installation #1579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d65b141
Switch from cmake to distutils extensions for nupic installation
Jan 11, 2015
fb18ade
Removed object-orientation.
rhyolight Jan 11, 2015
253b8f0
Merge pull request #47 from rhyolight/build_extensions
Jan 12, 2015
bdc48b2
Cleanup re: #1579. Fixup namespace conflicts with builtins (file, di…
oxtopus Jan 12, 2015
0f8482f
Merge pull request #48 from oxtopus/build_extensions
Jan 12, 2015
adc9763
Adds warning on darwin platform when ARCHFLAGS not set.
rhyolight Jan 12, 2015
c9b7555
Fix command line options
Jan 12, 2015
854966b
Merge branch 'build_extensions' of github.com:DavidRagazzi/nupic into…
rhyolight Jan 12, 2015
49de2b1
Merge pull request #49 from rhyolight/build_extensions
Jan 12, 2015
daa4841
Merge branch 'build_extensions' of github.com:DavidRagazzi/nupic into…
rhyolight Jan 12, 2015
320603b
Binary build commands require building out nupic.core
rhyolight Jan 12, 2015
43be75a
Merge pull request #50 from rhyolight/build_extensions
Jan 12, 2015
0f279e1
Merge branch 'master' into build_extensions
rhyolight Jan 13, 2015
53de635
Merge pull request #51 from rhyolight/build_extensions
Jan 13, 2015
e66635c
Changes after Scott's feedback
Jan 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ test.out
*.swp
*.coverage*

# build
build/

# personalized nupic configuration file
.nupic_config

Expand Down Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is ~nupic? I'm not convinced that I want this hidden from me if it gets created

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

~ = not, so these lines mean ignoring all files in nupic/bindings/, except *.i files.


# Pip stuff
dist/
nupic.egg-info/
nupic/*cpp_region.*
temp/

2 changes: 1 addition & 1 deletion ci/travis/install-osx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is still required for OS X builds, we'll need to add this to the README until we figure out how automate it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had added the instruction but it seems that it got lost in some place.. :-/

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this is separate from this PR but I don't set this env variable and have no problem on OS X. Why do we think it is necessary?


# Show nupic installation folder by trying to import nupic, if works, it prints
# the absolute path of nupic.__file__, which the installation folder itself.
Expand Down
17 changes: 0 additions & 17 deletions extensions/compare_nupic_core_version.cpp
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build_ext]
inplace=1

Loading