Skip to content

Commit 1ad77f7

Browse files
tianleiwutitaiwangmshariharans29github-actions[bot]BODAPATIMAHESH
authored
ORT 1.24.1 release cherry pick round 2 (#27233)
#27021: [Disable matmul 1d tests on DML](1afc8bc) #27206: [[CUDA] Run FlashAttention regression test only when FlashAttention is…](4d95d97) #27120: [POWER : Fix build failure due to unsupported cpuinfo on ppc64le](2843ec0) --------- Co-authored-by: Ti-Tai Wang <titaiwang@microsoft.com> Co-authored-by: Hariharan Seshadri <shariharan91@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: BODAPATIMAHESH <148746454+BODAPATIMAHESH@users.noreply.github.com>
1 parent 27a7b31 commit 1ad77f7

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

cmake/onnxruntime_unittests.cmake

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1553,8 +1553,13 @@ endif()
15531553
onnxruntime_common ${CMAKE_DL_LIBS})
15541554
set_target_properties(onnxruntime_runtime_path_test_shared_library PROPERTIES AIX_SHARED_LIBRARY_ARCHIVE OFF)
15551555
else()
1556-
target_link_libraries(onnxruntime_runtime_path_test_shared_library PRIVATE
1557-
onnxruntime_common cpuinfo ${CMAKE_DL_LIBS})
1556+
if (CPUINFO_SUPPORTED)
1557+
target_link_libraries(onnxruntime_runtime_path_test_shared_library PRIVATE
1558+
onnxruntime_common cpuinfo ${CMAKE_DL_LIBS})
1559+
else()
1560+
target_link_libraries(onnxruntime_runtime_path_test_shared_library PRIVATE
1561+
onnxruntime_common ${CMAKE_DL_LIBS})
1562+
endif()
15581563
endif()
15591564
target_include_directories(onnxruntime_runtime_path_test_shared_library PRIVATE ${ONNXRUNTIME_ROOT})
15601565

onnxruntime/test/python/transformers/test_gqa.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1775,6 +1775,7 @@ def test_flash_decode_parity(self):
17751775
del os.environ["ORT_DISABLE_FLASH_DECODE"]
17761776

17771777

1778+
@unittest.skipIf(not has_flash_attention(), "Flash Attention is not available, skipping tests.")
17781779
class TestGQARegressions(unittest.TestCase):
17791780
"""Specific regression tests for historical bugs."""
17801781

onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,10 @@
785785
"^test_reduce_max_empty_set_cpu", // DNNL result in "(shapes (2, 1, 4), (1, 0, 1) mismatch)". this is the same for test_reduce_min_empty_set which is already in the list
786786
"^test_reduce_min_empty_set_cpu",
787787
"^test_resize_upsample_sizes_nearest_not_smaller_cpu",
788-
"^test_clip_min_greater_than_max_cpu"
788+
"^test_clip_min_greater_than_max_cpu",
789+
// Fail since v1.20.1 (new matmul 1D tests)
790+
"^test_matmul_1d_1d_cpu",
791+
"^test_matmul_4d_1d_cpu"
789792
],
790793
// ORT first supported opset 7, so models with nodes that require versions prior to opset 7 are not supported
791794
"tests_with_pre_opset7_dependencies": [

0 commit comments

Comments
 (0)