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

Use ChainerX softmax cross entropy implementation in ChainerX examples #8294

Merged
merged 10 commits into from
Nov 1, 2019

Conversation

takagi
Copy link
Member

@takagi takagi commented Oct 15, 2019

Follows #8250 .

takagi/chainer@chainerx-softmax-cross-entropy...takagi:chainerx-example-softmax-cross-entropy

This PR fixes ChainerX examples to use ChainerX softmax cross entropy implementations introduced in #8250 .

@takagi takagi added the cat:example Example, e.g. the MNIST example. label Oct 15, 2019
@takagi takagi force-pushed the chainerx-example-softmax-cross-entropy branch 2 times, most recently from 558594d to 3166da3 Compare October 15, 2019 07:37
@takagi takagi added the ChainerX Related to ChainerX. label Oct 15, 2019
@takagi takagi force-pushed the chainerx-example-softmax-cross-entropy branch from 3166da3 to 0523744 Compare October 19, 2019 05:46
@hvy
Copy link
Member

hvy commented Oct 23, 2019

#8250 is now merged.

@takagi
Copy link
Member Author

takagi commented Oct 27, 2019

Now I've merged the master!

@hvy
Copy link
Member

hvy commented Oct 28, 2019

Could you fix the style errors?

@takagi
Copy link
Member Author

takagi commented Oct 28, 2019

Fixed!

chainerx_cc/examples/mnist_py/train_mnist.py Outdated Show resolved Hide resolved
chainerx_cc/examples/mnist_py/train_mnist.py Outdated Show resolved Hide resolved
chainerx_cc/examples/imagenet_py/train_imagenet.py Outdated Show resolved Hide resolved
chainerx_cc/examples/mnist/train_mnist.cc Outdated Show resolved Hide resolved
takagi and others added 5 commits October 29, 2019 12:44
Co-Authored-By: Hiroyuki Vincent Yamazaki <hiroyuki.vincent.yamazaki@gmail.com>
Co-Authored-By: Hiroyuki Vincent Yamazaki <hiroyuki.vincent.yamazaki@gmail.com>
@takagi
Copy link
Member Author

takagi commented Oct 29, 2019

I missed to apply the change that ChainerX SCE now returns the batch-wise result without reduced. PTAL.

@hvy
Copy link
Member

hvy commented Oct 30, 2019

Could you merge with the latest master as it should fix the C++ example?

@takagi
Copy link
Member Author

takagi commented Oct 31, 2019

Merged!

@hvy
Copy link
Member

hvy commented Nov 1, 2019

LGTM!

@hvy
Copy link
Member

hvy commented Nov 1, 2019

Jenkins, test this please.

@hvy hvy added this to the v7.0.0 milestone Nov 1, 2019
@hvy hvy added the st:test-and-merge State indicating that pull request is approved by a reviewer and can be merged after CI passes. label Nov 1, 2019
@chainer-ci
Copy link
Member

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

@mergify mergify bot merged commit c8e3b4f into chainer:master Nov 1, 2019
@takagi takagi deleted the chainerx-example-softmax-cross-entropy branch November 1, 2019 08:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cat:example Example, e.g. the MNIST example. 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
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants