Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/graphblas/nonblocking/init.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#ifndef _H_GRB_NONBLOCKING_INIT
#define _H_GRB_NONBLOCKING_INIT

#include <omp.h>
#include <graphblas/base/init.hpp>
#include <graphblas/utils/DMapper.hpp>

Expand Down Expand Up @@ -134,7 +135,7 @@ namespace grb {
* The maximum number of threads available in the system.
*/
static size_t numThreads() {
return num_threads;
return omp_get_max_threads();
}

};
Expand Down
2 changes: 1 addition & 1 deletion src/graphblas/nonblocking/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ bool grb::internal::NONBLOCKING::warn_if_not_native = true;
bool grb::internal::NONBLOCKING::manual_tile_size = false;
size_t grb::internal::NONBLOCKING::manual_fixed_tile_size =
grb::config::ANALYTIC_MODEL::MIN_TILE_SIZE;
size_t grb::internal::NONBLOCKING::num_threads = grb::config::OMP::threads();
size_t grb::internal::NONBLOCKING::num_threads; // = grb::config::OMP::threads();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's happening here btw, was this a circular dependence? (If yes, that's a straight up bug right??)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


template<>
grb::RC grb::init< grb::nonblocking >(
Expand Down