Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions _typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,4 @@ suppport = 'suppport'
SWTICH = 'SWTICH'
Swith = 'Swith'
sysyem = 'sysyem'
unsupport = 'unsupport'
upsupported = 'upsupported'
Unsupport = 'Unsupport'
UNSUPPORT = 'UNSUPPORT'
4 changes: 2 additions & 2 deletions cmake/operators.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,8 @@ function(op_library TARGET)
endif()
if(WIN32)
# remove windows unsupported op, because windows has no nccl, no warpctc such ops.
foreach(windows_unsupport_op "nccl_op" "gen_nccl_id_op")
if("${TARGET}" STREQUAL "${windows_unsupport_op}")
foreach(windows_unsupported_op "nccl_op" "gen_nccl_id_op")
if("${TARGET}" STREQUAL "${windows_unsupported_op}")
return()
endif()
endforeach()
Expand Down
22 changes: 11 additions & 11 deletions paddle/cinn/hlir/op/custom_call.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1209,24 +1209,24 @@ std::vector<ir::Expr> CustomCallArgsForMemset(
void operator()(int64_t v) { *scalar_ = static_cast<int>(v); }
void operator()(bool v) { *scalar_ = v ? 0xFFFFFFFF : 0; }

#define EXPAND_MEMSET_TYPE_UNSUPPORT(TYPE) \
#define EXPAND_MEMSET_TYPE_UNSUPPORTED(TYPE) \
void operator()(const TYPE &) { \
std::stringstream ss; \
ss << "The type of \"value\" of memset custom_call not support: " \
<< #TYPE; \
PADDLE_THROW(::common::errors::InvalidArgument(ss.str())); \
}

EXPAND_MEMSET_TYPE_UNSUPPORT(std::string)
EXPAND_MEMSET_TYPE_UNSUPPORT(std::vector<int>)
EXPAND_MEMSET_TYPE_UNSUPPORT(std::vector<int64_t>)
EXPAND_MEMSET_TYPE_UNSUPPORT(std::vector<float>)
EXPAND_MEMSET_TYPE_UNSUPPORT(std::vector<double>)
EXPAND_MEMSET_TYPE_UNSUPPORT(std::vector<bool>)
EXPAND_MEMSET_TYPE_UNSUPPORT(std::vector<std::string>)
EXPAND_MEMSET_TYPE_UNSUPPORT(std::vector<symbol::DimExpr>)
EXPAND_MEMSET_TYPE_UNSUPPORT(std::vector<cinn::dialect::SymbolBinding>)
#undef EXPAND_MEMSET_TYPE_UNSUPPORT
EXPAND_MEMSET_TYPE_UNSUPPORTED(std::string)
EXPAND_MEMSET_TYPE_UNSUPPORTED(std::vector<int>)
EXPAND_MEMSET_TYPE_UNSUPPORTED(std::vector<int64_t>)
EXPAND_MEMSET_TYPE_UNSUPPORTED(std::vector<float>)
EXPAND_MEMSET_TYPE_UNSUPPORTED(std::vector<double>)
EXPAND_MEMSET_TYPE_UNSUPPORTED(std::vector<bool>)
EXPAND_MEMSET_TYPE_UNSUPPORTED(std::vector<std::string>)
EXPAND_MEMSET_TYPE_UNSUPPORTED(std::vector<symbol::DimExpr>)
EXPAND_MEMSET_TYPE_UNSUPPORTED(std::vector<cinn::dialect::SymbolBinding>)
#undef EXPAND_MEMSET_TYPE_UNSUPPORTED
};

int value = 0;
Expand Down
16 changes: 8 additions & 8 deletions paddle/cinn/ir/op/ir_operators.cc
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ Expr BitwiseOrCallImpl(common::UnknownArch,
Expr a,
Expr b) {
std::stringstream ss;
ss << "Unsupport arch: " << target.arch_str() << " for bitwise_or.";
ss << "Unsupported arch: " << target.arch_str() << " for bitwise_or.";
PADDLE_THROW(::common::errors::InvalidArgument(ss.str()));
}

