Display possible NVIDIA CUDA/RTC library loading error message only in case a NVIDIA device was found using OpenCL

pull/2543/head
Jens Steube 4 years ago
parent 111f39eeb2
commit 57bef8abc9

@ -1557,6 +1557,9 @@ typedef struct backend_ctx
// cuda // cuda
int rc_cuda_init;
int rc_nvrtc_init;
int nvrtc_driver_version; int nvrtc_driver_version;
int cuda_driver_version; int cuda_driver_version;

@ -4935,8 +4935,7 @@ int backend_ctx_init (hashcat_ctx_t *hashcat_ctx)
if (rc_cuda_init == -1) if (rc_cuda_init == -1)
{ {
event_log_warning (hashcat_ctx, "Failed to initialize NVIDIA CUDA library."); backend_ctx->rc_cuda_init = rc_cuda_init;
event_log_warning (hashcat_ctx, NULL);
cuda_close (hashcat_ctx); cuda_close (hashcat_ctx);
} }
@ -4953,8 +4952,7 @@ int backend_ctx_init (hashcat_ctx_t *hashcat_ctx)
if (rc_nvrtc_init == -1) if (rc_nvrtc_init == -1)
{ {
event_log_warning (hashcat_ctx, "Failed to initialize NVIDIA RTC library."); backend_ctx->rc_nvrtc_init = rc_nvrtc_init;
event_log_warning (hashcat_ctx, NULL);
nvrtc_close (hashcat_ctx); nvrtc_close (hashcat_ctx);
} }
@ -6269,7 +6267,29 @@ int backend_ctx_devices_init (hashcat_ctx_t *hashcat_ctx, const int comptime)
{ {
if (user_options->backend_ignore_cuda == false) if (user_options->backend_ignore_cuda == false)
{ {
event_log_warning (hashcat_ctx, "* Device #%u: CUDA SDK Toolkit installation NOT detected.", device_id + 1); if (backend_ctx->rc_cuda_init == -1)
{
event_log_warning (hashcat_ctx, "Failed to initialize NVIDIA CUDA library.");
event_log_warning (hashcat_ctx, NULL);
}
else
{
event_log_warning (hashcat_ctx, "Successfully initialized NVIDIA CUDA library.");
event_log_warning (hashcat_ctx, NULL);
}
if (backend_ctx->rc_nvrtc_init == -1)
{
event_log_warning (hashcat_ctx, "Failed to initialize NVIDIA RTC library.");
event_log_warning (hashcat_ctx, NULL);
}
else
{
event_log_warning (hashcat_ctx, "Successfully initialized NVIDIA RTC library.");
event_log_warning (hashcat_ctx, NULL);
}
event_log_warning (hashcat_ctx, "* Device #%u: CUDA SDK Toolkit installation NOT detected or incorrectly installed.", device_id + 1);
event_log_warning (hashcat_ctx, " CUDA SDK Toolkit installation required for proper device support and utilization"); event_log_warning (hashcat_ctx, " CUDA SDK Toolkit installation required for proper device support and utilization");
event_log_warning (hashcat_ctx, " Falling back to OpenCL Runtime"); event_log_warning (hashcat_ctx, " Falling back to OpenCL Runtime");

Loading…
Cancel
Save