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.

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

Fix issue 519: Improved connection parameter skipping with connection rule all_to_all #568

Merged
merged 5 commits into from Dec 8, 2016

Conversation

@golosio
Copy link
Contributor

golosio commented Nov 28, 2016

This PR fixes issue 519: #519
in conn_builder.cpp, lines as:

  for ( GIDCollection::const_iterator sgid = sources_->begin();
        sgid != sources_->end();
        ++sgid )
    skip_conn_parameter_( tid );

have been replaced by passing the number of source neurons as second argument of the call to skip_conn_parameter.
I also wrote an MPI test for connection with array parameters and connection rule all_to_all.

@golosio
Copy link
Contributor Author

golosio commented Nov 28, 2016

I propose @hannahbos and @heplesser as reviewers.

@golosio
Copy link
Contributor Author

golosio commented Nov 28, 2016

@heplesser why this PR is not going to travis? I do not understand what does it mean this branch has a conflict. Does it mean that there was some modification of conn_builder.cpp that I did not pull before doing my changes?

@heplesser heplesser changed the title Fix issue 519: Improved skip connection parameters with connection rule all_to_all Fix issue 519: Improved connection parameter skipping with connection rule all_to_all Nov 28, 2016
@heplesser
Copy link
Contributor

heplesser commented Nov 29, 2016

@golosio Curious that it didn't go to Travis. It may be because the title contained "skip", but I thought one had to add [skip ci] to the title to suppress Travis checks.

@lekshmideepu Do you have any idea what is going on?

Copy link
Contributor

heplesser left a comment

Looks good. 👍

@golosio
Copy link
Contributor Author

golosio commented Nov 29, 2016

@heplesser Indeed the file conn_builder.cpp has been modified while I was working on it, so there was a conflict. Now I got the last version of the file and I applied the same changes on this file. Everything should be ok now.

@hannahbos
Copy link

hannahbos commented Dec 7, 2016

Thanks for improving this. 👍

@heplesser heplesser merged commit c2b0a81 into nest:master Dec 8, 2016
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.