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

Merge pull request #3983 from thrasibule/makeflags 

parallel build fixes
This commit is contained in:
Martin Kroeker 2023-04-16 13:49:05 +02:00 committed by GitHub
parent 73e6fcb925 397108fba2
commit a44422f0d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -40,9 +40,9 @@ LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast -O -Og -Os,$(LAPACK_FFLAGS))
SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench cpp_thread_test SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench cpp_thread_test
.PHONY : all libs netlib $(RELA) test ctest shared install .PHONY : all libs netlib $(RELA) test ctest shared install
.NOTPARALLEL : all libs $(RELA) prof lapack-test install blas-test .NOTPARALLEL : shared
all :: libs netlib $(RELA) tests shared all :: tests
@echo @echo
@echo " OpenBLAS build complete. ($(LIB_COMPONENTS))" @echo " OpenBLAS build complete. ($(LIB_COMPONENTS))"
@echo @echo
@ -150,7 +150,7 @@ ifeq ($(OSNAME), CYGWIN_NT)
endif endif
endif endif
tests : libs netlib $(RELA) shared tests : shared
ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN))) ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
touch $(LIBNAME) touch $(LIBNAME)
ifndef NO_FBLAS ifndef NO_FBLAS

6
getarch.c
View File

@ -1930,15 +1930,15 @@ printf("ELF_VERSION=2\n");
#ifdef MAKE_NB_JOBS #ifdef MAKE_NB_JOBS
#if MAKE_NB_JOBS > 0 #if MAKE_NB_JOBS > 0
printf("MAKE += -j %d\n", MAKE_NB_JOBS); printf("MAKEFLAGS += -j %d\n", MAKE_NB_JOBS);
#else #else
// Let make use parent -j argument or -j1 if there // Let make use parent -j argument or -j1 if there
// is no make parent // is no make parent
#endif #endif
#elif NO_PARALLEL_MAKE==1 #elif NO_PARALLEL_MAKE==1
printf("MAKE += -j 1\n"); printf("MAKEFLAGS += -j 1\n");
#else #else
printf("MAKE += -j %d\n", get_num_cores()); printf("MAKEFLAGS += -j %d\n", get_num_cores());
#endif #endif
break; break;