Dtype compliance: clamp#83

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
salilsdesai wants to merge 1 commit into from
Closed

Dtype compliance: clamp #83

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
114 changes: 90 additions & 24 deletions kernels/portable/cpu/op_clamp.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,43 @@ using Scalar = exec_aten::Scalar;
using ScalarType = exec_aten::ScalarType;
using Tensor = exec_aten::Tensor;

namespace {

template <typename CTYPE_VAL, typename CTYPE_OUT, typename CTYPE_CAST>
/** Check if val, when cast to CTYPE_CAST, is not in the range of CTYPE_OUT */
bool is_out_of_bounds(CTYPE_VAL val) {
const CTYPE_CAST val_cast = static_cast<CTYPE_CAST>(val);
return val_cast < std::numeric_limits<CTYPE_OUT>::lowest() ||
val_cast > std::numeric_limits<CTYPE_OUT>::max();
}

void check_bounds(
const Scalar& val_scalar,
const torch::executor::native::ScalarType& val_type,
const torch::executor::native::ScalarType& out_type,
const char* val_name) {
ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, "clamp", CTYPE_VAL, [&]() {
CTYPE_VAL val = 0;
ET_EXTRACT_SCALAR(val_scalar, val);
if (isIntegralType(out_type, /*includeBool=*/false)) {
ET_SWITCH_INT_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
if (is_out_of_bounds<CTYPE_VAL, CTYPE_OUT, long>(val)) {
ET_CHECK_MSG(false, "%s value out of bounds", val_name);
}
});
} else if (isFloatingType(out_type)) {
ET_SWITCH_FLOAT_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
if (std::isfinite(val) &&
is_out_of_bounds<CTYPE_VAL, CTYPE_OUT, double>(val)) {
ET_CHECK_MSG(false, "%s value out of bounds", val_name);
}
});
}
});
}

} // namespace

Tensor& clamp_out(
RuntimeContext& ctx,
const Tensor& in,
Expand All@@ -84,38 +121,67 @@ Tensor& clamp_out(
Error err = resize_tensor(out, in.sizes());
ET_CHECK_MSG(err == Error::Ok, "Could not resize output");

ET_CHECK_SAME_SHAPE_AND_DTYPE2(in, out);
ScalarType in_type = in.scalar_type();
ScalarType min_type = in_type;
ScalarType max_type = in_type;
ScalarType common_type = in_type;
ScalarType out_type = out.scalar_type();

bool has_min = min_opt.has_value();
if (has_min) {
min_type = utils::get_scalar_dtype(min_opt.value());
common_type = utils::promote_type_with_scalar(common_type, min_opt.value());
check_bounds(min_opt.value(), min_type, out_type, "minimum");
}
bool has_max = max_opt.has_value();
if (has_max) {
max_type = utils::get_scalar_dtype(max_opt.value());
common_type = utils::promote_type_with_scalar(common_type, max_opt.value());
check_bounds(max_opt.value(), max_type, out_type, "maximum");
}

ET_SWITCH_REAL_TYPES(in.scalar_type(), ctx, "clamp", CTYPE, [&]() {
ET_CHECK_MSG(
has_min || has_max, "At least one of 'min' or 'max' must not be None");

ET_CHECK(common_type == out_type);

ET_SWITCH_REAL_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
// Extract optional min value
CTYPE min = 0;
bool has_min = min_opt.has_value();
CTYPE_OUT min = 0;
if (has_min) {
bool ok = utils::extract_scalar<CTYPE>(min_opt.value(), &min);
ET_CHECK_MSG(ok, "Invalid min value: wrong type or out of range");
ET_SWITCH_SCALAR_OBJ_TYPES(min_type, ctx, "clamp", CTYPE_MIN, [&]() {
CTYPE_MIN min_val = 0;
ET_EXTRACT_SCALAR(min_opt.value(), min_val);
min = static_cast<CTYPE_OUT>(min_val);
});
}

// Extract optional max value
CTYPE max = 0;
bool has_max = max_opt.has_value();
CTYPE_OUT max = 0;
if (has_max) {
bool ok = utils::extract_scalar<CTYPE>(max_opt.value(), &max);
ET_CHECK_MSG(ok, "Invalid max value: wrong type or out of range");
ET_SWITCH_SCALAR_OBJ_TYPES(max_type, ctx, "clamp", CTYPE_MAX, [&]() {
CTYPE_MAX max_val = 0;
ET_EXTRACT_SCALAR(max_opt.value(), max_val);
max = static_cast<CTYPE_OUT>(max_val);
});
}

apply_unary_map_fn(
[has_min, min, has_max, max](const CTYPE val_in) {
CTYPE val_out = val_in;
if (has_min) {
val_out = max_override(val_out, min);
}
if (has_max) {
val_out = min_override(val_out, max);
}
return val_out;
},
in.const_data_ptr<CTYPE>(),
out.mutable_data_ptr<CTYPE>(),
in.numel());
ET_SWITCH_REAL_TYPES_AND(Bool, in_type, ctx, "clamp", CTYPE_IN, [&]() {
apply_unary_map_fn(
[has_min, min, has_max, max](const CTYPE_IN val_in) {
CTYPE_OUT val_out = static_cast<CTYPE_OUT>(val_in);
if (has_min) {
val_out = max_override(val_out, min);
}
if (has_max) {
val_out = min_override(val_out, max);
}
return val_out;
},
in.const_data_ptr<CTYPE_IN>(),
out.mutable_data_ptr<CTYPE_OUT>(),
in.numel());
});
});

return out;
Expand Down
4 changes: 2 additions & 2 deletions kernels/test/op_clamp_test.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -303,12 +303,12 @@ TEST(OpClampOutTest, ByteTensorFloatingPointClampDies) {

#ifndef USE_ATEN_LIB
TEST(OpClampOutTest, IntTensorTooSmallClampDies) {
// Cannot be represented by a uint32_t.
// Cannot be represented by a int32_t.
expect_bad_clamp_value_dies<ScalarType::Int>(-2147483649);
}

TEST(OpClampOutTest, IntTensorTooLargeClampDies) {
// Cannot be represented by a uint32_t.
// Cannot be represented by a int32_t.
expect_bad_clamp_value_dies<ScalarType::Int>(2147483648);
}
#endif
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Dtype compliance: clamp#83

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

salilsdesai
wants to merge
1
commit into

from

 Closed


Dtype compliance: clamp
#83
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


114 changes: 90 additions & 24 deletions
kernels/portable/cpu/op_clamp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,43 @@ using Scalar = exec_aten::Scalar;
using ScalarType = exec_aten::ScalarType;
using Tensor = exec_aten::Tensor;

namespace {

template <typename CTYPE_VAL, typename CTYPE_OUT, typename CTYPE_CAST>
/** Check if val, when cast to CTYPE_CAST, is not in the range of CTYPE_OUT */
bool is_out_of_bounds(CTYPE_VAL val) {
 const CTYPE_CAST val_cast = static_cast<CTYPE_CAST>(val);
 return val_cast < std::numeric_limits<CTYPE_OUT>::lowest() ||
 val_cast > std::numeric_limits<CTYPE_OUT>::max();
}

void check_bounds(
 const Scalar& val_scalar,
 const torch::executor::native::ScalarType& val_type,
 const torch::executor::native::ScalarType& out_type,
 const char* val_name) {
 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, "clamp", CTYPE_VAL, [&]() {
 CTYPE_VAL val = 0;
 ET_EXTRACT_SCALAR(val_scalar, val);
 if (isIntegralType(out_type, /*includeBool=*/false)) {
 ET_SWITCH_INT_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 if (is_out_of_bounds<CTYPE_VAL, CTYPE_OUT, long>(val)) {
 ET_CHECK_MSG(false, "%s value out of bounds", val_name);
 }
 });
 } else if (isFloatingType(out_type)) {
 ET_SWITCH_FLOAT_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 if (std::isfinite(val) &&
 is_out_of_bounds<CTYPE_VAL, CTYPE_OUT, double>(val)) {
 ET_CHECK_MSG(false, "%s value out of bounds", val_name);
 }
 });
 }
 });
}

} // namespace

