Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Column pooler2 update #293

Closed
wants to merge 25 commits into from
Closed

Column pooler2 update #293

wants to merge 25 commits into from

Conversation

breznak
Copy link
Member

@breznak breznak commented Mar 2, 2019

updates to CP branch

  • merges master (makes this PR a bit messy)
  • uses upstream MNIST experiment
  • small fixes to CP
  • all compiles & runs
    • but I'm unlucky, MNIST score is again ~20% 🤔

breznak added 13 commits February 28, 2019 18:18
@breznak
SP: strip unlearned columns: return usage
d2f061a 
return number of cols removed/stripped.
and print if > 0
@breznak
Merge branch 'master_community' into sp_stripUnlearnedColumns
2a570a9
@breznak
SP: removed stripUnlearnedColumns()
d5bcc46
@breznak
Revert "Start ASCII experiment"
0c3bc81 
This reverts commit 19ef852.
@breznak
Merge branch 'master_community' into columnPooler2-update
a39117a
@breznak
merge MNIST example from master
c7e7b9d
@breznak
resolve merge conflicts
f499e01 
removed duplicit MNIST cmake entry
@breznak
ColumnPooler: make in namespace nupic::algorithms::column_pooler
01e83b0
@breznak
ColumnPooler: add initialize() and default empty constructor
d132610
@breznak
CP: fix typo Inhbition -> Inhibition in names
6bffed9
@breznak
MNIST: using CP instead of SP
1926f0f
@breznak
Connections: adaptSegment make const input,
3d853b8 
add check for segfault from CP
@breznak
CP: tmp check potential segfault
ca27761
@breznak
Copy link
Member Author

breznak commented Mar 2, 2019

@ctrl-z-9000-times

breznak
breznak commented Mar 2, 2019
View reviewed changes
src/nupic/algorithms/ColumnPooler.cpp
@@ -42,6 +42,10 @@
#include <nupic/math/Math.hpp>
#include <nupic/math/Topology.hpp>

namespace nupic {
namespace algorithms {
namespace column_pooler {
Copy link
Member Author

Choose a reason for hiding this comment

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

added ns

src/nupic/algorithms/ColumnPooler.cpp
@@ -61,7 +65,7 @@ class ColumnPooler // : public Serializable
vector<UInt> distalInputDimensions_;
vector<UInt> inhibitionDimensions_;
vector<UInt> cellDimensions_;
UInt cellsPerInhbitionArea_;
UInt cellsPerInhibitionArea_;
Copy link
Member Author

Choose a reason for hiding this comment

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

confusing name/typo

src/nupic/algorithms/ColumnPooler.cpp
@@ -112,11 +116,65 @@ class ColumnPooler // : public Serializable

Connections distalConnections;


ColumnPooler() {}; //default constructor, must call initialize to setup properly
Copy link
Member Author

Choose a reason for hiding this comment

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

default constructor & initialize()

src/nupic/algorithms/ColumnPooler.cpp
@@ -400,6 +458,7 @@ class ColumnPooler // : public Serializable
for(const auto &cell : active.getFlatSparse())
{
// Adapt Proximal Segments
NTA_CHECK(cell < proximalMaxSegment_.size()) << "cell oob! " << cell << " < " << proximalMaxSegment_.size();
Copy link
Member Author

Choose a reason for hiding this comment

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

not sure, but sometimes I may crash here

@breznak breznak added the ready label Mar 2, 2019
@breznak breznak mentioned this pull request Mar 2, 2019
Open
5 tasks
breznak and others added 9 commits March 2, 2019 16:09
@ctrl-z-9000-times
Copy link
Collaborator

Thanks for working on this @breznak!
I have a few changes on my own branch which I want to merge with your changes when I get the chance, and then I will merge this into the main development branch columnPooler2

@breznak
Copy link
Member Author

breznak commented Mar 2, 2019

I have a few changes on my own branch which I want to merge with your changes when I get the chance, and then I will merge this into the main development branch columnPooler2

thanks! This was working ok, but some merge conglict broke between me merging your 2nd push to cp2 branch, and merging master.. I'll be trying to fix that.

@breznak
Copy link
Member Author

breznak commented Mar 3, 2019

Thanks for merging this in the main devel branch. Closing.

@breznak breznak closed this Mar 3, 2019
@breznak breznak deleted the columnPooler2-update branch March 3, 2019 08:29
@breznak breznak mentioned this pull request Mar 3, 2019
Draft
14 tasks
@breznak breznak mentioned this pull request Apr 4, 2019
Merged
@breznak breznak mentioned this pull request Jul 6, 2019
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ctrl-z-9000-times ctrl-z-9000-times Awaiting requested review from ctrl-z-9000-times

Assignees
No one assigned
Labels
ready
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@breznak @ctrl-z-9000-times