dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix work_pool.opencl test hanging (#2332)

Browse source
This commit is contained in:
Guilherme Lawless 2019-10-09 17:19:13 +01:00 • committed by GitHub
commit 8f239729e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nano/core_test/work_pool.cpp
View file

@ -83,14 +83,14 @@ TEST (work, opencl)
ASSERT_FALSE (error); ASSERT_FALSE (error);
if (!environment.platforms.empty () && !environment.platforms.begin ()->devices.empty ()) if (!environment.platforms.empty () && !environment.platforms.begin ()->devices.empty ())
{ {
auto opencl (nano::opencl_work::create (true, { 0, 0, 16 * 1024 }, logger)); nano::opencl_config config (0, 0, 16 * 1024);
auto opencl (nano::opencl_work::create (true, config, logger));
if (opencl != nullptr) if (opencl != nullptr)
{ {
// 0 threads, should add 1 for managing OpenCL // 0 threads, should add 1 for managing OpenCL
nano::work_pool pool (0, std::chrono::nanoseconds (0), opencl ? [&opencl](nano::root const & root_a, uint64_t difficulty_a, std::atomic<int> & ticket_a) { nano::work_pool pool (0, std::chrono::nanoseconds (0), [&opencl](nano::root const & root_a, uint64_t difficulty_a, std::atomic<int> & ticket_a) {
return opencl->generate_work (root_a, difficulty_a); return opencl->generate_work (root_a, difficulty_a);
} });
: std::function<boost::optional<uint64_t> (nano::root const &, uint64_t, std::atomic<int> & ticket_a)> (nullptr));
ASSERT_NE (nullptr, pool.opencl); ASSERT_NE (nullptr, pool.opencl);
nano::root root; nano::root root;
uint64_t difficulty (0xff00000000000000); uint64_t difficulty (0xff00000000000000);

3
nano/nano_node/entry.cpp
View file

@ -450,7 +450,8 @@ int main (int argc, char * const * argv)
if (!error) if (!error)
{ {
nano::logger_mt logger; nano::logger_mt logger;
auto opencl (nano::opencl_work::create (true, { platform, device, threads }, logger)); nano::opencl_config config (platform, device, threads);
auto opencl (nano::opencl_work::create (true, config, logger));
nano::work_pool work_pool (std::numeric_limits<unsigned>::max (), std::chrono::nanoseconds (0), opencl ? [&opencl](nano::root const & root_a, uint64_t difficulty_a, std::atomic<int> &) { nano::work_pool work_pool (std::numeric_limits<unsigned>::max (), std::chrono::nanoseconds (0), opencl ? [&opencl](nano::root const & root_a, uint64_t difficulty_a, std::atomic<int> &) {
return opencl->generate_work (root_a, difficulty_a); return opencl->generate_work (root_a, difficulty_a);
} }