Skip to content

Avoid unordered_map for runtime datatype mapping #3223

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

Open
LwhJesse wants to merge 1 commit into
base: main
Choose a base branch
from
+92 −55
Open

Avoid unordered_map for runtime datatype mapping #3223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 31 additions & 18 deletions tools/library/src/blockwise_gemm_operation_3x.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,26 +243,39 @@ class BlockwiseGemmUniversal3xOperation : public GemmOperation3xBase<Operator_>
operator_args.mainloop.ptr_A = static_cast<ArrayElementA const *>(arguments->A);
operator_args.mainloop.ptr_B = static_cast<ArrayElementB const *>(arguments->B);

std::unordered_map<RuntimeDatatype, cute::UMMA::MXF8F6F4Format> mapping = {
{RuntimeDatatype::kE4M3, cute::UMMA::MXF8F6F4Format::E4M3},
{RuntimeDatatype::kE5M2, cute::UMMA::MXF8F6F4Format::E5M2},
{RuntimeDatatype::kE3M2, cute::UMMA::MXF8F6F4Format::E3M2},
{RuntimeDatatype::kE2M1, cute::UMMA::MXF8F6F4Format::E2M1}
};

auto iter_runtime_a = mapping.find(arguments->runtime_input_datatype_a);
auto iter_runtime_b = mapping.find(arguments->runtime_input_datatype_b);

