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

Fix ChainerX CMake test dependencies #8422

Merged
merged 1 commit into from
Nov 18, 2019
Merged

Fix ChainerX CMake test dependencies #8422

merged 1 commit into from
Nov 18, 2019

Conversation

niboshi
Copy link
Member

@niboshi niboshi commented Nov 12, 2019

  • Previously the main function was included in chainerx via chainerx_testing, if CHAINERX_BUILD_TEST was set. Removed main from chainerx_testing.
  • Avoid referencing gtest multiple times.
  • ChainerX submodules are included in chainerx. Removed redundancy.
  • Use CUDA_ADD_EXECUTABLE instead of add_executable for chainerx_cuda_test.

@emcastillo emcastillo self-assigned this Nov 13, 2019
@niboshi niboshi mentioned this pull request Nov 13, 2019
Closed
emcastillo
emcastillo approved these changes Nov 18, 2019
View reviewed changes
Copy link
Member

@emcastillo emcastillo left a comment

Choose a reason for hiding this comment

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

LGTM

@emcastillo
Copy link
Member

Jenkins, test this please

@emcastillo emcastillo added ChainerX Related to ChainerX. cat:code-fix Code refactoring that does not change the behavior. labels Nov 18, 2019
@emcastillo emcastillo added this to the v7.0.0 milestone Nov 18, 2019
@emcastillo emcastillo 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 18, 2019
@emcastillo
Copy link
Member

Jenkins, test this please

@chainer-ci
Copy link
Member

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

@mergify mergify bot merged commit c064bb3 into chainer:master Nov 18, 2019
@niboshi niboshi deleted the chainerx-test-deps branch November 18, 2019 18:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emcastillo emcastillo emcastillo approved these changes

Assignees

@emcastillo emcastillo

Labels
cat:code-fix Code refactoring that does not change the behavior. 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
Milestone
v7.0.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@niboshi @emcastillo @chainer-ci