Lines 1-5
Link Here
|
1 |
--- Makefile.orig 2011-09-18 17:57:28.000000000 +0900 |
1 |
--- Makefile.orig 2012-03-04 22:09:49.000000000 +0900 |
2 |
+++ Makefile 2012-02-12 21:30:02.000000000 +0900 |
2 |
+++ Makefile 2012-03-04 22:15:17.000000000 +0900 |
3 |
@@ -34,7 +34,7 @@ |
3 |
@@ -34,7 +34,7 @@ |
4 |
@echo " OpenBLAS build complete." |
4 |
@echo " OpenBLAS build complete." |
5 |
@echo |
5 |
@echo |
Lines 9-48
Link Here
|
9 |
ifndef BINARY64 |
9 |
ifndef BINARY64 |
10 |
@echo " BINARY ... 32bit " |
10 |
@echo " BINARY ... 32bit " |
11 |
else |
11 |
else |
12 |
@@ -195,47 +195,42 @@ |
12 |
@@ -202,47 +202,42 @@ |
13 |
netlib : |
13 |
netlib : |
14 |
|
14 |
|
15 |
else |
15 |
else |
16 |
-netlib : lapack-3.1.1 patch.for_lapack-3.1.1 lapack-3.1.1/make.inc |
16 |
-netlib : lapack-3.4.0 patch.for_lapack-3.4.0 lapack-3.4.0/make.inc |
17 |
+netlib : lapack-%%LAPACKVER%% patch.for_lapack-%%LAPACKVER%% lapack-%%LAPACKVER%%/make.inc |
17 |
+netlib : lapack-%%LAPACKVER%% patch.for_lapack-%%LAPACKVER%% lapack-%%LAPACKVER%%/make.inc |
18 |
ifndef NOFORTRAN |
18 |
ifndef NOFORTRAN |
19 |
- -@$(MAKE) -C lapack-3.1.1 lapacklib |
19 |
- -@$(MAKE) -C lapack-3.4.0 lapacklib |
20 |
+ -@$(MAKE) -C lapack-%%LAPACKVER%% lapacklib |
20 |
+ -@$(MAKE) -C lapack-%%LAPACKVER%% lapacklib |
21 |
endif |
21 |
endif |
22 |
endif |
22 |
endif |
23 |
|
23 |
|
24 |
-prof_lapack : lapack-3.1.1 lapack-3.1.1/make.inc |
24 |
-prof_lapack : lapack-3.4.0 lapack-3.4.0/make.inc |
25 |
- -@$(MAKE) -C lapack-3.1.1 lapack_prof |
25 |
- -@$(MAKE) -C lapack-3.4.0 lapack_prof |
26 |
+prof_lapack : lapack-%%LAPACKVER%% lapack-%%LAPACKVER%%/make.inc |
26 |
+prof_lapack : lapack-%%LAPACKVER%% lapack-%%LAPACKVER%%/make.inc |
27 |
+ -@$(MAKE) -C lapack-%%LAPACKVER%% lapack_prof |
27 |
+ -@$(MAKE) -C lapack-%%LAPACKVER%% lapack_prof |
28 |
|
28 |
|
29 |
-lapack-3.1.1/make.inc : |
29 |
-lapack-3.4.0/make.inc : |
30 |
+lapack-%%LAPACKVER%%/make.inc : |
30 |
+lapack-%%LAPACKVER%%/make.inc : |
31 |
ifndef NOFORTRAN |
31 |
ifndef NOFORTRAN |
32 |
- -@echo "FORTRAN = $(FC)" > lapack-3.1.1/make.inc |
32 |
- -@echo "FORTRAN = $(FC)" > lapack-3.4.0/make.inc |
33 |
- -@echo "OPTS = $(FFLAGS)" >> lapack-3.1.1/make.inc |
33 |
- -@echo "OPTS = $(FFLAGS)" >> lapack-3.4.0/make.inc |
34 |
- -@echo "POPTS = $(FPFLAGS)" >> lapack-3.1.1/make.inc |
34 |
- -@echo "POPTS = $(FPFLAGS)" >> lapack-3.4.0/make.inc |
35 |
- -@echo "NOOPT = $(FFLAGS) -O0" >> lapack-3.1.1/make.inc |
35 |
- -@echo "NOOPT = $(FFLAGS) -O0" >> lapack-3.4.0/make.inc |
36 |
- -@echo "PNOOPT = $(FPFLAGS) -O0" >> lapack-3.1.1/make.inc |
36 |
- -@echo "PNOOPT = $(FPFLAGS) -O0" >> lapack-3.4.0/make.inc |
37 |
- -@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> lapack-3.1.1/make.inc |
37 |
- -@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> lapack-3.4.0/make.inc |
38 |
- -@echo "ARCH = $(AR)" >> lapack-3.1.1/make.inc |
38 |
- -@echo "ARCH = $(AR)" >> lapack-3.4.0/make.inc |
39 |
- -@echo "RANLIB = $(RANLIB)" >> lapack-3.1.1/make.inc |
39 |
- -@echo "RANLIB = $(RANLIB)" >> lapack-3.4.0/make.inc |
40 |
- -@echo "LAPACKLIB = ../$(LIBNAME)" >> lapack-3.1.1/make.inc |
40 |
- -@echo "LAPACKLIB = ../$(LIBNAME)" >> lapack-3.4.0/make.inc |
41 |
- -@echo "LAPACKLIB_P = ../$(LIBNAME_P)" >> lapack-3.1.1/make.inc |
41 |
- -@echo "LAPACKLIB_P = ../$(LIBNAME_P)" >> lapack-3.4.0/make.inc |
42 |
- -@echo "SUFFIX = $(SUFFIX)" >> lapack-3.1.1/make.inc |
42 |
- -@echo "SUFFIX = $(SUFFIX)" >> lapack-3.4.0/make.inc |
43 |
- -@echo "PSUFFIX = $(PSUFFIX)" >> lapack-3.1.1/make.inc |
43 |
- -@echo "PSUFFIX = $(PSUFFIX)" >> lapack-3.4.0/make.inc |
44 |
-# -@echo "CEXTRALIB = $(CEXTRALIB)" >> lapack-3.1.1/make.inc |
44 |
-# -@echo "CEXTRALIB = $(CEXTRALIB)" >> lapack-3.4.0/make.inc |
45 |
- -@cat make.inc >> lapack-3.1.1/make.inc |
45 |
- -@cat make.inc >> lapack-3.4.0/make.inc |
46 |
+ -@echo "FORTRAN = $(FC)" > lapack-%%LAPACKVER%%/make.inc |
46 |
+ -@echo "FORTRAN = $(FC)" > lapack-%%LAPACKVER%%/make.inc |
47 |
+ -@echo "OPTS = $(FFLAGS)" >> lapack-%%LAPACKVER%%/make.inc |
47 |
+ -@echo "OPTS = $(FFLAGS)" >> lapack-%%LAPACKVER%%/make.inc |
48 |
+ -@echo "POPTS = $(FPFLAGS)" >> lapack-%%LAPACKVER%%/make.inc |
48 |
+ -@echo "POPTS = $(FPFLAGS)" >> lapack-%%LAPACKVER%%/make.inc |
Lines 59-97
Link Here
|
59 |
+ -@cat make.inc >> lapack-%%LAPACKVER%%/make.inc |
59 |
+ -@cat make.inc >> lapack-%%LAPACKVER%%/make.inc |
60 |
endif |
60 |
endif |
61 |
|
61 |
|
62 |
-lapack-3.1.1 : lapack-3.1.1.tgz |
62 |
-lapack-3.4.0 : lapack-3.4.0.tgz |
63 |
+lapack-%%LAPACKVER%% : lapack-%%LAPACKVER%%.tgz |
63 |
+lapack-%%LAPACKVER%% : lapack-%%LAPACKVER%%.tgz |
64 |
ifndef NOFORTRAN |
64 |
ifndef NOFORTRAN |
65 |
- @if test `$(MD5SUM) lapack-3.1.1.tgz | $(AWK) '{print $$1}'` = 00b21551a899bcfbaa7b8443e1faeef9; then \ |
65 |
- @if test `$(MD5SUM) lapack-3.4.0.tgz | $(AWK) '{print $$1}'` = 02d5706ec03ba885fc246e5fa10d8c70; then \ |
66 |
- echo $(TAR) zxf $< ;\ |
66 |
- echo $(TAR) zxf $< ;\ |
67 |
- $(TAR) zxf $< && (cd lapack-3.1.1; $(PATCH) -p1 < ../patch.for_lapack-3.1.1) ;\ |
67 |
- $(TAR) zxf $< && (cd lapack-3.4.0; $(PATCH) -p1 < ../patch.for_lapack-3.4.0) ;\ |
68 |
- else \ |
68 |
- else \ |
69 |
- echo " lapack-3.1.1.tgz check sum is wrong (Please use orignal)." ;\ |
69 |
- echo " lapack-3.4.0.tgz check sum is wrong (Please use orignal)." ;\ |
70 |
- rm -rf lapack-3.1.1 ;\ |
70 |
- rm -rf lapack-3.4.0 ;\ |
71 |
- fi |
71 |
- fi |
72 |
+ echo $(TAR) zxf $< ;\ |
72 |
+ echo $(TAR) zxf $< ;\ |
73 |
+ $(TAR) zxf $< && (cd lapack-%%LAPACKVER%%; $(PATCH) -p1 < ../patch.for_lapack-%%LAPACKVER%%) |
73 |
+ $(TAR) zxf $< && (cd lapack-%%LAPACKVER%%; $(PATCH) -p1 < ../patch.for_lapack-%%LAPACKVER%%) |
74 |
endif |
74 |
endif |
75 |
|
75 |
|
76 |
-lapack-3.1.1.tgz : |
76 |
-lapack-3.4.0.tgz : |
77 |
+lapack-%%LAPACKVER%%.tgz : |
77 |
+lapack-%%LAPACKVER%%.tgz : |
78 |
ifndef NOFORTRAN |
78 |
ifndef NOFORTRAN |
79 |
- -wget http://www.netlib.org/lapack/lapack-3.1.1.tgz |
79 |
- -wget http://www.netlib.org/lapack/lapack-3.4.0.tgz |
80 |
+ -wget http://www.netlib.org/lapack/lapack-%%LAPACKVER%%.tgz |
80 |
+ -wget http://www.netlib.org/lapack/lapack-%%LAPACKVER%%.tgz |
81 |
endif |
81 |
endif |
82 |
|
82 |
|
83 |
large.tgz : |
83 |
large.tgz : |
84 |
@@ -248,21 +243,21 @@ |
84 |
@@ -255,21 +250,21 @@ |
85 |
-wget http://www.netlib.org/lapack/timing/timing.tgz |
85 |
-wget http://www.netlib.org/lapack/timing/timing.tgz |
86 |
endif |
86 |
endif |
87 |
|
87 |
|
88 |
-lapack-timing : lapack-3.1.1 large.tgz timing.tgz |
88 |
-lapack-timing : lapack-3.4.0 large.tgz timing.tgz |
89 |
+lapack-timing : lapack-%%LAPACKVER%% large.tgz timing.tgz |
89 |
+lapack-timing : lapack-%%LAPACKVER%% large.tgz timing.tgz |
90 |
ifndef NOFORTRAN |
90 |
ifndef NOFORTRAN |
91 |
- (cd lapack-3.1.1; $(TAR) zxf ../timing.tgz TIMING) |
91 |
- (cd lapack-3.4.0; $(TAR) zxf ../timing.tgz TIMING) |
92 |
- (cd lapack-3.1.1/TIMING; $(TAR) zxf ../../large.tgz ) |
92 |
- (cd lapack-3.4.0/TIMING; $(TAR) zxf ../../large.tgz ) |
93 |
- make -C lapack-3.1.1 tmglib |
93 |
- make -C lapack-3.4.0 tmglib |
94 |
- make -C lapack-3.1.1/TIMING |
94 |
- make -C lapack-3.4.0/TIMING |
95 |
+ (cd lapack-%%LAPACKVER%%; $(TAR) zxf ../timing.tgz TIMING) |
95 |
+ (cd lapack-%%LAPACKVER%%; $(TAR) zxf ../timing.tgz TIMING) |
96 |
+ (cd lapack-%%LAPACKVER%%/TIMING; $(TAR) zxf ../../large.tgz ) |
96 |
+ (cd lapack-%%LAPACKVER%%/TIMING; $(TAR) zxf ../../large.tgz ) |
97 |
+ make -C lapack-%%LAPACKVER%% tmglib |
97 |
+ make -C lapack-%%LAPACKVER%% tmglib |
Lines 100-110
Link Here
|
100 |
|
100 |
|
101 |
|
101 |
|
102 |
lapack-test : |
102 |
lapack-test : |
103 |
- $(MAKE) -C lapack-3.1.1 tmglib |
103 |
- $(MAKE) -C lapack-3.4.0 tmglib |
104 |
- $(MAKE) -C lapack-3.1.1/TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintstds xlintsts xlintstz xlintstzc |
104 |
- $(MAKE) -C lapack-3.4.0/TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintstds xlintsts xlintstz xlintstzc |
105 |
- @rm -f lapack-3.1.1/TESTING/*.out |
105 |
- @rm -f lapack-3.4.0/TESTING/*.out |
106 |
- $(MAKE) -j 1 -C lapack-3.1.1/TESTING |
106 |
- $(MAKE) -j 1 -C lapack-3.4.0/TESTING |
107 |
- $(GREP) failed lapack-3.1.1/TESTING/*.out |
107 |
- $(GREP) failed lapack-3.4.0/TESTING/*.out |
108 |
+ $(MAKE) -C lapack-%%LAPACKVER%% tmglib |
108 |
+ $(MAKE) -C lapack-%%LAPACKVER%% tmglib |
109 |
+ $(MAKE) -C lapack-%%LAPACKVER%%/TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintstds xlintsts xlintstz xlintstzc |
109 |
+ $(MAKE) -C lapack-%%LAPACKVER%%/TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintstds xlintsts xlintstz xlintstzc |
110 |
+ @rm -f lapack-%%LAPACKVER%%/TESTING/*.out |
110 |
+ @rm -f lapack-%%LAPACKVER%%/TESTING/*.out |
Lines 113-125
Link Here
|
113 |
|
113 |
|
114 |
dummy : |
114 |
dummy : |
115 |
|
115 |
|
116 |
@@ -280,9 +275,10 @@ |
116 |
@@ -287,9 +282,10 @@ |
117 |
#endif |
117 |
#endif |
118 |
@rm -f *.$(LIBSUFFIX) *.so *~ *.exe getarch getarch_2nd *.dll *.lib *.$(SUFFIX) *.dwf libopenblas.$(LIBSUFFIX) libopenblas_p.$(LIBSUFFIX) *.lnk myconfig.h |
118 |
@rm -f *.$(LIBSUFFIX) *.so *~ *.exe getarch getarch_2nd *.dll *.lib *.$(SUFFIX) *.dwf libopenblas.$(LIBSUFFIX) libopenblas_p.$(LIBSUFFIX) *.lnk myconfig.h |
119 |
@rm -f Makefile.conf config.h Makefile_kernel.conf config_kernel.h st* *.dylib |
119 |
@rm -f Makefile.conf config.h Makefile_kernel.conf config_kernel.h st* *.dylib |
120 |
- @if test -d lapack-3.1.1; then \ |
120 |
- @if test -d lapack-3.4.0; then \ |
121 |
- echo deleting lapack-3.1.1; \ |
121 |
- echo deleting lapack-3.4.0; \ |
122 |
- rm -rf lapack-3.1.1 ;\ |
122 |
- rm -rf lapack-3.4.0 ;\ |
123 |
+ @if test -d lapack-%%LAPACKVER%%; then \ |
123 |
+ @if test -d lapack-%%LAPACKVER%%; then \ |
124 |
+ echo deleting lapack-%%LAPACKVER%%; \ |
124 |
+ echo deleting lapack-%%LAPACKVER%%; \ |
125 |
+ rm -rf lapack-%%LAPACKVER%% ;\ |
125 |
+ rm -rf lapack-%%LAPACKVER%% ;\ |