Patches for upstream

View: New views
1 Messages — Rating Filter:   Alert me  

Patches for upstream

by Sascha Manns-3 :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Hello Mates,

in openSUSE we using atm three Patches for atlas. I've attached that.
Maybe it is useful for us.
--
Sincerely Yours

Sascha Manns
openSUSE Ambassador
openSUSE Build Service
openSUSE Marketing Team
Maifeldstrasse 10
D-56 727 Mayen

Phone: +49 2651 4014045
Fax: +49 1805 019800 64392
Email: saigkill@...
Web: http://saschamanns.gulli.to
Project-Blog: http://lizards.opensuse.org/author/saigkill
Private-Blog: http://saschasbacktrace.blogspot.com
PGP-Key: B157F9C6 @ hkp://wwwkeys.pgp.net

[atlas-compiler_error_ger_SSE.patch]

diff -uNrp ATLAS/include/contrib/ATL_gemv_ger_SSE.h ATLASp/include/contrib/ATL_gemv_ger_SSE.h
--- ATLAS/include/contrib/ATL_gemv_ger_SSE.h 2009-08-06 21:10:41.000000000 +0200
+++ ATLASp/include/contrib/ATL_gemv_ger_SSE.h 2009-08-09 23:12:34.000000000 +0200
@@ -1,3 +1,8 @@
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/socket.h>
+
 #ifdef GER
 #undef NO_TRANSPOSE
 #define NO_TRANSPOSE


[atlas-compiler_errors.patch]

