kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[FEM] Replacement of hardware_concurrency() with idealThreadCount()

Browse Source 
I encountered problems with std::thread::hardware_concurrency() with mingw-w64 < v8.1.

QThread::idealThreadCount() is a better alternative.
This commit is contained in:
xtemp09
2023-03-07 15:23:02 +07:00
committed by wwmayer
parent ee0c3ad5c1
commit 3ecd69e0c5
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp
View File

@@ -25,7 +25,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <thread>
# include <QThread>
# include <QMessageBox>
#endif
@@ -46,10 +46,8 @@ DlgSettingsFemCcxImp::DlgSettingsFemCcxImp(QWidget* parent)
ui->dsb_ccx_analysis_time->setMaximum(FLOAT_MAX);
ui->dsb_ccx_initial_time_step->setMaximum(FLOAT_MAX);
// determine number of CPU cores
auto processor_count = std::thread::hardware_concurrency();
// hardware check might fail and then returns 0
if (processor_count > 0)
ui->sb_ccx_numcpu->setMaximum(processor_count);
int processor_count = QThread::idealThreadCount();
ui->sb_ccx_numcpu->setMaximum(processor_count);
connect(ui->fc_ccx_binary_path, &Gui::PrefFileChooser::fileNameChanged,
this, &DlgSettingsFemCcxImp::onfileNameChanged);

13
src/Mod/Fem/Gui/DlgSettingsFemElmerImp.cpp
View File

@@ -24,7 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <thread>
# include <QThread>
# include <QMessageBox>
#endif
@@ -41,10 +41,8 @@ DlgSettingsFemElmerImp::DlgSettingsFemElmerImp(QWidget* parent)
ui->setupUi(this);
// determine number of CPU cores
processor_count = std::thread::hardware_concurrency();
// hardware check might fail and then returns 0
if (processor_count > 0)
ui->sb_elmer_num_cores->setMaximum(processor_count);
processor_count = QThread::idealThreadCount();
ui->sb_elmer_num_cores->setMaximum(processor_count);
connect(ui->fc_grid_binary_path, &Gui::PrefFileChooser::fileNameChanged,
this, &DlgSettingsFemElmerImp::onfileNameChanged);
@@ -109,10 +107,7 @@ void DlgSettingsFemElmerImp::onfileNameChanged(QString FileName)
void DlgSettingsFemElmerImp::onfileNameChangedMT(QString FileName)
{
// reset in case it was previously set to 1
// (hardware check might fail and then returns 0)
if (processor_count > 0)
ui->sb_elmer_num_cores->setMaximum(processor_count);
ui->sb_elmer_num_cores->setMaximum(processor_count);
if (ui->sb_elmer_num_cores->value() == 1)
return;

2
src/Mod/Fem/Gui/DlgSettingsFemElmerImp.h
View File

@@ -51,7 +51,7 @@ protected:
private:
std::unique_ptr<Ui_DlgSettingsFemElmerImp> ui;
unsigned int processor_count;
int processor_count;
};
} // namespace FemGui