Skip to content

[solvers] Virtual GetSolution() #1426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
averinevg wants to merge 4 commits into from
Closed

[solvers] Virtual GetSolution() #1426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5043a94
Make GetSolution() virtual: first stage
averinevg Feb 14, 2022
cc5ed39
Merge branch 'develop' into virtual_get_solution
averinevg Feb 15, 2022
fc6cb0d
Fix tests
averinevg Feb 15, 2022
89d9cfd
Fix formatting
averinevg Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/include/miopen/activ/solvers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ using OldStyleSolver = SolverMixin<OldStyleProblemDescription>;
struct ActivFwdSolver0 : OldStyleSolver
{
// To suppress -Woverloaded-virtual
using OldStyleSolver::GetSolution;
using OldStyleSolver::IsApplicable;

const std::string& SolverDbId() const override { return GetSolverDbId<ActivFwdSolver0>(); }
Expand All @@ -57,7 +58,7 @@ struct ActivFwdSolver0 : OldStyleSolver
return IsApplicable(*std::get<0>(problem), *std::get<1>(problem));
}

inline ConvSolution GetSolution(const OldStyleProblemDescription& problem) const
ConvSolution GetSolution(const OldStyleProblemDescription& problem) const override
{
return GetSolution(*std::get<0>(problem), *std::get<1>(problem));
}
Expand All @@ -71,6 +72,7 @@ struct ActivFwdSolver0 : OldStyleSolver
struct ActivFwdSolver1 : OldStyleSolver
{
// To suppress -Woverloaded-virtual
using OldStyleSolver::GetSolution;
using OldStyleSolver::IsApplicable;

const std::string& SolverDbId() const override { return GetSolverDbId<ActivFwdSolver1>(); }
Expand All @@ -80,7 +82,7 @@ struct ActivFwdSolver1 : OldStyleSolver
return IsApplicable(*std::get<0>(problem), *std::get<1>(problem));
}

inline ConvSolution GetSolution(const OldStyleProblemDescription& problem) const
ConvSolution GetSolution(const OldStyleProblemDescription& problem) const override
{
return GetSolution(*std::get<0>(problem), *std::get<1>(problem));
}
Expand All @@ -94,6 +96,7 @@ struct ActivFwdSolver1 : OldStyleSolver
struct ActivBwdSolver0 : OldStyleSolver
{
// To suppress -Woverloaded-virtual
using OldStyleSolver::GetSolution;
using OldStyleSolver::IsApplicable;

const std::string& SolverDbId() const override { return GetSolverDbId<ActivBwdSolver0>(); }
Expand All @@ -103,7 +106,7 @@ struct ActivBwdSolver0 : OldStyleSolver
return IsApplicable(*std::get<0>(problem), *std::get<1>(problem));
}

inline ConvSolution GetSolution(const OldStyleProblemDescription& problem) const
ConvSolution GetSolution(const OldStyleProblemDescription& problem) const override
{
return GetSolution(*std::get<0>(problem), *std::get<1>(problem));
}
Expand All @@ -117,6 +120,7 @@ struct ActivBwdSolver0 : OldStyleSolver
struct ActivBwdSolver1 : OldStyleSolver
{
// To suppress -Woverloaded-virtual
using OldStyleSolver::GetSolution;
using OldStyleSolver::IsApplicable;

const std::string& SolverDbId() const override { return GetSolverDbId<ActivBwdSolver1>(); }
Expand All @@ -126,7 +130,7 @@ struct ActivBwdSolver1 : OldStyleSolver
return IsApplicable(*std::get<0>(problem), *std::get<1>(problem));
}

inline ConvSolution GetSolution(const OldStyleProblemDescription& problem) const
ConvSolution GetSolution(const OldStyleProblemDescription& problem) const override
{
return GetSolution(*std::get<0>(problem), *std::get<1>(problem));
}
Expand Down
21 changes: 14 additions & 7 deletions src/include/miopen/batchnorm/solvers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ using OldStyleSolver = SolverMixin<OldStyleProblemDescription>;
struct BnFwdTrainingSpatialSingle : OldStyleSolver
{
// To suppress -Woverloaded-virtual
using OldStyleSolver::GetSolution;
using OldStyleSolver::IsApplicable;

const std::string& SolverDbId() const override
Expand All @@ -60,7 +61,7 @@ struct BnFwdTrainingSpatialSingle : OldStyleSolver
return IsApplicable(*std::get<0>(problem), *std::get<1>(problem));
}

inline ConvSolution GetSolution(const OldStyleProblemDescription& problem) const
ConvSolution GetSolution(const OldStyleProblemDescription& problem) const override
{
return GetSolution(*std::get<0>(problem), *std::get<1>(problem));
}
Expand All @@ -74,6 +75,7 @@ struct BnFwdTrainingSpatialSingle : OldStyleSolver
struct BnFwdTrainingSpatialMultiple : OldStyleSolver
{
// To suppress -Woverloaded-virtual
using OldStyleSolver::GetSolution;
using OldStyleSolver::IsApplicable;

const std::string& SolverDbId() const override
Expand All @@ -86,7 +88,7 @@ struct BnFwdTrainingSpatialMultiple : OldStyleSolver
return IsApplicable(*std::get<0>(problem), *std::get<1>(problem));
}

