Merge 645eabe67f
into 608effee7b
This commit is contained in:
commit
544f630493
|
@ -48,6 +48,7 @@
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
#include <omp.h>
|
||||||
#ifndef likely
|
#ifndef likely
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
#define likely(x) __builtin_expect(!!(x), 1)
|
#define likely(x) __builtin_expect(!!(x), 1)
|
||||||
|
@ -158,6 +159,9 @@ int BLASFUNC(blas_thread_shutdown)(void){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#if defined(_OPENMP) && _OPENMP >= 201811
|
||||||
|
omp_pause_resource_all(omp_pause_hard);
|
||||||
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,10 +44,7 @@ endif
|
||||||
#this does not work with OpenMP nor with native Windows or Android threads
|
#this does not work with OpenMP nor with native Windows or Android threads
|
||||||
# FIXME TBD if this works on OSX, SunOS, POWER and zarch
|
# FIXME TBD if this works on OSX, SunOS, POWER and zarch
|
||||||
ifeq ($(OSNAME), $(filter $(OSNAME),Linux CYGWIN_NT))
|
ifeq ($(OSNAME), $(filter $(OSNAME),Linux CYGWIN_NT))
|
||||||
ifneq ($(USE_OPENMP), 1)
|
OBJS += test_fork.o test_post_fork.o
|
||||||
OBJS += test_fork.o
|
|
||||||
endif
|
|
||||||
OBJS += test_post_fork.o
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(C_COMPILER), PGI)
|
ifeq ($(C_COMPILER), PGI)
|
||||||
|
|
|
@ -64,7 +64,7 @@ static void check_dgemm(double *a, double *b, double *result, double *expected,
|
||||||
|
|
||||||
CTEST(fork, safety)
|
CTEST(fork, safety)
|
||||||
{
|
{
|
||||||
#ifndef BUILD_DOUBLE
|
#if !defined(BUILD_DOUBLE) || (defined(_OPENMP) && _OPENMP < 201811)
|
||||||
exit(0);
|
exit(0);
|
||||||
#else
|
#else
|
||||||
blasint n = 1000;
|
blasint n = 1000;
|
||||||
|
|
Loading…
Reference in New Issue