Skip to content

Commit

Permalink
[HotFix] Fix Windows build with disabled CK (after #2523) (#2598)
Browse files Browse the repository at this point in the history
* Properly guard CK usage by MIOPEN_USE_COMPOSABLEKERNEL defines

* Update src/solver/conv_hip_implicit_gemm_grouped_fwd_xdlops.cpp

Co-authored-by: Artem Tamazov <artem.tamazov@gmail.com>

---------

Co-authored-by: Jun Liu <Liu.Jun@amd.com>
Co-authored-by: Artem Tamazov <artem.tamazov@gmail.com>
  • Loading branch information
3 people authored Dec 13, 2023
1 parent a64e600 commit 91f87d4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
5 changes: 3 additions & 2 deletions src/solver/conv_hip_implicit_gemm_f16f8f16_fwd_xdlops.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,12 @@ namespace miopen {
namespace solver {
namespace conv {

using d_type = ck::half_t;
using c_type = ck::f8_t;
using ProblemDescription = miopen::conv::ProblemDescription;

#if MIOPEN_USE_COMPOSABLEKERNEL
using d_type = ck::half_t;
using c_type = ck::f8_t;

template <typename DataType, typename ComputeType>
using DeviceOpF8Fwd = ck::tensor_operation::device::DeviceGroupedConvFwdMultipleABD<
3,
Expand Down
6 changes: 4 additions & 2 deletions src/solver/conv_hip_implicit_gemm_grouped_fwd_xdlops.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ bool ConvHipImplicitGemmGroupFwdXdlops::CheckCKApplicability(
{
return IsCKApplicable<DeviceOpGFwdPtrs<DataType>, CKArgs>(problem);
}
#endif

#if MIOPEN_ENABLE_AI_KERNEL_TUNING
static std::vector<std::string> GetKernelAsTokens(const std::string& kernel)
Expand Down Expand Up @@ -285,7 +284,8 @@ bool PerformanceConfigHipImplicitGemmGroupFwdXdlops::RunParameterPredictionModel
}
return false;
}
#endif
#endif // MIOPEN_ENABLE_AI_KERNEL_TUNING
#endif // MIOPEN_BACKEND_HIP && MIOPEN_USE_COMPOSABLEKERNEL

bool PerformanceConfigHipImplicitGemmGroupFwdXdlops::IsModelApplicable(
const ExecutionContext& ctx, const ProblemDescription& problem) const
Expand Down Expand Up @@ -339,6 +339,7 @@ void PerformanceConfigHipImplicitGemmGroupFwdXdlops::HeuristicInit(

bool PerformanceConfigHipImplicitGemmGroupFwdXdlops::SetNextValue(const ProblemDescription& problem)
{
#if MIOPEN_USE_COMPOSABLEKERNEL
if(valid_kernels.empty())
{
switch(problem.GetInDataType())
Expand All @@ -362,6 +363,7 @@ bool PerformanceConfigHipImplicitGemmGroupFwdXdlops::SetNextValue(const ProblemD
return true;
}
else
#endif
return false;
}

Expand Down

0 comments on commit 91f87d4

Please sign in to comment.