diff options
| author | Nathan Cassereau <84033440+ncassereau-idris@users.noreply.github.com> | 2022-11-21 17:27:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-21 17:27:50 +0100 |
| commit | fa0d4f2afff73284f4b79bfebb085eed332c112f (patch) | |
| tree | 2b4f175da95f9a4097ca0ab1513b71862a9ee610 /ot/lp/network_simplex_simple_omp.h | |
| parent | e433775c2015eb85c2683b6955618c2836f001bc (diff) | |
[MRG] Replaces numpy compiler with setuptools (#409)
* Numpy ccompiler deprecation handled with setuptools ccompiler
* Remove useless OMP Macro, already provides _OPENMP
* RELEASES.md
* Remove forgotten temporary bug added for logging purposes
Diffstat (limited to 'ot/lp/network_simplex_simple_omp.h')
| -rw-r--r-- | ot/lp/network_simplex_simple_omp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ot/lp/network_simplex_simple_omp.h b/ot/lp/network_simplex_simple_omp.h index c324d4c..890b7ab 100644 --- a/ot/lp/network_simplex_simple_omp.h +++ b/ot/lp/network_simplex_simple_omp.h @@ -67,7 +67,7 @@ //#include "core.h" //#include "lmath.h" -#ifdef OMP +#ifdef _OPENMP #include <omp.h> #endif #include <cmath> @@ -254,7 +254,7 @@ namespace lemon_omp { // Reset data structures reset(); max_iter = maxiters; -#ifdef OMP +#ifdef _OPENMP if (max_threads < 0) { max_threads = omp_get_max_threads(); } @@ -513,7 +513,7 @@ namespace lemon_omp { int j; #pragma omp parallel { -#ifdef OMP +#ifdef _OPENMP int t = omp_get_thread_num(); #else int t = 0; |