Skip to content

Commit 3e030cc

Browse files
author
Chip-Kerchner
committed
Fix LAPACK unit testing build issues. Limit AIX builds to 32 threads (to eliminate failures of some systems).
1 parent 6699227 commit 3e030cc

3 files changed

Lines changed: 10 additions & 1 deletion

File tree

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,12 @@ endif
316316
-@echo "PNOOPT = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc
317317
ifeq ($(C_COMPILER)$(F_COMPILER)$(USE_OPENMP), CLANGGFORTRAN1)
318318
-@echo "LDFLAGS = $(FFLAGS) $(EXTRALIB) -lomp" >> $(NETLIB_LAPACK_DIR)/make.inc
319+
else
320+
ifeq ($(C_COMPILER)$(F_COMPILER)$(USE_OPENMP), CLANGIBM1)
321+
-@echo "LDFLAGS = $(FFLAGS) $(EXTRALIB) -lomp" >> $(NETLIB_LAPACK_DIR)/make.inc
319322
else
320323
-@echo "LDFLAGS = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
324+
endif
321325
endif
322326
-@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
323327
-@echo "override CFLAGS = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc

Makefile.system

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1181,7 +1181,7 @@ ifeq ($(F_COMPILER), IBM)
11811181
CCOMMON_OPT += -DF_INTERFACE_IBM
11821182
FEXTRALIB += -lxlf90
11831183
ifeq ($(C_COMPILER), $(filter $(C_COMPILER),GCC CLANG))
1184-
FCOMMON_OPT += -qextname
1184+
FCOMMON_OPT += -qextname -qzerosize
11851185
endif
11861186
# FCOMMON_OPT += -qarch=440
11871187
ifdef BINARY64

getarch.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2006,8 +2006,13 @@ printf("ELF_VERSION=2\n");
20062006
#endif
20072007
#elif NO_PARALLEL_MAKE==1
20082008
printf("MAKEFLAGS += -j 1\n");
2009+
#else
2010+
#ifdef _AIX
2011+
int count = get_num_cores();
2012+
printf("MAKEFLAGS += -j %d\n", (count > 32) ? 32 : count);
20092013
#else
20102014
printf("MAKEFLAGS += -j %d\n", get_num_cores());
2015+
#endif
20112016
#endif
20122017

20132018
break;

0 commit comments

Comments
 (0)