From 56d3d1039c945d630da3187a7e86d8c25b325340 Mon Sep 17 00:00:00 2001 From: frjohnst Date: Wed, 15 May 2024 09:44:29 -0400 Subject: [PATCH 1/2] Revert "resolve second_ conflict which breaks xlf timef" This reverts commit 9b24b3141985de115e6191b376b435117a32404a. It turns out that PRs 4515 and 4520 break the tests under lapack-netlib/TESTING which require SECOND and DSECND. IBM has decided this is a bigger biger problem than the conflict between lapack second_ and the xlf run time. --- lapack-netlib/SRC/Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lapack-netlib/SRC/Makefile b/lapack-netlib/SRC/Makefile index 205a32d31b..de22427016 100644 --- a/lapack-netlib/SRC/Makefile +++ b/lapack-netlib/SRC/Makefile @@ -101,10 +101,8 @@ SCLAUX = la_constants.o \ slaset.o slasq1.o slasq2.o slasq3.o slasq4.o slasq5.o slasq6.o \ slasr.o slasrt.o slassq.o slasv2.o spttrf.o sstebz.o sstedc.o \ ssteqr.o ssterf.o slaisnan.o sisnan.o \ - slartgp.o slartgs.o scombssq.o ../INSTALL/sroundup_lwork.o -ifneq ($(F_COMPILER), IBM) -SCLAUX += ../INSTALL/second_$(TIMER).o -endif + slartgp.o slartgs.o scombssq.o ../INSTALL/sroundup_lwork.o \ + ../INSTALL/second_$(TIMER).o endif ifneq "$(or $(BUILD_DOUBLE),$(BUILD_COMPLEX16))" "" @@ -126,10 +124,7 @@ DZLAUX = la_constants.o\ dlasr.o dlasrt.o dlassq.o dlasv2.o dpttrf.o dstebz.o dstedc.o \ dsteqr.o dsterf.o dlaisnan.o disnan.o \ dlartgp.o dlartgs.o ../INSTALL/droundup_lwork.o \ - ../INSTALL/dlamch.o -ifneq ($(F_COMPILER), IBM) -DZLAUX += ../INSTALL/dsecnd_$(TIMER).o -endif + ../INSTALL/dlamch.o ../INSTALL/dsecnd_$(TIMER).o endif #ifeq ($(BUILD_SINGLE),1) From 87026ac1b17491aa16eb9cda53945980cfe20bb6 Mon Sep 17 00:00:00 2001 From: frjohnst Date: Wed, 15 May 2024 09:45:17 -0400 Subject: [PATCH 2/2] Revert "fix conlict between PR 4515 and AIX shared obj support" This reverts commit bdaa6705ca7b0031223417402e3f87e85fef86ac. It turns out that PRs 4515 and 4520 break the tests under lapack-netlib/TESTING which require SECOND and DSECND. IBM has decided this is a bigger biger problem than the conflict between lapack second_ and the xlf run time. --- exports/Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/exports/Makefile b/exports/Makefile index 457e59b2c8..668a4866e8 100644 --- a/exports/Makefile +++ b/exports/Makefile @@ -315,11 +315,6 @@ test : linktest.c linktest.c : $(GENSYM) ../Makefile.system ../getarch.c ./$(GENSYM) linktest $(ARCH) "$(BU)" $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_BFLOAT16) $(BUILD_SINGLE) $(BUILD_DOUBLE) $(BUILD_COMPLEX) $(BUILD_COMPLEX16) > linktest.c -ifeq ($(F_COMPILER), IBM) - mv linktest.c linktest.c.FIRST - egrep -v 'second_|dsecnd_' linktest.c.FIRST > linktest.c - rm linktest.c.FIRST -endif clean :: @rm -f *.def *.dylib __.SYMDEF* *.renamed