if (iter_runtime_a != mapping.end()) {
operator_args.mainloop.runtime_data_type_a = iter_runtime_a->second;
} else {
assert("invalid runtime argument for datatype A!");
auto runtime_datatype_to_mxf8f6f4 =
[](RuntimeDatatype type, cute::UMMA::MXF8F6F4Format& format) -> Status {
switch (type) {
case RuntimeDatatype::kE4M3:
format = cute::UMMA::MXF8F6F4Format::E4M3;
return Status::kSuccess;
case RuntimeDatatype::kE5M2:
format = cute::UMMA::MXF8F6F4Format::E5M2;
return Status::kSuccess;
case RuntimeDatatype::kE3M2:
format = cute::UMMA::MXF8F6F4Format::E3M2;
return Status::kSuccess;
case RuntimeDatatype::kE2M1:
format = cute::UMMA::MXF8F6F4Format::E2M1;
return Status::kSuccess;
default:
assert(false && "invalid runtime argument for datatype!");
return Status::kErrorInvalidProblem;
}
};

status = runtime_datatype_to_mxf8f6f4(
arguments->runtime_input_datatype_a,
operator_args.mainloop.runtime_data_type_a);
if (status != Status::kSuccess) {
return status;
}

if (iter_runtime_b != mapping.end()) {
operator_args.mainloop.runtime_data_type_b = iter_runtime_b->second;
} else {
assert("invalid runtime argument for datatype B!");
status = runtime_datatype_to_mxf8f6f4(
arguments->runtime_input_datatype_b,
operator_args.mainloop.runtime_data_type_b);
if (status != Status::kSuccess) {
return status;
}

}
Expand Down
48 changes: 30 additions & 18 deletions tools/library/src/gemm_operation_3x.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
#include "cutlass/util/reference/device/tensor_fill.h"
#include "cutlass/util/reference/device/tensor_compare.h"
#include "cute/tensor.hpp"
#include <unordered_map>

///////////////////////////////////////////////////////////////////////////////////////////////////

Expand Down Expand Up @@ -374,26 +373,39 @@ class GemmUniversal3xOperation : public GemmOperation3xBase<Operator_> {
operator_args.mainloop.ptr_A = static_cast<ArrayElementA const *>(arguments->A);
operator_args.mainloop.ptr_B = static_cast<ArrayElementB const *>(arguments->B);

std::unordered_map<RuntimeDatatype, cute::UMMA::MXF8F6F4Format> mapping = {
{RuntimeDatatype::kE4M3, cute::UMMA::MXF8F6F4Format::E4M3},
{RuntimeDatatype::kE5M2, cute::UMMA::MXF8F6F4Format::E5M2},
{RuntimeDatatype::kE3M2, cute::UMMA::MXF8F6F4Format::E3M2},
{RuntimeDatatype::kE2M1, cute::UMMA::MXF8F6F4Format::E2M1}
};

auto iter_runtime_a = mapping.find(arguments->runtime_input_datatype_a);
auto iter_runtime_b = mapping.find(arguments->runtime_input_datatype_b);
auto runtime_datatype_to_mxf8f6f4 =
[](RuntimeDatatype type, cute::UMMA::MXF8F6F4Format& format) -> Status {
switch (type) {
case RuntimeDatatype::kE4M3:
format = cute::UMMA::MXF8F6F4Format::E4M3;
return Status::kSuccess;
case RuntimeDatatype::kE5M2:
format = cute::UMMA::MXF8F6F4Format::E5M2;
return Status::kSuccess;
case RuntimeDatatype::kE3M2:
format = cute::UMMA::MXF8F6F4Format::E3M2;
return Status::kSuccess;
case RuntimeDatatype::kE2M1:
format = cute::UMMA::MXF8F6F4Format::E2M1;
return Status::kSuccess;
default:
assert(false && "invalid runtime argument for datatype!");
return Status::kErrorInvalidProblem;
}
};

if (iter_runtime_a != mapping.end()) {
operator_args.mainloop.runtime_data_type_a = iter_runtime_a->second;
} else {
assert("invalid runtime argument for datatype A!");
status = runtime_datatype_to_mxf8f6f4(
arguments->runtime_input_datatype_a,
operator_args.mainloop.runtime_data_type_a);
if (status != Status::kSuccess) {
return status;
}

if (iter_runtime_b != mapping.end()) {
operator_args.mainloop.runtime_data_type_b = iter_runtime_b->second;
} else {
assert("invalid runtime argument for datatype B!");
status = runtime_datatype_to_mxf8f6f4(
arguments->runtime_input_datatype_b,
operator_args.mainloop.runtime_data_type_b);
if (status != Status::kSuccess) {
return status;
}

}
Expand Down
50 changes: 31 additions & 19 deletions tools/library/src/sparse_gemm_operation_3x.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
#include "cutlass/util/reference/device/tensor_fill.h"
#include "cutlass/util/reference/device/tensor_compare.h"
#include "cute/tensor.hpp"
#include <unordered_map>

///////////////////////////////////////////////////////////////////////////////////////////////////

Expand Down Expand Up @@ -196,26 +195,39 @@ class SparseGemmUniversal3xOperation : public GemmOperation3xBase<Operator_> {
operator_args.mainloop.ptr_A = static_cast<ArrayElementA const *>(device_a_compressed_ptr);
operator_args.mainloop.ptr_B = static_cast<ArrayElementB const *>(arguments->B);

std::unordered_map<RuntimeDatatype, cute::UMMA::MXF8F6F4Format> mapping = {
{RuntimeDatatype::kE4M3, cute::UMMA::MXF8F6F4Format::E4M3},
{RuntimeDatatype::kE5M2, cute::UMMA::MXF8F6F4Format::E5M2},
{RuntimeDatatype::kE3M2, cute::UMMA::MXF8F6F4Format::E3M2},
{RuntimeDatatype::kE2M1, cute::UMMA::MXF8F6F4Format::E2M1}
};

auto iter_runtime_a = mapping.find(arguments->runtime_input_datatype_a);
auto iter_runtime_b = mapping.find(arguments->runtime_input_datatype_b);

if (iter_runtime_a != mapping.end()) {
operator_args.mainloop.runtime_data_type_a = iter_runtime_a->second;
} else {
assert("invalid runtime argument for datatype A!");
auto runtime_datatype_to_mxf8f6f4 =
[](RuntimeDatatype type, cute::UMMA::MXF8F6F4Format& format) -> Status {
switch (type) {
case RuntimeDatatype::kE4M3:
format = cute::UMMA::MXF8F6F4Format::E4M3;
return Status::kSuccess;
case RuntimeDatatype::kE5M2:
format = cute::UMMA::MXF8F6F4Format::E5M2;
return Status::kSuccess;
case RuntimeDatatype::kE3M2:
format = cute::UMMA::MXF8F6F4Format::E3M2;
return Status::kSuccess;
case RuntimeDatatype::kE2M1:
format = cute::UMMA::MXF8F6F4Format::E2M1;
return Status::kSuccess;
default:
assert(false && "invalid runtime argument for datatype!");
return Status::kErrorInvalidProblem;
}
};

status = runtime_datatype_to_mxf8f6f4(
arguments->runtime_input_datatype_a,
operator_args.mainloop.runtime_data_type_a);
if (status != Status::kSuccess) {
return status;
}

if (iter_runtime_b != mapping.end()) {
operator_args.mainloop.runtime_data_type_b = iter_runtime_b->second;
} else {
assert("invalid runtime argument for datatype B!");
status = runtime_datatype_to_mxf8f6f4(
arguments->runtime_input_datatype_b,
operator_args.mainloop.runtime_data_type_b);
if (status != Status::kSuccess) {
return status;
}

}
Expand Down