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

feat: generalize conv mem layout and ND #935

Merged
merged 12 commits into from
Feb 10, 2025
Merged

feat: generalize conv mem layout and ND #935

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e320e07
dataformat
alexander-camuto Feb 7, 2025
27ed57a
moar
alexander-camuto Feb 7, 2025
03d25cd
generalized layout and conv nd
alexander-camuto Feb 8, 2025
8f0c460
patch
alexander-camuto Feb 8, 2025
3cd9d2a
patch conv
alexander-camuto Feb 8, 2025
6c038f2
Update integration_tests.rs
alexander-camuto Feb 8, 2025
70b4953
Update main.rs
alexander-camuto Feb 9, 2025
07d192a
Merge branch 'main' into ac/layoutytpe
alexander-camuto Feb 9, 2025
6a8358d
bump tests
alexander-camuto Feb 9, 2025
a8cccee
Update binding_tests.py
alexander-camuto Feb 9, 2025
27465a8
move to large test
alexander-camuto Feb 9, 2025
c2d0bbb
bump to 1d_conv
alexander-camuto Feb 9, 2025
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
Prev Previous commit
Next Next commit
patch conv
  • Loading branch information
@alexander-camuto
alexander-camuto committed Feb 8, 2025
commit 3cd9d2ad80d1960f53b76adccb2e147404807135
2 changes: 2 additions & 0 deletions benches/accum_conv.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ impl Circuit<Fr> for MyCircuit {
padding: vec![(0, 0)],
stride: vec![1; 2],
group: 1,
data_format: DataFormat::NCHW,
kernel_format: KernelFormat::OIHW,
}),
)
.unwrap();
Expand Down
3 changes: 3 additions & 0 deletions examples/conv2d_mnist/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ use instant::Instant;
use mnist::*;
use rand::rngs::OsRng;
use std::marker::PhantomData;
use tract_onnx::tract_core::ndarray::Data;

mod params;

Expand Down Expand Up @@ -208,6 +209,8 @@ where
padding: vec![(PADDING, PADDING); 2],
stride: vec![STRIDE; 2],
group: 1,
data_format: DataFormat::NCHW,
kernel_format: KernelFormat::OIHW,
};
let x = config
.layer_config
Expand Down
Loading