Expand All @@ -106,7 +106,7 @@ Expr BitwiseOrCallImpl(common::X86Arch, const Target &target, Expr a, Expr b) {

Expr BitwiseOrCallImpl(common::ARMArch, const Target &target, Expr a, Expr b) {
std::stringstream ss;
ss << "Unsupport arch: " << target.arch_str() << " for bitwise_or.";
ss << "Unsupported arch: " << target.arch_str() << " for bitwise_or.";
PADDLE_THROW(::common::errors::InvalidArgument(ss.str()));
}

Expand Down Expand Up @@ -170,7 +170,7 @@ Expr BitwiseAndCallImpl(common::UnknownArch,
Expr a,
Expr b) {
std::stringstream ss;
ss << "Unsupport arch: " << target.arch_str() << " for bitwise_and.";
ss << "Unsupported arch: " << target.arch_str() << " for bitwise_and.";
PADDLE_THROW(::common::errors::InvalidArgument(ss.str()));
}

Expand All @@ -180,7 +180,7 @@ Expr BitwiseAndCallImpl(common::X86Arch, const Target &target, Expr a, Expr b) {

Expr BitwiseAndCallImpl(common::ARMArch, const Target &target, Expr a, Expr b) {
std::stringstream ss;
ss << "Unsupport arch: " << target.arch_str() << " for bitwise_and.";
ss << "Unsupported arch: " << target.arch_str() << " for bitwise_and.";
PADDLE_THROW(::common::errors::InvalidArgument(ss.str()));
}

Expand Down Expand Up @@ -244,7 +244,7 @@ Expr BitwiseXorCallImpl(common::UnknownArch,
Expr a,
Expr b) {
std::stringstream ss;
ss << "Unsupport arch: " << target.arch_str() << " for bitwise_xor.";
ss << "Unsupported arch: " << target.arch_str() << " for bitwise_xor.";
PADDLE_THROW(::common::errors::InvalidArgument(ss.str()));
}

Expand All @@ -254,7 +254,7 @@ Expr BitwiseXorCallImpl(common::X86Arch, const Target &target, Expr a, Expr b) {

Expr BitwiseXorCallImpl(common::ARMArch, const Target &target, Expr a, Expr b) {
std::stringstream ss;
ss << "Unsupport arch: " << target.arch_str() << " for bitwise_xor.";
ss << "Unsupported arch: " << target.arch_str() << " for bitwise_xor.";
PADDLE_THROW(::common::errors::InvalidArgument(ss.str()));
}

Expand Down Expand Up @@ -315,7 +315,7 @@ Expr operator^(Expr a, Expr b) {

Expr BitwiseNotCallImpl(common::UnknownArch, const Target &target, Expr a) {
std::stringstream ss;
ss << "Unsupport arch: " << target.arch_str() << " for bitwise_not.";
ss << "Unsupported arch: " << target.arch_str() << " for bitwise_not.";
PADDLE_THROW(::common::errors::InvalidArgument(ss.str()));
}

Expand All @@ -325,7 +325,7 @@ Expr BitwiseNotCallImpl(common::X86Arch, const Target &target, Expr a) {

Expr BitwiseNotCallImpl(common::ARMArch, const Target &target, Expr a) {
std::stringstream ss;
ss << "Unsupport arch: " << target.arch_str() << " for bitwise_not.";
ss << "Unsupported arch: " << target.arch_str() << " for bitwise_not.";
PADDLE_THROW(::common::errors::InvalidArgument(ss.str()));
}

Expand Down
12 changes: 6 additions & 6 deletions paddle/cinn/operator_fusion/pattern.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ enum class PatternType {
ReduceTreePlusTrivial,
ItersPermutation,
Horizontal,
Unsupport = -1,
Unsupported = -1,
};

struct PatternContent {
Expand Down Expand Up @@ -216,19 +216,19 @@ struct HorizontalFusionPattern : public PatternBase {
void update_tracker() const;
};

struct UnsupportPattern : public PatternBase {
explicit UnsupportPattern(const std::vector<pir::Operation*>& ops,
const FusionTrackerPtr& tracker)
struct UnsupportedPattern : public PatternBase {
explicit UnsupportedPattern(const std::vector<pir::Operation*>& ops,
const FusionTrackerPtr& tracker)
: PatternBase(UniqueId(), tracker, ops) {}
DEFINE_PATTERN_STATIC_ATTR(Unsupport);
DEFINE_PATTERN_STATIC_ATTR(Unsupported);
};

using StmtPattern = std::variant<TrivialPattern,
ReducePattern,
ReduceTreePattern,
ReduceTreePlusTrivialPattern,
HorizontalFusionPattern,
UnsupportPattern,
UnsupportedPattern,
ItersPermutationPattern>;

static std::string GetPatternId(const StmtPattern& s);
Expand Down
14 changes: 7 additions & 7 deletions paddle/cinn/operator_fusion/pattern_fuser.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ static StmtPattern ConvertToStmtPattern(const PatternContent& content) {
return result;
} else {
PADDLE_THROW(::common::errors::InvalidArgument(
"Unsupport op for fusion: %s", OpsDebugStr({content.op})));
"Unsupported op for fusion: %s", OpsDebugStr({content.op})));
auto result =
UnsupportPattern({content.op}, std::make_shared<FusionTracker>());
UnsupportedPattern({content.op}, std::make_shared<FusionTracker>());
result.tracker_->append(
std::make_shared<InitPatternInstr>(content.op, result.id()));
return result;
Expand Down Expand Up @@ -186,9 +186,9 @@ static std::vector<pir::Operation*> GetOutputOpsInPattern(
std::vector<pir::Operation*> operator()(const TrivialPattern& pattern) {
return {pattern.sink_op()};
}
std::vector<pir::Operation*> operator()(const UnsupportPattern& pattern) {
std::vector<pir::Operation*> operator()(const UnsupportedPattern& pattern) {
PADDLE_THROW(::common::errors::Unimplemented(
"Get output ops in UnsupportPattern is not implement!"));
"Get output ops in UnsupportedPattern is not implement!"));
}
std::vector<pir::Operation*> operator()(const ReduceTreePattern& pattern) {
return this->operator()(pattern.GetRootPattern());
Expand Down Expand Up @@ -304,7 +304,7 @@ struct LoopValueDimsVisitor {
return res;
}

std::vector<LoopValueDims> operator()(const UnsupportPattern& pattern) {
std::vector<LoopValueDims> operator()(const UnsupportedPattern& pattern) {
PADDLE_ENFORCE(false, "Not support GetLoopRange.");
}

Expand Down Expand Up @@ -465,9 +465,9 @@ struct LoopFrameworkVisitor {
CreateIsReduceVector(trivial_loop.size(), reduce_loop.size())};
}

MaybeLoopFramework operator()(const UnsupportPattern& pattern) {
MaybeLoopFramework operator()(const UnsupportedPattern& pattern) {
PADDLE_THROW(
::common::errors::Unimplemented("Unsupport for GetLoopRange."));
::common::errors::Unimplemented("Unsupported for GetLoopRange."));
}

MaybeLoopFramework operator()(const ItersPermutationPattern& pattern) {
Expand Down
2 changes: 1 addition & 1 deletion paddle/cinn/utils/profiler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void ProfilerHelper::UpdateState() {
g_state = ProfilerState::kAll;
break;
default:
LOG(WARNING) << "Unsupport FLAGS_cinn_profiler_state = "
LOG(WARNING) << "Unsupported FLAGS_cinn_profiler_state = "
<< FLAGS_cinn_profiler_state << ", and will do nothing.";
}
}
Expand Down
40 changes: 20 additions & 20 deletions paddle/fluid/framework/fleet/box_wrapper.cc
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ void BoxWrapper::PullSparse(const phi::Place& place,
const std::vector<int64_t>& slot_lengths,
const int hidden_size,
const int expand_embed_dim) {
#define EMBEDX_CASE(i, ...) \
case i: { \
constexpr size_t EmbedxDim = i; \
switch (expand_embed_dim) { \
__VA_ARGS__ \
default: \
PADDLE_THROW(common::errors::InvalidArgument( \
"Unsupport this expand embedding size [%d]", expand_embed_dim)); \
} \
#define EMBEDX_CASE(i, ...) \
case i: { \
constexpr size_t EmbedxDim = i; \
switch (expand_embed_dim) { \
__VA_ARGS__ \
default: \
PADDLE_THROW(common::errors::InvalidArgument( \
"Unsupported this expand embedding size [%d]", expand_embed_dim)); \
} \
} break

#define PULLSPARSE_CASE(i, ...) \
Expand All @@ -108,7 +108,7 @@ void BoxWrapper::PullSparse(const phi::Place& place,
EMBEDX_CASE(16, PULLSPARSE_CASE(0););
default:
PADDLE_THROW(common::errors::InvalidArgument(
"Unsupport this embedding size [%d]", hidden_size - 3));
"Unsupported this embedding size [%d]", hidden_size - 3));
}
#undef PULLSPARSE_CASE
#undef EMBEDX_CASE
Expand All @@ -121,15 +121,15 @@ void BoxWrapper::PushSparseGrad(const phi::Place& place,
const int hidden_size,
const int expand_embed_dim,
const int batch_size) {
#define EMBEDX_CASE(i, ...) \
case i: { \
constexpr size_t EmbedxDim = i; \
switch (expand_embed_dim) { \
__VA_ARGS__ \
default: \
PADDLE_THROW(common::errors::InvalidArgument( \
"Unsupport this expand embedding size [%d]", expand_embed_dim)); \
} \
#define EMBEDX_CASE(i, ...) \
case i: { \
constexpr size_t EmbedxDim = i; \
switch (expand_embed_dim) { \
__VA_ARGS__ \
default: \
PADDLE_THROW(common::errors::InvalidArgument( \
"Unsupported this expand embedding size [%d]", expand_embed_dim)); \
} \
} break

#define PUSHSPARSE_CASE(i, ...) \
Expand All @@ -151,7 +151,7 @@ void BoxWrapper::PushSparseGrad(const phi::Place& place,
EMBEDX_CASE(16, PUSHSPARSE_CASE(0););
default:
PADDLE_THROW(common::errors::InvalidArgument(
"Unsupport this embedding size [%d]", hidden_size - 3));
"Unsupported this embedding size [%d]", hidden_size - 3));
}
#undef PUSHSPARSE_CASE
#undef EMBEDX_CASE
Expand Down
40 changes: 20 additions & 20 deletions paddle/fluid/framework/fleet/box_wrapper.cu
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,15 @@ void BoxWrapper::CopyForPull(const phi::Place& place,
values.size() * sizeof(float*),
cudaMemcpyHostToDevice);
#endif
#define EMBEDX_CASE(i, ...) \
case i: { \
constexpr size_t EmbedxDim = i; \
switch (expand_embed_dim) { \
__VA_ARGS__ \
default: \
PADDLE_THROW(common::errors::InvalidArgument( \
"Unsupport this expand embedding size [%d]", expand_embed_dim)); \
} \
#define EMBEDX_CASE(i, ...) \
case i: { \
constexpr size_t EmbedxDim = i; \
switch (expand_embed_dim) { \
__VA_ARGS__ \
default: \
PADDLE_THROW(common::errors::InvalidArgument( \
"Unsupported this expand embedding size [%d]", expand_embed_dim)); \
} \
} break

#ifdef PADDLE_WITH_HIP
Expand Down Expand Up @@ -222,7 +222,7 @@ void BoxWrapper::CopyForPull(const phi::Place& place,
EMBEDX_CASE(16, EXPAND_EMBED_PULL_CASE(0););
default:
PADDLE_THROW(common::errors::InvalidArgument(
"Unsupport this embedding size [%d]", hidden_size - 3));
"Unsupported this embedding size [%d]", hidden_size - 3));
}
cudaStreamSynchronize(stream);
#undef EXPAND_EMBED_PULL_CASE
Expand Down Expand Up @@ -310,15 +310,15 @@ void BoxWrapper::CopyForPush(const phi::Place& place,
cudaMemcpyHostToDevice);
#endif

#define EMBEDX_CASE(i, ...) \
case i: { \
constexpr size_t EmbedxDim = i; \
switch (expand_embed_dim) { \
__VA_ARGS__ \
default: \
PADDLE_THROW(common::errors::InvalidArgument( \
"Unsupport this expand embedding size [%d]", expand_embed_dim)); \
} \
#define EMBEDX_CASE(i, ...) \
case i: { \
constexpr size_t EmbedxDim = i; \
switch (expand_embed_dim) { \
__VA_ARGS__ \
default: \
PADDLE_THROW(common::errors::InvalidArgument( \
"Unsupported this expand embedding size [%d]", expand_embed_dim)); \
} \
} break

#ifdef PADDLE_WITH_HIP
Expand Down Expand Up @@ -357,7 +357,7 @@ void BoxWrapper::CopyForPush(const phi::Place& place,
EMBEDX_CASE(16, EXPAND_EMBED_PUSH_CASE(0););
default:
PADDLE_THROW(common::errors::InvalidArgument(
"Unsupport this embedding size [%d]", hidden_size - 3));
"Unsupported this embedding size [%d]", hidden_size - 3));
}

cudaStreamSynchronize(stream);
Expand Down
Loading