From a0a98790f00ab39641b48af67a9a121a39df9243 Mon Sep 17 00:00:00 2001 From: Evgeny Mankov Date: Thu, 29 Aug 2019 19:55:38 +0300 Subject: [PATCH] [HIPIFY][DNN] cuDNN 7.6.3 support --- hipamd/docs/markdown/CUDNN_API_supported_by_HIP.md | 11 +++++++++-- hipamd/hipify-clang/src/CUDA2HIP_DNN_API_types.cpp | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/hipamd/docs/markdown/CUDNN_API_supported_by_HIP.md b/hipamd/docs/markdown/CUDNN_API_supported_by_HIP.md index dfecc96f1b..7efa922a21 100644 --- a/hipamd/docs/markdown/CUDNN_API_supported_by_HIP.md +++ b/hipamd/docs/markdown/CUDNN_API_supported_by_HIP.md @@ -233,9 +233,11 @@ | define |`CUDNN_SEQDATA_DIM_COUNT` | 9.0 | | | struct |`cudnnSeqDataStruct` | 9.0 | | | struct* |`cudnnSeqDataDescriptor_t` | 9.0 | | -| enum |***`cudnnAttnQueryMap_t`*** | 9.0 | | +| unsigned |***`cudnnAttnQueryMap_t`*** | 9.0 | | | 0 |*`CUDNN_ATTN_QUERYMAP_ALL_TO_ONE`* | 9.0 | | -| 1 |*`CUDNN_ATTN_QUERYMAP_ONE_TO_ONE`* | 9.0 | | +| 1U << 0 |*`CUDNN_ATTN_QUERYMAP_ONE_TO_ONE`* | 9.0 | | +| 1 |*`CUDNN_ATTN_DISABLE_PROJ_BIASES`* | 10.1 Update 2 | | +| 1U << 1 |*`CUDNN_ATTN_ENABLE_PROJ_BIASES`* | 10.1 Update 2 | | | struct |`cudnnAttnStruct` | 9.0 | | | struct* |`cudnnAttnDescriptor_t` | 9.0 | | | enum |***`cudnnMultiHeadAttnWeightKind_t`*** | 9.0 | | @@ -243,6 +245,11 @@ | 1 |*`CUDNN_MH_ATTN_K_WEIGHTS`* | 9.0 | | | 2 |*`CUDNN_MH_ATTN_V_WEIGHTS`* | 9.0 | | | 3 |*`CUDNN_MH_ATTN_O_WEIGHTS`* | 9.0 | | +| 4 |*`CUDNN_MH_ATTN_Q_BIASES`* | 10.1 Update 2 | | +| 5 |*`CUDNN_MH_ATTN_K_BIASES`* | 10.1 Update 2 | | +| 6 |*`CUDNN_MH_ATTN_V_BIASES`* | 10.1 Update 2 | | +| 7 |*`CUDNN_MH_ATTN_O_BIASES`* | 10.1 Update 2 | | +| define 8 |`CUDNN_ATTN_WKIND_COUNT` | 10.1 Update 2 | | | enum |***`cudnnWgradMode_t`*** | 9.0 | | | 0 |*`CUDNN_WGRAD_MODE_ADD`* | 9.0 | | | 1 |*`CUDNN_WGRAD_MODE_SET`* | 9.0 | | diff --git a/hipamd/hipify-clang/src/CUDA2HIP_DNN_API_types.cpp b/hipamd/hipify-clang/src/CUDA2HIP_DNN_API_types.cpp index a7d277e4c2..cc372067b1 100644 --- a/hipamd/hipify-clang/src/CUDA2HIP_DNN_API_types.cpp +++ b/hipamd/hipify-clang/src/CUDA2HIP_DNN_API_types.cpp @@ -229,14 +229,21 @@ const std::map CUDA_DNN_TYPE_NAME_MAP{ {"CUDNN_SEQDATA_BATCH_DIM", {"HIPDNN_SEQDATA_BATCH_DIM", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // 1 {"CUDNN_SEQDATA_BEAM_DIM", {"HIPDNN_SEQDATA_BEAM_DIM", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // 2 {"CUDNN_SEQDATA_VECT_DIM", {"HIPDNN_SEQDATA_VECT_DIM", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // 3 - {"cudnnAttnQueryMap_t", {"hipdnnAttnQueryMap_t", "", CONV_TYPE, API_DNN, HIP_UNSUPPORTED}}, + {"cudnnAttnQueryMap_t", {"hipdnnAttnQueryMap_t", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, {"CUDNN_ATTN_QUERYMAP_ALL_TO_ONE", {"HIPDNN_ATTN_QUERYMAP_ALL_TO_ONE", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // 0 - {"CUDNN_ATTN_QUERYMAP_ONE_TO_ONE", {"HIPDNN_ATTN_QUERYMAP_ONE_TO_ONE", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // 1 + {"CUDNN_ATTN_QUERYMAP_ONE_TO_ONE", {"HIPDNN_ATTN_QUERYMAP_ONE_TO_ONE", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // 1U << 0 + {"CUDNN_ATTN_DISABLE_PROJ_BIASES", {"HIPDNN_ATTN_DISABLE_PROJ_BIASES", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // 0 + {"CUDNN_ATTN_ENABLE_PROJ_BIASES", {"HIPDNN_ATTN_ENABLE_PROJ_BIASES", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // 1U << 1 {"cudnnMultiHeadAttnWeightKind_t", {"hipdnnMultiHeadAttnWeightKind_t", "", CONV_TYPE, API_DNN, HIP_UNSUPPORTED}}, {"CUDNN_MH_ATTN_Q_WEIGHTS", {"HIPDNN_MH_ATTN_Q_WEIGHTS", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // 0 {"CUDNN_MH_ATTN_K_WEIGHTS", {"HIPDNN_MH_ATTN_K_WEIGHTS", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // 1 {"CUDNN_MH_ATTN_V_WEIGHTS", {"HIPDNN_MH_ATTN_V_WEIGHTS", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // 2 {"CUDNN_MH_ATTN_O_WEIGHTS", {"HIPDNN_MH_ATTN_O_WEIGHTS", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // 3 + {"CUDNN_MH_ATTN_Q_BIASES", {"HIPDNN_MH_ATTN_Q_BIASES", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // 4 + {"CUDNN_MH_ATTN_K_BIASES", {"HIPDNN_MH_ATTN_K_BIASES", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // 5 + {"CUDNN_MH_ATTN_V_BIASES", {"HIPDNN_MH_ATTN_V_BIASES", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // 6 + {"CUDNN_MH_ATTN_O_BIASES", {"HIPDNN_MH_ATTN_O_BIASES", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // 7 + {"CUDNN_ATTN_WKIND_COUNT", {"HIPDNN_ATTN_WKIND_COUNT", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // 8 {"cudnnWgradMode_t", {"hipdnnWgradMode_t", "", CONV_TYPE, API_DNN, HIP_UNSUPPORTED}}, {"CUDNN_WGRAD_MODE_ADD", {"HIPDNN_WGRAD_MODE_ADD", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // 0 {"CUDNN_WGRAD_MODE_SET", {"HIPDNN_WGRAD_MODE_SET", "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // 1