Tensor& clamp_out(
 RuntimeContext& ctx,
 const Tensor& in,
Expand All@@ -84,38 +121,67 @@ Tensor& clamp_out(
 Error err = resize_tensor(out, in.sizes());
 ET_CHECK_MSG(err == Error::Ok, "Could not resize output");

 ET_CHECK_SAME_SHAPE_AND_DTYPE2(in, out);
 ScalarType in_type = in.scalar_type();
 ScalarType min_type = in_type;
 ScalarType max_type = in_type;
 ScalarType common_type = in_type;
 ScalarType out_type = out.scalar_type();

 bool has_min = min_opt.has_value();
 if (has_min) {
 min_type = utils::get_scalar_dtype(min_opt.value());
 common_type = utils::promote_type_with_scalar(common_type, min_opt.value());
 check_bounds(min_opt.value(), min_type, out_type, "minimum");
 }
 bool has_max = max_opt.has_value();
 if (has_max) {
 max_type = utils::get_scalar_dtype(max_opt.value());
 common_type = utils::promote_type_with_scalar(common_type, max_opt.value());
 check_bounds(max_opt.value(), max_type, out_type, "maximum");
 }

 ET_SWITCH_REAL_TYPES(in.scalar_type(), ctx, "clamp", CTYPE, [&]() {
 ET_CHECK_MSG(
 has_min || has_max, "At least one of 'min' or 'max' must not be None");

 ET_CHECK(common_type == out_type);

 ET_SWITCH_REAL_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 // Extract optional min value
 CTYPE min = 0;
 bool has_min = min_opt.has_value();
 CTYPE_OUT min = 0;
 if (has_min) {
 bool ok = utils::extract_scalar<CTYPE>(min_opt.value(), &min);
 ET_CHECK_MSG(ok, "Invalid min value: wrong type or out of range");
 ET_SWITCH_SCALAR_OBJ_TYPES(min_type, ctx, "clamp", CTYPE_MIN, [&]() {
 CTYPE_MIN min_val = 0;
 ET_EXTRACT_SCALAR(min_opt.value(), min_val);
 min = static_cast<CTYPE_OUT>(min_val);
 });
 }

 // Extract optional max value
 CTYPE max = 0;
 bool has_max = max_opt.has_value();
 CTYPE_OUT max = 0;
 if (has_max) {
 bool ok = utils::extract_scalar<CTYPE>(max_opt.value(), &max);
 ET_CHECK_MSG(ok, "Invalid max value: wrong type or out of range");
 ET_SWITCH_SCALAR_OBJ_TYPES(max_type, ctx, "clamp", CTYPE_MAX, [&]() {
 CTYPE_MAX max_val = 0;
 ET_EXTRACT_SCALAR(max_opt.value(), max_val);
 max = static_cast<CTYPE_OUT>(max_val);
 });
 }

 apply_unary_map_fn(
 [has_min, min, has_max, max](const CTYPE val_in) {
 CTYPE val_out = val_in;
 if (has_min) {
 val_out = max_override(val_out, min);
 }
 if (has_max) {
 val_out = min_override(val_out, max);
 }
 return val_out;
 },
 in.const_data_ptr<CTYPE>(),
 out.mutable_data_ptr<CTYPE>(),
 in.numel());
 ET_SWITCH_REAL_TYPES_AND(Bool, in_type, ctx, "clamp", CTYPE_IN, [&]() {
 apply_unary_map_fn(
 [has_min, min, has_max, max](const CTYPE_IN val_in) {
 CTYPE_OUT val_out = static_cast<CTYPE_OUT>(val_in);
 if (has_min) {
 val_out = max_override(val_out, min);
 }
 if (has_max) {
 val_out = min_override(val_out, max);
 }
 return val_out;
 },
 in.const_data_ptr<CTYPE_IN>(),
 out.mutable_data_ptr<CTYPE_OUT>(),
 in.numel());
 });
 });

 return out;
Expand Down

4 changes: 2 additions & 2 deletions
kernels/test/op_clamp_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -303,12 +303,12 @@ TEST(OpClampOutTest, ByteTensorFloatingPointClampDies) {

#ifndef USE_ATEN_LIB
TEST(OpClampOutTest, IntTensorTooSmallClampDies) {
 // Cannot be represented by a uint32_t.
 // Cannot be represented by a int32_t.
 expect_bad_clamp_value_dies<ScalarType::Int>(-2147483649);
}

TEST(OpClampOutTest, IntTensorTooLargeClampDies) {
 // Cannot be represented by a uint32_t.
 // Cannot be represented by a int32_t.
 expect_bad_clamp_value_dies<ScalarType::Int>(2147483648);
}
#endif
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Dtype compliance: clamp#83

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

salilsdesai
wants to merge
1
commit into

from

 Closed


Dtype compliance: clamp
#83
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


114 changes: 90 additions & 24 deletions
kernels/portable/cpu/op_clamp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,43 @@ using Scalar = exec_aten::Scalar;
using ScalarType = exec_aten::ScalarType;
using Tensor = exec_aten::Tensor;

namespace {

template <typename CTYPE_VAL, typename CTYPE_OUT, typename CTYPE_CAST>
/** Check if val, when cast to CTYPE_CAST, is not in the range of CTYPE_OUT */
bool is_out_of_bounds(CTYPE_VAL val) {
 const CTYPE_CAST val_cast = static_cast<CTYPE_CAST>(val);
 return val_cast < std::numeric_limits<CTYPE_OUT>::lowest() ||
 val_cast > std::numeric_limits<CTYPE_OUT>::max();
}

void check_bounds(
 const Scalar& val_scalar,
 const torch::executor::native::ScalarType& val_type,
 const torch::executor::native::ScalarType& out_type,
 const char* val_name) {
 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, "clamp", CTYPE_VAL, [&]() {
 CTYPE_VAL val = 0;
 ET_EXTRACT_SCALAR(val_scalar, val);
 if (isIntegralType(out_type, /*includeBool=*/false)) {
 ET_SWITCH_INT_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 if (is_out_of_bounds<CTYPE_VAL, CTYPE_OUT, long>(val)) {
 ET_CHECK_MSG(false, "%s value out of bounds", val_name);
 }
 });
 } else if (isFloatingType(out_type)) {
 ET_SWITCH_FLOAT_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 if (std::isfinite(val) &&
 is_out_of_bounds<CTYPE_VAL, CTYPE_OUT, double>(val)) {
 ET_CHECK_MSG(false, "%s value out of bounds", val_name);
 }
 });
 }
 });
}

} // namespace

