Skip to content
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

avoid using warning tensor in cpu tbe op #3631

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

avoid using warning tensor in cpu tbe op #3631

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
31 changes: 14 additions & 17 deletions fbgemm_gpu/codegen/utils/embedding_bounds_check_host_cpu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ void bounds_check_indices_cpu(
Tensor& indices,
Tensor& offsets,
int64_t bounds_check_mode_,
Tensor& warning,
[[maybe_unused]] Tensor& warning,
const std::optional<Tensor>& weights,
const std::optional<Tensor>& B_offsets,
const int64_t max_B,
Expand All @@ -71,15 +71,11 @@ void bounds_check_indices_cpu(
vbe ? B_offsets.value().data_ptr<int32_t>() : nullptr;

auto bounds_check_mode = static_cast<BoundsCheckMode>(bounds_check_mode_);
if (bounds_check_mode == BoundsCheckMode::WARNING) {
warning.zero_();
}

const int32_t T = rows_per_table.size(0);
const int32_t total_B = offsets.size(0) - 1;
const int32_t B = total_B / T;
const auto rows_per_table_acc = rows_per_table.accessor<int64_t, 1>();
auto warning_acc = warning.data_ptr<int64_t>();

AT_DISPATCH_INDEX_TYPES(indices.scalar_type(), "bounds_check_indices_cpu", [&] {
[[FBGEMM_MEM_CHECK_ONLY]] const auto func_name = "bounds_check_indices_cpu";
Expand Down Expand Up @@ -107,23 +103,22 @@ void bounds_check_indices_cpu(
TORCH_CHECK(num_indices == offsets_acc[total_B]);
} else if (bounds_check_mode == BoundsCheckMode::WARNING) {
if (num_indices != offsets_acc[total_B]) {
if (__sync_fetch_and_add(&warning_acc[0], 1) == 0) {
LOG(ERROR)
<< "EmbeddingBoundsCheck (VBE " << (vbe ? "true" : "false")
<< "): The last element in offsets is incorrect for "
<< "total batch size " << (vbe ? "total_B" : "B") << ": "
<< (vbe ? total_B : B) << ", total table num T: " << T
<< ", last element in offsets: " << offsets_acc[total_B]
<< ", indices size: " << num_indices
<< ". Setting the last element in offsets to be indices size.";
}
LOG(ERROR)
<< "EmbeddingBoundsCheck (VBE " << (vbe ? "true" : "false")
<< "): The last element in offsets is incorrect for "
<< "total batch size " << (vbe ? "total_B" : "B") << ": "
<< (vbe ? total_B : B) << ", total table num T: " << T
<< ", last element in offsets: " << offsets_acc[total_B]
<< ", indices size: " << num_indices
<< ". Setting the last element in offsets to be indices size.";
offsets_acc[total_B] = num_indices;
}
} else if (bounds_check_mode == BoundsCheckMode::IGNORE) {
if (num_indices != offsets_acc[total_B]) {
offsets_acc[total_B] = num_indices;
}
}
bool warning_logged = false;
for (const auto t : c10::irange(T)) {
auto num_rows = rows_per_table_acc[t];
auto B_begin = vbe ? B_offsets_ptr[t] : t * B;
Expand All @@ -138,14 +133,15 @@ void bounds_check_indices_cpu(
} else if (bounds_check_mode == BoundsCheckMode::WARNING) {
if (indices_start < 0 || indices_start > indices_end ||
indices_end > num_indices) {
if (__sync_fetch_and_add(&warning_acc[0], 1) == 0) {
if (!warning_logged) {
LOG(ERROR)
<< "EmbeddingBoundsCheck (VBE " << (vbe ? "true" : "false")
<< "): (at least one) Out of bounds access for batch: " << b
<< ", table: " << t << ", indices_start: " << indices_start
<< ", indices_end: " << indices_end
<< ", num_indices: " << num_indices
<< ". Setting indices_start and indices_end within the range";
warning_logged = true;
}
adjust_offset_cpu(
indices_start,
Expand Down Expand Up @@ -175,13 +171,14 @@ void bounds_check_indices_cpu(
TORCH_CHECK(idx < num_rows);
} else if (bounds_check_mode == BoundsCheckMode::WARNING) {
if (idx < 0 || idx >= num_rows) {
if (__sync_fetch_and_add(&warning_acc[0], 1) == 0) {
if (!warning_logged) {
LOG(ERROR)
<< "EmbeddingBoundsCheck (VBE " << (vbe ? "true" : "false")
<< "): (at least one) Out of bounds access for batch: " << b
<< ", table: " << t << ", bag element: " << l
<< ", idx: " << idx << ", num_rows: " << num_rows
<< ". Setting idx to zero.";
warning_logged = true;
}
indices_acc[indices_start + l] = 0;
}
Expand Down
Loading