diff --git a/paddle/fluid/inference/api/demo_ci/CMakeLists.txt b/paddle/fluid/inference/api/demo_ci/CMakeLists.txt index 0c9e3d34483364..0cca4532a0ce6b 100644 --- a/paddle/fluid/inference/api/demo_ci/CMakeLists.txt +++ b/paddle/fluid/inference/api/demo_ci/CMakeLists.txt @@ -241,7 +241,7 @@ if(WITH_GPU) ${TENSORRT_LIB_DIR}/nvinfer${CMAKE_STATIC_LIBRARY_SUFFIX}) set(DEPS ${DEPS} ${TENSORRT_LIB_DIR}/nvinfer_plugin${CMAKE_STATIC_LIBRARY_SUFFIX}) - if(${TENSORRT_MAJOR_VERSION} GREATER_EQUAL 7) + if(${TENSORRT_MAJOR_VERSION} EQUAL 7) set(DEPS ${DEPS} ${TENSORRT_LIB_DIR}/myelin64_1${CMAKE_STATIC_LIBRARY_SUFFIX}) endif() @@ -272,7 +272,7 @@ if(WIN32) ${CMAKE_COMMAND} -E copy ${TENSORRT_LIB_DIR}/nvinfer_plugin${CMAKE_SHARED_LIBRARY_SUFFIX} ${LIB_PATH}) - if(${TENSORRT_MAJOR_VERSION} GREATER_EQUAL 7) + if(${TENSORRT_MAJOR_VERSION} EQUAL 7) add_custom_command( TARGET ${DEMO_NAME} POST_BUILD diff --git a/tools/windows/run_unittests.sh b/tools/windows/run_unittests.sh index 527a46ad017134..03e802750b8df5 100644 --- a/tools/windows/run_unittests.sh +++ b/tools/windows/run_unittests.sh @@ -242,6 +242,57 @@ disable_wingpu_cuda12_test="^test_cholesky_op$|\ ^test_add_reader_dependency$|\ ^test_conv2d_fusion_op$|\ ^test_fused_conv2d_add_act_op$|\ +^test_analyzer_detect_functional_mkldnn$|\ +^test_audio_datasets$|\ +^test_signal$|\ +^test_stft_op$|\ +^test_trt_convert_flatten_contiguous_range$|\ +^test_trt_convert_gather$|\ +^test_trt_convert_index_select$|\ +^test_trt_convert_lookup_table$|\ +^test_trt_convert_prelu$|\ +^test_trt_convert_bilinear_interp_v2$|\ +^test_trt_convert_leaky_relu$|\ +^test_reverse_roll_fuse_pass$|\ +^test_trt_convert_einsum$|\ +^test_trt_convert_roi_align$|\ +^test_trt_convert_temporal_shift$|\ +^test_trt_convert_mish$|\ +^test_trt_convert_pad3d$|\ +^test_trt_convert_yolo_box$|\ +^test_merge_layernorm_fuse_pass$|\ +^test_trt_convert_instance_norm$|\ +^test_skip_merge_layernorm_fuse_pass$|\ +^test_trt_float64$|\ +^test_trt_convert_arg_max$|\ +^test_trt_convert_arg_min$|\ +^test_trt_convert_assign$|\ +^test_trt_convert_cast$|\ +^test_trt_convert_compare_and_logical$|\ +^test_trt_convert_concat$|\ +^test_preln_layernorm_x_fuse_pass$|\ +^test_trt_convert_argsort$|\ +^test_trt_remove_amp_strategy_op_pass$|\ +^test_trt_convert_bitwise_and$|\ +^test_trt_convert_bitwise_or$|\ +^test_trt_convert_scatter$|\ +^test_trt_convert_solve$|\ +^test_quant_linear_fuse_pass$|\ +^test_trt_explicit_quantization$|\ +^test_trt_nearest_interp_v2_op$|\ +^test_trt_pool3d_op$|\ +^test_trt_convert_anchor_generator$|\ +^test_trt_convert_softmax$|\ +^test_trt_convert_strided_slice$|\ +^test_layernorm_shift_partition_pass$|\ +^test_trt_convert_multihead_matmul$|\ +^test_trt_convert_reshape$|\ +^test_trt_convert_split$|\ +^test_trt_convert_squeeze2$|\ +^test_trt_convert_sum$|\ +^test_trt_convert_transpose$|\ +^test_trt_convert_unsqueeze2$|\ +^test_simplify_with_basic_ops_pass_autoscan$|\ ^disable_wingpu_cuda12_test$" # /*=================Fixed Disabled Windows TRT MKL unittests=======================*/