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

Jump to bottom

WIP: Implement Pad mode=reflect #181

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

WIP: Implement Pad mode=reflect #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19737cb
add compiler support and test for pad reflect
redthing1 Jul 30, 2023
866a5c4
Add support for pad mode reflect in the shader template
mayjs Aug 14, 2023
77cc055
add a more complex pad reflect test
redthing1 Nov 5, 2023
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
2 changes: 2 additions & 0 deletions wonnx/src/compiler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1308,13 +1308,15 @@ pub fn compile(
let mode = node.get_attribute_value("mode", Some("constant".to_string()))?;
match mode.as_str() {
"constant" => {}
"reflect" => {}
_ => {
return Err(CompileError::UnimplementedVariant {
op: String::from("Pad"),
variant: format!("mode={}", mode),
})
}
}
context.insert("mode", &mode);

let pads: Vec<i64> = node.get_attribute_value("pads", None)?;
if pads.len() != input_shapes[0].rank() * 2 {
Expand Down
25 changes: 18 additions & 7 deletions wonnx/templates/matrix/pad.wgsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,30 @@ fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {

var pad = false;
{% for pad in pad_info %}
let id_{{ loop.index0 }} = d_{{ loop.index0 }}
- {{ pad.copy_start }}u;
var id_{{ loop.index0 }} = 0u;

if (d_{{ loop.index0 }} < {{ pad.copy_start }}u) {
pad = true;
}
if (d_{{ loop.index0 }} > {{ pad.end_pad_start }}u) {
pad = true;
{% if mode == "reflect" %}
id_{{ loop.index0 }} = ({{ pad.copy_start }}u - d_{{ loop.index0 }}) % {{ i_shape[0][loop.index0] }}u;
{% else %}
id_{{ loop.index0 }} = d_{{ loop.index0 }} - {{ pad.copy_start }}u;
pad = true;
{% endif %}
}
else if (d_{{ loop.index0 }} > {{ pad.end_pad_start }}u) {
{% if mode == "reflect" %}
id_{{ loop.index0 }} = 2u * {{ pad.end_pad_start }}u - d_{{ loop.index0 }};
{% else %}
id_{{ loop.index0 }} = d_{{ loop.index0 }} - {{ pad.copy_start }}u;
pad = true;
{% endif %}
} else {
id_{{ loop.index0 }} = d_{{ loop.index0 }} - {{ pad.copy_start }}u;
}
{% endfor %}

if (pad) {
output_0.data[gidx] = {{ scalar_type }}({{ constant_value }});
output_0.data[gidx] = {{ scalar_type }}({{ constant_value }});
} else {
let index =
{%- for chunk in i_chunks | first -%}
Expand Down
72 changes: 72 additions & 0 deletions wonnx/tests/matrix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,78 @@ fn test_pad_complex() {
assert_eq!(actual, &test_y);
}

#[test]
fn test_pad_reflect() {
let mut input_data = HashMap::new();
#[rustfmt::skip]
let data = [
1.0, 1.2,
2.3, 3.4,
4.5, 5.7,
].to_vec();
input_data.insert("X".to_string(), data.as_slice().into());

let model = model(graph(
vec![tensor("X", &[3, 2])],
vec![tensor("Y", &[3, 4])],
vec![],
vec![initializer_int64("pads", vec![0, 2, 0, 0], vec![4])],
vec![node(vec!["X", "pads"], vec!["Y"], "Pad", "Pad", vec![
attribute("mode", "reflect"),
])],
));

let session =
pollster::block_on(wonnx::Session::from_model(model)).expect("session did not create");
let result = pollster::block_on(session.run(&input_data)).unwrap();

#[rustfmt::skip]
let test_y = vec![
1.0, 1.2, 1.0, 1.2,
2.3, 3.4, 2.3, 3.4,
4.5, 5.7, 4.5, 5.7,
];
let actual: &[_] = (&result["Y"]).try_into().unwrap();
// No arithmetic is done, so `assert_eq!` can be used.
assert_eq!(actual, &test_y);
}

#[test]
fn test_pad_reflect_complex() {
let mut input_data = HashMap::new();
#[rustfmt::skip]
let data = [
1.0, 1.2, 1.3,
2.3, 3.4, 4.5,
4.5, 5.7, 6.8,
].to_vec();
input_data.insert("X".to_string(), data.as_slice().into());

let model = model(graph(
vec![tensor("X", &[3, 3])],
vec![tensor("Y", &[3, 7])],
vec![],
vec![initializer_int64("pads", vec![0, 2, 0, 2], vec![4])],
vec![node(vec!["X", "pads"], vec!["Y"], "Pad", "Pad", vec![
attribute("mode", "reflect"),
])],
));

let session =
pollster::block_on(wonnx::Session::from_model(model)).expect("session did not create");
let result = pollster::block_on(session.run(&input_data)).unwrap();

#[rustfmt::skip]
let test_y = vec![
1.3, 1.2, 1.0, 1.2, 1.3, 1.2, 1.0,
4.5, 3.4, 2.3, 3.4, 4.5, 3.4, 2.3,
6.8, 5.7, 4.5, 5.7, 6.8, 5.7, 4.5,
];
let actual: &[_] = (&result["Y"]).try_into().unwrap();
// No arithmetic is done, so `assert_eq!` can be used.
assert_eq!(actual, &test_y);
}

#[test]
fn test_resize() {
let _ = env_logger::builder().is_test(true).try_init();
Expand Down
Loading