From 0e6639d0fad0ba99bb3d001c5fb853906386b949 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 3 Nov 2021 20:37:31 +0100 Subject: [PATCH] Fix missing endif and rearrange for non-Linux OpenMP --- driver/others/memory.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/driver/others/memory.c b/driver/others/memory.c index c3f6269cd..becde694c 100644 --- a/driver/others/memory.c +++ b/driver/others/memory.c @@ -246,16 +246,18 @@ int get_num_procs(void) { #endif if (!nums) nums = sysconf(_SC_NPROCESSORS_CONF); -#if !defined(OS_LINUX) - return nums; -#endif + #if defined(USE_OPENMP) -/* if (omp_get_proc_bind() != omp_proc_bind_false)*/ #if _OPENMP >= 201307 nums = omp_get_num_places(); #endif return nums; #endif +#endif + +#if !defined(OS_LINUX) + return nums; +#endif #if !defined(__GLIBC_PREREQ) return nums; @@ -1813,9 +1815,7 @@ int get_num_procs(void) { #endif if (!nums) nums = sysconf(_SC_NPROCESSORS_CONF); -#if !defined(OS_LINUX) - return nums; -#endif + #if defined(USE_OPENMP) /* if (omp_get_proc_bind() != omp_proc_bind_false) */ #if_OPENMP >= 201307 @@ -1823,7 +1823,12 @@ int get_num_procs(void) { #endif return nums; #endif +#endif +#if !defined(OS_LINUX) + return nums; +#endif + #if !defined(__GLIBC_PREREQ) return nums; #else