Skip to content

Fix disabling of USE_CUDNN when not found #8340

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
Merged
merged 1 commit into from
Jun 11, 2018
Merged

Fix disabling of USE_CUDNN when not found #8340

merged 1 commit into from
Jun 11, 2018

Conversation

orionr
Copy link
Contributor

@orionr orionr commented Jun 11, 2018 •
edited
Loading

Yangqing
Yangqing approved these changes Jun 11, 2018
View reviewed changes
Copy link
Contributor

@Yangqing Yangqing left a comment

Choose a reason for hiding this comment

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

Approving to unblock - one minor question inline.

cmake/Dependencies.cmake
@@ -411,6 +411,8 @@ if(USE_CUDA)
endif()
if(CAFFE2_USE_CUDNN)
list(APPEND Caffe2_PUBLIC_CUDA_DEPENDENCY_LIBS caffe2::cudnn)
else()
caffe2_update_option(USE_CUDNN OFF)

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

@orionr orionr mentioned this pull request Jun 11, 2018
Closed
@orionr
Copy link
Contributor Author

orionr commented Jun 11, 2018

Test failures are unrelated, so merging.

@orionr orionr merged commit 9b1480a into pytorch:master Jun 11, 2018
@orionr orionr deleted the fix-disable-cudnn branch June 11, 2018 18:40
petrex pushed a commit to petrex/pytorch that referenced this pull request Jun 11, 2018
Merge remote-tracking branch 'upstream/master' into caffe2_ops_miopen
c25b71b 
* upstream/master:
  Allow TypeMeta hold non-default-constructible types (pytorch#8349)
  [caffe2] Move elementwise grad ops to separate files (pytorch#8315)
  Revert D3314316 (pytorch#8346)
  Fix disabling of USE_CUDNN when not found (pytorch#8340)
  Implement dim_arange operator (pytorch#8266)
  [C++ API] Cursors (pytorch#8190)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@Yangqing Yangqing Yangqing approved these changes

Reviewers whose approvals may not affect merge requirements
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
@orionr @Yangqing