diff --git a/src/DynareMain.cc b/src/DynareMain.cc index e4bd0efdea658cc820417399b70c89f6c782f568..d9ba0ccbede673bb4d70bfb8b75433fc485b97ce 100644 --- a/src/DynareMain.cc +++ b/src/DynareMain.cc @@ -503,7 +503,7 @@ main(int argc, char **argv) } if (mod_file->use_dll) - ModelTree::initializeMEXCompilationWorkers(max(jthread::hardware_concurrency(), 1U)); + ModelTree::initializeMEXCompilationWorkers(max(thread::hardware_concurrency(), 1U)); if (json == JsonOutputPointType::parsing) mod_file->writeJsonOutput(basename, json, json_output_mode, onlyjson); diff --git a/src/ModelTree.cc b/src/ModelTree.cc index 9e780a58beb5c82adaeceaa2e1be0437f3e745fc..9f691dcf3bfa50f0c87d9adc57af09a52946ecdc 100644 --- a/src/ModelTree.cc +++ b/src/ModelTree.cc @@ -45,7 +45,7 @@ condition_variable_any ModelTree::mex_compilation_cv; mutex ModelTree::mex_compilation_mut; vector<tuple<filesystem::path, set<filesystem::path>, string>> ModelTree::mex_compilation_queue; set<filesystem::path> ModelTree::mex_compilation_ongoing, ModelTree::mex_compilation_done, ModelTree::mex_compilation_failed; -vector<jthread> ModelTree::mex_compilation_workers; +vector<thread> ModelTree::mex_compilation_workers; void ModelTree::copyHelper(const ModelTree &m) @@ -1868,6 +1868,7 @@ ModelTree::getRHSFromLHS(expr_t lhs) const void ModelTree::initializeMEXCompilationWorkers(int numworkers) { + /* assert(numworkers > 0); assert(mex_compilation_workers.empty()); @@ -1917,6 +1918,7 @@ ModelTree::initializeMEXCompilationWorkers(int numworkers) mex_compilation_cv.notify_all(); } }); +*/ } void diff --git a/src/ModelTree.hh b/src/ModelTree.hh index f7f3394b3c4b2f83d9ec61cfb5d45278ae69a9a2..bae1a9bdede569cabadefad16171c6fc8ee38556 100644 --- a/src/ModelTree.hh +++ b/src/ModelTree.hh @@ -406,7 +406,7 @@ private: vector<int> endo2eq; // Stores workers used for compiling MEX files in parallel - static vector<jthread> mex_compilation_workers; + static vector<thread> mex_compilation_workers; /* The following variables implement the thread synchronization mechanism for limiting the number of concurrent GCC processes and tracking dependencies