diff -uNrp ATLAS/src/auxil/ATL_buildinfo.c ATLASp/src/auxil/ATL_buildinfo.c
--- ATLAS/src/auxil/ATL_buildinfo.c 2009-08-06 21:10:47.000000000 +0200
+++ ATLASp/src/auxil/ATL_buildinfo.c 2009-08-09 23:19:56.000000000 +0200
@@ -1,6 +1,10 @@
 #include <stdio.h>
 #include "atlas_buildinfo.h"
 #include "atlas_cacheedge.h"
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/socket.h>
 
 void ATL_buildinfo(void)
 {
diff -uNrp ATLAS/tune/blas/gemm/usercomb.c ATLASp/tune/blas/gemm/usercomb.c
--- ATLAS/tune/blas/gemm/usercomb.c 2009-08-06 21:11:21.000000000 +0200
+++ ATLASp/tune/blas/gemm/usercomb.c 2009-08-09 23:27:03.000000000 +0200
@@ -31,6 +31,8 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
+#include <unistd.h>
+#include <sys/socket.h>
 
 int LineIsCont(char *ln)
 {
diff -uNrp ATLAS/tune/blas/gemv/gemvtune.c ATLASp/tune/blas/gemv/gemvtune.c
--- ATLAS/tune/blas/gemv/gemvtune.c 2009-08-06 21:11:21.000000000 +0200
+++ ATLASp/tune/blas/gemv/gemvtune.c 2009-08-09 23:29:25.000000000 +0200
@@ -37,6 +37,9 @@ int FAx=0, MAx=0, FAy=0, MAy=0, FAa=0, M
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/socket.h>
 
 struct FA_allocs
 {
diff -uNrp ATLAS/tune/blas/gemv/mvsearch.c ATLASp/tune/blas/gemv/mvsearch.c
--- ATLAS/tune/blas/gemv/mvsearch.c 2009-08-06 21:11:21.000000000 +0200
+++ ATLASp/tune/blas/gemv/mvsearch.c 2009-08-09 23:31:25.000000000 +0200
@@ -34,6 +34,8 @@
 #include <assert.h>
 #include "atlas_fopen.h"
 #include <string.h>
+#include <unistd.h>
+#include <sys/socket.h>
 
 #define ATL_MVIsMM(iflag_) ( ((iflag_) | 8) == (iflag_) )
 #define ATL_MVIsAxpy(iflag_) ( ((iflag_) | 16) == (iflag_) )


[atlas-suse-shared.patch]

diff -uNrp ATLAS/makes/Make.lib ATLASp/makes/Make.lib
--- ATLAS/makes/Make.lib 2009-08-06 21:10:40.000000000 +0200
+++ ATLASp/makes/Make.lib 2009-08-09 23:03:27.000000000 +0200
@@ -3,6 +3,8 @@ mySRCdir = $(SRCdir)/lib
 #
 # override with libatlas.so only when atlas is built to one lib
 #
+so_ver_major=3
+so_ver = $(so_ver_major).0
 DYNlibs = liblapack.so libf77blas.so libcblas.so libatlas.so
 PTDYNlibs = liblapack.so libptf77blas.so libptcblas.so libatlas.so
 CDYNlibs = liblapack.so libcblas.so libatlas.so
@@ -36,47 +38,81 @@ $(tarnam).tgz :
 # The following commands are to build dynamic/shared objects on Linux
 # ===================================================================
 ptshared :
- - rm -f libatlas.so liblapack.so
- $(MAKE) libatlas.so libptf77blas.so libf77blas.so \
-                libptcblas.so libcblas.so liblapack.so
+ - rm -f libatlas.so* liblapack.so* \
+                lib*blas.so* libclapack.so*
+        $(MAKE) libatlas.so libcblas.so libptf77blas.so libf77blas.so \
+                libptcblas.so liblapack.so libclapack.so
 shared :
- - rm -f libatlas.so liblapack.so
- $(MAKE) libatlas.so libf77blas.so libcblas.so liblapack.so
+        - rm -f libatlas.so liblapack.so \
+                libatlas.so.$(so_ver) liblapack.so.$(so_ver)
+        $(MAKE) libatlas.so libcblas.so libf77blas.so liblapack.so libclapack.so
+
 cptshared :
- - rm -f libatlas.so libclapack.so
- $(MAKE) libatlas.so libclapack.so libptcblas.so libcblas.so
+ - rm -f libatlas.so libclapack.so \
+                libatlas.so.$(so_ver) libclapack.so.$(so_ver)
+        $(MAKE) libatlas.so libptcblas.so libcblas.so libclapack.so
 cshared :
- - rm -f libatlas.so libclapack.so
- $(MAKE) libatlas.so libclapack.so libcblas.so
+ - rm -f libatlas.so libclapack.so \
+                libatlas.so.$(so_ver) libclapack.so.$(so_ver)
+        $(MAKE) libatlas.so libcblas.so libclapack.so
 
 libatlas.so : libatlas.a
- ld $(LDFLAGS) -shared -soname $(LIBINSTdir)/libatlas.so -o libatlas.so \
-           -rpath-link $(LIBINSTdir) \
-           --whole-archive libatlas.a --no-whole-archive -lc $(LIBS)
+ mkdir static_libs ; cd static_libs ; ar x ../libatlas.a ; cd ../
+        gcc $(LDFLAGS) -shared -Wl,-soname=libatlas.so.$(so_ver_major) \
+        -o libatlas.so.$(so_ver) static_libs/*.o -lc $(LIBS)
+        rm -rf static_libs
+        ln -s ./libatlas.so.$(so_ver) libatlas.so.$(so_ver_major)
+        ln -s ./libatlas.so.$(so_ver) libatlas.so
+
 liblapack.so : liblapack.a
- ld $(LDFLAGS) -shared -soname $(LIBINSTdir)/liblapack.so \
-            -o liblapack.so  -rpath-link $(LIBINSTdir) --whole-archive \
-           liblapack.a --no-whole-archive $(F77SYSLIB)
+ mkdir static_libs ; cd static_libs ; ar x ../liblapack.a ; cd ../
+        gcc $(LDFLAGS) -shared -Wl,-soname=liblapack.so.$(so_ver_major) \
+           -o liblapack.so.$(so_ver) static_libs/*.o $(F77SYSLIB) \
+           libf77blas.so.$(so_ver_major) libcblas.so.$(so_ver_major)
+        rm -rf static_libs
+        ln -s ./liblapack.so.$(so_ver) liblapack.so.$(so_ver_major)
+        ln -s ./liblapack.so.$(so_ver) liblapack.so
 libclapack.so : libclapack.a
- ld $(LDFLAGS) -shared -soname $(LIBINSTdir)/libclapack.so \
-           -o libclapack.so -rpath-link $(LIBINSTdir) \
-           --whole-archive libclapack.a --no-whole-archive -lc $(LIBS)
+ mkdir static_libs ; cd static_libs ; ar x ../libclapack.a ; cd ../
+        gcc $(LDFLAGS) -shared -Wl,-soname=libclapack.so.$(so_ver_major) \
+           -o libclapack.so.$(so_ver) static_libs/*.o \
+           libcblas.so.$(so_ver_major) -lc $(LIBS)
+        rm -rf static_libs
+        ln -s ./libclapack.so.$(so_ver) libclapack.so.$(so_ver_major)
+        ln -s ./libclapack.so.$(so_ver) libclapack.so
 libptf77blas.so : libptf77blas.a
- ld $(LDFLAGS) -shared -soname $(LIBINSTdir)/libptf77blas.so \
-           -o libptf77blas.so -rpath-link $(LIBINSTdir) \
-           --whole-archive libptf77blas.a --no-whole-archive $(F77SYSLIB)
+ mkdir static_libs ; cd static_libs ; ar x ../libptf77blas.a ; cd ../
+        gcc $(LDFLAGS) -shared -Wl,-soname=libptf77blas.so.$(so_ver_major) \
+          -o libptf77blas.so.$(so_ver) static_libs/*.o \
+           libatlas.so.$(so_ver) $(F77SYSLIB)
+        rm -rf static_libs
+        ln -s ./libptf77blas.so.$(so_ver) libptf77blas.so.$(so_ver_major)
+        ln -s ./libptf77blas.so.$(so_ver) libptf77blas.so
 libf77blas.so : libf77blas.a
- ld $(LDFLAGS) -shared -soname $(LIBINSTdir)/libf77blas.so \
-           -o libf77blas.so -rpath-link $(LIBINSTdir) \
-           --whole-archive libf77blas.a --no-whole-archive $(F77SYSLIB)
+ mkdir static_libs ; cd static_libs ; ar x ../libf77blas.a ; cd ../
+        gcc $(LDFLAGS) -shared -Wl,-soname=libf77blas.so.$(so_ver_major) \
+           -o libf77blas.so.$(so_ver) static_libs/*.o \
+           libatlas.so.$(so_ver) $(F77SYSLIB)
+        rm -rf static_libs
+        ln -s ./libf77blas.so.$(so_ver) libf77blas.so.$(so_ver_major)
+        ln -s ./libf77blas.so.$(so_ver) libf77blas.so
 libptcblas.so : libptcblas.a
- ld $(LDFLAGS) -shared -soname $(LIBINSTdir)/libptcblas.so \
-           -o libptcblas.so -rpath-link $(LIBINSTdir) \
-          --whole-archive libptcblas.a --no-whole-archive -lc $(LIBS)
+ mkdir static_libs ; cd static_libs ; ar x ../libptcblas.a ; cd ../
+        gcc $(LDFLAGS) -shared -Wl,-soname=libptcblas.so.$(so_ver_major) \
+           -o libptcblas.so.$(so_ver) static_libs/*.o \
+           libatlas.so.$(so_ver) -lc $(LIBS)
+        rm -rf static_libs
+        ln -s ./libptcblas.so.$(so_ver) libptcblas.so.$(so_ver_major)
+        ln -s ./libptcblas.so.$(so_ver) libptcblas.so
+
 libcblas.so : libcblas.a
- ld $(LDFLAGS) -shared -soname $(LIBINSTdir)/libcblas.so \
-           -o libcblas.so -rpath-link $(LIBINSTdir) \
-          --whole-archive libcblas.a --no-whole-archive -lc $(LIBS)
+ mkdir static_libs ; cd static_libs ; ar x ../libcblas.a ; cd ../
+        gcc $(LDFLAGS) -shared -Wl,-soname=libcblas.so.$(so_ver_major) \
+           -o libcblas.so.$(so_ver) static_libs/*.o \
+           libatlas.so.$(so_ver) -lc $(LIBS)
+        rm -rf static_libs
+        ln -s ./libcblas.so.$(so_ver) libcblas.so.$(so_ver_major)
+        ln -s ./libcblas.so.$(so_ver) libcblas.so
 
 #
 # Builds one shared lib from all ATLAS files


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Math-atlas-devel mailing list
Math-atlas-devel@...
https://lists.sourceforge.net/lists/listinfo/math-atlas-devel