r38579 - in /packages/openblas/trunk/debian: changelog patches/bug_35_dynamic_arch.diff patches/series rules

Sun Jun 19 16:02:23 UTC 2011

Author: sylvestre
Date: Sun Jun 19 16:02:22 2011
New Revision: 38579

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38579
Log:
Fix various issues

Added:
    packages/openblas/trunk/debian/patches/bug_35_dynamic_arch.diff
Modified:
    packages/openblas/trunk/debian/changelog
    packages/openblas/trunk/debian/patches/series
    packages/openblas/trunk/debian/rules

Modified: packages/openblas/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/openblas/trunk/debian/changelog?rev=38579&op=diff
==============================================================================

--- packages/openblas/trunk/debian/changelog (original)
+++ packages/openblas/trunk/debian/changelog Sun Jun 19 16:02:22 2011
@@ -1,4 +1,4 @@
-openblas (0.1alpha1-5~exp1) UNRELEASED; urgency=low
+openblas (0.1alpha1-5~exp1) unstable; urgency=low
 
   * Good news: use DYNAMIC_ARCH=1 in the build option of OpenBLAS/Gotoblas
     to support multiple architecture. All kernel will be included in the library

Added: packages/openblas/trunk/debian/patches/bug_35_dynamic_arch.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/openblas/trunk/debian/patches/bug_35_dynamic_arch.diff?rev=38579&op=file
==============================================================================
--- packages/openblas/trunk/debian/patches/bug_35_dynamic_arch.diff (added)
+++ packages/openblas/trunk/debian/patches/bug_35_dynamic_arch.diff Sun Jun 19 16:02:22 2011
@@ -1,0 +1,121 @@
+diff --git a/Makefile.system b/Makefile.system
+index 6fb0ec8..7686c93 100644
+--- a/Makefile.system
++++ b/Makefile.system
+@@ -515,6 +515,10 @@ ifeq ($(DYNAMIC_ARCH), 1)
+ CCOMMON_OPT	+= -DDYNAMIC_ARCH
+ endif
+ 
++ifeq ($(NO_LAPACK), 1)
++CCOMMON_OPT	+= -DNO_LAPACK
++endif
++
+ ifdef SMP
+ CCOMMON_OPT	+= -DSMP_SERVER
+ 
+diff --git a/kernel/Makefile b/kernel/Makefile
+index 6084cbc..a3a32de 100644
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -53,6 +53,11 @@ SBLASOBJS	+= setparam$(TSUFFIX).$(SUFFIX)
+ CCOMMON_OPT	+= -DTS=$(TSUFFIX)
+ endif
+ 
++KERNEL_INTERFACE = ../common_level1.h ../common_level2.h ../common_level3.h 
++ifneq ($(NO_LAPACK), 1)
++KERNEL_INTERFACE += ../common_lapack.h 
++endif
++
+ ifeq ($(ARCH), x86)
+ COMMONOBJS	+= cpuid.$(SUFFIX)
+ endif
+@@ -88,9 +93,10 @@ setparam$(TSUFFIX).$(SUFFIX): setparam$(TSUFFIX).c kernel$(TSUFFIX).h
+ setparam$(TSUFFIX).c : setparam-ref.c
+ 	sed 's/TS/$(TSUFFIX)/g' $< > $(@F)
+ 
+-kernel$(TSUFFIX).h : ../common_level1.h ../common_level2.h ../common_level3.h ../common_lapack.h 
++kernel$(TSUFFIX).h : $(KERNEL_INTERFACE) 
+ 	sed 's/\ *(/$(TSUFFIX)(/g' $^ > $(@F)
+ 
++
+ cpuid.$(SUFFIX): $(KERNELDIR)/cpuid.S
+ 	$(CC) -c $(CFLAGS) $< -o $(@F)
+ 
+diff --git a/kernel/setparam-ref.c b/kernel/setparam-ref.c
+index 0ab57f3..73df762 100644
+--- a/kernel/setparam-ref.c
++++ b/kernel/setparam-ref.c
+@@ -101,7 +101,11 @@ gotoblas_t TABLE_NAME = {
+ #endif
+   ssymm_outcopyTS, ssymm_oltcopyTS,
+ 
++#ifndef NO_LAPACK
+   sneg_tcopyTS, slaswp_ncopyTS,
++#else
++  NULL,NULL,
++#endif
+ 
+   0, 0, 0,
+   DGEMM_DEFAULT_UNROLL_M, DGEMM_DEFAULT_UNROLL_N, MAX(DGEMM_DEFAULT_UNROLL_M, DGEMM_DEFAULT_UNROLL_N),
+@@ -147,7 +151,11 @@ gotoblas_t TABLE_NAME = {
+ #endif
+   dsymm_outcopyTS, dsymm_oltcopyTS,
+ 
++#ifndef NO_LAPACK
+   dneg_tcopyTS, dlaswp_ncopyTS,
++#else
++  NULL, NULL,
++#endif
+ 
+ #ifdef EXPRECISION
+ 
+@@ -286,7 +294,11 @@ gotoblas_t TABLE_NAME = {
+   chemm3m_oucopyrTS,  chemm3m_olcopyrTS,
+   chemm3m_oucopyiTS,  chemm3m_olcopyiTS,
+ 
++#ifndef NO_LAPACK
+   cneg_tcopyTS, claswp_ncopyTS,
++#else
++  NULL, NULL,
++#endif
+ 
+   0, 0, 0,
+   ZGEMM_DEFAULT_UNROLL_M, ZGEMM_DEFAULT_UNROLL_N, MAX(ZGEMM_DEFAULT_UNROLL_M, ZGEMM_DEFAULT_UNROLL_N),
+@@ -375,7 +387,11 @@ gotoblas_t TABLE_NAME = {
+   zhemm3m_oucopyrTS,  zhemm3m_olcopyrTS,
+   zhemm3m_oucopyiTS,  zhemm3m_olcopyiTS,
+ 
++#ifndef NO_LAPACK
+   zneg_tcopyTS, zlaswp_ncopyTS,
++#else
++  NULL, NULL,
++#endif
+ 
+ #ifdef EXPRECISION
+ 
+--- a/kernel/setparam-ref.c
++++ b/kernel/setparam-ref.c
+@@ -203,7 +203,11 @@ gotoblas_t TABLE_NAME = {
+ #endif
+   qsymm_outcopyTS, qsymm_oltcopyTS,
+ 
++#ifndef NO_LAPACK
+   qneg_tcopyTS, qlaswp_ncopyTS,
++#else
++  NULL, NULL,
++#endif
+ 
+ #endif
+ 
+@@ -482,7 +486,11 @@ gotoblas_t TABLE_NAME = {
+   xhemm3m_oucopyrTS,  xhemm3m_olcopyrTS,
+   xhemm3m_oucopyiTS,  xhemm3m_olcopyiTS,
+ 
++#ifndef NO_LAPACK
+   xneg_tcopyTS, xlaswp_ncopyTS,
++#else
++  NULL, NULL,
++#endif
+ 
+ #endif
+ 

Modified: packages/openblas/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/openblas/trunk/debian/patches/series?rev=38579&op=diff
==============================================================================
--- packages/openblas/trunk/debian/patches/series (original)
+++ packages/openblas/trunk/debian/patches/series Sun Jun 19 16:02:22 2011
@@ -2,3 +2,5 @@
 kfreebsd.diff
 hurd.diff
 unsupportedarch.diff
+bug_35_dynamic_arch.diff
+

Modified: packages/openblas/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/openblas/trunk/debian/rules?rev=38579&op=diff
==============================================================================
--- packages/openblas/trunk/debian/rules (original)
+++ packages/openblas/trunk/debian/rules Sun Jun 19 16:02:22 2011
@@ -24,9 +24,9 @@
 	fi;
 
 	rm libopenblas.so
-	mv libopenblas_*.so libopenblas.so.0
+	mv libopenblasp-*.so libopenblas.so.0
 	ln -s libopenblas.so.0 libopenblas.so
-	mv libopenblas_*.a libopenblas.a
+	mv libopenblasp-*.a libopenblas.a
 	touch $@
 
 custom: custom-stamp


