From 1471aa3c1ea8ebddb8f5ac5f34d9528fa0491416 Mon Sep 17 00:00:00 2001 From: wuxun-zhang Date: Wed, 6 Nov 2019 15:35:40 +0800 Subject: [PATCH 1/4] use dim_t instead of int --- src/operator/nn/mkldnn/mkldnn_slice.cc | 2 +- src/operator/nn/mkldnn/mkldnn_transpose.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/operator/nn/mkldnn/mkldnn_slice.cc b/src/operator/nn/mkldnn/mkldnn_slice.cc index dba10f8b6cd5..575554a25c88 100644 --- a/src/operator/nn/mkldnn/mkldnn_slice.cc +++ b/src/operator/nn/mkldnn/mkldnn_slice.cc @@ -41,7 +41,7 @@ MKLDNNSliceFwd::MKLDNNSliceFwd(const SliceParam ¶m, mkldnn::memory::dims dims(N); mkldnn::memory::dims offsets(N); for (int i = 0; i < N; ++i) { - int s = 0; + dim_t s = 0; if (i < param.begin.ndim() && param.begin[i]) { s = *param.begin[i]; if (s < 0) s += ishape[i]; diff --git a/src/operator/nn/mkldnn/mkldnn_transpose.cc b/src/operator/nn/mkldnn/mkldnn_transpose.cc index 2ec38d586552..ee9c06d49744 100644 --- a/src/operator/nn/mkldnn/mkldnn_transpose.cc +++ b/src/operator/nn/mkldnn/mkldnn_transpose.cc @@ -73,7 +73,7 @@ class MKLDNNTransposeForward { mkldnn_dims_t strides; mkldnn_dims_t sh; - unsigned int total_stride = 1; + dim_t total_stride = 1; for (int i = data_ndim - 1; i >= 0; i--) { sh[i] = shape[i]; strides[axes[i]] = total_stride; From aefde71e7e2aa396613d813a5a0f25f8412f44a1 Mon Sep 17 00:00:00 2001 From: wuxun-zhang Date: Thu, 7 Nov 2019 10:20:58 +0800 Subject: [PATCH 2/4] fix same issue in pooling --- src/operator/nn/mkldnn/mkldnn_pooling.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/operator/nn/mkldnn/mkldnn_pooling.cc b/src/operator/nn/mkldnn/mkldnn_pooling.cc index f9dbe5bbfd8f..6eda2aa33b34 100644 --- a/src/operator/nn/mkldnn/mkldnn_pooling.cc +++ b/src/operator/nn/mkldnn/mkldnn_pooling.cc @@ -127,7 +127,7 @@ mkldnn::algorithm GetMKLDNNPoolAlgo(const PoolingParam ¶m) { } } -static inline int GetPaddingSizeFull(int x, int padl, int padr, int k, int s) { +static inline int GetPaddingSizeFull(dim_t x, int padl, int padr, int k, int s) { if ((x + padl + padr - k) % s != 0) { return (padr + s - ((x + padl + padr - k) % s)); } else { From 6e10fb83825aaf2f2a33b77c63f714f6e5c26602 Mon Sep 17 00:00:00 2001 From: wuxun-zhang Date: Thu, 7 Nov 2019 19:01:29 +0800 Subject: [PATCH 3/4] rebase code From c4e3586439c220fd1a8a57a6ec776a88a7fbdd79 Mon Sep 17 00:00:00 2001 From: wuxun-zhang Date: Thu, 7 Nov 2019 23:57:09 +0800 Subject: [PATCH 4/4] trigger CI