@@ -1519,9 +1519,10 @@ TEST_F(QnnHTPBackendTests, Conv3D_U16S8S32_PerChannel2) {
15191519// Expected val: 87.354057312011719
15201520// QNN QDQ val: 0 (err 87.354057312011719)
15211521// CPU QDQ val: 87.3583984375 (err 0.00434112548828125)
1522- TEST_F (QnnHTPBackendTests, DISABLED_ConvU16S16S32_DynamicBias) {
1522+ // Issue fixed in 2.30
1523+ TEST_F (QnnHTPBackendTests, ConvU16S16S32_DynamicBias) {
15231524 TestInputDef<float > input_def ({1 , 2 , 5 , 5 }, false , GetFloatDataInRange (-10 .0f , 10 .0f , 50 ));
1524- TestInputDef<float > weight_def ({1 , 2 , 3 , 3 }, false , GetFloatDataInRange (-1 .0f , 5 .0f , 18 ));
1525+ TestInputDef<float > weight_def ({1 , 2 , 3 , 3 }, true , GetFloatDataInRange (-1 .0f , 5 .0f , 18 ));
15251526 RunHTPConvOpTest<uint16_t , int16_t >(" Conv" ,
15261527 input_def, // Input
15271528 weight_def.OverrideValueRange (-5 .0f , 5 .0f ), // Weights (symmetric quant range)
@@ -1537,9 +1538,10 @@ TEST_F(QnnHTPBackendTests, DISABLED_ConvU16S16S32_DynamicBias) {
15371538
15381539// Tests 16-bit QDQ Conv with dynamic weights and bias (uses QNN's DepthwiseConv2d)
15391540// TODO(adrianlizarraga): FAIL: Failed to finalize QNN graph. Error code 1002
1540- TEST_F (QnnHTPBackendTests, DISABLED_DepthwiseConvU16S16S32_DynamicBias) {
1541+ // Issue fixed in 2.30
1542+ TEST_F (QnnHTPBackendTests, DepthwiseConvU16S16S32_DynamicBias) {
15411543 TestInputDef<float > input_def ({1 , 1 , 5 , 5 }, false , GetFloatDataInRange (-10 .0f , 10 .0f , 25 ));
1542- TestInputDef<float > weight_def ({1 , 1 , 3 , 3 }, false , GetFloatDataInRange (-1 .0f , 5 .0f , 9 ));
1544+ TestInputDef<float > weight_def ({1 , 1 , 3 , 3 }, true , GetFloatDataInRange (-1 .0f , 5 .0f , 9 ));
15431545 RunHTPConvOpTest<uint16_t , int16_t >(" Conv" ,
15441546 input_def, // Input
15451547 weight_def.OverrideValueRange (-5 .0f , 5 .0f ), // Weights (symmetric quant range)
@@ -1559,9 +1561,10 @@ TEST_F(QnnHTPBackendTests, DISABLED_DepthwiseConvU16S16S32_DynamicBias) {
15591561// Expected val: 85.354057312011719
15601562// QNN QDQ val: 0 (err 85.354057312011719)
15611563// CPU QDQ val: 85.358139038085938 (err 0.00408172607421875)
1562- TEST_F (QnnHTPBackendTests, DISABLED_ConvU16S16S32_NoBias) {
1564+ // Issue fixed in 2.30
1565+ TEST_F (QnnHTPBackendTests, ConvU16S16S32_NoBias) {
15631566 TestInputDef<float > input_def ({1 , 2 , 5 , 5 }, false , GetFloatDataInRange (-10 .0f , 10 .0f , 50 ));
1564- TestInputDef<float > weight_def ({1 , 2 , 3 , 3 }, false , GetFloatDataInRange (-1 .0f , 5 .0f , 18 ));
1567+ TestInputDef<float > weight_def ({1 , 2 , 3 , 3 }, true , GetFloatDataInRange (-1 .0f , 5 .0f , 18 ));
15651568 RunHTPConvOpTest<uint16_t , int16_t >(" Conv" ,
15661569 input_def, // Input
15671570 weight_def.OverrideValueRange (-5 .0f , 5 .0f ), // Weights (symmetric quant range)
@@ -1577,12 +1580,13 @@ TEST_F(QnnHTPBackendTests, DISABLED_ConvU16S16S32_NoBias) {
15771580
15781581// Tests 16-bit QDQ Conv with dynamic weights and no bias (uses QNN's DepthWiseConv2d)
15791582// TODO(adrianlizarraga): FAIL: Failed to finalize QNN graph. Error code 1002
1580- TEST_F (QnnHTPBackendTests, DISABLED_DepthwiseConvU16S16S32_NoBias) {
1583+ // Issue fixed in 2.30
1584+ TEST_F (QnnHTPBackendTests, DepthwiseConvU16S16S32_NoBias) {
15811585 std::vector<float > input_data = GetFloatDataInRange (-10 .0f , 10 .0f , 25 );
15821586 std::vector<float > weight_data = GetFloatDataInRange (-10 .0f , 10 .0f , 9 );
15831587 RunHTPConvOpTest<uint16_t , int16_t >(" Conv" ,
15841588 TestInputDef<float >({1 , 1 , 5 , 5 }, false , input_data), // Input
1585- TestInputDef<float >({1 , 1 , 3 , 3 }, false , weight_data), // Weights
1589+ TestInputDef<float >({1 , 1 , 3 , 3 }, true , weight_data), // Weights
15861590 TestInputDef<float >(), // Bias
15871591 {1 , 1 }, // Strides
15881592 {0 , 0 , 0 , 0 }, // Pads
0 commit comments