Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into snnn-patch-5
Browse files Browse the repository at this point in the history
  • Loading branch information
@snnn
snnn committed Dec 17, 2024
2 parents 601317f + 9115682 commit 00544c1
Show file tree
Hide file tree
Showing 2 changed files with 156 additions and 156 deletions.
160 changes: 80 additions & 80 deletions js/web/test/data/ops/conv.jsonc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,48 +391,48 @@
}
]
},
{
"name": "conv - vectorize group - B",
"operator": "Conv",
"inputShapeDefinitions": "rankOnly",
"opset": { "domain": "", "version": 17 },
"attributes": [
{ "name": "kernel_shape", "data": [2, 2], "type": "ints" },
{ "name": "group", "data": 3, "type": "int" }
],
"cases": [
{
"name": "T[0]",
"inputs": [
{
"data": [
0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0,
19.0, 20.0, 21.0, 22.0, 23.0, 0, 0, 0
],
"dims": [1, 3, 3, 3],
"type": "float32"
},
{
"data": [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0],
"dims": [3, 1, 2, 2],
"type": "float32"
},
{
"data": [0.1, 0.2, 0.3],
"dims": [3],
"type": "float32"
}
],
"outputs": [
{
"data": [27.1, 37.1, 57.1, 67.1, 293.2, 319.2, 371.2, 397.2, 847.3, 889.3, 409.3, 428.3],
"dims": [1, 3, 2, 2],
"type": "float32"
}
]
}
]
},
// {
// "name": "conv - vectorize group - B",
// "operator": "Conv",
// "inputShapeDefinitions": "rankOnly",
// "opset": { "domain": "", "version": 17 },
// "attributes": [
// { "name": "kernel_shape", "data": [2, 2], "type": "ints" },
// { "name": "group", "data": 3, "type": "int" }
// ],
// "cases": [
// {
// "name": "T[0]",
// "inputs": [
// {
// "data": [
// 0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0,
// 19.0, 20.0, 21.0, 22.0, 23.0, 0, 0, 0
// ],
// "dims": [1, 3, 3, 3],
// "type": "float32"
// },
// {
// "data": [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0],
// "dims": [3, 1, 2, 2],
// "type": "float32"
// },
// {
// "data": [0.1, 0.2, 0.3],
// "dims": [3],
// "type": "float32"
// }
// ],
// "outputs": [
// {
// "data": [27.1, 37.1, 57.1, 67.1, 293.2, 319.2, 371.2, 397.2, 847.3, 889.3, 409.3, 428.3],
// "dims": [1, 3, 2, 2],
// "type": "float32"
// }
// ]
// }
// ]
// },
{
"name": "conv - vectorize group - C",
"operator": "Conv",
Expand Down Expand Up @@ -470,44 +470,44 @@
}
]
},
{
"name": "conv - vectorize group - D",
"operator": "Conv",
"inputShapeDefinitions": "rankOnly",
"opset": { "domain": "", "version": 17 },
"attributes": [
{ "name": "kernel_shape", "data": [2, 2], "type": "ints" },
{ "name": "group", "data": 3, "type": "int" },
{ "name": "strides", "data": [2, 2], "type": "ints" }
],
"cases": [
{
"name": "T[0] strides = [2, 2]",
"inputs": [
{
"data": [
0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0,
19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0, 33.0, 34.0, 35.0
],
"dims": [1, 3, 3, 4],
"type": "float32"
},
{
"data": [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0],
"dims": [3, 1, 2, 2],
"type": "float32"
}
],
"outputs": [
{
"data": [34, 54, 386, 438, 1122, 1206],
"dims": [1, 3, 1, 2],
"type": "float32"
}
]
}
]
},
// {
// "name": "conv - vectorize group - D",
// "operator": "Conv",
// "inputShapeDefinitions": "rankOnly",
// "opset": { "domain": "", "version": 17 },
// "attributes": [
// { "name": "kernel_shape", "data": [2, 2], "type": "ints" },
// { "name": "group", "data": 3, "type": "int" },
// { "name": "strides", "data": [2, 2], "type": "ints" }
// ],
// "cases": [
// {
// "name": "T[0] strides = [2, 2]",
// "inputs": [
// {
// "data": [
// 0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0,
// 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0, 33.0, 34.0, 35.0
// ],
// "dims": [1, 3, 3, 4],
// "type": "float32"
// },
// {
// "data": [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0],
// "dims": [3, 1, 2, 2],
// "type": "float32"
// }
// ],
// "outputs": [
// {
// "data": [34, 54, 386, 438, 1122, 1206],
// "dims": [1, 3, 1, 2],
// "type": "float32"
// }
// ]
// }
// ]
// },
{
"name": "conv - pointwise",
"operator": "Conv",
Expand Down
152 changes: 76 additions & 76 deletions js/web/test/data/ops/fused-conv.jsonc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,44 +249,44 @@
}
]
},
{
"name": "NHWC group-conv with HardSigmoid",
"operator": "Conv",
"attributes": [
{ "name": "activation", "data": "HardSigmoid", "type": "string" },
{ "name": "kernel_shape", "data": [2, 2], "type": "ints" },
{ "name": "group", "data": 3, "type": "int" },
{ "name": "activation_params", "data": [2.0, 5.0], "type": "floats" }
],
"opset": { "domain": "com.ms.internal.nhwc", "version": 1 },
"cases": [
{
"name": "T[0]",
"inputs": [
{
"data": [
0.0, 1.0, 2.0, -3.0, 4.0, -5.0, 6.0, 7.0, 8.0, -9.0, -10.0, 11.0, -12.0, 13.0, -14.0, 15.0, 16.0, 17.0,
18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0
],
"dims": [1, 3, 3, 3],
"type": "float32"
},
{
"data": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
"dims": [3, 1, 2, 2],
"type": "float32"
}
],
"outputs": [
{
"data": [0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1],
"dims": [1, 2, 2, 3],
"type": "float32"
}
]
}
]
},
// {
// "name": "NHWC group-conv with HardSigmoid",
// "operator": "Conv",
// "attributes": [
// { "name": "activation", "data": "HardSigmoid", "type": "string" },
// { "name": "kernel_shape", "data": [2, 2], "type": "ints" },
// { "name": "group", "data": 3, "type": "int" },
// { "name": "activation_params", "data": [2.0, 5.0], "type": "floats" }
// ],
// "opset": { "domain": "com.ms.internal.nhwc", "version": 1 },
// "cases": [
// {
// "name": "T[0]",
// "inputs": [
// {
// "data": [
// 0.0, 1.0, 2.0, -3.0, 4.0, -5.0, 6.0, 7.0, 8.0, -9.0, -10.0, 11.0, -12.0, 13.0, -14.0, 15.0, 16.0, 17.0,
// 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0
// ],
// "dims": [1, 3, 3, 3],
// "type": "float32"
// },
// {
// "data": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
// "dims": [3, 1, 2, 2],
// "type": "float32"
// }
// ],
// "outputs": [
// {
// "data": [0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1],
// "dims": [1, 2, 2, 3],
// "type": "float32"
// }
// ]
// }
// ]
// },
{
"name": "fused group-conv with LeakyRelu",
"operator": "FusedConv",
Expand Down Expand Up @@ -325,44 +325,44 @@
}
]
},
{
"name": "NHWC group-conv with LeakyRelu",
"operator": "Conv",
"attributes": [
{ "name": "activation", "data": "LeakyRelu", "type": "string" },
{ "name": "kernel_shape", "data": [2, 2], "type": "ints" },
{ "name": "group", "data": 3, "type": "int" },
{ "name": "activation_params", "data": [2.0], "type": "floats" }
],
"opset": { "domain": "com.ms.internal.nhwc", "version": 1 },
"cases": [
{
"name": "T[0]",
"inputs": [
{
"data": [
0.0, 1.0, 2.0, -3.0, 4.0, -5.0, 6.0, 7.0, 8.0, -9.0, -10.0, 11.0, -12.0, 13.0, -14.0, 15.0, 16.0, 17.0,
18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0
],
"dims": [1, 3, 3, 3],
"type": "float32"
},
{
"data": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
"dims": [3, 1, 2, 2],
"type": "float32"
}
],
"outputs": [
{
"data": [-162, 63, -158, 33, 281, 85, 105, 337, 455, 177, 515, 609],
"dims": [1, 2, 2, 3],
"type": "float32"
}
]
}
]
},
// {
// "name": "NHWC group-conv with LeakyRelu",
// "operator": "Conv",
// "attributes": [
// { "name": "activation", "data": "LeakyRelu", "type": "string" },
// { "name": "kernel_shape", "data": [2, 2], "type": "ints" },
// { "name": "group", "data": 3, "type": "int" },
// { "name": "activation_params", "data": [2.0], "type": "floats" }
// ],
// "opset": { "domain": "com.ms.internal.nhwc", "version": 1 },
// "cases": [
// {
// "name": "T[0]",
// "inputs": [
// {
// "data": [
// 0.0, 1.0, 2.0, -3.0, 4.0, -5.0, 6.0, 7.0, 8.0, -9.0, -10.0, 11.0, -12.0, 13.0, -14.0, 15.0, 16.0, 17.0,
// 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0
// ],
// "dims": [1, 3, 3, 3],
// "type": "float32"
// },
// {
// "data": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
// "dims": [3, 1, 2, 2],
// "type": "float32"
// }
// ],
// "outputs": [
// {
// "data": [-162, 63, -158, 33, 281, 85, 105, 337, 455, 177, 515, 609],
// "dims": [1, 2, 2, 3],
// "type": "float32"
// }
// ]
// }
// ]
// },
{
"name": "fused conv with LeakyRelu",
"operator": "FusedConv",
Expand Down

0 comments on commit 00544c1

Please sign in to comment.