saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-30 20:18:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add test cases for commit c019bb9355a511f471e55e7302b26e1d370ed46a (#1556)

Browse source
This commit is contained in:
pengwa 2019-08-04 17:18:45 +08:00 committed by GitHub
parent 8a6bfe00af
commit 6c271c63ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
onnxruntime/core/providers/cuda/tensor/transpose.cc
View file

@ -20,13 +20,13 @@ namespace cuda {
.TypeConstraint("T", DataTypeImpl::GetTensorType<T>()), \
Transpose<T>);
// special case acceleration using cublas matrix tranpose
// special case acceleration using cublas matrix transpose
std::tuple<int, int> TryTransposeWithCublas(const std::vector<size_t>& perm, const TensorShape& input_shape) {
int M = 0;
int N = 0;
if (perm.size() == 4 && input_shape[0] == 1 && perm[0] == 0) {
// NCHW < ->NHWC when N == 1
// NCHW <-> NHWC when N == 1
if ((perm[1] == 2 && perm[2] == 3 && perm[3] == 1) ||
(perm[1] == 3 && perm[2] == 1 && perm[3] == 2)) {
if (perm[1] == 2) {

116
onnxruntime/test/providers/cpu/tensor/transpose_test.cc
View file

@ -43,7 +43,7 @@ TEST(TransposeOpTest, TwoDimNoAttr) {
2.0f, 5.0f,
3.0f, 6.0f};
TransposeTest(input_shape, input_vals, nullptr, expected_shape, expected_vals, false);//TensorRT: SegFault error
TransposeTest(input_shape, input_vals, nullptr, expected_shape, expected_vals, false); //TensorRT: SegFault error
}
TEST(TransposeOpTest, TwoDimNoAttrStr) {
@ -113,37 +113,23 @@ TEST(TransposeOpTest, ThreeDim) {
std::vector<int64_t> perm = {0, 2, 1};
std::vector<int64_t> expected_shape({4, 3, 2});
auto expected_vals = {
1.0f,
4.0f,
2.0f,
5.0f,
3.0f,
6.0f,
1.0f, 4.0f,
2.0f, 5.0f,
3.0f, 6.0f,
1.1f,
4.1f,
2.1f,
5.1f,
3.1f,
6.1f,
1.1f, 4.1f,
2.1f, 5.1f,
3.1f, 6.1f,
1.2f,
4.2f,
2.2f,
5.2f,
3.2f,
6.2f,
1.2f, 4.2f,
2.2f, 5.2f,
3.2f, 6.2f,
1.3f,
4.3f,
2.3f,
5.3f,
3.3f,
6.3f,
1.3f, 4.3f,
2.3f, 5.3f,
3.3f, 6.3f};
};
TransposeTest(input_shape, input_vals, &perm, expected_shape, expected_vals, false); //TensorRT: illegal error
TransposeTest(input_shape, input_vals, &perm, expected_shape, expected_vals, false); //TensorRT: illegal error
}
TEST(TransposeOpTest, ThreeDimStr) {
@ -164,38 +150,60 @@ TEST(TransposeOpTest, ThreeDimStr) {
std::vector<int64_t> perm = {0, 2, 1};
std::vector<int64_t> expected_shape({4, 3, 2});
std::initializer_list<std::string> expected_vals = {
"1",
"4",
"2",
"5",
"3",
"6",
"1", "4",
"2", "5",
"3", "6",
"1",
"4",
"2",
"5",
"3",
"6",
"1", "4",
"2", "5",
"3", "6",
"1",
"4",
"2",
"5",
"3",
"6",
"1", "4",
"2", "5",
"3", "6",
"1",
"4",
"2",
"5",
"3",
"6"
};
"1", "4",
"2", "5",
"3", "6"};
TransposeTest(input_shape, input_vals, &perm, expected_shape, expected_vals);
}
TEST(TransposeOpTest, NCHW2NHWC) {
std::vector<int64_t> input_shape({1, 3, 2, 2});
std::vector<std::string> input_vals = {
"1", "2", "3", "4",
"5", "6", "7", "8",
"9", "10", "11", "12"};
std::vector<int64_t> perm = {0, 2, 3, 1};
std::vector<int64_t> expected_shape({1, 2, 2, 3});
std::initializer_list<std::string> expected_vals = {
"1", "5", "9",
"2", "6", "10",
"3", "7", "11",
"4", "8", "12"};
TransposeTest(input_shape, input_vals, &perm, expected_shape, expected_vals, false);
}
TEST(TransposeOpTest, NHWC2NCHW) {
std::vector<int64_t> input_shape({1, 2, 2, 3});
std::vector<std::string> input_vals = {
"1", "2", "3",
"4", "5", "6",
"7", "8", "9",
"10", "11", "12"};
std::vector<int64_t> perm = {0, 3, 1, 2};
std::vector<int64_t> expected_shape({1, 3, 2, 2});
std::initializer_list<std::string> expected_vals = {
"1", "4", "7", "10",
"2", "5", "8", "11",
"3", "6", "9", "12"};
TransposeTest(input_shape, input_vals, &perm, expected_shape, expected_vals, false);
}
} // namespace test
} // namespace onnxruntime