From f5c99620b95f587ad127fdab0256855f94295c29 Mon Sep 17 00:00:00 2001 From: Robert Chisholm Date: Mon, 6 Nov 2023 14:53:38 +0000 Subject: [PATCH] lint fix --- include/flamegpu/simulation/detail/MPIEnsemble.h | 2 ++ src/flamegpu/simulation/CUDAEnsemble.cu | 2 +- src/flamegpu/simulation/detail/MPIEnsemble.cu | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/flamegpu/simulation/detail/MPIEnsemble.h b/include/flamegpu/simulation/detail/MPIEnsemble.h index 9f2cdb942..b9ebc5d44 100644 --- a/include/flamegpu/simulation/detail/MPIEnsemble.h +++ b/include/flamegpu/simulation/detail/MPIEnsemble.h @@ -6,6 +6,7 @@ #include #include #include +#include #include "flamegpu/simulation/CUDAEnsemble.h" #include "flamegpu/simulation/detail/MPISimRunner.h" @@ -80,6 +81,7 @@ class MPIEnsemble { void retrieveLocalErrorDetail(std::mutex &log_export_queue_mutex, std::multimap &err_detail, std::vector &err_detail_local, int i); + private: /** * @return Retrieve the local world rank from MPI diff --git a/src/flamegpu/simulation/CUDAEnsemble.cu b/src/flamegpu/simulation/CUDAEnsemble.cu index 2fa846d71..cb135181d 100644 --- a/src/flamegpu/simulation/CUDAEnsemble.cu +++ b/src/flamegpu/simulation/CUDAEnsemble.cu @@ -278,7 +278,7 @@ unsigned int CUDAEnsemble::simulate(const RunPlanVector& plans) { if (runner_status == detail::MPISimRunner::Signal::RunFailed) { // Fetch the job id, increment local error counter const unsigned int failed_run_id = err_cts[i].exchange(UINT_MAX); - ++err_count; + ++err_count; // Retrieve and handle local error detail mpi->retrieveLocalErrorDetail(log_export_queue_mutex, err_detail, err_detail_local, i); runner_status = detail::MPISimRunner::Signal::RequestJob; diff --git a/src/flamegpu/simulation/detail/MPIEnsemble.cu b/src/flamegpu/simulation/detail/MPIEnsemble.cu index af7afd2ee..fadaf6220 100644 --- a/src/flamegpu/simulation/detail/MPIEnsemble.cu +++ b/src/flamegpu/simulation/detail/MPIEnsemble.cu @@ -209,7 +209,7 @@ void MPIEnsemble::initMPI() { } } } -void MPIEnsemble::retrieveLocalErrorDetail(std::mutex &log_export_queue_mutex, std::multimap &err_detail, +void MPIEnsemble::retrieveLocalErrorDetail(std::mutex &log_export_queue_mutex, std::multimap &err_detail, std::vector &err_detail_local, const int i) { // Fetch error detail detail::AbstractSimRunner::ErrorDetail e_detail;