Remove FIN_OLD_PROBLEM_DESCRIPTION_COMPAT (#2503)

ROCm · Dec 19, 2023 · 10250d6 · 10250d6
1 parent dd23f4e
commit 10250d6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 32 deletions.
diff --git a/fin b/fin
diff --git 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
@@ -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
@@ -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)
 {