Tensor& clamp_out(
 RuntimeContext& ctx,
 const Tensor& in,
Expand All@@ -84,38 +121,67 @@ Tensor& clamp_out(
 Error err = resize_tensor(out, in.sizes());
 ET_CHECK_MSG(err == Error::Ok, "Could not resize output");

 ET_CHECK_SAME_SHAPE_AND_DTYPE2(in, out);
 ScalarType in_type = in.scalar_type();
 ScalarType min_type = in_type;
 ScalarType max_type = in_type;
 ScalarType common_type = in_type;
 ScalarType out_type = out.scalar_type();

 bool has_min = min_opt.has_value();
 if (has_min) {
 min_type = utils::get_scalar_dtype(min_opt.value());
 common_type = utils::promote_type_with_scalar(common_type, min_opt.value());
 check_bounds(min_opt.value(), min_type, out_type, "minimum");
 }
 bool has_max = max_opt.has_value();
 if (has_max) {
 max_type = utils::get_scalar_dtype(max_opt.value());
 common_type = utils::promote_type_with_scalar(common_type, max_opt.value());
 check_bounds(max_opt.value(), max_type, out_type, "maximum");
 }

 ET_SWITCH_REAL_TYPES(in.scalar_type(), ctx, "clamp", CTYPE, [&]() {
 ET_CHECK_MSG(
 has_min || has_max, "At least one of 'min' or 'max' must not be None");

 ET_CHECK(common_type == out_type);

 ET_SWITCH_REAL_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 // Extract optional min value
 CTYPE min = 0;
 bool has_min = min_opt.has_value();
 CTYPE_OUT min = 0;
 if (has_min) {
 bool ok = utils::extract_scalar<CTYPE>(min_opt.value(), &min);
 ET_CHECK_MSG(ok, "Invalid min value: wrong type or out of range");
 ET_SWITCH_SCALAR_OBJ_TYPES(min_type, ctx, "clamp", CTYPE_MIN, [&]() {
 CTYPE_MIN min_val = 0;
 ET_EXTRACT_SCALAR(min_opt.value(), min_val);
 min = static_cast<CTYPE_OUT>(min_val);
 });
 }

 // Extract optional max value
 CTYPE max = 0;
 bool has_max = max_opt.has_value();
 CTYPE_OUT max = 0;
 if (has_max) {
 bool ok = utils::extract_scalar<CTYPE>(max_opt.value(), &max);
 ET_CHECK_MSG(ok, "Invalid max value: wrong type or out of range");
 ET_SWITCH_SCALAR_OBJ_TYPES(max_type, ctx, "clamp", CTYPE_MAX, [&]() {
 CTYPE_MAX max_val = 0;
 ET_EXTRACT_SCALAR(max_opt.value(), max_val);
 max = static_cast<CTYPE_OUT>(max_val);
 });
 }

 apply_unary_map_fn(
 [has_min, min, has_max, max](const CTYPE val_in) {
 CTYPE val_out = val_in;
 if (has_min) {
 val_out = max_override(val_out, min);
 }
 if (has_max) {
 val_out = min_override(val_out, max);
 }
 return val_out;
 },
 in.const_data_ptr<CTYPE>(),
 out.mutable_data_ptr<CTYPE>(),
 in.numel());
 ET_SWITCH_REAL_TYPES_AND(Bool, in_type, ctx, "clamp", CTYPE_IN, [&]() {
 apply_unary_map_fn(
 [has_min, min, has_max, max](const CTYPE_IN val_in) {
 CTYPE_OUT val_out = static_cast<CTYPE_OUT>(val_in);
 if (has_min) {
 val_out = max_override(val_out, min);
 }
 if (has_max) {
 val_out = min_override(val_out, max);
 }
 return val_out;
 },
 in.const_data_ptr<CTYPE_IN>(),
 out.mutable_data_ptr<CTYPE_OUT>(),
 in.numel());
 });
 });

 return out;
Expand Down

4 changes: 2 additions & 2 deletions
kernels/test/op_clamp_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -303,12 +303,12 @@ TEST(OpClampOutTest, ByteTensorFloatingPointClampDies) {

#ifndef USE_ATEN_LIB
TEST(OpClampOutTest, IntTensorTooSmallClampDies) {
 // Cannot be represented by a uint32_t.
 // Cannot be represented by a int32_t.
 expect_bad_clamp_value_dies<ScalarType::Int>(-2147483649);
}

TEST(OpClampOutTest, IntTensorTooLargeClampDies) {
 // Cannot be represented by a uint32_t.
 // Cannot be represented by a int32_t.
 expect_bad_clamp_value_dies<ScalarType::Int>(2147483648);
}
#endif
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Dtype compliance: clamp#83

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

salilsdesai
wants to merge
1
commit into

from

 Closed


Dtype compliance: clamp
#83
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


114 changes: 90 additions & 24 deletions
kernels/portable/cpu/op_clamp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,43 @@ using Scalar = exec_aten::Scalar;
using ScalarType = exec_aten::ScalarType;
using Tensor = exec_aten::Tensor;

namespace {

template <typename CTYPE_VAL, typename CTYPE_OUT, typename CTYPE_CAST>
/** Check if val, when cast to CTYPE_CAST, is not in the range of CTYPE_OUT */
bool is_out_of_bounds(CTYPE_VAL val) {
 const CTYPE_CAST val_cast = static_cast<CTYPE_CAST>(val);
 return val_cast < std::numeric_limits<CTYPE_OUT>::lowest() ||
 val_cast > std::numeric_limits<CTYPE_OUT>::max();
}

void check_bounds(
 const Scalar& val_scalar,
 const torch::executor::native::ScalarType& val_type,
 const torch::executor::native::ScalarType& out_type,
 const char* val_name) {
 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, "clamp", CTYPE_VAL, [&]() {
 CTYPE_VAL val = 0;
 ET_EXTRACT_SCALAR(val_scalar, val);
 if (isIntegralType(out_type, /*includeBool=*/false)) {
 ET_SWITCH_INT_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 if (is_out_of_bounds<CTYPE_VAL, CTYPE_OUT, long>(val)) {
 ET_CHECK_MSG(false, "%s value out of bounds", val_name);
 }
 });
 } else if (isFloatingType(out_type)) {
 ET_SWITCH_FLOAT_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 if (std::isfinite(val) &&
 is_out_of_bounds<CTYPE_VAL, CTYPE_OUT, double>(val)) {
 ET_CHECK_MSG(false, "%s value out of bounds", val_name);
 }
 });
 }
 });
}

} // namespace

