Model
diff --git a/object_detection/main.js b/object_detection/main.js
index 8ed9b8fe..504ad73e 100644
--- a/object_detection/main.js
+++ b/object_detection/main.js
@@ -13,7 +13,9 @@ const imgElement = document.getElementById('feedElement');
imgElement.src = './images/test.jpg';
const camElement = document.getElementById('feedMediaElement');
let modelName = '';
+let modelId = '';
let layout = 'nhwc';
+let dataType = 'float32';
let instanceType = modelName + layout;
let rafReq;
let isFirstTimeLoad = true;
@@ -33,6 +35,19 @@ let lastBackend = '';
let stopRender = true;
let isRendering = false;
const disabledSelectors = ['#tabs > li', '.btn'];
+const modelIds = ['ssdmobilenetv1', 'tinyyolov2'];
+const modelList = {
+ 'cpu': {
+ 'float32': modelIds,
+ },
+ 'gpu': {
+ 'float32': modelIds,
+ 'float16': modelIds,
+ },
+ 'npu': {
+ 'float16': ['ssdmobilenetv1'],
+ },
+};
async function fetchLabels(url) {
const response = await fetch(url);
@@ -53,18 +68,56 @@ $('#backendBtns .btn').on('change', async (e) => {
if (inputType === 'camera') {
await stopCamRender();
}
- layout = utils.getDefaultLayout($(e.target).attr('id'));
- await main();
+ const backendId = $(e.target).attr('id');
+ layout = utils.getDefaultLayout(backendId);
+ [backend, deviceType] = backendId.split('_');
+ // Only show the supported models for each deviceType. Now fp16 nchw models
+ // are only supported on gpu/npu.
+ if (backendId == 'webnn_gpu') {
+ ui.handleBtnUI('#float16Label', false);
+ ui.handleBtnUI('#float32Label', false);
+ utils.displayAvailableModels(modelList, modelIds, deviceType, dataType);
+ } else if (backendId == 'webnn_npu') {
+ ui.handleBtnUI('#float16Label', false);
+ ui.handleBtnUI('#float32Label', true);
+ $('#float16').click();
+ utils.displayAvailableModels(modelList, modelIds, deviceType, 'float16');
+ } else {
+ ui.handleBtnUI('#float16Label', true);
+ ui.handleBtnUI('#float32Label', false);
+ $('#float32').click();
+ utils.displayAvailableModels(modelList, modelIds, deviceType, 'float32');
+ }
+
+ // Uncheck selected model
+ if (modelId != '') {
+ $(`#${modelId}`).parent().removeClass('active');
+ }
});
$('#modelBtns .btn').on('change', async (e) => {
if (inputType === 'camera') {
await stopCamRender();
}
- modelName = $(e.target).attr('id');
+
+ modelId = $(e.target).attr('id');
+ modelName = modelId;
+ if (dataType == 'float16') {
+ modelName += 'fp16';
+ }
+
await main();
});
+$('#dataTypeBtns .btn').on('change', async (e) => {
+ dataType = $(e.target).attr('id');
+ utils.displayAvailableModels(modelList, modelIds, deviceType, dataType);
+ // Uncheck selected model
+ if (modelId != '') {
+ $(`#${modelId}`).parent().removeClass('active');
+ }
+});
+
// Click trigger to do inference with ![]()
element
$('#img').click(async () => {
if (inputType === 'camera') {
@@ -146,7 +199,7 @@ async function drawOutput(inputElement, outputs, labels) {
$('#inferenceresult').show();
// Draw output for SSD Mobilenet V1 model
- if (modelName === 'ssdmobilenetv1') {
+ if (modelName.includes('ssdmobilenetv1')) {
const anchors = SsdDecoder.generateAnchors({});
SsdDecoder.decodeOutputBoxTensor({}, outputs.boxes, anchors);
let [totalDetections, boxesList, scoresList, classesList] =
@@ -181,8 +234,10 @@ function showPerfResult(medianComputeTime = undefined) {
function constructNetObject(type) {
const netObject = {
'tinyyolov2nchw': new TinyYoloV2Nchw(),
+ 'tinyyolov2fp16nchw': new TinyYoloV2Nchw('float16'),
'tinyyolov2nhwc': new TinyYoloV2Nhwc(),
'ssdmobilenetv1nchw': new SsdMobilenetV1Nchw(),
+ 'ssdmobilenetv1fp16nchw': new SsdMobilenetV1Nchw('float16'),
'ssdmobilenetv1nhwc': new SsdMobilenetV1Nhwc(),
};
@@ -192,8 +247,6 @@ function constructNetObject(type) {
async function main() {
try {
if (modelName === '') return;
- [backend, deviceType] =
- $('input[name="backend"]:checked').attr('id').split('_');
ui.handleClick(disabledSelectors, true);
if (isFirstTimeLoad) $('#hint').hide();
let start;
@@ -218,7 +271,7 @@ async function main() {
netInstance = constructNetObject(instanceType);
inputOptions = netInstance.inputOptions;
labels = await fetchLabels(inputOptions.labelUrl);
- if (modelName === 'tinyyolov2') {
+ if (modelName.includes('tinyyolov2')) {
outputs = {
'output': new Float32Array(
utils.sizeOfShape(netInstance.outputDimensions)),
diff --git a/object_detection/ssd_mobilenetv1_nchw.js b/object_detection/ssd_mobilenetv1_nchw.js
index 2edb0e14..a8726525 100644
--- a/object_detection/ssd_mobilenetv1_nchw.js
+++ b/object_detection/ssd_mobilenetv1_nchw.js
@@ -4,10 +4,10 @@ import {buildConstantByNpy, computePadding2DForAutoPad, weightsOrigin} from '../
// SSD MobileNet V1 model with 'nchw' layout, trained on the COCO dataset.
export class SsdMobilenetV1Nchw {
- constructor() {
+ constructor(dataType = 'float32') {
this.context_ = null;
this.deviceType_ = null;
- this.targetDataType_ = 'float32';
+ this.targetDataType_ = dataType;
this.model_ = null;
this.builder_ = null;
this.graph_ = null;
@@ -86,9 +86,6 @@ ${nameArray[1]}_BatchNorm_batchnorm`;
async load(contextOptions) {
this.context_ = await navigator.ml.createContext(contextOptions);
this.deviceType_ = contextOptions.deviceType;
- if (this.deviceType_ == 'gpu' || this.deviceType_ == 'npu') {
- this.targetDataType_ = 'float16';
- }
this.builder_ = new MLGraphBuilder(this.context_);
let input = this.builder_.input('input', {
dataType: 'float32',
diff --git a/object_detection/tiny_yolov2_nchw.js b/object_detection/tiny_yolov2_nchw.js
index 6ddcbcdb..32b35eb3 100644
--- a/object_detection/tiny_yolov2_nchw.js
+++ b/object_detection/tiny_yolov2_nchw.js
@@ -4,12 +4,12 @@ import {buildConstantByNpy, computePadding2DForAutoPad, weightsOrigin} from '../
// Tiny Yolo V2 model with 'nchw' layout, trained on the Pascal VOC dataset.
export class TinyYoloV2Nchw {
- constructor() {
+ constructor(dataType = 'float32') {
this.context_ = null;
this.builder_ = null;
this.graph_ = null;
this.deviceType_ = null;
- this.targetDataType_ = 'float32';
+ this.targetDataType_ = dataType;
this.weightsUrl_ = weightsOrigin() +
'/test-data/models/tiny_yolov2_nchw/weights/';
this.inputOptions = {
@@ -60,9 +60,6 @@ export class TinyYoloV2Nchw {
async load(contextOptions) {
this.context_ = await navigator.ml.createContext(contextOptions);
this.deviceType_ = contextOptions.deviceType;
- if (this.deviceType_ == 'gpu' || this.deviceType_ == 'npu') {
- this.targetDataType_ = 'float16';
- }
this.builder_ = new MLGraphBuilder(this.context_);
let image = this.builder_.input('input', {
dataType: 'float32',
diff --git a/test-data/models/tiny_yolov2_nchw/README.md b/test-data/models/tiny_yolov2_nchw/README.md
index 50748dee..b69eb920 100644
--- a/test-data/models/tiny_yolov2_nchw/README.md
+++ b/test-data/models/tiny_yolov2_nchw/README.md
@@ -1 +1 @@
-`.npy` files under this folder are downloaded from model of [Tiny YOLO v2](https://github.com/onnx/models/blob/master/vision/object_detection_segmentation/tiny-yolov2/model/tinyyolov2-8.tar.gz), which is licensed under the Apache 2.0.
\ No newline at end of file
+`.npy` files under this folder are downloaded from optimized model (fuse Conv + BatchNormalization) of [Tiny YOLO v2](https://github.com/onnx/models/blob/master/vision/object_detection_segmentation/tiny-yolov2/model/tinyyolov2-8.tar.gz), which is licensed under the Apache 2.0.
\ No newline at end of file
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B.npy
deleted file mode 100644
index 58988818..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean.npy
deleted file mode 100644
index 8128ace1..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean1.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean1.npy
deleted file mode 100644
index be75f923..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean1.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean2.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean2.npy
deleted file mode 100644
index 8448bc4a..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean2.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean3.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean3.npy
deleted file mode 100644
index 860c0ae6..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean3.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean4.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean4.npy
deleted file mode 100644
index 6929cf1e..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean4.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean5.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean5.npy
deleted file mode 100644
index a4d29999..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean5.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean6.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean6.npy
deleted file mode 100644
index 34bed7f6..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean6.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean7.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean7.npy
deleted file mode 100644
index 34bed7f6..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_mean7.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale.npy
deleted file mode 100644
index 68224221..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale1.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale1.npy
deleted file mode 100644
index f8fb6586..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale1.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale2.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale2.npy
deleted file mode 100644
index 8e0c3eb6..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale2.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale3.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale3.npy
deleted file mode 100644
index ffd6967d..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale3.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale4.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale4.npy
deleted file mode 100644
index edb1e6c5..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale4.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale5.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale5.npy
deleted file mode 100644
index 9e73961e..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale5.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale6.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale6.npy
deleted file mode 100644
index 1dfac3c4..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale6.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale7.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale7.npy
deleted file mode 100644
index 36c35dea..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_scale7.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance.npy
deleted file mode 100644
index f27dae82..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance1.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance1.npy
deleted file mode 100644
index 8f573456..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance1.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance2.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance2.npy
deleted file mode 100644
index b81f0dff..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance2.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance3.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance3.npy
deleted file mode 100644
index 87c97133..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance3.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance4.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance4.npy
deleted file mode 100644
index c17df529..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance4.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance5.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance5.npy
deleted file mode 100644
index 8674224f..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance5.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance6.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance6.npy
deleted file mode 100644
index a69fe1f4..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance6.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance7.npy b/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance7.npy
deleted file mode 100644
index a69fe1f4..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_variance7.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B.npy b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B.npy
new file mode 100644
index 00000000..66f93123
Binary files /dev/null and b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B.npy differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B1.npy b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B1.npy
similarity index 50%
rename from test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B1.npy
rename to test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B1.npy
index 61bd2805..b9efc3d9 100644
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B1.npy and b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B1.npy differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B2.npy b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B2.npy
similarity index 66%
rename from test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B2.npy
rename to test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B2.npy
index 1c2e148c..303c6d9f 100644
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B2.npy and b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B2.npy differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B3.npy b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B3.npy
similarity index 80%
rename from test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B3.npy
rename to test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B3.npy
index 5dc68992..c38080c5 100644
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B3.npy and b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B3.npy differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B4.npy b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B4.npy
similarity index 88%
rename from test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B4.npy
rename to test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B4.npy
index c2d62377..a6e69125 100644
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B4.npy and b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B4.npy differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B5.npy b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B5.npy
similarity index 94%
rename from test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B5.npy
rename to test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B5.npy
index 20a02992..42fee982 100644
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B5.npy and b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B5.npy differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B6.npy b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B6.npy
similarity index 96%
rename from test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B6.npy
rename to test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B6.npy
index ef5ea1a0..a893b3f0 100644
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B6.npy and b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B6.npy differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B7.npy b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B7.npy
similarity index 96%
rename from test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B7.npy
rename to test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B7.npy
index 8665e78d..e74659b9 100644
Binary files a/test-data/models/tiny_yolov2_nchw/weights/BatchNormalization_B7.npy and b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_BN_B_BatchNormalization_B7.npy differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution1_W.npy b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution1_W.npy
new file mode 100644
index 00000000..d81d8cdf
Binary files /dev/null and b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution1_W.npy differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution2_W.npy b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution2_W.npy
new file mode 100644
index 00000000..72f7a1e6
Binary files /dev/null and b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution2_W.npy differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution3_W.npy b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution3_W.npy
new file mode 100644
index 00000000..7f32ff64
Binary files /dev/null and b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution3_W.npy differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution4_W.npy b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution4_W.npy
new file mode 100644
index 00000000..3c61157a
Binary files /dev/null and b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution4_W.npy differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution5_W.npy b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution5_W.npy
new file mode 100644
index 00000000..6482851e
Binary files /dev/null and b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution5_W.npy differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/convolution6_W.npy b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution6_W.npy
similarity index 66%
rename from test-data/models/tiny_yolov2_nchw/weights/convolution6_W.npy
rename to test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution6_W.npy
index 32dbaae2..ecf5d335 100644
Binary files a/test-data/models/tiny_yolov2_nchw/weights/convolution6_W.npy and b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution6_W.npy differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/convolution7_W.npy b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution7_W.npy
similarity index 76%
rename from test-data/models/tiny_yolov2_nchw/weights/convolution7_W.npy
rename to test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution7_W.npy
index b992fed0..c43252b8 100644
Binary files a/test-data/models/tiny_yolov2_nchw/weights/convolution7_W.npy and b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution7_W.npy differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution_W.npy b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution_W.npy
new file mode 100644
index 00000000..a372560a
Binary files /dev/null and b/test-data/models/tiny_yolov2_nchw/weights/ConvBnFusion_W_convolution_W.npy differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/convolution1_W.npy b/test-data/models/tiny_yolov2_nchw/weights/convolution1_W.npy
deleted file mode 100644
index fa2160a3..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/convolution1_W.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/convolution2_W.npy b/test-data/models/tiny_yolov2_nchw/weights/convolution2_W.npy
deleted file mode 100644
index d8d8ebef..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/convolution2_W.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/convolution3_W.npy b/test-data/models/tiny_yolov2_nchw/weights/convolution3_W.npy
deleted file mode 100644
index ff9e767a..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/convolution3_W.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/convolution4_W.npy b/test-data/models/tiny_yolov2_nchw/weights/convolution4_W.npy
deleted file mode 100644
index 317578f2..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/convolution4_W.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/convolution5_W.npy b/test-data/models/tiny_yolov2_nchw/weights/convolution5_W.npy
deleted file mode 100644
index 14e8d387..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/convolution5_W.npy and /dev/null differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/convolution8_B.npy b/test-data/models/tiny_yolov2_nchw/weights/convolution8_B.npy
index 18344387..dc75a6d0 100644
Binary files a/test-data/models/tiny_yolov2_nchw/weights/convolution8_B.npy and b/test-data/models/tiny_yolov2_nchw/weights/convolution8_B.npy differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/convolution8_W.npy b/test-data/models/tiny_yolov2_nchw/weights/convolution8_W.npy
index d10eb8bf..ba704449 100644
Binary files a/test-data/models/tiny_yolov2_nchw/weights/convolution8_W.npy and b/test-data/models/tiny_yolov2_nchw/weights/convolution8_W.npy differ
diff --git a/test-data/models/tiny_yolov2_nchw/weights/convolution_W.npy b/test-data/models/tiny_yolov2_nchw/weights/convolution_W.npy
deleted file mode 100644
index 13a8d281..00000000
Binary files a/test-data/models/tiny_yolov2_nchw/weights/convolution_W.npy and /dev/null differ