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

Move majel/test/* to majel/; Update generic.cmake #2339

Merged
merged 1 commit into from
Jun 1, 2017
Merged

Move majel/test/* to majel/; Update generic.cmake #2339

merged 1 commit into from
Jun 1, 2017

Conversation

wangkuiyi
Copy link
Collaborator

@wangkuiyi wangkuiyi commented Jun 1, 2017 •
edited
Loading

Fixes #2259
Fixes #2209

In addition to move majel/test/* to majel/*, I also changed cmake/generic.cmake to add conditions to *_test, and nv_*:

  • for *_test, add check of if (WITH_TESTING)
  • for nv_*, add check of if (WITH_GPU)

I verified this PR by following the procedure listed here.

gangliao
gangliao approved these changes Jun 1, 2017
View reviewed changes
Copy link
Contributor

@gangliao gangliao left a comment

Choose a reason for hiding this comment

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

LGTM

@gangliao gangliao merged commit 0e6a18b into PaddlePaddle:develop Jun 1, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gangliao gangliao gangliao approved these changes

@JiayiFeng JiayiFeng Awaiting requested review from JiayiFeng

@QiJune QiJune Awaiting requested review from QiJune

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@wangkuiyi @gangliao