From 16b88cfa13840dcca3383874629f1f9888a313ad Mon Sep 17 00:00:00 2001 From: tvukovic-amd Date: Mon, 27 May 2024 15:37:19 +0100 Subject: [PATCH] Fix format --- .../gpu/include/migraphx/gpu/context.hpp | 17 ++++++++--------- src/targets/gpu/include/migraphx/gpu/miopen.hpp | 1 - src/targets/gpu/lowering.cpp | 4 ++-- test/verify/test_conv3d.cpp | 3 ++- test/verify/test_conv_pooling.cpp | 2 +- test/verify/test_max_pooling_ceil_3d.cpp | 4 ++-- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/targets/gpu/include/migraphx/gpu/context.hpp b/src/targets/gpu/include/migraphx/gpu/context.hpp index 14713ed658f..2397bf5e1e2 100644 --- a/src/targets/gpu/include/migraphx/gpu/context.hpp +++ b/src/targets/gpu/include/migraphx/gpu/context.hpp @@ -28,9 +28,9 @@ #include #include #if MIGRAPHX_USE_MIOPEN == 0 - #include - #include - #include +#include +#include +#include #endif #include #include @@ -114,7 +114,6 @@ struct hip_device return mihandle.get(); } #endif - #if MIGRAPHX_USE_ROCBLAS auto get_rocblas() @@ -154,11 +153,11 @@ struct hip_device } private: - std::size_t id = 0; - shared s = nullptr; - #if MIGRAPHX_USE_MIOPEN - shared mihandle = nullptr; - #endif + std::size_t id = 0; + shared s = nullptr; +#if MIGRAPHX_USE_MIOPEN + shared mihandle = nullptr; +#endif #if MIGRAPHX_USE_ROCBLAS shared rbhandle = nullptr; #endif diff --git a/src/targets/gpu/include/migraphx/gpu/miopen.hpp b/src/targets/gpu/include/migraphx/gpu/miopen.hpp index b3169b6677a..9f447b57b44 100644 --- a/src/targets/gpu/include/migraphx/gpu/miopen.hpp +++ b/src/targets/gpu/include/migraphx/gpu/miopen.hpp @@ -33,7 +33,6 @@ #include #include - #include #ifdef MIGRAPHX_HAS_FIND_MODE_API diff --git a/src/targets/gpu/lowering.cpp b/src/targets/gpu/lowering.cpp index 19ed198f2f5..bef5dc65192 100644 --- a/src/targets/gpu/lowering.cpp +++ b/src/targets/gpu/lowering.cpp @@ -86,7 +86,7 @@ struct miopen_apply compute_fp32 = get_compute_fp32_flag(); #endif offload_copy = (mod == mpm->get_root_module()) ? pass->offload_copy : false; - + add_extend_op("argmax"); add_extend_op("argmin"); add_extend_op("logsoftmax"); @@ -98,7 +98,7 @@ struct miopen_apply add_extend_op("rnn_var_sl_shift_output"); add_extend_op("rnn_var_sl_shift_sequence"); add_extend_op("topk"); - + #if MIGRAPHX_USE_MIOPEN add_convolution_op("convolution"); add_convolution_op("convolution_backwards"); diff --git a/test/verify/test_conv3d.cpp b/test/verify/test_conv3d.cpp index f7f29b6c190..393c79e513c 100644 --- a/test/verify/test_conv3d.cpp +++ b/test/verify/test_conv3d.cpp @@ -27,7 +27,8 @@ #include #include -// 3D convolution not supported in mlir due to https://github.com/ROCm/AMDMIGraphX/blob/e4013bb2a5818c4df50f51dbb310ca271f5adc69/src/targets/gpu/fuse_mlir.cpp#L259 +// 3D convolution not supported in mlir due to +// https://github.com/ROCm/AMDMIGraphX/blob/e4013bb2a5818c4df50f51dbb310ca271f5adc69/src/targets/gpu/fuse_mlir.cpp#L259 #if MIGRAPHX_USE_MIOPEN struct test_conv3d : verify_program { diff --git a/test/verify/test_conv_pooling.cpp b/test/verify/test_conv_pooling.cpp index 6b28d1fcfb7..df500930f56 100644 --- a/test/verify/test_conv_pooling.cpp +++ b/test/verify/test_conv_pooling.cpp @@ -34,7 +34,7 @@ struct test_conv_pooling : verify_program> migraphx::program create_program() const { migraphx::program p; - auto* mm = p.get_main_module(); + auto* mm = p.get_main_module(); auto input = mm->add_parameter("x", migraphx::shape{DType, {4, 3, 32, 32}}); auto weights = mm->add_parameter("w", migraphx::shape{DType, {4, 3, 3, 3}}); auto conv = mm->add_instruction(migraphx::make_op("convolution"), input, weights); diff --git a/test/verify/test_max_pooling_ceil_3d.cpp b/test/verify/test_max_pooling_ceil_3d.cpp index 76a4f11fba5..5c93bd675e0 100644 --- a/test/verify/test_max_pooling_ceil_3d.cpp +++ b/test/verify/test_max_pooling_ceil_3d.cpp @@ -33,9 +33,9 @@ struct test_max_pooling_ceil_3d : verify_program> migraphx::program create_program() const { migraphx::program p; - auto* mm = p.get_main_module(); + auto* mm = p.get_main_module(); auto input = mm->add_parameter("x", migraphx::shape{T, {1, 3, 5, 5, 5}}); - auto op = migraphx::op::pooling{ + auto op = migraphx::op::pooling{ migraphx::op::pooling_mode::max, {1, 1, 1}, {3, 3, 3}, {3, 3, 3}, {1, 1, 1}, true}; mm->add_instruction(op, input); return p;