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

Integration with nupic.core API #751

Merged
merged 88 commits into from
Apr 8, 2014
Merged

Integration with nupic.core API #751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
44342a4
"htmtest" only with PyNode tests moved to "/tests"
Mar 27, 2014
def5632
.gitignored updated to ignore "/nta" folder
Mar 27, 2014
e3ab961
CMake file is able to build submodules
Mar 27, 2014
6de1052
A improved version of CMake file
Mar 28, 2014
ab45215
Fixed -lc++abi issue
Mar 28, 2014
34f68e8
Fixed -gfull issue
Mar 28, 2014
e586d5a
Update .gitmodules
Apr 1, 2014
8db1211
Update .gitmodules
Apr 1, 2014
37fd170
Updated SHA
Apr 1, 2014
ecf0a88
Update SHA
Apr 1, 2014
52cb6ae
Replaced "nupic.core" to "nupic_core" (compliance with file name conv…
Apr 2, 2014
cf995eb
Update SHA
Apr 2, 2014
98b4719
Force Travis to compile
Apr 3, 2014
fc599c0
"htmtest" only with PyNode tests moved to "/tests"
Mar 27, 2014
2185ede
.gitignored updated to ignore "/nta" folder
Mar 27, 2014
4250138
CMake file is able to build submodules
Mar 27, 2014
62a0f58
A improved version of CMake file
Mar 28, 2014
1cccc04
Fixed -lc++abi issue
Mar 28, 2014
6908bbc
Fixed -gfull issue
Mar 28, 2014
b6fde05
Update .gitmodules
Apr 1, 2014
f29d0b8
Update .gitmodules
Apr 1, 2014
b494dc7
Updated SHA
Apr 1, 2014
d00f974
Update SHA
Apr 1, 2014
3262d04
Replaced "nupic.core" to "nupic_core" (compliance with file name conv…
Apr 2, 2014
3adfb04
Update SHA
Apr 2, 2014
bede134
Force Travis to compile
Apr 3, 2014
fc63e6f
Merge branch 'master' of https://github.com/DavidRagazzi/nupic
Apr 3, 2014
292ce71
Update Travis file
Apr 3, 2014
89d3b20
Pass release dir, i.e. $NTA by command line
Apr 3, 2014
7bb9ac7
Removed "testeverything" test from Travis (it is at nupic.core)
Apr 3, 2014
11ea1c3
Removed "-stdlib=libstdc++" from Linux build
Apr 3, 2014
7abbcff
update SHA to HEAD
Apr 4, 2014
6581257
disable Werror temporarily
Apr 4, 2014
e1c728e
use system includes -isystem to avoid warnings on external
Apr 4, 2014
6ed6258
Revert "disable Werror temporarily"
Apr 4, 2014
df282f9
parse NTA_INCLUDEFLAGS for swig, avoid -isystem
Apr 4, 2014
76aaacc
remove unused val htmtest (Werror)
Apr 4, 2014
4f207af
Solved "-isystem" issue
Apr 4, 2014
7c7b6d0
Revert "Solved "-isystem" issue"
Apr 4, 2014
ebb4f85
Merge pull request #1 from breznak/tst
Apr 4, 2014
4dcdd42
CMake use PROJECT_BUILD_RELEASE_DIR where possible
Apr 6, 2014
9751bfc
CMake use PROJECT_BUILD_RELEASE_DIR where possible
Apr 6, 2014
7b12be4
respect user-defined NTA NUPIC BUILDDIR variables
Apr 6, 2014
434e16f
Merge pull request #3 from breznak/fix_variables
Apr 6, 2014
5ee93ba
Warning message ("You need logoff") when environment variables are cr…
Apr 6, 2014
2e6408c
Revert config of build/release and build/temp by NTA and NTABUILDDIR
Apr 6, 2014
0ec73da
Changes from (https://github.com/DavidRagazzi/nupic/pull/4) inserted …
Apr 7, 2014
ae9f9fe
Changes from (https://github.com/DavidRagazzi/nupic/pull/4) inserted …
Apr 7, 2014
86e4890
Changes from (https://github.com/DavidRagazzi/nupic/pull/4) inserted …
Apr 7, 2014
4f787e5
Changes from (https://github.com/DavidRagazzi/nupic/pull/4) inserted …
Apr 7, 2014
bf97838
Delete run_tests.sh
Apr 7, 2014
171e158
Improvements at Readme file
Apr 7, 2014
39c074d
Solved "testeverything" issue
Apr 7, 2014
b893970
Fixed 'htmtest' conflicting binary name
Apr 7, 2014
4414ccf
Fixed 'htmtest' conflicting binary name
Apr 7, 2014
d4e9173
Fixed 'tests_all' target
Apr 7, 2014
662fc9b
Use 'make' instead of direct call to test binaries
Apr 7, 2014
7d2336a
Revert "Use 'make' instead of direct call to test binaries"
Apr 7, 2014
79bbed0
Removed 'tests_run_all' from 'tests_all' ('tests_run_all' are run by …
Apr 7, 2014
b0a67e7
Use 'make' instead of direct call to test binaries
Apr 7, 2014
d748ef2
Change to scripts dir before call make "tests_*"
Apr 7, 2014
fad10da
Updated SHA
Apr 7, 2014
5b1d09b
Update README.md
Apr 7, 2014
bbb6a6b
Update README.md
Apr 7, 2014
a1c1098
Update SHA
Apr 7, 2014
567aa53
Improving warning message "You should logoff" (it is advised to user …
Apr 7, 2014
f7b8706
set PROJECT_BUILD_RELEASE_DIR to $NTA as default value
Apr 7, 2014
598a2f3
Included environment variables from env.sh
Apr 8, 2014
b841485
Delete env.sh
Apr 8, 2014
d62f5bf
Get Python version directly from shell
Apr 8, 2014
3038998
Fixing PY_VERSION
Apr 8, 2014
7e1749f
Fixing PY_VERSION
Apr 8, 2014
6b88b4c
Force PY_VERSION=2.7
Apr 8, 2014
f27071a
Force PY_VERSION=2.7
Apr 8, 2014
d46d903
Force PY_VERSION=2.7
Apr 8, 2014
d45385d
Remove "export PY_VERSION" (it already is set in lines above)
Apr 8, 2014
6c85302
Update .travis.yml
Apr 8, 2014
b0fd4c9
Update .travis.yml
Apr 8, 2014
b56c858
Update .travis.yml
Apr 8, 2014
f6a0db7
Update .travis.yml
Apr 8, 2014
d99dd45
Update .travis.yml
Apr 8, 2014
c3768e7
Adaptation of "https://github.com/DavidRagazzi/nupic/pull/5/files" RE…
Apr 8, 2014
55aea52
All required environment variables now
Apr 8, 2014
febae65
All required environment variables now
Apr 8, 2014
d308837
Update README.md
Apr 8, 2014
31ebfa5
Removed double quote in export PYTHONPATH
Apr 8, 2014
68834b5
Merge branch 'master' of github.com:numenta/nupic into david-master
rhyolight Apr 8, 2014
46835bf
Merge pull request #7 from rhyolight/david-master
Apr 8, 2014
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,5 @@ configure.ac
# /py/nupic/frameworks/prediction/
/py/nupic/frameworks/prediction/.project
/py/nupic/frameworks/prediction/.pydevproject

nta
15 changes: 9 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,21 @@ install:
- pip install -q -r $NUPIC/external/common/requirements.txt
- "mkdir -p $TRAVIS_BUILD_DIR/build/scripts"
- "cd $TRAVIS_BUILD_DIR/build/scripts"
- "cmake $NUPIC"
- "cmake $NUPIC -DPROJECT_BUILD_RELEASE_DIR:STRING=$NTA"
- "make -j3"
- "cd"

# Add more environment variables
- "export PYTHONPATH=$PYTHONPATH:$NTA/lib/python$PY_VERSION/site-packages"
- "export NTA_ROOTDIR=$NTA"

script:
- "cd $TRAVIS_BUILD_DIR/build/scripts"
# legacy binary tests
- "$NTA/bin/htmtest"
# (not quite everything, really)
- "$NTA/bin/testeverything"
- "make tests_pyhtm"
# actual unit tests
- "cd $NUPIC"
- "$NUPIC/run_tests.sh --all"
- "make tests_run_all"
- "cd"

# run all example files
# examples/bindings
Expand Down
Loading