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

Op registration: math #6842

Merged
merged 4 commits into from Apr 12, 2019
Merged

Op registration: math #6842

merged 4 commits into from Apr 12, 2019

Conversation

asi1024
Copy link
Member

@asi1024 asi1024 commented Apr 11, 2019 •
edited

Part of #6692.

@asi1024 asi1024 added the ChainerX Related to ChainerX. label Apr 11, 2019
@asi1024 asi1024 added this to Ready to Review in ChainerX sprint backlog via automation Apr 11, 2019
@niboshi niboshi mentioned this pull request Apr 11, 2019
Closed
15 tasks
@niboshi niboshi moved this from Ready to Review to Reviewing in ChainerX sprint backlog Apr 11, 2019
@niboshi niboshi self-assigned this Apr 11, 2019
niboshi
niboshi requested changes Apr 11, 2019
View reviewed changes
chainerx_cc/chainerx/cuda/cuda_device/activation.cu
using CudaTypeOut = cuda_internal::DataType<Out>;
Elementwise<const In, const Out, Out>(
IfLessElseASSAImpl<In, Out>{static_cast<CudaTypeIn>(x2), static_cast<CudaTypeOut>(pos)}, x1_cast, neg_cast, out);
class CudaIfLessElseASSAOp : public IfLessElseASSAOp {
Copy link
Member

Choose a reason for hiding this comment

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

Enclose in namespace {.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed.

ChainerX sprint backlog automation moved this from Reviewing to Needs Changes Apr 11, 2019
@asi1024 asi1024 moved this from Needs Changes to Ready to Review in ChainerX sprint backlog Apr 11, 2019
@niboshi niboshi moved this from Ready to Review to Reviewing in ChainerX sprint backlog Apr 11, 2019
@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 Apr 11, 2019
@niboshi
Copy link
Member

niboshi commented Apr 11, 2019

Jenkins, test this please

@pfn-ci-bot
Copy link
Collaborator

Successfully created a job for commit 4127749 (2fce18d):

@asi1024
Copy link
Member Author

asi1024 commented Apr 11, 2019

Resolved conflicts. Jenkins, test this please.

@pfn-ci-bot
Copy link
Collaborator

Successfully created a job for commit 69f6a28 (bdaa930):

@chainer-ci
Copy link
Member

Jenkins CI test (for commit 69f6a28, target branch master) succeeded!

@niboshi
Copy link
Member

niboshi commented Apr 11, 2019

Please resolve the conflict.

@niboshi niboshi moved this from Reviewing to Needs Changes in ChainerX sprint backlog Apr 11, 2019
@niboshi niboshi removed the st:test-and-merge State indicating that pull request is approved by a reviewer and can be merged after CI passes. label Apr 11, 2019
@niboshi
Copy link
Member

niboshi commented Apr 11, 2019

@asi1024 Please merge instead of rebase when resolving conflict. Reviewing is much easier.
Also please refrain from triggering jenkins by yourself.

@asi1024 asi1024 moved this from Needs Changes to Ready to Review in ChainerX sprint backlog Apr 11, 2019
@niboshi
Copy link
Member

niboshi commented Apr 11, 2019

Jenkins, test this please

@pfn-ci-bot
Copy link
Collaborator

Successfully created a job for commit a4e514f (2d5f283):

@niboshi niboshi added 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. labels Apr 11, 2019
@niboshi niboshi added the to-be-backported Pull request that should be backported. label Apr 11, 2019
@niboshi niboshi moved this from Ready to Review to Waiting for CI in ChainerX sprint backlog Apr 11, 2019
@chainer-ci
Copy link
Member

Jenkins CI test (for commit a4e514f, target branch master) failed with status FAILURE.

@niboshi
Copy link
Member

niboshi commented Apr 11, 2019

Hmm, please fix the conflict once again :(

@hvy
Copy link
Member

hvy commented Apr 11, 2019

Jenkins, test this please.

@pfn-ci-bot
Copy link
Collaborator

Successfully created a job for commit c3a9165 (c70a70d):

@chainer-ci
Copy link
Member

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

@niboshi
Copy link
Member

niboshi commented Apr 12, 2019

LGTM

@niboshi niboshi merged commit e3d90b8 into chainer:master Apr 12, 2019
ChainerX sprint backlog automation moved this from Waiting for CI to Done Apr 12, 2019
@hvy hvy removed the to-be-backported Pull request that should be backported. label Apr 12, 2019
@hvy
Copy link
Member

hvy commented Apr 12, 2019

Removing to-be-backported as we decided not to backport non-critical PRs.

@niboshi niboshi added this to the v7.0.0a1 milestone Apr 16, 2019
@asi1024 asi1024 deleted the op-regist-math branch May 4, 2019 19:07
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. ChainerX Related to ChainerX. st:test-and-merge State indicating that pull request is approved by a reviewer and can be merged after CI passes.
Projects
ChainerX sprint backlog
  
Done
Milestone
v7.0.0a1
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@asi1024 @niboshi @pfn-ci-bot @chainer-ci @hvy