|
 |
17b272 |
diff --git a/Makefile b/Makefile
|
|
|
17b272 |
index e113026..ae8f7de 100644
|
|
|
17b272 |
--- a/Makefile
|
|
|
17b272 |
+++ b/Makefile
|
|
|
17b272 |
@@ -12,9 +12,6 @@ BLASDIRS += reference
|
|
|
c65734 |
endif
|
|
|
c65734 |
|
|
|
c65734 |
SUBDIRS = $(BLASDIRS)
|
|
|
c65734 |
-ifneq ($(NO_LAPACK), 1)
|
|
|
c65734 |
-SUBDIRS += lapack
|
|
|
c65734 |
-endif
|
|
|
c65734 |
|
|
|
17b272 |
RELA =
|
|
|
17b272 |
ifeq ($(BUILD_RELAPACK), 1)
|
|
|
17b272 |
@@ -32,8 +29,6 @@ export NOFORTRAN
|
|
|
17b272 |
export NO_LAPACK
|
|
|
17b272 |
endif
|
|
|
17b272 |
|
|
|
17b272 |
-LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS))
|
|
|
17b272 |
-
|
|
|
17b272 |
SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench cpp_thread_test
|
|
|
c65734 |
|
|
|
17b272 |
.PHONY : all libs netlib $(RELA) test ctest shared install
|
|
|
17b272 |
@@ -235,76 +230,8 @@ hpl_p :
|
|
|
c65734 |
fi; \
|
|
|
c65734 |
done
|
|
|
c65734 |
|
|
|
c65734 |
-ifeq ($(NO_LAPACK), 1)
|
|
|
c65734 |
netlib :
|
|
|
c65734 |
-
|
|
|
c65734 |
-else
|
|
|
c65734 |
-netlib : lapack_prebuild
|
|
|
17b272 |
-ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
|
|
|
c65734 |
- @$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib
|
|
|
c65734 |
- @$(MAKE) -C $(NETLIB_LAPACK_DIR) tmglib
|
|
|
c65734 |
-endif
|
|
|
c65734 |
-ifndef NO_LAPACKE
|
|
|
c65734 |
- @$(MAKE) -C $(NETLIB_LAPACK_DIR) lapackelib
|
|
|
c65734 |
-endif
|
|
|
c65734 |
-endif
|
|
|
c65734 |
-
|
|
|
17b272 |
-ifeq ($(NO_LAPACK), 1)
|
|
|
17b272 |
-re_lapack :
|
|
|
17b272 |
-
|
|
|
17b272 |
-else
|
|
|
17b272 |
-re_lapack :
|
|
|
17b272 |
- @$(MAKE) -C relapack
|
|
|
17b272 |
-endif
|
|
|
17b272 |
-
|
|
|
c65734 |
-prof_lapack : lapack_prebuild
|
|
|
c65734 |
- @$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof
|
|
|
c65734 |
-
|
|
|
c65734 |
-lapack_prebuild :
|
|
|
17b272 |
-ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
|
|
|
17b272 |
- -@echo "FC = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
17b272 |
- -@echo "FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
17b272 |
- -@echo "FFLAGS_DRV = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
c65734 |
- -@echo "POPTS = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
17b272 |
- -@echo "FFLAGS_NOOPT = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
c65734 |
- -@echo "PNOOPT = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
17b272 |
- -@echo "LDFLAGS = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
c65734 |
- -@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
c65734 |
- -@echo "override CFLAGS = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
17b272 |
- -@echo "AR = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
17b272 |
- -@echo "ARFLAGS = $(ARFLAGS) -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
c65734 |
- -@echo "RANLIB = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
17b272 |
- -@echo "LAPACKLIB = ../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
17b272 |
- -@echo "TMGLIB = ../../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
c65734 |
- -@echo "BLASLIB = ../../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
17b272 |
- -@echo "LAPACKELIB = ../../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
c65734 |
- -@echo "LAPACKLIB_P = ../$(LIBNAME_P)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
c65734 |
- -@echo "SUFFIX = $(SUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
c65734 |
- -@echo "PSUFFIX = $(PSUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
c65734 |
- -@echo "CEXTRALIB = $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
17b272 |
-ifeq ($(F_COMPILER), GFORTRAN)
|
|
|
c65734 |
- -@echo "TIMER = INT_ETIME" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
c65734 |
-ifdef SMP
|
|
|
17b272 |
-ifeq ($(OSNAME), WINNT)
|
|
|
17b272 |
- -@echo "LOADER = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
17b272 |
-else ifeq ($(OSNAME), Haiku)
|
|
|
17b272 |
- -@echo "LOADER = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
17b272 |
-else
|
|
|
c65734 |
- -@echo "LOADER = $(FC) -pthread" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
17b272 |
-endif
|
|
|
c65734 |
-else
|
|
|
c65734 |
- -@echo "LOADER = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
c65734 |
-endif
|
|
|
c65734 |
-else
|
|
|
c65734 |
- -@echo "TIMER = NONE" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
c65734 |
- -@echo "LOADER = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
c65734 |
-endif
|
|
|
17b272 |
-ifeq ($(BUILD_LAPACK_DEPRECATED), 1)
|
|
|
17b272 |
- -@echo "BUILD_DEPRECATED = 1" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
17b272 |
-endif
|
|
|
17b272 |
- -@echo "LAPACKE_WITH_TMG = 1" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
c65734 |
- -@cat make.inc >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
|
c65734 |
-endif
|
|
|
c65734 |
+ @$(MAKE) -C $(NETLIB_LAPACK_DIR)
|
|
|
c65734 |
|
|
|
c65734 |
large.tgz :
|
|
|
17b272 |
ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
|
|
|
17b272 |
diff --git a/Makefile.system b/Makefile.system
|
|
|
17b272 |
index 8d78b42..47d8eec 100644
|
|
|
17b272 |
--- a/Makefile.system
|
|
|
17b272 |
+++ b/Makefile.system
|
|
|
17b272 |
@@ -31,7 +31,7 @@ else ifeq ($(ARCH), zarch)
|
|
|
17b272 |
override ARCH=zarch
|
|
|
c65734 |
endif
|
|
|
c65734 |
|
|
|
c65734 |
-NETLIB_LAPACK_DIR = $(TOPDIR)/lapack-netlib
|
|
|
c65734 |
+NETLIB_LAPACK_DIR = $(TOPDIR)/netliblapack
|
|
|
c65734 |
|
|
|
c65734 |
# Default C compiler
|
|
|
c65734 |
# - Only set if not specified on the command line or inherited from the environment.
|