tri11paragon
/
blt-gp
mirror of https://github.com/tri11paragon/blt-gp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed a race, still another around

thread
Brett 2024-07-12 04:03:56 -04:00
parent 382d8be885
commit 821ffa3aa9
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.25)
project(blt-gp VERSION 0.0.62)
project(blt-gp VERSION 0.0.63)
include(CTest)

9
include/blt/gp/program.h
View File

@ -448,7 +448,7 @@ namespace blt::gp
std::vector<std::unique_ptr<std::thread>> threads;
std::mutex evaluation_control;
std::atomic_uint64_t evaluation_left = 0;
std::atomic_uint64_t threads_left = 0;
std::atomic_int64_t threads_left = 0;
std::atomic_bool lifetime_over = false;
} thread_helper;
@ -478,11 +478,14 @@ namespace blt::gp
{
std::scoped_lock lock(thread_helper.evaluation_control);
thread_helper.evaluation_left = current_pop.get_individuals().size();
thread_helper.threads_left = config.threads + 1;
thread_helper.threads_left = static_cast<blt::i64>(config.threads) + 1;
}
//std::cout << "Wait" << std::endl;
execute_thread();
while (thread_helper.threads_left > 0)
execute_thread();
std::this_thread::yield();
//std::cout << "Finished" << std::endl;
// for (auto& ind : current_pop.get_individuals())
// {

6
src/program.cpp
View File

@ -61,7 +61,6 @@ namespace blt::gp
{
execute_thread();
}
std::cout << "Ending Thread!" << std::endl;
}));
}
}
@ -70,6 +69,7 @@ namespace blt::gp
{
if (thread_helper.evaluation_left > 0)
{
//std::cout << "Thread beginning" << std::endl;
while (thread_helper.evaluation_left > 0)
{
blt::size_t begin = 0;
@ -91,8 +91,7 @@ namespace blt::gp
auto old_best = current_stats.best_fitness.load();
while (ind.fitness.adjusted_fitness > old_best &&
!current_stats.best_fitness.compare_exchange_weak(old_best, ind.fitness.adjusted_fitness,
std::memory_order_release,
std::memory_order_relaxed));
std::memory_order_release, std::memory_order_relaxed));
auto old_worst = current_stats.worst_fitness.load();
while (ind.fitness.adjusted_fitness < old_worst &&
@ -105,6 +104,7 @@ namespace blt::gp
}
}
thread_helper.threads_left--;
//std::cout << "thread finished!" << std::endl;
}
}
}