floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into sandybridge

This commit is contained in:
Zaheer Chothia 2012-06-21 00:18:09 +02:00
parent e4a27d194e 037d995c4d
commit 98d004c50b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -257,12 +257,16 @@ LAPACK_URL=http://www.netlib.org/lapack/lapack-3.4.1.tgz
lapack-3.4.1.tgz : lapack-3.4.1.tgz :
ifndef NOFORTRAN ifndef NOFORTRAN
#http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
ifeq ($(OSNAME), $(filter $(OSNAME),Darwin FreeBSD NetBSD)) ifeq ($(OSNAME), $(filter $(OSNAME),Darwin NetBSD))
curl -O $(LAPACK_URL) curl -O $(LAPACK_URL)
else
ifeq ($(OSNAME), FreeBSD)
fetch $(LAPACK_URL)
else else
wget $(LAPACK_URL) wget $(LAPACK_URL)
endif endif
endif endif
endif
large.tgz : large.tgz :
ifndef NOFORTRAN ifndef NOFORTRAN

2
common_thread.h
View File

@ -135,7 +135,7 @@ static __inline int num_cpu_avail(int level) {
int openmp_nthreads=0; int openmp_nthreads=0;
#endif #endif
if ((blas_cpu_number == 1) if (blas_cpu_number == 1
#ifdef USE_OPENMP #ifdef USE_OPENMP
|| omp_in_parallel() || omp_in_parallel()