Tensor& clamp_out(
 RuntimeContext& ctx,
 const Tensor& in,
Expand All@@ -84,38 +121,67 @@ Tensor& clamp_out(
 Error err = resize_tensor(out, in.sizes());
 ET_CHECK_MSG(err == Error::Ok, "Could not resize output");

 ET_CHECK_SAME_SHAPE_AND_DTYPE2(in, out);
 ScalarType in_type = in.scalar_type();
 ScalarType min_type = in_type;
 ScalarType max_type = in_type;
 ScalarType common_type = in_type;
 ScalarType out_type = out.scalar_type();

 bool has_min = min_opt.has_value();
 if (has_min) {
 min_type = utils::get_scalar_dtype(min_opt.value());
 common_type = utils::promote_type_with_scalar(common_type, min_opt.value());
 check_bounds(min_opt.value(), min_type, out_type, "minimum");
 }
 bool has_max = max_opt.has_value();
 if (has_max) {
 max_type = utils::get_scalar_dtype(max_opt.value());
 common_type = utils::promote_type_with_scalar(common_type, max_opt.value());
 check_bounds(max_opt.value(), max_type, out_type, "maximum");
 }

 ET_SWITCH_REAL_TYPES(in.scalar_type(), ctx, "clamp", CTYPE, [&]() {
 ET_CHECK_MSG(
 has_min || has_max, "At least one of 'min' or 'max' must not be None");

 ET_CHECK(common_type == out_type);

 ET_SWITCH_REAL_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 // Extract optional min value
 CTYPE min = 0;
 bool has_min = min_opt.has_value();
 CTYPE_OUT min = 0;
 if (has_min) {
 bool ok = utils::extract_scalar<CTYPE>(min_opt.value(), &min);
 ET_CHECK_MSG(ok, "Invalid min value: wrong type or out of range");
 ET_SWITCH_SCALAR_OBJ_TYPES(min_type, ctx, "clamp", CTYPE_MIN, [&]() {
 CTYPE_MIN min_val = 0;
 ET_EXTRACT_SCALAR(min_opt.value(), min_val);
 min = static_cast<CTYPE_OUT>(min_val);
 });
 }

 // Extract optional max value
 CTYPE max = 0;
 bool has_max = max_opt.has_value();
 CTYPE_OUT max = 0;
 if (has_max) {
 bool ok = utils::extract_scalar<CTYPE>(max_opt.value(), &max);
 ET_CHECK_MSG(ok, "Invalid max value: wrong type or out of range");
 ET_SWITCH_SCALAR_OBJ_TYPES(max_type, ctx, "clamp", CTYPE_MAX, [&]() {
 CTYPE_MAX max_val = 0;
 ET_EXTRACT_SCALAR(max_opt.value(), max_val);
 max = static_cast<CTYPE_OUT>(max_val);
 });
 }

 apply_unary_map_fn(
 [has_min, min, has_max, max](const CTYPE val_in) {
 CTYPE val_out = val_in;
 if (has_min) {
 val_out = max_override(val_out, min);
 }
 if (has_max) {
 val_out = min_override(val_out, max);
 }
 return val_out;
 },
 in.const_data_ptr<CTYPE>(),
 out.mutable_data_ptr<CTYPE>(),
 in.numel());
 ET_SWITCH_REAL_TYPES_AND(Bool, in_type, ctx, "clamp", CTYPE_IN, [&]() {
 apply_unary_map_fn(
 [has_min, min, has_max, max](const CTYPE_IN val_in) {
 CTYPE_OUT val_out = static_cast<CTYPE_OUT>(val_in);
 if (has_min) {
 val_out = max_override(val_out, min);
 }
 if (has_max) {
 val_out = min_override(val_out, max);
 }
 return val_out;
 },
 in.const_data_ptr<CTYPE_IN>(),
 out.mutable_data_ptr<CTYPE_OUT>(),
 in.numel());
 });
 });

 return out;
Expand Down

4 changes: 2 additions & 2 deletions
kernels/test/op_clamp_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -303,12 +303,12 @@ TEST(OpClampOutTest, ByteTensorFloatingPointClampDies) {

#ifndef USE_ATEN_LIB
TEST(OpClampOutTest, IntTensorTooSmallClampDies) {
 // Cannot be represented by a uint32_t.
 // Cannot be represented by a int32_t.
 expect_bad_clamp_value_dies<ScalarType::Int>(-2147483649);
}

TEST(OpClampOutTest, IntTensorTooLargeClampDies) {
 // Cannot be represented by a uint32_t.
 // Cannot be represented by a int32_t.
 expect_bad_clamp_value_dies<ScalarType::Int>(2147483648);
}
#endif
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Dtype compliance: clamp#83

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

salilsdesai
wants to merge
1
commit into

from

 Closed


Dtype compliance: clamp
#83
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


114 changes: 90 additions & 24 deletions
kernels/portable/cpu/op_clamp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,43 @@ using Scalar = exec_aten::Scalar;
using ScalarType = exec_aten::ScalarType;
using Tensor = exec_aten::Tensor;

namespace {

template <typename CTYPE_VAL, typename CTYPE_OUT, typename CTYPE_CAST>
/** Check if val, when cast to CTYPE_CAST, is not in the range of CTYPE_OUT */
bool is_out_of_bounds(CTYPE_VAL val) {
 const CTYPE_CAST val_cast = static_cast<CTYPE_CAST>(val);
 return val_cast < std::numeric_limits<CTYPE_OUT>::lowest() ||
 val_cast > std::numeric_limits<CTYPE_OUT>::max();
}

void check_bounds(
 const Scalar& val_scalar,
 const torch::executor::native::ScalarType& val_type,
 const torch::executor::native::ScalarType& out_type,
 const char* val_name) {
 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, "clamp", CTYPE_VAL, [&]() {
 CTYPE_VAL val = 0;
 ET_EXTRACT_SCALAR(val_scalar, val);
 if (isIntegralType(out_type, /*includeBool=*/false)) {
 ET_SWITCH_INT_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 if (is_out_of_bounds<CTYPE_VAL, CTYPE_OUT, long>(val)) {
 ET_CHECK_MSG(false, "%s value out of bounds", val_name);
 }
 });
 } else if (isFloatingType(out_type)) {
 ET_SWITCH_FLOAT_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 if (std::isfinite(val) &&
 is_out_of_bounds<CTYPE_VAL, CTYPE_OUT, double>(val)) {
 ET_CHECK_MSG(false, "%s value out of bounds", val_name);
 }
 });
 }
 });
}

} // namespace

