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

Delete cudnn6 code #31835

Merged
merged 7 commits into from
Mar 29, 2021
Merged

Delete cudnn6 code #31835

merged 7 commits into from
Mar 29, 2021

Conversation

tianshuo78520a
Copy link
Contributor

PR types

Others

PR changes

Others

Describe

Delete cudnn6 code

@paddle-bot-old
Copy link

Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

platform::errors::Unimplemented("Unexpected CUDNN pooling mode."));
}
}
#else
Copy link
Contributor

Choose a reason for hiding this comment

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

这里把else误删了

Copy link
Contributor Author

Choose a reason for hiding this comment

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

好的,发现了问题

@@ -34,17 +34,6 @@ namespace operators {
static constexpr size_t kNUM_CUDNN_FWD_ALGS = 1;
static constexpr size_t kNUM_CUDNN_BWD_FILTER_ALGS = 1;
static constexpr size_t kNUM_CUDNN_BWD_DATA_ALGS = 1;
#elif CUDNN_VERSION_MIN(6, 0, 5)
Copy link
Contributor

Choose a reason for hiding this comment

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

#define CUDNN_VERSION_MIN(major, minor, patch) \
(CUDNN_VERSION >= ((major)*1000 + (minor)*100 + (patch)))

CUDNN_VERSION_MIN(6, 0, 5) 表示>=6.0.5,因此37-42行也不能删

Copy link
Contributor Author

Choose a reason for hiding this comment

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

好的,已经修改

Copy link
Contributor

@Xreki Xreki left a comment

Choose a reason for hiding this comment

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

LGTM. 若cudnn6以下不再支持了,其实platform/dynload/cudnn.h的实现可以简化一下,另外是不是代码里面最好加一个对CUDNN_VERSION的静态的assert检查?

@luotao1 luotao1 merged commit 8829a30 into PaddlePaddle:develop Mar 29, 2021
@luotao1
Copy link
Contributor

luotao1 commented Mar 29, 2021

若cudnn6以下不再支持了,其实platform/dynload/cudnn.h的实现可以简化一下,另外是不是代码里面最好加一个对CUDNN_VERSION的静态的assert检查

@tianshuo78520a 可以在下一个PR里改一下。

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants