From 10250d6bcdaef2767d4886b839f639938d15e9e5 Mon Sep 17 00:00:00 2001
From: Evgenii Averin <86725875+averinevg@users.noreply.github.com>
Date: Tue, 19 Dec 2023 18:11:30 +0100
Subject: [PATCH] Remove FIN_OLD_PROBLEM_DESCRIPTION_COMPAT (#2503)

---
 fin                                        |  2 +-
 src/include/miopen/problem_description.hpp | 23 ----------------------
 src/solver/norm/forward_layernorm2d_ck.cpp |  5 +----
 src/solver/norm/forward_layernorm4d_ck.cpp |  5 +----
 4 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/fin b/fin
index ae2ff171f9..044f5e90c6 160000
--- a/fin
+++ b/fin
@@ -1 +1 @@
-Subproject commit ae2ff171f9803e2731092a1309ed71ffc18ec2c1
+Subproject commit 044f5e90c6ddb2184467e7029f39c2d7fba19d29
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 <cstdint>
 #include <string>
 
-#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
diff --git a/src/solver/norm/forward_layernorm2d_ck.cpp b/src/solver/norm/forward_layernorm2d_ck.cpp
index 1af9d541c6..802d9c72f9 100644
--- a/src/solver/norm/forward_layernorm2d_ck.cpp
+++ b/src/solver/norm/forward_layernorm2d_ck.cpp
@@ -160,10 +160,7 @@ typename LnPtrsType::iterator FindLnPtr(LnPtrsType& ln_ptrs,
     });
 }
 
-template <typename DeviceOpType,
-          typename CKArgsType,
-          typename CastType,
-          typename ProblemDescriptionType = ProblemDescription>
+template <typename DeviceOpType, typename CKArgsType, 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..ad9f655caa 100644
--- a/src/solver/norm/forward_layernorm4d_ck.cpp
+++ b/src/solver/norm/forward_layernorm4d_ck.cpp
@@ -168,10 +168,7 @@ typename LnPtrsType::iterator FindLnPtr(LnPtrsType& ln_ptrs,
     });
 }
 
-template <typename DeviceOpType,
-          typename CKArgsType,
-          typename CastType,
-          typename ProblemDescriptionType = ProblemDescription>
+template <typename DeviceOpType, typename CKArgsType, typename CastType>
 ConvSolution MakeInvokerFactory([[maybe_unused]] const ExecutionContext& context,
                                 const miopen::norm::ProblemDescription& problem)
 {