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

cherry picked windows patches. #14046

Merged
merged 71 commits into from
Nov 8, 2018
Merged

Conversation

dzhwinter
Copy link
Contributor

No description provided.

@dzhwinter dzhwinter changed the title Windows/debug cherry picked windows patches. Oct 30, 2018
#define CUDNN_ENFORCE(condition) \
do { \
cudnnStatus_t status = condition; \
if (UNLIKELY(status != CUDNN_STATUS_SUCCESS)) { \
PADDLE_THROW(::paddle::platform::cudnnGetErrorString(status)); \
} \
} while (false)
#else
Copy link
Contributor

Choose a reason for hiding this comment

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

UNLIKELY 在paddle/fluid/inference/analysis/argument.h 做了条件编译,这里就不需要分别处理了

Copy link
Contributor

Choose a reason for hiding this comment

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

在 paddle/fluid/platform/enforce.h 里

Copy link
Contributor Author

Choose a reason for hiding this comment

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

cudnn_helper.h里加和unlikely没关系,
是因为PADDLE_THROW windows不会抛栈,用std::cerr << 输出cudnn错误。

Copy link
Contributor Author

Choose a reason for hiding this comment

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

是修复cudnn时候的,加入PADDLE_ENFORCE抛栈,可以去掉这一块。

wopeizl
wopeizl previously approved these changes Nov 2, 2018
wopeizl
wopeizl previously approved these changes Nov 7, 2018
Copy link
Contributor

@NHZlX NHZlX left a comment

Choose a reason for hiding this comment

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

LGTM

@dzhwinter dzhwinter merged commit 1f4a434 into PaddlePaddle:develop Nov 8, 2018
@shanyi15
Copy link
Collaborator

shanyi15 commented Nov 8, 2018

请研发老师们注意:pr中如果涉及对/doc目录的改动,reviewer请加shanyi15,多谢

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

Successfully merging this pull request may close these issues.

5 participants