88 lines
3.2 KiB
Diff
88 lines
3.2 KiB
Diff
diff -up OpenBLAS-0.2.15/Makefile.system_lapack OpenBLAS-0.2.15/Makefile
|
|
--- OpenBLAS-0.2.15/Makefile.system_lapack 2015-10-27 13:44:50.000000000 -0700
|
|
+++ OpenBLAS-0.2.15/Makefile 2015-10-28 09:14:56.696685503 -0700
|
|
@@ -16,11 +16,7 @@ BLASDIRS += reference
|
|
endif
|
|
|
|
SUBDIRS = $(BLASDIRS)
|
|
-ifneq ($(NO_LAPACK), 1)
|
|
-SUBDIRS += lapack
|
|
-endif
|
|
-
|
|
-LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS))
|
|
+SUBDIRS += lapack
|
|
|
|
SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench
|
|
|
|
@@ -211,57 +207,8 @@ hpl_p :
|
|
fi; \
|
|
done
|
|
|
|
-ifeq ($(NO_LAPACK), 1)
|
|
netlib :
|
|
-
|
|
-else
|
|
-netlib : lapack_prebuild
|
|
-ifndef NOFORTRAN
|
|
- @$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib
|
|
- @$(MAKE) -C $(NETLIB_LAPACK_DIR) tmglib
|
|
-endif
|
|
-ifndef NO_LAPACKE
|
|
- @$(MAKE) -C $(NETLIB_LAPACK_DIR) lapackelib
|
|
-endif
|
|
-endif
|
|
-
|
|
-prof_lapack : lapack_prebuild
|
|
- @$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof
|
|
-
|
|
-lapack_prebuild :
|
|
-ifndef NOFORTRAN
|
|
- -@echo "FORTRAN = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc
|
|
- -@echo "OPTS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
- -@echo "POPTS = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
- -@echo "NOOPT = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
- -@echo "PNOOPT = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
- -@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
- -@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
- -@echo "override CFLAGS = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
- -@echo "ARCH = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
- -@echo "ARCHFLAGS = -ru" >> $(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
|
|
- -@echo "BLASLIB = ../../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
- -@echo "LAPACKELIB = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
- -@echo "LAPACKLIB_P = ../$(LIBNAME_P)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
- -@echo "SUFFIX = $(SUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
- -@echo "PSUFFIX = $(PSUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
- -@echo "CEXTRALIB = $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
-ifeq ($(FC), gfortran)
|
|
- -@echo "TIMER = INT_ETIME" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
-ifdef SMP
|
|
- -@echo "LOADER = $(FC) -pthread" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
-else
|
|
- -@echo "LOADER = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
-endif
|
|
-else
|
|
- -@echo "TIMER = NONE" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
- -@echo "LOADER = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
-endif
|
|
- -@cat make.inc >> $(NETLIB_LAPACK_DIR)/make.inc
|
|
-endif
|
|
+ @$(MAKE) -C $(NETLIB_LAPACK_DIR)
|
|
|
|
large.tgz :
|
|
ifndef NOFORTRAN
|
|
diff -up OpenBLAS-0.2.15/Makefile.system.system_lapack OpenBLAS-0.2.15/Makefile.system
|
|
--- OpenBLAS-0.2.15/Makefile.system.system_lapack 2015-10-27 13:44:50.000000000 -0700
|
|
+++ OpenBLAS-0.2.15/Makefile.system 2015-10-28 09:14:39.994350500 -0700
|
|
@@ -9,7 +9,7 @@ ifndef TOPDIR
|
|
TOPDIR = .
|
|
endif
|
|
|
|
-NETLIB_LAPACK_DIR = $(TOPDIR)/lapack-netlib
|
|
+NETLIB_LAPACK_DIR = $(TOPDIR)/netliblapack
|
|
|
|
# Default C compiler
|
|
# - Only set if not specified on the command line or inherited from the environment.
|