diff options
| author | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2017-03-10 17:22:47 +0000 |
|---|---|---|
| committer | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2017-03-10 17:22:47 +0000 |
| commit | b61de7c64afe492304a2777fcca2989898556d6c (patch) | |
| tree | ece34c6f1fd7993cfecc33ce53b15d3742828452 | |
| parent | bff1acca47cf01f620c80b8a38cd1ecbb91d7101 (diff) | |
| download | openmp_llvm-b61de7c64afe492304a2777fcca2989898556d6c.tar.gz | |
Fix assertion failure when 'proclist' is used without 'explicit' in KMP_AFFINITY
This change fixes an assertion failure the in case KMP_AFFINITY is set with
'proclist' specified but without 'explicit'
e.g., KMP_AFFINITY=verbose,proclist=[0-31]
Patch by Olga Malysheva
Differential Revision: https://reviews.llvm.org/D30404
git-svn-id: https://llvm.org/svn/llvm-project/openmp/trunk@297480 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | runtime/src/kmp_settings.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/runtime/src/kmp_settings.cpp b/runtime/src/kmp_settings.cpp index 3f8ec39..3d6bd4e 100644 --- a/runtime/src/kmp_settings.cpp +++ b/runtime/src/kmp_settings.cpp @@ -2240,9 +2240,12 @@ __kmp_parse_affinity_env( char const * name, char const * value, if ( proclist ) { if ( ! type ) { KMP_WARNING( AffProcListNoType, name ); - __kmp_affinity_type = affinity_explicit; + *out_type = affinity_explicit; +# if OMP_40_ENABLED + __kmp_nested_proc_bind.bind_types[0] = proc_bind_intel; +# endif } - else if ( __kmp_affinity_type != affinity_explicit ) { + else if ( *out_type != affinity_explicit ) { KMP_WARNING( AffProcListNotExplicit, name ); KMP_ASSERT( *out_proclist != NULL ); KMP_INTERNAL_FREE( *out_proclist ); |