Tensor& clamp_out(
 RuntimeContext& ctx,
 const Tensor& in,
Expand All@@ -84,38 +121,67 @@ Tensor& clamp_out(
 Error err = resize_tensor(out, in.sizes());
 ET_CHECK_MSG(err == Error::Ok, "Could not resize output");

 ET_CHECK_SAME_SHAPE_AND_DTYPE2(in, out);
 ScalarType in_type = in.scalar_type();
 ScalarType min_type = in_type;
 ScalarType max_type = in_type;
 ScalarType common_type = in_type;
 ScalarType out_type = out.scalar_type();

 bool has_min = min_opt.has_value();
 if (has_min) {
 min_type = utils::get_scalar_dtype(min_opt.value());
 common_type = utils::promote_type_with_scalar(common_type, min_opt.value());
 check_bounds(min_opt.value(), min_type, out_type, "minimum");
 }
 bool has_max = max_opt.has_value();
 if (has_max) {
 max_type = utils::get_scalar_dtype(max_opt.value());
 common_type = utils::promote_type_with_scalar(common_type, max_opt.value());
 check_bounds(max_opt.value(), max_type, out_type, "maximum");
 }

 ET_SWITCH_REAL_TYPES(in.scalar_type(), ctx, "clamp", CTYPE, [&]() {
 ET_CHECK_MSG(
 has_min || has_max, "At least one of 'min' or 'max' must not be None");

 ET_CHECK(common_type == out_type);

 ET_SWITCH_REAL_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 // Extract optional min value
 CTYPE min = 0;
 bool has_min = min_opt.has_value();
 CTYPE_OUT min = 0;
 if (has_min) {
 bool ok = utils::extract_scalar<CTYPE>(min_opt.value(), &min);
 ET_CHECK_MSG(ok, "Invalid min value: wrong type or out of range");
 ET_SWITCH_SCALAR_OBJ_TYPES(min_type, ctx, "clamp", CTYPE_MIN, [&]() {
 CTYPE_MIN min_val = 0;
 ET_EXTRACT_SCALAR(min_opt.value(), min_val);
 min = static_cast<CTYPE_OUT>(min_val);
 });
 }

 // Extract optional max value
 CTYPE max = 0;
 bool has_max = max_opt.has_value();
 CTYPE_OUT max = 0;
 if (has_max) {
 bool ok = utils::extract_scalar<CTYPE>(max_opt.value(), &max);
 ET_CHECK_MSG(ok, "Invalid max value: wrong type or out of range");
 ET_SWITCH_SCALAR_OBJ_TYPES(max_type, ctx, "clamp", CTYPE_MAX, [&]() {
 CTYPE_MAX max_val = 0;
 ET_EXTRACT_SCALAR(max_opt.value(), max_val);
 max = static_cast<CTYPE_OUT>(max_val);
 });
 }

 apply_unary_map_fn(
 [has_min, min, has_max, max](const CTYPE val_in) {
 CTYPE val_out = val_in;
 if (has_min) {
 val_out = max_override(val_out, min);
 }
 if (has_max) {
 val_out = min_override(val_out, max);
 }
 return val_out;
 },
 in.const_data_ptr<CTYPE>(),
 out.mutable_data_ptr<CTYPE>(),
 in.numel());
 ET_SWITCH_REAL_TYPES_AND(Bool, in_type, ctx, "clamp", CTYPE_IN, [&]() {
 apply_unary_map_fn(
 [has_min, min, has_max, max](const CTYPE_IN val_in) {
 CTYPE_OUT val_out = static_cast<CTYPE_OUT>(val_in);
 if (has_min) {
 val_out = max_override(val_out, min);
 }
 if (has_max) {
 val_out = min_override(val_out, max);
 }
 return val_out;
 },
 in.const_data_ptr<CTYPE_IN>(),
 out.mutable_data_ptr<CTYPE_OUT>(),
 in.numel());
 });
 });

 return out;
Expand Down

4 changes: 2 additions & 2 deletions
kernels/test/op_clamp_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -303,12 +303,12 @@ TEST(OpClampOutTest, ByteTensorFloatingPointClampDies) {

#ifndef USE_ATEN_LIB
TEST(OpClampOutTest, IntTensorTooSmallClampDies) {
 // Cannot be represented by a uint32_t.
 // Cannot be represented by a int32_t.
 expect_bad_clamp_value_dies<ScalarType::Int>(-2147483649);
}

TEST(OpClampOutTest, IntTensorTooLargeClampDies) {
 // Cannot be represented by a uint32_t.
 // Cannot be represented by a int32_t.
 expect_bad_clamp_value_dies<ScalarType::Int>(2147483648);
}
#endif
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Dtype compliance: clamp#83

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

salilsdesai
wants to merge
1
commit into

from

 Closed


Dtype compliance: clamp
#83
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


114 changes: 90 additions & 24 deletions
kernels/portable/cpu/op_clamp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,43 @@ using Scalar = exec_aten::Scalar;
using ScalarType = exec_aten::ScalarType;
using Tensor = exec_aten::Tensor;

namespace {

template <typename CTYPE_VAL, typename CTYPE_OUT, typename CTYPE_CAST>
/** Check if val, when cast to CTYPE_CAST, is not in the range of CTYPE_OUT */
bool is_out_of_bounds(CTYPE_VAL val) {
 const CTYPE_CAST val_cast = static_cast<CTYPE_CAST>(val);
 return val_cast < std::numeric_limits<CTYPE_OUT>::lowest() ||
 val_cast > std::numeric_limits<CTYPE_OUT>::max();
}

void check_bounds(
 const Scalar& val_scalar,
 const torch::executor::native::ScalarType& val_type,
 const torch::executor::native::ScalarType& out_type,
 const char* val_name) {
 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, "clamp", CTYPE_VAL, [&]() {
 CTYPE_VAL val = 0;
 ET_EXTRACT_SCALAR(val_scalar, val);
 if (isIntegralType(out_type, /*includeBool=*/false)) {
 ET_SWITCH_INT_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 if (is_out_of_bounds<CTYPE_VAL, CTYPE_OUT, long>(val)) {
 ET_CHECK_MSG(false, "%s value out of bounds", val_name);
 }
 });
 } else if (isFloatingType(out_type)) {
 ET_SWITCH_FLOAT_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 if (std::isfinite(val) &&
 is_out_of_bounds<CTYPE_VAL, CTYPE_OUT, double>(val)) {
 ET_CHECK_MSG(false, "%s value out of bounds", val_name);
 }
 });
 }
 });
}

} // namespace

