Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

openmp_wrapper.h stubs signature use __GOMP_NOTHROW #3923

Merged
merged 4 commits into from
Feb 13, 2021
Merged

openmp_wrapper.h stubs signature use __GOMP_NOTHROW #3923

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3719f1
openmp_wrapper.h stubs signature use __GOMP_NOTHROW
bsergean Feb 8, 2021
c7ec16e
move __GOMP_NOTHROW definition in the no open mp stub conditional branch
bsergean Feb 8, 2021
d1eba96
Update include/LightGBM/utils/openmp_wrapper.h
bsergean Feb 9, 2021
141250c
add NOLINT macro to disable cpplint on a safe line of code
bsergean Feb 9, 2021
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
27 changes: 22 additions & 5 deletions include/LightGBM/utils/openmp_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*/
#ifndef LIGHTGBM_OPENMP_WRAPPER_H_
#define LIGHTGBM_OPENMP_WRAPPER_H_

#ifdef _OPENMP

#include <LightGBM/utils/log.h>
Expand Down Expand Up @@ -66,6 +67,22 @@ class ThreadExceptionHelper {

#else

/*
* To be compatible with openmp, define a nothrow macro which is used by gcc
* openmp, but not by clang.
* See also https://github.com/dmlc/dmlc-core/blob/main/include/dmlc/omp.h#L14
bsergean marked this conversation as resolved.
Show resolved Hide resolved
*/
#if defined(__clang__)
#undef __GOMP_NOTHROW
#define __GOMP_NOTHROW
#elif defined(__cplusplus)
#undef __GOMP_NOTHROW
#define __GOMP_NOTHROW throw()
#else
#undef __GOMP_NOTHROW
#define __GOMP_NOTHROW __attribute__((__nothrow__))
#endif

#ifdef _MSC_VER
#pragma warning(disable : 4068) // disable unknown pragma warning
#endif
Expand All @@ -76,11 +93,11 @@ class ThreadExceptionHelper {
/** Fall here if no OPENMP support, so just
simulate a single thread running.
All #pragma omp should be ignored by the compiler **/
inline void omp_set_num_threads(int) {}
inline int omp_get_num_threads() {return 1;}
inline int omp_get_max_threads() {return 1;}
inline int omp_get_thread_num() {return 0;}
inline int OMP_NUM_THREADS() { return 1; }
inline void omp_set_num_threads(int) __GOMP_NOTHROW {}
inline int omp_get_num_threads() __GOMP_NOTHROW {return 1;}
inline int omp_get_max_threads() __GOMP_NOTHROW {return 1;}
inline int omp_get_thread_num() __GOMP_NOTHROW {return 0;}
inline int OMP_NUM_THREADS() __GOMP_NOTHROW { return 1; }
#ifdef __cplusplus
} // extern "C"
#endif
Expand Down