From f5b693b46736d445472b6db2f15850760c96c313 Mon Sep 17 00:00:00 2001 From: Evgenii Averin <86725875+averinevg@users.noreply.github.com> Date: Fri, 3 Nov 2023 11:45:04 +0100 Subject: [PATCH 1/6] Remove FIN_OLD_PROBLEM_DESCRIPTION_COMPAT --- src/include/miopen/problem_description.hpp | 23 ---------------------- 1 file changed, 23 deletions(-) diff --git a/src/include/miopen/problem_description.hpp b/src/include/miopen/problem_description.hpp index 8e1167baad..2d2ee23ca1 100644 --- a/src/include/miopen/problem_description.hpp +++ b/src/include/miopen/problem_description.hpp @@ -33,8 +33,6 @@ #include #include -#define FIN_OLD_PROBLEM_DESCRIPTION_COMPAT 1 - namespace miopen { // Tensor Helper APIs @@ -57,27 +55,6 @@ SetDescFromMLDesc(int spatial_dims, TTo& to, const TensorDescriptor& tensor, con return tensor.GetElementSpace(); } -#if FIN_OLD_PROBLEM_DESCRIPTION_COMPAT -struct ProblemDescription : conv::ProblemDescription -{ - ProblemDescription() = default; - - ProblemDescription(conv::ProblemDescription desc) : conv::ProblemDescription(std::move(desc)) - { - conv_problem.p = this; - } - - struct - { - void SetupFloats(ExecutionContext& ctx) const { p->SetupFloats(ctx); } - - private: - const conv::ProblemDescription* p = nullptr; - friend struct ProblemDescription; - } conv_problem; -}; -#endif - // For mlo_construct_base // TODO remove this struct ProblemDescriptionCompatTemporary From 39ca3343aec14e30bb26e4fcd595472154a7586b Mon Sep 17 00:00:00 2001 From: Evgenii Averin <86725875+averinevg@users.noreply.github.com> Date: Fri, 3 Nov 2023 13:05:09 +0100 Subject: [PATCH 2/6] Temporary switch fin branch --- .gitmodules | 4 ++-- fin | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8a38304f74..8290f769a2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "fin"] path = fin - url = https://github.com/ROCmSoftwarePlatform/MIFin.git - branch = develop + url = https://github.com/averinevg/MIFin.git + branch = ea_replace_miopen_problem_description_with_conv_problem_description diff --git a/fin b/fin index ae2ff171f9..0f848795a5 160000 --- a/fin +++ b/fin @@ -1 +1 @@ -Subproject commit ae2ff171f9803e2731092a1309ed71ffc18ec2c1 +Subproject commit 0f848795a530a1390d6c9125673d9a69a7256fe7 From 4a61a1af24e9f9ba17bd4ab25210074300007423 Mon Sep 17 00:00:00 2001 From: Evgenii Averin <86725875+averinevg@users.noreply.github.com> Date: Tue, 14 Nov 2023 17:54:58 +0100 Subject: [PATCH 3/6] Update fin branch --- fin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fin b/fin index 0f848795a5..044f5e90c6 160000 --- a/fin +++ b/fin @@ -1 +1 @@ -Subproject commit 0f848795a530a1390d6c9125673d9a69a7256fe7 +Subproject commit 044f5e90c6ddb2184467e7029f39c2d7fba19d29 From 52bea377d585be4e2d653e74b4cdcbaf97a9f664 Mon Sep 17 00:00:00 2001 From: Evgenii Averin <86725875+averinevg@users.noreply.github.com> Date: Tue, 14 Nov 2023 17:57:35 +0100 Subject: [PATCH 4/6] Update fin branch --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8290f769a2..8a38304f74 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "fin"] path = fin - url = https://github.com/averinevg/MIFin.git - branch = ea_replace_miopen_problem_description_with_conv_problem_description + url = https://github.com/ROCmSoftwarePlatform/MIFin.git + branch = develop From 6cb33848b27adea7ef9373bfbd810ed6748460a2 Mon Sep 17 00:00:00 2001 From: Evgenii Averin <86725875+averinevg@users.noreply.github.com> Date: Tue, 5 Dec 2023 16:36:43 +0100 Subject: [PATCH 5/6] Fix layernorm --- src/solver/norm/forward_layernorm2d_ck.cpp | 3 +-- src/solver/norm/forward_layernorm4d_ck.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/solver/norm/forward_layernorm2d_ck.cpp b/src/solver/norm/forward_layernorm2d_ck.cpp index 1af9d541c6..6167a6de53 100644 --- a/src/solver/norm/forward_layernorm2d_ck.cpp +++ b/src/solver/norm/forward_layernorm2d_ck.cpp @@ -162,8 +162,7 @@ typename LnPtrsType::iterator FindLnPtr(LnPtrsType& ln_ptrs, template + typename CastType> ConvSolution MakeInvokerFactory([[maybe_unused]] const ExecutionContext& context, const miopen::norm::ProblemDescription& problem) { diff --git a/src/solver/norm/forward_layernorm4d_ck.cpp b/src/solver/norm/forward_layernorm4d_ck.cpp index 8b147d44c4..fc94d684fc 100644 --- a/src/solver/norm/forward_layernorm4d_ck.cpp +++ b/src/solver/norm/forward_layernorm4d_ck.cpp @@ -170,8 +170,7 @@ typename LnPtrsType::iterator FindLnPtr(LnPtrsType& ln_ptrs, template + typename CastType> ConvSolution MakeInvokerFactory([[maybe_unused]] const ExecutionContext& context, const miopen::norm::ProblemDescription& problem) { From 3f7db52958a455cd1adb99b6654bcefb4cbc532e Mon Sep 17 00:00:00 2001 From: Evgenii Averin <86725875+averinevg@users.noreply.github.com> Date: Tue, 5 Dec 2023 16:37:58 +0100 Subject: [PATCH 6/6] Fix formatting --- src/solver/norm/forward_layernorm2d_ck.cpp | 4 +--- src/solver/norm/forward_layernorm4d_ck.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/solver/norm/forward_layernorm2d_ck.cpp b/src/solver/norm/forward_layernorm2d_ck.cpp index 6167a6de53..802d9c72f9 100644 --- a/src/solver/norm/forward_layernorm2d_ck.cpp +++ b/src/solver/norm/forward_layernorm2d_ck.cpp @@ -160,9 +160,7 @@ typename LnPtrsType::iterator FindLnPtr(LnPtrsType& ln_ptrs, }); } -template +template ConvSolution MakeInvokerFactory([[maybe_unused]] const ExecutionContext& context, const miopen::norm::ProblemDescription& problem) { diff --git a/src/solver/norm/forward_layernorm4d_ck.cpp b/src/solver/norm/forward_layernorm4d_ck.cpp index fc94d684fc..ad9f655caa 100644 --- a/src/solver/norm/forward_layernorm4d_ck.cpp +++ b/src/solver/norm/forward_layernorm4d_ck.cpp @@ -168,9 +168,7 @@ typename LnPtrsType::iterator FindLnPtr(LnPtrsType& ln_ptrs, }); } -template +template ConvSolution MakeInvokerFactory([[maybe_unused]] const ExecutionContext& context, const miopen::norm::ProblemDescription& problem) {