Tensor& clamp_out(
 RuntimeContext& ctx,
 const Tensor& in,
Expand All@@ -84,38 +121,67 @@ Tensor& clamp_out(
 Error err = resize_tensor(out, in.sizes());
 ET_CHECK_MSG(err == Error::Ok, "Could not resize output");

 ET_CHECK_SAME_SHAPE_AND_DTYPE2(in, out);
 ScalarType in_type = in.scalar_type();
 ScalarType min_type = in_type;
 ScalarType max_type = in_type;
 ScalarType common_type = in_type;
 ScalarType out_type = out.scalar_type();

 bool has_min = min_opt.has_value();
 if (has_min) {
 min_type = utils::get_scalar_dtype(min_opt.value());
 common_type = utils::promote_type_with_scalar(common_type, min_opt.value());
 check_bounds(min_opt.value(), min_type, out_type, "minimum");
 }
 bool has_max = max_opt.has_value();
 if (has_max) {
 max_type = utils::get_scalar_dtype(max_opt.value());
 common_type = utils::promote_type_with_scalar(common_type, max_opt.value());
 check_bounds(max_opt.value(), max_type, out_type, "maximum");
 }

 ET_SWITCH_REAL_TYPES(in.scalar_type(), ctx, "clamp", CTYPE, [&]() {
 ET_CHECK_MSG(
 has_min || has_max, "At least one of 'min' or 'max' must not be None");

 ET_CHECK(common_type == out_type);

 ET_SWITCH_REAL_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 // Extract optional min value
 CTYPE min = 0;
 bool has_min = min_opt.has_value();
 CTYPE_OUT min = 0;
 if (has_min) {
 bool ok = utils::extract_scalar<CTYPE>(min_opt.value(), &min);
 ET_CHECK_MSG(ok, "Invalid min value: wrong type or out of range");
 ET_SWITCH_SCALAR_OBJ_TYPES(min_type, ctx, "clamp", CTYPE_MIN, [&]() {
 CTYPE_MIN min_val = 0;
 ET_EXTRACT_SCALAR(min_opt.value(), min_val);
 min = static_cast<CTYPE_OUT>(min_val);
 });
 }

 // Extract optional max value
 CTYPE max = 0;
 bool has_max = max_opt.has_value();
 CTYPE_OUT max = 0;
 if (has_max) {
 bool ok = utils::extract_scalar<CTYPE>(max_opt.value(), &max);
 ET_CHECK_MSG(ok, "Invalid max value: wrong type or out of range");
 ET_SWITCH_SCALAR_OBJ_TYPES(max_type, ctx, "clamp", CTYPE_MAX, [&]() {
 CTYPE_MAX max_val = 0;
 ET_EXTRACT_SCALAR(max_opt.value(), max_val);
 max = static_cast<CTYPE_OUT>(max_val);
 });
 }

 apply_unary_map_fn(
 [has_min, min, has_max, max](const CTYPE val_in) {
 CTYPE val_out = val_in;
 if (has_min) {
 val_out = max_override(val_out, min);
 }
 if (has_max) {
 val_out = min_override(val_out, max);
 }
 return val_out;
 },
 in.const_data_ptr<CTYPE>(),
 out.mutable_data_ptr<CTYPE>(),
 in.numel());
 ET_SWITCH_REAL_TYPES_AND(Bool, in_type, ctx, "clamp", CTYPE_IN, [&]() {
 apply_unary_map_fn(
 [has_min, min, has_max, max](const CTYPE_IN val_in) {
 CTYPE_OUT val_out = static_cast<CTYPE_OUT>(val_in);
 if (has_min) {
 val_out = max_override(val_out, min);
 }
 if (has_max) {
 val_out = min_override(val_out, max);
 }
 return val_out;
 },
 in.const_data_ptr<CTYPE_IN>(),
 out.mutable_data_ptr<CTYPE_OUT>(),
 in.numel());
 });
 });

 return out;
Expand Down

4 changes: 2 additions & 2 deletions
kernels/test/op_clamp_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -303,12 +303,12 @@ TEST(OpClampOutTest, ByteTensorFloatingPointClampDies) {

#ifndef USE_ATEN_LIB
TEST(OpClampOutTest, IntTensorTooSmallClampDies) {
 // Cannot be represented by a uint32_t.
 // Cannot be represented by a int32_t.
 expect_bad_clamp_value_dies<ScalarType::Int>(-2147483649);
}

TEST(OpClampOutTest, IntTensorTooLargeClampDies) {
 // Cannot be represented by a uint32_t.
 // Cannot be represented by a int32_t.
 expect_bad_clamp_value_dies<ScalarType::Int>(2147483648);
}
#endif
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Dtype compliance: clamp#83

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

salilsdesai
wants to merge
1
commit into

from

 Closed


Dtype compliance: clamp
#83
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


114 changes: 90 additions & 24 deletions
kernels/portable/cpu/op_clamp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,43 @@ using Scalar = exec_aten::Scalar;
using ScalarType = exec_aten::ScalarType;
using Tensor = exec_aten::Tensor;

namespace {

template <typename CTYPE_VAL, typename CTYPE_OUT, typename CTYPE_CAST>
/** Check if val, when cast to CTYPE_CAST, is not in the range of CTYPE_OUT */
bool is_out_of_bounds(CTYPE_VAL val) {
 const CTYPE_CAST val_cast = static_cast<CTYPE_CAST>(val);
 return val_cast < std::numeric_limits<CTYPE_OUT>::lowest() ||
 val_cast > std::numeric_limits<CTYPE_OUT>::max();
}

void check_bounds(
 const Scalar& val_scalar,
 const torch::executor::native::ScalarType& val_type,
 const torch::executor::native::ScalarType& out_type,
 const char* val_name) {
 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, "clamp", CTYPE_VAL, [&]() {
 CTYPE_VAL val = 0;
 ET_EXTRACT_SCALAR(val_scalar, val);
 if (isIntegralType(out_type, /*includeBool=*/false)) {
 ET_SWITCH_INT_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 if (is_out_of_bounds<CTYPE_VAL, CTYPE_OUT, long>(val)) {
 ET_CHECK_MSG(false, "%s value out of bounds", val_name);
 }
 });
 } else if (isFloatingType(out_type)) {
 ET_SWITCH_FLOAT_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 if (std::isfinite(val) &&
 is_out_of_bounds<CTYPE_VAL, CTYPE_OUT, double>(val)) {
 ET_CHECK_MSG(false, "%s value out of bounds", val_name);
 }
 });
 }
 });
}

} // namespace

