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

Default index mode for chainerx Take #8281

Merged
merged 1 commit into from
Oct 30, 2019
Merged

Default index mode for chainerx Take #8281

merged 1 commit into from
Oct 30, 2019

Conversation

emcastillo
Copy link
Member

@emcastillo emcastillo commented Oct 10, 2019 •
edited

Allows the examples to be built

Closes #8276

@niboshi niboshi mentioned this pull request Oct 11, 2019
Merged
@emcastillo
Copy link
Member Author

PTAL

emcastillo
emcastillo commented Oct 11, 2019
View reviewed changes
chainerx_cc/chainerx/array_index.h Outdated
@@ -16,6 +16,14 @@ enum class ArrayIndexTag {
kEllipsis,
};

enum class IndexBoundsMode {
// Index out-of-bounds handling modes for take
Copy link
Member Author

Choose a reason for hiding this comment

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

TODO: remove this comment or update it with all the routines that support it
choose also allows index mode kwarg

@emcastillo
Copy link
Member Author

I updated the comment that describes the IndexBoundsMode,
Since this indexing mode is used at more than one routine in numpy, I think that the most appropiate place to declare it is the array_index file as I discussed with @niboshi before.

Should we merge this instead of #8288?

@hvy
Copy link
Member

hvy commented Oct 28, 2019

This basically LGTM, @niboshi may I proceed with merging it?

niboshi
niboshi requested changes Oct 30, 2019
View reviewed changes
Copy link
Member

@niboshi niboshi left a comment

Choose a reason for hiding this comment

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

I made some additional comments. Please check.

chainerx_cc/chainerx/array_index.h Outdated Show resolved Hide resolved
chainerx_cc/chainerx/routines/indexing.h Outdated Show resolved Hide resolved
chainerx_cc/chainerx/routines/indexing.cc Outdated Show resolved Hide resolved
@emcastillo
Copy link
Member Author

Comments addressed! thanks a lot :)!

@niboshi
Copy link
Member

niboshi commented Oct 30, 2019

Thanks
Jenkins, test this please

@niboshi niboshi added the st:test-and-merge State indicating that pull request is approved by a reviewer and can be merged after CI passes. label Oct 30, 2019
@niboshi niboshi added this to the v7.0.0 milestone Oct 30, 2019
@niboshi niboshi added cat:bug Bug report or fix. cat:enhancement Implementation that does not break interfaces. and removed cat:bug Bug report or fix. labels Oct 30, 2019
@chainer-ci
Copy link
Member

Jenkins CI test (for commit 6a41596, target branch master) succeeded!

@mergify mergify bot merged commit f8bede5 into chainer:master Oct 30, 2019
@emcastillo emcastillo deleted the take-fix branch October 30, 2019 04:07
@hvy hvy mentioned this pull request Oct 30, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@niboshi niboshi niboshi approved these changes

Assignees

@niboshi niboshi

Labels
cat:enhancement Implementation that does not break interfaces. st:test-and-merge State indicating that pull request is approved by a reviewer and can be merged after CI passes.
Projects
None yet
Milestone
v7.0.0
Development

Successfully merging this pull request may close these issues.

ChainerX example cannot build
4 participants
@emcastillo @hvy @niboshi @chainer-ci