Skip to content

Commit

Permalink
fix dynload for cufft on windows (#51)
Browse files Browse the repository at this point in the history 
1. fix dynload for cufft on windows;
2. fix unittests.
  • Loading branch information
Feiyu Chan authored Sep 16, 2021
1 parent 1e16889 commit e804bd5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
7 changes: 6 additions & 1 deletion paddle/fluid/platform/dynload/dynamic_loader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ static constexpr char* win_cusolver_lib =
static constexpr char* win_cusparse_lib =
"cusparse64_" CUDA_VERSION_MAJOR CUDA_VERSION_MINOR
".dll;cusparse64_" CUDA_VERSION_MAJOR ".dll;cusparse64_10.dll";
static constexpr char* win_cufft_lib =
"cufft64_" CUDA_VERSION_MAJOR CUDA_VERSION_MINOR
".dll;cufft64_" CUDA_VERSION_MAJOR ".dll;cufft64_10.dll";
#else
static constexpr char* win_curand_lib =
"curand64_" CUDA_VERSION_MAJOR CUDA_VERSION_MINOR
Expand All @@ -122,7 +125,9 @@ static constexpr char* win_cusolver_lib =
static constexpr char* win_cusparse_lib =
"cusparse64_" CUDA_VERSION_MAJOR CUDA_VERSION_MINOR
".dll;cusparse64_" CUDA_VERSION_MAJOR ".dll";
static constexpr char* win_cufft_lib = "cufft64_" CUDA_MAJOR_VERSION ".dll";
static constexpr char* win_cufft_lib =
"cufft64_" CUDA_VERSION_MAJOR CUDA_VERSION_MINOR
".dll;cufft64_" CUDA_VERSION_MAJOR ".dll";
#endif // CUDA_VERSION
#endif

Expand Down
4 changes: 2 additions & 2 deletions python/paddle/fluid/tests/unittests/fft/test_fft.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -534,8 +534,8 @@ def test_hfft2(self):
[('test_n_nagative',
np.random.randn(4, 4, 4) + 1j * np.random.randn(4, 4, 4), (-1, -2),
(-2, -1), 'backward', ValueError), \
('test_n_equal_input_length',
np.random.randn(4, 4, 4) + 1j * np.random.randn(4, 4, 4), (2, 1), (-2, -1),
('test_zero_point',
np.random.randn(4, 4, 1) + 1j * np.random.randn(4, 4, 1), None, (-2, -1),
"backward", ValueError), \
('test_n_zero', np.random.randn(4, 4, 4) + 1j * np.random.randn(4, 4, 4),
(0, 0), (-2, -1), 'backward', ValueError), \
Expand Down

1 comment on commit e804bd5

@paddle-bot-old
Copy link

@paddle-bot-old paddle-bot-old bot commented on e804bd5 Sep 16, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🕵️ CI failures summary

🔍 PR: #35665 Commit ID: e804bd5 contains failed CI.

🔹 Failed: PR-CI-APPROVAL

approve_failed
2021-09-16 18:45:58 正在保存至: “bk.txt”

2021-09-16 18:45:58      0K                                                       100% 3.36M=0s

2021-09-16 18:45:58 2021-09-16 18:45:58 (3.36 MB/s) - 已保存 “bk.txt” [5/5])

2021-09-16 18:46:09 ****************

2021-09-16 18:46:09 0. You must have Dianhai approval for change 20+ files or add than 1000+ lines of content.

2021-09-16 18:46:09 1. You must have one RD (wanghuancoder, luotao1 or XiaoguangHu01) approval for CMakeLists.txt, which manages the compilation parameter.

2021-09-16 18:46:09 2. The error message you wrote in PADDLE_ENFORCE{**} or PADDLE_THROW does not meet our error message writing specification. Possible errors include 1. the error message is empty / 2. the error message is too short / 3. the error type is not specified. Please read the specification [ https://github.com/PaddlePaddle/Paddle/wiki/Paddle-Error-Message-Writing-Specification ], then refine the error message. If it is a mismatch, please request chenwhql (Recommend), luotao1 or lanxianghit review and approve.

2021-09-16 18:46:09 The PADDLE_ENFORCE{**} or PADDLE_THROW entries that do not meet the specification are as follows:

2021-09-16 18:46:09 PADDLE_THROW(platform::errors::External(DftiErrorMessage(status)));

2021-09-16 18:46:09 PADDLE_THROW(platform::errors::External(get_cufft_error_info(error)));

2021-09-16 18:46:09 There are 3 approved errors.

2021-09-16 18:46:09 ****************

2021-09-16 18:46:09 + EXCODE=6

2021-09-16 18:46:09 + echo 'EXCODE: 6'

2021-09-16 18:46:09 EXCODE: 6

2021-09-16 18:46:09 + echo 'ipipe_log_param_EXCODE: 6'

2021-09-16 18:46:09 ipipe_log_param_EXCODE: 6

2021-09-16 18:46:09 + exit 6

🔹 Failed: PR-CI-Windows

build_failed
2021-09-16 19:13:26 [468/1310] Building CUDA object paddle\fluid\operators\CMakeFiles\paddle_operators_unity.dir\paddle_operators_unity_0_cu.cu.obj

2021-09-16 19:13:27 paddle_operators_unity_0_cu.cu

2021-09-16 19:13:27 Unknown compiler version - please run the configure tests and report the results

2021-09-16 19:13:27 [469/1310] Building CXX object paddle\fluid\operators\CMakeFiles\paddle_operators_unity.dir\activation_op.cc.obj

2021-09-16 19:13:27 Unknown compiler version - please run the configure tests and report the results

2021-09-16 19:13:55 [470/1310] Building CUDA object paddle\fluid\operators\CMakeFiles\paddle_operators_unity.dir\paddle_operators_unity_21_cu.cu.obj

2021-09-16 19:13:55 paddle_operators_unity_21_cu.cu

2021-09-16 19:13:55 Unknown compiler version - please run the configure tests and report the results

2021-09-16 19:13:55 ninja: build stopped: subcommand failed.

2021-09-16 19:13:55 7

2021-09-16 19:13:55 Build Paddle failed, will exit

2021-09-16 19:13:56 EXCODE: 7

🔹 Failed: PR-CI-OP-benchmark

test_failed
2021-09-16 19:50:38 [tools/test_ci_op_benchmark.sh:271] [ERROR] Missing test script of "frame"(paddle/fluid/operators/frame_op.cu) in benchmark.

2021-09-16 19:50:38 + '[' 8 -ne 0 ']'

2021-09-16 19:50:38 + LOG '[INFO] See https://github.com/PaddlePaddle/Paddle/wiki/PR-CI-OP-benchmark-Manual for details.'

2021-09-16 19:50:38 + echo '[tools/test_ci_op_benchmark.sh:275] [INFO] See https://github.com/PaddlePaddle/Paddle/wiki/PR-CI-OP-benchmark-Manual for details.'

2021-09-16 19:50:38 [tools/test_ci_op_benchmark.sh:275] [INFO] See https://github.com/PaddlePaddle/Paddle/wiki/PR-CI-OP-benchmark-Manual for details.

2021-09-16 19:50:38 + LOG '[INFO] Or you can apply for one RD (Avin0323(Recommend), Xreki, luotao1) approval to pass this PR.'

2021-09-16 19:50:38 + echo '[tools/test_ci_op_benchmark.sh:276] [INFO] Or you can apply for one RD (Avin0323(Recommend), Xreki, luotao1) approval to pass this PR.'

2021-09-16 19:50:38 [tools/test_ci_op_benchmark.sh:276] [INFO] Or you can apply for one RD (Avin0323(Recommend), Xreki, luotao1) approval to pass this PR.

2021-09-16 19:50:38 + exit 8

2021-09-16 19:50:38 + EXCODE=8

2021-09-16 19:50:38 + echo 'EXCODE: 8'

2021-09-16 19:50:38 EXCODE: 8

2021-09-16 19:50:38 + echo 'ipipe_log_param_EXCODE: 8'

2021-09-16 19:50:38 ipipe_log_param_EXCODE: 8

2021-09-16 19:50:38 + '[' 8 -eq 0 ']'

2021-09-16 19:50:38 + set +x

2021-09-16 19:50:38 Sorry, some tests failed.

2021-09-16 19:50:38 + exit 8

2021-09-16 19:50:38 {build code state=8}

🔹 Failed: PR-CI-CPU-Py2

Unknown Failed
2021-09-16 21:02:32 samplecode_temp/paddle.tensor.fft.irfftn_example.py

2021-09-16 21:02:32 samplecode_temp/paddle.tensor.fft.rfft2_example.py

2021-09-16 21:02:32 Mistakes found in sample codes. Please recheck the sample codes.'

2021-09-16 21:02:32 + set +x

2021-09-16 21:02:32 ========================================

2021-09-16 21:02:32 summary problems:

2021-09-16 21:02:32 There is 1 error: Example code error.

2021-09-16 21:02:32 ========================================

2021-09-16 21:02:32 Example code error Please fix the error listed in the information:

2021-09-16 21:02:32 + EXCODE=10

2021-09-16 21:02:32 + echo 'EXCODE: 10'

2021-09-16 21:02:32 EXCODE: 10

2021-09-16 21:02:32 + echo 'ipipe_log_param_EXCODE: 10'

2021-09-16 21:02:32 ipipe_log_param_EXCODE: 10

2021-09-16 21:02:32 + set +x

2021-09-16 21:02:32 + exit 10

2021-09-16 21:02:32 {build code state=10}

2021-09-16 21:02:32 the build(ed1df73fed834c5d9defa8f378c9aadb) state is BUILD_CODE_FAIL

2021-09-16 21:02:48 the build(ed1df73fed834c5d9defa8f378c9aadb) state is FINISH

🔹 Failed: PR-CI-Py3

test_failed
2021-09-16 21:13:11 The following tests FAILED:

2021-09-16 21:13:11 	1029 - test_signal (Failed)

2021-09-16 21:13:11 	1386 - test_fft (Failed)

2021-09-16 21:13:11 	1387 - test_fft_with_static_graph (Failed)

2021-09-16 21:13:11 	1388 - test_spectral_op (Failed)

2021-09-16 21:13:11 Errors while running CTest

2021-09-16 21:13:11 + EXCODE=8

2021-09-16 21:13:11 + echo 'EXCODE: 8'

2021-09-16 21:13:11 EXCODE: 8

2021-09-16 21:13:11 + echo 'ipipe_log_param_EXCODE: 8'

2021-09-16 21:13:11 ipipe_log_param_EXCODE: 8

2021-09-16 21:13:11 + [[ 8 -eq 0 ]]

2021-09-16 21:13:11 + set +x

2021-09-16 21:13:11 Sorry, some tests failed.

2021-09-16 21:13:11 + exit 8

2021-09-16 21:13:11 {build code state=8}

Please sign in to comment.