Browse Source

try to fix parallel archive update

pull/3981/head
Guillaume Horel 3 years ago
parent
commit
c50dd90b91
5 changed files with 23 additions and 23 deletions
  1. +1
    -1
      Makefile
  2. +7
    -7
      Makefile.tail
  3. +4
    -4
      interface/Makefile
  4. +5
    -5
      lapack-netlib/SRC/Makefile
  5. +6
    -6
      lapack-netlib/SRC/VARIANTS/Makefile

+ 1
- 1
Makefile View File

@@ -295,7 +295,7 @@ endif
-@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "override CFLAGS = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "AR = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "ARFLAGS = $(ARFLAGS) -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "ARFLAGS = $(ARFLAGS) -r" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "RANLIB = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "LAPACKLIB = ../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "TMGLIB = ../../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc


+ 7
- 7
Makefile.tail View File

@@ -43,25 +43,25 @@ $(XBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
$(SBEXTOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)

libs :: $(BLASOBJS) $(COMMONOBJS)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^
$(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $?

prof :: $(BLASOBJS_P) $(COMMONOBJS_P)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME_P) $^
$(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME_P) $?

hpl :: $(HPLOBJS) $(COMMONOBJS)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^
$(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $?

hpl_p :: $(HPLOBJS_P) $(COMMONOBJS_P)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME_P) $^
$(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME_P) $?

kernel :: $(BLASOBJS)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^
$(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $?

commonlibs :: $(COMMONOBJS)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^
$(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $?

commonprof :: $(COMMONOBJS_P)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME_P) $^
$(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME_P) $?

quick :
$(MAKE) -C $(TOPDIR) libs


+ 4
- 4
interface/Makefile View File

@@ -544,16 +544,16 @@ clean ::
@rm -f functable.h

level1 : $(SBEXTOBJS) $(SBBLAS1OBJS) $(SBLAS1OBJS) $(DBLAS1OBJS) $(QBLAS1OBJS) $(CBLAS1OBJS) $(ZBLAS1OBJS) $(XBLAS1OBJS)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^
$(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $?

level2 : $(SBBLAS2OBJS) $(SBLAS2OBJS) $(DBLAS2OBJS) $(QBLAS2OBJS) $(CBLAS2OBJS) $(ZBLAS2OBJS) $(XBLAS2OBJS)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^
$(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $?

level3 : $(SBBLAS3OBJS) $(SBLAS3OBJS) $(DBLAS3OBJS) $(QBLAS3OBJS) $(CBLAS3OBJS) $(ZBLAS3OBJS) $(XBLAS3OBJS)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^
$(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $?

aux : $(CBAUXOBJS)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^
$(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $?

$(CSBBLASOBJS) $(CSBBLASOBJS_P) $(CSBLASOBJS) $(CSBLASOBJS_P) $(CDBLASOBJS) $(CDBLASOBJS_P) $(CQBLASOBJS) $(CQBLASOBJS_P) \
$(CCBLASOBJS) $(CCBLASOBJS_P) $(CZBLASOBJS) $(CZBLASOBJS_P) $(CXBLASOBJS) $(CXBLASOBJS_P) $(CBAUXOBJS_P) : override CFLAGS += -DCBLAS


+ 5
- 5
lapack-netlib/SRC/Makefile View File

@@ -622,24 +622,24 @@ endif
all: $(LAPACKLIB)

$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED)
$(AR) $(ARFLAGS) $@ $^
$(AR) $(ARFLAGS) $@ $?
$(RANLIB) $@

.PHONY: single complex double complex16
single: $(SLASRC) $(DSLASRC) $(SXLASRC) $(SCLAUX) $(ALLAUX)
$(AR) $(ARFLAGS) $(LAPACKLIB) $^
$(AR) $(ARFLAGS) $(LAPACKLIB) $?
$(RANLIB) $(LAPACKLIB)

complex: $(CLASRC) $(ZCLASRC) $(CXLASRC) $(SCLAUX) $(ALLAUX)
$(AR) $(ARFLAGS) $(LAPACKLIB) $^
$(AR) $(ARFLAGS) $(LAPACKLIB) $?
$(RANLIB) $(LAPACKLIB)

double: $(DLASRC) $(DSLASRC) $(DXLASRC) $(DZLAUX) $(ALLAUX)
$(AR) $(ARFLAGS) $(LAPACKLIB) $^
$(AR) $(ARFLAGS) $(LAPACKLIB) $?
$(RANLIB) $(LAPACKLIB)

complex16: $(ZLASRC) $(ZCLASRC) $(ZXLASRC) $(DZLAUX) $(ALLAUX)
$(AR) $(ARFLAGS) $(LAPACKLIB) $^
$(AR) $(ARFLAGS) $(LAPACKLIB) $?
$(RANLIB) $(LAPACKLIB)

$(ALLAUX): $(FRC)


+ 6
- 6
lapack-netlib/SRC/VARIANTS/Makefile View File

@@ -35,27 +35,27 @@ QRLL = qr/LL/cgeqrf.o qr/LL/dgeqrf.o qr/LL/sgeqrf.o qr/LL/zgeqrf.o qr/LL/sceil.o
all: cholrl.a choltop.a lucr.a lull.a lurec.a qrll.a

cholrl.a: $(CHOLRL)
$(AR) $(ARFLAGS) $@ $^
$(AR) $(ARFLAGS) $@ $?
$(RANLIB) $@

choltop.a: $(CHOLTOP)
$(AR) $(ARFLAGS) $@ $^
$(AR) $(ARFLAGS) $@ $?
$(RANLIB) $@

lucr.a: $(LUCR)
$(AR) $(ARFLAGS) $@ $^
$(AR) $(ARFLAGS) $@ $?
$(RANLIB) $@

lull.a: $(LULL)
$(AR) $(ARFLAGS) $@ $^
$(AR) $(ARFLAGS) $@ $?
$(RANLIB) $@

lurec.a: $(LUREC)
$(AR) $(ARFLAGS) $@ $^
$(AR) $(ARFLAGS) $@ $?
$(RANLIB) $@

qrll.a: $(QRLL)
$(AR) $(ARFLAGS) $@ $^
$(AR) $(ARFLAGS) $@ $?
$(RANLIB) $@

.PHONY: clean cleanobj cleanlib


Loading…
Cancel
Save