From fe91f6276db5aff017573c38d0d586cd3b8a0525 Mon Sep 17 00:00:00 2001 From: Jens Steube <jens.steube@gmail.com> Date: Sun, 16 May 2021 18:31:43 +0200 Subject: [PATCH] CUDA Backend: Do not warn about missing CUDA SDK installation if --stdout is used --- docs/changes.txt | 10 +++++++++ src/backend.c | 56 ++++++++++++++++++++++++++---------------------- 2 files changed, 40 insertions(+), 26 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index c18020058..b0ca9e75c 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -1,5 +1,15 @@ * changes v6.2.1 -> v6.x.x +## +## Improvements +## + +- CUDA Backend: Do not warn about missing CUDA SDK installation if --stdout is used + +## +## Technical +## + - Dependencies: Updated LZMA SDK from 19.00 to 21.02 alpha - Dependencies: Updated xxHash from 0.1.0 to v0.8.0 - Stable XXH3 diff --git a/src/backend.c b/src/backend.c index ca8cd1373..de545fc27 100644 --- a/src/backend.c +++ b/src/backend.c @@ -6611,39 +6611,43 @@ int backend_ctx_devices_init (hashcat_ctx_t *hashcat_ctx, const int comptime) device_param->spin_damp = (double) user_options->spin_damp / 100; - // recommend CUDA - if ((backend_ctx->cuda == NULL) || (backend_ctx->nvrtc == NULL)) + if (user_options->stdout_flag == false) { - if (user_options->backend_ignore_cuda == false) + // recommend CUDA + + if ((backend_ctx->cuda == NULL) || (backend_ctx->nvrtc == NULL)) { - if (backend_ctx->rc_cuda_init == -1) + if (user_options->backend_ignore_cuda == false) { - 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_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, " Falling back to OpenCL Runtime"); - 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, " Falling back to OpenCL Runtime"); - - event_log_warning (hashcat_ctx, NULL); } } }