Commit c7c50b76 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

OpenMP installation error [Bug #6523]

parent 2ff82d83
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
* using CDI library version 1.7.2 * using CDI library version 1.7.2
* Version 1.7.2 released * Version 1.7.2 released
2016-03-25 Uwe Schulzweida
* OpenMP installation error [Bug #6523]
2016-03-18 Uwe Schulzweida 2016-03-18 Uwe Schulzweida
* New operator: settbounds - Set time bounds * New operator: settbounds - Set time bounds
......
...@@ -1410,11 +1410,13 @@ int main(int argc, char *argv[]) ...@@ -1410,11 +1410,13 @@ int main(int argc, char *argv[])
fprintf(stderr, "OMP num procs = %d\n", omp_get_num_procs()); fprintf(stderr, "OMP num procs = %d\n", omp_get_num_procs());
fprintf(stderr, "OMP max threads = %d\n", omp_get_max_threads()); fprintf(stderr, "OMP max threads = %d\n", omp_get_max_threads());
fprintf(stderr, "OMP num threads = %d\n", omp_get_num_threads()); fprintf(stderr, "OMP num threads = %d\n", omp_get_num_threads());
#if defined(HAVE_OPENMP3)
fprintf(stderr, "OMP thread limit = %d\n", omp_get_thread_limit()); fprintf(stderr, "OMP thread limit = %d\n", omp_get_thread_limit());
omp_sched_t kind; omp_sched_t kind;
int modifer; int modifer;
omp_get_schedule(&kind, &modifer); omp_get_schedule(&kind, &modifer);
fprintf(stderr, "OMP schedule = %d (1:static; 2:dynamic; 3:guided; 4:auto)\n", (int) kind); fprintf(stderr, "OMP schedule = %d (1:static; 2:dynamic; 3:guided; 4:auto)\n", (int) kind);
#endif
#if defined(HAVE_OPENMP4) #if defined(HAVE_OPENMP4)
fprintf(stderr, "OMP proc bind = %d (0:false; 1:true; 2:master; 3:close; 4:spread)\n", (int) omp_get_proc_bind()); fprintf(stderr, "OMP proc bind = %d (0:false; 1:true; 2:master; 3:close; 4:spread)\n", (int) omp_get_proc_bind());
#if !defined(__ICC) #if !defined(__ICC)
......
...@@ -42,9 +42,22 @@ ...@@ -42,9 +42,22 @@
#include "util.h" #include "util.h"
#include "datetime.h" #include "datetime.h"
#define OPENMP4 201307 #if defined(_OPENMP)
#if defined(_OPENMP) && defined(OPENMP4) && _OPENMP >= OPENMP4 #define OPENMP3 200805
#define HAVE_OPENMP4 1 #define OPENMP4 201307
#define OPENMP45 201511
#if _OPENMP >= OPENMP3
#define HAVE_OPENMP3 1
#endif
#if _OPENMP >= OPENMP4
#define HAVE_OPENMP4 1
#endif
#if _OPENMP >= OPENMP45
#define HAVE_OPENMP45 1
#endif
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment