Skip to content

Commit b48bf6b

Browse files
authored
[cherry-pick 2.6] Fix bugs 2.6 on cuda12 (#59953)
* fix_test_inference_windows_compile * disable_unittest_on_win_cuda12
1 parent 142c71a commit b48bf6b

File tree

2 files changed

+53
-2
lines changed

2 files changed

+53
-2
lines changed

paddle/fluid/inference/api/demo_ci/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ if(WITH_GPU)
241241
${TENSORRT_LIB_DIR}/nvinfer${CMAKE_STATIC_LIBRARY_SUFFIX})
242242
set(DEPS ${DEPS}
243243
${TENSORRT_LIB_DIR}/nvinfer_plugin${CMAKE_STATIC_LIBRARY_SUFFIX})
244-
if(${TENSORRT_MAJOR_VERSION} GREATER_EQUAL 7)
244+
if(${TENSORRT_MAJOR_VERSION} EQUAL 7)
245245
set(DEPS ${DEPS}
246246
${TENSORRT_LIB_DIR}/myelin64_1${CMAKE_STATIC_LIBRARY_SUFFIX})
247247
endif()
@@ -272,7 +272,7 @@ if(WIN32)
272272
${CMAKE_COMMAND} -E copy
273273
${TENSORRT_LIB_DIR}/nvinfer_plugin${CMAKE_SHARED_LIBRARY_SUFFIX}
274274
${LIB_PATH})
275-
if(${TENSORRT_MAJOR_VERSION} GREATER_EQUAL 7)
275+
if(${TENSORRT_MAJOR_VERSION} EQUAL 7)
276276
add_custom_command(
277277
TARGET ${DEMO_NAME}
278278
POST_BUILD

tools/windows/run_unittests.sh

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,57 @@ disable_wingpu_cuda12_test="^test_cholesky_op$|\
242242
^test_add_reader_dependency$|\
243243
^test_conv2d_fusion_op$|\
244244
^test_fused_conv2d_add_act_op$|\
245+
^test_analyzer_detect_functional_mkldnn$|\
246+
^test_audio_datasets$|\
247+
^test_signal$|\
248+
^test_stft_op$|\
249+
^test_trt_convert_flatten_contiguous_range$|\
250+
^test_trt_convert_gather$|\
251+
^test_trt_convert_index_select$|\
252+
^test_trt_convert_lookup_table$|\
253+
^test_trt_convert_prelu$|\
254+
^test_trt_convert_bilinear_interp_v2$|\
255+
^test_trt_convert_leaky_relu$|\
256+
^test_reverse_roll_fuse_pass$|\
257+
^test_trt_convert_einsum$|\
258+
^test_trt_convert_roi_align$|\
259+
^test_trt_convert_temporal_shift$|\
260+
^test_trt_convert_mish$|\
261+
^test_trt_convert_pad3d$|\
262+
^test_trt_convert_yolo_box$|\
263+
^test_merge_layernorm_fuse_pass$|\
264+
^test_trt_convert_instance_norm$|\
265+
^test_skip_merge_layernorm_fuse_pass$|\
266+
^test_trt_float64$|\
267+
^test_trt_convert_arg_max$|\
268+
^test_trt_convert_arg_min$|\
269+
^test_trt_convert_assign$|\
270+
^test_trt_convert_cast$|\
271+
^test_trt_convert_compare_and_logical$|\
272+
^test_trt_convert_concat$|\
273+
^test_preln_layernorm_x_fuse_pass$|\
274+
^test_trt_convert_argsort$|\
275+
^test_trt_remove_amp_strategy_op_pass$|\
276+
^test_trt_convert_bitwise_and$|\
277+
^test_trt_convert_bitwise_or$|\
278+
^test_trt_convert_scatter$|\
279+
^test_trt_convert_solve$|\
280+
^test_quant_linear_fuse_pass$|\
281+
^test_trt_explicit_quantization$|\
282+
^test_trt_nearest_interp_v2_op$|\
283+
^test_trt_pool3d_op$|\
284+
^test_trt_convert_anchor_generator$|\
285+
^test_trt_convert_softmax$|\
286+
^test_trt_convert_strided_slice$|\
287+
^test_layernorm_shift_partition_pass$|\
288+
^test_trt_convert_multihead_matmul$|\
289+
^test_trt_convert_reshape$|\
290+
^test_trt_convert_split$|\
291+
^test_trt_convert_squeeze2$|\
292+
^test_trt_convert_sum$|\
293+
^test_trt_convert_transpose$|\
294+
^test_trt_convert_unsqueeze2$|\
295+
^test_simplify_with_basic_ops_pass_autoscan$|\
245296
^disable_wingpu_cuda12_test$"
246297

247298
# /*=================Fixed Disabled Windows TRT MKL unittests=======================*/

0 commit comments

Comments
 (0)