Tensor& clamp_out(
 RuntimeContext& ctx,
 const Tensor& in,
Expand All@@ -84,38 +121,67 @@ Tensor& clamp_out(
 Error err = resize_tensor(out, in.sizes());
 ET_CHECK_MSG(err == Error::Ok, "Could not resize output");

 ET_CHECK_SAME_SHAPE_AND_DTYPE2(in, out);
 ScalarType in_type = in.scalar_type();
 ScalarType min_type = in_type;
 ScalarType max_type = in_type;
 ScalarType common_type = in_type;
 ScalarType out_type = out.scalar_type();

 bool has_min = min_opt.has_value();
 if (has_min) {
 min_type = utils::get_scalar_dtype(min_opt.value());
 common_type = utils::promote_type_with_scalar(common_type, min_opt.value());
 check_bounds(min_opt.value(), min_type, out_type, "minimum");
 }
 bool has_max = max_opt.has_value();
 if (has_max) {
 max_type = utils::get_scalar_dtype(max_opt.value());
 common_type = utils::promote_type_with_scalar(common_type, max_opt.value());
 check_bounds(max_opt.value(), max_type, out_type, "maximum");
 }

 ET_SWITCH_REAL_TYPES(in.scalar_type(), ctx, "clamp", CTYPE, [&]() {
 ET_CHECK_MSG(
 has_min || has_max, "At least one of 'min' or 'max' must not be None");

 ET_CHECK(common_type == out_type);

 ET_SWITCH_REAL_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 // Extract optional min value
 CTYPE min = 0;
 bool has_min = min_opt.has_value();
 CTYPE_OUT min = 0;
 if (has_min) {
 bool ok = utils::extract_scalar<CTYPE>(min_opt.value(), &min);
 ET_CHECK_MSG(ok, "Invalid min value: wrong type or out of range");
 ET_SWITCH_SCALAR_OBJ_TYPES(min_type, ctx, "clamp", CTYPE_MIN, [&]() {
 CTYPE_MIN min_val = 0;
 ET_EXTRACT_SCALAR(min_opt.value(), min_val);
 min = static_cast<CTYPE_OUT>(min_val);
 });
 }

 // Extract optional max value
 CTYPE max = 0;
 bool has_max = max_opt.has_value();
 CTYPE_OUT max = 0;
 if (has_max) {
 bool ok = utils::extract_scalar<CTYPE>(max_opt.value(), &max);
 ET_CHECK_MSG(ok, "Invalid max value: wrong type or out of range");
 ET_SWITCH_SCALAR_OBJ_TYPES(max_type, ctx, "clamp", CTYPE_MAX, [&]() {
 CTYPE_MAX max_val = 0;
 ET_EXTRACT_SCALAR(max_opt.value(), max_val);
 max = static_cast<CTYPE_OUT>(max_val);
 });
 }

 apply_unary_map_fn(
 [has_min, min, has_max, max](const CTYPE val_in) {
 CTYPE val_out = val_in;
 if (has_min) {
 val_out = max_override(val_out, min);
 }
 if (has_max) {
 val_out = min_override(val_out, max);
 }
 return val_out;
 },
 in.const_data_ptr<CTYPE>(),
 out.mutable_data_ptr<CTYPE>(),
 in.numel());
 ET_SWITCH_REAL_TYPES_AND(Bool, in_type, ctx, "clamp", CTYPE_IN, [&]() {
 apply_unary_map_fn(
 [has_min, min, has_max, max](const CTYPE_IN val_in) {
 CTYPE_OUT val_out = static_cast<CTYPE_OUT>(val_in);
 if (has_min) {
 val_out = max_override(val_out, min);
 }
 if (has_max) {
 val_out = min_override(val_out, max);
 }
 return val_out;
 },
 in.const_data_ptr<CTYPE_IN>(),
 out.mutable_data_ptr<CTYPE_OUT>(),
 in.numel());
 });
 });

 return out;
Expand Down

4 changes: 2 additions & 2 deletions
kernels/test/op_clamp_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -303,12 +303,12 @@ TEST(OpClampOutTest, ByteTensorFloatingPointClampDies) {

#ifndef USE_ATEN_LIB
TEST(OpClampOutTest, IntTensorTooSmallClampDies) {
 // Cannot be represented by a uint32_t.
 // Cannot be represented by a int32_t.
 expect_bad_clamp_value_dies<ScalarType::Int>(-2147483649);
}

TEST(OpClampOutTest, IntTensorTooLargeClampDies) {
 // Cannot be represented by a uint32_t.
 // Cannot be represented by a int32_t.
 expect_bad_clamp_value_dies<ScalarType::Int>(2147483648);
}
#endif
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Dtype compliance: clamp#83

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

salilsdesai
wants to merge
1
commit into

from

 Closed


Dtype compliance: clamp
#83
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


114 changes: 90 additions & 24 deletions
kernels/portable/cpu/op_clamp.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,43 @@ using Scalar = exec_aten::Scalar;
using ScalarType = exec_aten::ScalarType;
using Tensor = exec_aten::Tensor;

namespace {

template <typename CTYPE_VAL, typename CTYPE_OUT, typename CTYPE_CAST>
/** Check if val, when cast to CTYPE_CAST, is not in the range of CTYPE_OUT */
bool is_out_of_bounds(CTYPE_VAL val) {
 const CTYPE_CAST val_cast = static_cast<CTYPE_CAST>(val);
 return val_cast < std::numeric_limits<CTYPE_OUT>::lowest() ||
 val_cast > std::numeric_limits<CTYPE_OUT>::max();
}

void check_bounds(
 const Scalar& val_scalar,
 const torch::executor::native::ScalarType& val_type,
 const torch::executor::native::ScalarType& out_type,
 const char* val_name) {
 ET_SWITCH_SCALAR_OBJ_TYPES(val_type, ctx, "clamp", CTYPE_VAL, [&]() {
 CTYPE_VAL val = 0;
 ET_EXTRACT_SCALAR(val_scalar, val);
 if (isIntegralType(out_type, /*includeBool=*/false)) {
 ET_SWITCH_INT_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 if (is_out_of_bounds<CTYPE_VAL, CTYPE_OUT, long>(val)) {
 ET_CHECK_MSG(false, "%s value out of bounds", val_name);
 }
 });
 } else if (isFloatingType(out_type)) {
 ET_SWITCH_FLOAT_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 if (std::isfinite(val) &&
 is_out_of_bounds<CTYPE_VAL, CTYPE_OUT, double>(val)) {
 ET_CHECK_MSG(false, "%s value out of bounds", val_name);
 }
 });
 }
 });
}

} // namespace