inline ConvSolution GetSolution(const OldStyleProblemDescription& problem) const
ConvSolution GetSolution(const OldStyleProblemDescription& problem) const override
{
return GetSolution(*std::get<0>(problem), *std::get<1>(problem));
}
Expand All @@ -100,6 +102,7 @@ struct BnFwdTrainingSpatialMultiple : OldStyleSolver
struct BnFwdTrainingPerActivation : OldStyleSolver
{
// To suppress -Woverloaded-virtual
using OldStyleSolver::GetSolution;
using OldStyleSolver::IsApplicable;

const std::string& SolverDbId() const override
Expand All @@ -112,7 +115,7 @@ struct BnFwdTrainingPerActivation : OldStyleSolver
return IsApplicable(*std::get<0>(problem), *std::get<1>(problem));
}

inline ConvSolution GetSolution(const OldStyleProblemDescription& problem) const
ConvSolution GetSolution(const OldStyleProblemDescription& problem) const override
{
return GetSolution(*std::get<0>(problem), *std::get<1>(problem));
}
Expand All @@ -126,6 +129,7 @@ struct BnFwdTrainingPerActivation : OldStyleSolver
struct BnBwdTrainingSpatialSingle : OldStyleSolver
{
// To suppress -Woverloaded-virtual
using OldStyleSolver::GetSolution;
using OldStyleSolver::IsApplicable;

const std::string& SolverDbId() const override
Expand All @@ -138,7 +142,7 @@ struct BnBwdTrainingSpatialSingle : OldStyleSolver
return IsApplicable(*std::get<0>(problem), *std::get<1>(problem));
}

inline ConvSolution GetSolution(const OldStyleProblemDescription& problem) const
ConvSolution GetSolution(const OldStyleProblemDescription& problem) const override
{
return GetSolution(*std::get<0>(problem), *std::get<1>(problem));
}
Expand All @@ -152,6 +156,7 @@ struct BnBwdTrainingSpatialSingle : OldStyleSolver
struct BnBwdTrainingSpatialMultiple : OldStyleSolver
{
// To suppress -Woverloaded-virtual
using OldStyleSolver::GetSolution;
using OldStyleSolver::IsApplicable;

const std::string& SolverDbId() const override
Expand All @@ -164,7 +169,7 @@ struct BnBwdTrainingSpatialMultiple : OldStyleSolver
return IsApplicable(*std::get<0>(problem), *std::get<1>(problem));
}

inline ConvSolution GetSolution(const OldStyleProblemDescription& problem) const
ConvSolution GetSolution(const OldStyleProblemDescription& problem) const override
{
return GetSolution(*std::get<0>(problem), *std::get<1>(problem));
}
Expand All @@ -178,6 +183,7 @@ struct BnBwdTrainingSpatialMultiple : OldStyleSolver
struct BnBwdTrainingPerActivation : OldStyleSolver
{
// To suppress -Woverloaded-virtual
using OldStyleSolver::GetSolution;
using OldStyleSolver::IsApplicable;

const std::string& SolverDbId() const override
Expand All @@ -190,7 +196,7 @@ struct BnBwdTrainingPerActivation : OldStyleSolver
return IsApplicable(*std::get<0>(problem), *std::get<1>(problem));
}

inline ConvSolution GetSolution(const OldStyleProblemDescription& problem) const
ConvSolution GetSolution(const OldStyleProblemDescription& problem) const override
{
return GetSolution(*std::get<0>(problem), *std::get<1>(problem));
}
Expand All @@ -204,6 +210,7 @@ struct BnBwdTrainingPerActivation : OldStyleSolver
struct BnFwdInference : OldStyleSolver
{
// To suppress -Woverloaded-virtual
using OldStyleSolver::GetSolution;
using OldStyleSolver::IsApplicable;

const std::string& SolverDbId() const override { return GetSolverDbId<BnFwdInference>(); }
Expand All @@ -213,7 +220,7 @@ struct BnFwdInference : OldStyleSolver
return IsApplicable(*std::get<0>(problem), *std::get<1>(problem));
}

inline ConvSolution GetSolution(const OldStyleProblemDescription& problem) const
ConvSolution GetSolution(const OldStyleProblemDescription& problem) const override
{
return GetSolution(*std::get<0>(problem), *std::get<1>(problem));
}
Expand Down
3 changes: 2 additions & 1 deletion src/include/miopen/pooling/solvers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,14 @@ struct OldStyleSolver : SolverMixin<OldStyleProblemDescription>
// To suppress -Woverloaded-virtual
using SolverMixin<OldStyleProblemDescription>::GetWorkspaceSize;
using SolverMixin<OldStyleProblemDescription>::IsApplicable;
using SolverMixin<OldStyleProblemDescription>::GetSolution;

bool IsApplicable(const OldStyleProblemDescription& problem) const override
{
return IsApplicable(*std::get<0>(problem), *std::get<1>(problem));
}

ConvSolution GetSolution(const OldStyleProblemDescription& problem) const
ConvSolution GetSolution(const OldStyleProblemDescription& problem) const override
{
return GetSolution(*std::get<0>(problem), *std::get<1>(problem));
}
Expand Down
Loading