Skip to content

Commit 24b186a

Browse files
committed
Fix ConfigEps execution provider ordering in test files
1 parent 3874516 commit 24b186a

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

onnxruntime/test/contrib_ops/skiplayernorm_op_test.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ static void RunOneTest(
9494
sum_output_data);
9595
}
9696

97-
if (cpu_ep != nullptr) {
98-
execution_providers.push_back(DefaultCpuExecutionProvider());
99-
}
10097
if (webgpu_ep != nullptr) {
10198
execution_providers.push_back(DefaultWebGpuExecutionProvider());
10299
}
100+
if (cpu_ep != nullptr) {
101+
execution_providers.push_back(DefaultCpuExecutionProvider());
102+
}
103103

104104
test.Run(OpTester::ExpectResult::kExpectSuccess, "", {}, nullptr, &execution_providers);
105105
} else if (CudaHasBF16Support() && use_bfloat16) {

onnxruntime/test/providers/cpu/tensor/gather_op_test.cc

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -440,10 +440,10 @@ TEST(GatherOpTest, Gather_axis1_scalar_indices) {
440440

441441
TEST(ShrunkenGatherOpTest, ShrunkenGather_PositiveAxis) {
442442
std::vector<std::unique_ptr<IExecutionProvider>> execution_providers;
443-
execution_providers.emplace_back(DefaultCpuExecutionProvider());
444443
#ifdef USE_CUDA
445444
execution_providers.emplace_back(DefaultCudaExecutionProvider());
446445
#endif
446+
execution_providers.emplace_back(DefaultCpuExecutionProvider());
447447

448448
OpTester test("ShrunkenGather", 1, onnxruntime::kMSDomain);
449449
test.AddAttribute<int64_t>("axis", 0LL);
@@ -461,10 +461,12 @@ TEST(ShrunkenGatherOpTest, ShrunkenGather_PositiveAxis) {
461461

462462
TEST(ShrunkenGatherOpTest, ShrunkenGather_NegativeAxis) {
463463
std::vector<std::unique_ptr<IExecutionProvider>> execution_providers;
464-
execution_providers.emplace_back(DefaultCpuExecutionProvider());
464+
// Add CUDA EP first so it gets tested before CPU EP
465+
// (ConfigEps runs the first available EP for the operator)
465466
#ifdef USE_CUDA
466467
execution_providers.emplace_back(DefaultCudaExecutionProvider());
467468
#endif
469+
execution_providers.emplace_back(DefaultCpuExecutionProvider());
468470

469471
OpTester test("ShrunkenGather", 1, onnxruntime::kMSDomain);
470472
test.AddAttribute<int64_t>("axis", -1LL);
@@ -482,10 +484,12 @@ TEST(ShrunkenGatherOpTest, ShrunkenGather_NegativeAxis) {
482484

483485
TEST(ShrunkenGatherOpTest, ShrunkenGather_InvalidIndicesRank) {
484486
std::vector<std::unique_ptr<IExecutionProvider>> execution_providers;
485-
execution_providers.emplace_back(DefaultCpuExecutionProvider());
487+
// Add CUDA EP first so it gets tested before CPU EP
488+
// (ConfigEps runs the first available EP for the operator)
486489
#ifdef USE_CUDA
487490
execution_providers.emplace_back(DefaultCudaExecutionProvider());
488491
#endif
492+
execution_providers.emplace_back(DefaultCpuExecutionProvider());
489493

490494
OpTester test("ShrunkenGather", 1, onnxruntime::kMSDomain);
491495
test.AddAttribute<int64_t>("axis", 0LL);
@@ -503,10 +507,12 @@ TEST(ShrunkenGatherOpTest, ShrunkenGather_InvalidIndicesRank) {
503507

504508
TEST(ShrunkenGatherOpTest, ShrunkenGather_InvalidInputRank) {
505509
std::vector<std::unique_ptr<IExecutionProvider>> execution_providers;
506-
execution_providers.emplace_back(DefaultCpuExecutionProvider());
510+
// Add CUDA EP first so it gets tested before CPU EP
511+
// (ConfigEps runs the first available EP for the operator)
507512
#ifdef USE_CUDA
508513
execution_providers.emplace_back(DefaultCudaExecutionProvider());
509514
#endif
515+
execution_providers.emplace_back(DefaultCpuExecutionProvider());
510516

511517
OpTester test("ShrunkenGather", 1, onnxruntime::kMSDomain);
512518
test.AddAttribute<int64_t>("axis", 0LL);

0 commit comments

Comments
 (0)