Tensor& clamp_out(
 RuntimeContext& ctx,
 const Tensor& in,
Expand All@@ -84,38 +121,67 @@ Tensor& clamp_out(
 Error err = resize_tensor(out, in.sizes());
 ET_CHECK_MSG(err == Error::Ok, "Could not resize output");

 ET_CHECK_SAME_SHAPE_AND_DTYPE2(in, out);
 ScalarType in_type = in.scalar_type();
 ScalarType min_type = in_type;
 ScalarType max_type = in_type;
 ScalarType common_type = in_type;
 ScalarType out_type = out.scalar_type();

 bool has_min = min_opt.has_value();
 if (has_min) {
 min_type = utils::get_scalar_dtype(min_opt.value());
 common_type = utils::promote_type_with_scalar(common_type, min_opt.value());
 check_bounds(min_opt.value(), min_type, out_type, "minimum");
 }
 bool has_max = max_opt.has_value();
 if (has_max) {
 max_type = utils::get_scalar_dtype(max_opt.value());
 common_type = utils::promote_type_with_scalar(common_type, max_opt.value());
 check_bounds(max_opt.value(), max_type, out_type, "maximum");
 }

 ET_SWITCH_REAL_TYPES(in.scalar_type(), ctx, "clamp", CTYPE, [&]() {
 ET_CHECK_MSG(
 has_min || has_max, "At least one of 'min' or 'max' must not be None");

 ET_CHECK(common_type == out_type);

 ET_SWITCH_REAL_TYPES(out_type, ctx, "clamp", CTYPE_OUT, [&]() {
 // Extract optional min value
 CTYPE min = 0;
 bool has_min = min_opt.has_value();
 CTYPE_OUT min = 0;
 if (has_min) {
 bool ok = utils::extract_scalar<CTYPE>(min_opt.value(), &min);
 ET_CHECK_MSG(ok, "Invalid min value: wrong type or out of range");
 ET_SWITCH_SCALAR_OBJ_TYPES(min_type, ctx, "clamp", CTYPE_MIN, [&]() {
 CTYPE_MIN min_val = 0;
 ET_EXTRACT_SCALAR(min_opt.value(), min_val);
 min = static_cast<CTYPE_OUT>(min_val);
 });
 }

 // Extract optional max value
 CTYPE max = 0;
 bool has_max = max_opt.has_value();
 CTYPE_OUT max = 0;
 if (has_max) {
 bool ok = utils::extract_scalar<CTYPE>(max_opt.value(), &max);
 ET_CHECK_MSG(ok, "Invalid max value: wrong type or out of range");
 ET_SWITCH_SCALAR_OBJ_TYPES(max_type, ctx, "clamp", CTYPE_MAX, [&]() {
 CTYPE_MAX max_val = 0;
 ET_EXTRACT_SCALAR(max_opt.value(), max_val);
 max = static_cast<CTYPE_OUT>(max_val);
 });
 }

 apply_unary_map_fn(
 [has_min, min, has_max, max](const CTYPE val_in) {
 CTYPE val_out = val_in;
 if (has_min) {
 val_out = max_override(val_out, min);
 }
 if (has_max) {
 val_out = min_override(val_out, max);
 }
 return val_out;
 },
 in.const_data_ptr<CTYPE>(),
 out.mutable_data_ptr<CTYPE>(),
 in.numel());
 ET_SWITCH_REAL_TYPES_AND(Bool, in_type, ctx, "clamp", CTYPE_IN, [&]() {
 apply_unary_map_fn(
 [has_min, min, has_max, max](const CTYPE_IN val_in) {
 CTYPE_OUT val_out = static_cast<CTYPE_OUT>(val_in);
 if (has_min) {
 val_out = max_override(val_out, min);
 }
 if (has_max) {
 val_out = min_override(val_out, max);
 }
 return val_out;
 },
 in.const_data_ptr<CTYPE_IN>(),
 out.mutable_data_ptr<CTYPE_OUT>(),
 in.numel());
 });
 });

 return out;
Expand Down

4 changes: 2 additions & 2 deletions
kernels/test/op_clamp_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -303,12 +303,12 @@ TEST(OpClampOutTest, ByteTensorFloatingPointClampDies) {

#ifndef USE_ATEN_LIB
TEST(OpClampOutTest, IntTensorTooSmallClampDies) {
 // Cannot be represented by a uint32_t.
 // Cannot be represented by a int32_t.
 expect_bad_clamp_value_dies<ScalarType::Int>(-2147483649);
}

TEST(OpClampOutTest, IntTensorTooLargeClampDies) {
 // Cannot be represented by a uint32_t.
 // Cannot be represented by a int32_t.
 expect_bad_clamp_value_dies<ScalarType::Int>(2147483648);
}
#endif
Expand Down