From 123a0f7c643bae689f88b92f2beff1b7399a7ee1 Mon Sep 17 00:00:00 2001 From: JD Date: Thu, 21 Apr 2022 17:02:15 -0500 Subject: [PATCH] Fix `clang-format` (#189) * Fix clang-format filepath * update docker and fix format [ROCm/composable_kernel commit: 7353ec0c25468d754ad5dd786e979a3bbade0a47] --- Dockerfile | 9 ++------- Jenkinsfile | 2 +- example/11_conv2d_bwd_weight/conv2d_bwd_weight_xdl.cpp | 9 +++++++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6da9e587f9..fd69a00ee1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,7 +42,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --allow- libnuma-dev \ libpthread-stubs0-dev \ llvm-amdgpu \ - miopengemm \ pkg-config \ python \ python3 \ @@ -51,19 +50,15 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --allow- python-pip \ python3-pip \ software-properties-common \ - sqlite3 \ wget \ rocm-dev \ rocm-device-libs \ - rocm-opencl \ - rocm-opencl-dev \ rocm-cmake \ - rocblas \ vim \ zlib1g-dev \ openssh-server \ - kmod \ - mysql-client && \ + clang-format-10 \ + kmod && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* diff --git a/Jenkinsfile b/Jenkinsfile index 76fb68b881..0aeabd690c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -204,7 +204,7 @@ pipeline { stage('Clang Format') { agent{ label rocmnode("nogpu") } environment{ - execute_cmd = "find . -iname \'*.h\' \ + execute_cmd = "find .. -iname \'*.h\' \ -o -iname \'*.hpp\' \ -o -iname \'*.cpp\' \ -o -iname \'*.h.in\' \ diff --git a/example/11_conv2d_bwd_weight/conv2d_bwd_weight_xdl.cpp b/example/11_conv2d_bwd_weight/conv2d_bwd_weight_xdl.cpp index 7b74b40d32..bf78cc87e0 100644 --- a/example/11_conv2d_bwd_weight/conv2d_bwd_weight_xdl.cpp +++ b/example/11_conv2d_bwd_weight/conv2d_bwd_weight_xdl.cpp @@ -72,8 +72,13 @@ using DeviceConvBwdWeightInstance = ck::tensor_operation::device:: 8>; // CBlockTransferScalarPerVector_NWaveNPerXdl // clang-format on -using ReferenceConvBwdWeightInstance = ck::tensor_operation::host:: - ReferenceConvBwdWeight; +using ReferenceConvBwdWeightInstance = + ck::tensor_operation::host::ReferenceConvBwdWeight; int main(int argc, char* argv[]) {