r36302 - in /packages/atlas/trunk/debian: changelog patches/randomCrashOnBuild.diff rules
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Wed Mar 24 07:30:52 UTC 2010
Author: sylvestre
Date: Wed Mar 24 07:30:50 2010
New Revision: 36302
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36302
Log:
* Put back randomCrashOnBuild.diff. It was not the reason
* Disable modification introduced in 3.8.3-14 about DEB_SHLIBDEPS_INCLUDE
and put back LD_LIBRARY_PATH=/debian/tmp/usr/lib/atlas-base/
(Closes: #574999)
Added:
packages/atlas/trunk/debian/patches/randomCrashOnBuild.diff
Modified:
packages/atlas/trunk/debian/changelog
packages/atlas/trunk/debian/rules
Modified: packages/atlas/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/changelog?rev=36302&op=diff
==============================================================================
--- packages/atlas/trunk/debian/changelog (original)
+++ packages/atlas/trunk/debian/changelog Wed Mar 24 07:30:50 2010
@@ -1,3 +1,12 @@
+atlas (3.8.3-16) experimental; urgency=low
+
+ * Put back randomCrashOnBuild.diff. It was not the reason
+ * Disable modification introduced in 3.8.3-14 about DEB_SHLIBDEPS_INCLUDE
+ and put back LD_LIBRARY_PATH=$(CURDIR)/debian/tmp/usr/lib/atlas-base/
+ (Closes: #574999)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 23 Mar 2010 15:11:12 +0100
+
atlas (3.8.3-15) experimental; urgency=low
* randomCrashOnBuild.diff was crashing many builds
Added: packages/atlas/trunk/debian/patches/randomCrashOnBuild.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/patches/randomCrashOnBuild.diff?rev=36302&op=file
==============================================================================
--- packages/atlas/trunk/debian/patches/randomCrashOnBuild.diff (added)
+++ packages/atlas/trunk/debian/patches/randomCrashOnBuild.diff Wed Mar 24 07:30:50 2010
@@ -1,0 +1,153 @@
+--- ./tune/blas/gemm/emit_mm.c 2009-02-18 19:48:25.000000000 +0100
++++ /home/sylvestre/Downloads/emit_mm.c 2010-03-19 18:18:54.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * Automatically Tuned Linear Algebra Software v3.8.3
++ * Automatically Tuned Linear Algebra Software v3.8.4
+ * (C) Copyright 1997 R. Clint Whaley
+ *
+ * Redistribution and use in source and binary forms, with or without
+@@ -1638,7 +1638,7 @@
+ cTA, cTB, M, N, K);
+ fprintf(fpout, " * lda=%d, ldb=%d, ldc=%d, mu=%d, nu=%d, ku=%d, pf=%d\n",
+ lda, ldb, ldc, mu, nu, ku, pfA);
+- fprintf(fpout, " * Generated by ATLAS/tune/blas/gemm/emit_mm.c (3.8.3)\n");
++ fprintf(fpout, " * Generated by ATLAS/tune/blas/gemm/emit_mm.c (3.8.4)\n");
+ fprintf(fpout, " */\n");
+ }
+
+@@ -3082,7 +3082,17 @@
+ * Returns 1 if nb is handled by succeeding case, 0 otherwise
+ */
+ {
+- for (; cp; cp = cp->next) if (nb % cp->imult == 0) return(1);
++
++ for (; cp; cp = cp->next)
++ {
++ if (cp->fixed == 2)
++ {
++ if (cp->imult == nb)
++ return(1);
++ }
++ else if (nb % cp->imult == 0)
++ return(1);
++ }
+ return(0);
+ }
+
+@@ -3110,14 +3120,6 @@
+ istop = cp0->nb;
+ while (istop % cp0->imult) istop--;
+ if (istop == cp0->nb) istop -= cp0->imult;
+- for (cp=cp0->next; cp; cp = cp->next)
+- {
+- if (cp->imult % cp0->imult == 0 && cp->fixed != 2)
+- {
+- istop = cp->imult;
+- break;
+- }
+- }
+
+ for (i=2*cp0->imult; i <= istop; i += cp0->imult)
+ {
+@@ -3582,7 +3584,7 @@
+ CLEANNODE *wp, *cp0;
+ FILE *fp;
+ int i;
+- const char *ifs = "else if", *ifp;
++ const char *ifs = "else if", *ifp, *sp;
+ const char cwh[3] = {'M', 'N', 'K'};
+ char ln[128], st[2], *typ;
+
+@@ -3613,7 +3615,11 @@
+
+ if (pre == 'c') pre = 'C';
+ else if (pre == 'z') pre = 'Z';
+-
++/*
++ * fixed=2 means a kernel specialized for that exact N. They will have not
++ * survived pruning if they weren't better than all the general algorithms,
++ * so we can test for them all up front
++ */
+ for (cp=cp0; cp; cp = cp->next) /* handle fixed = 2 cases */
+ {
+ if (cp->fixed == 2)
+@@ -3625,36 +3631,49 @@
+ ifp = ifs;
+ }
+ }
+-
+- for (cp=cp0; cp; cp = cp->next) /* fixed = 1 cases */
+- {
+- if (cp->fixed == 1)
+- {
+- for (i=cp->ncomps-1; i >= 0; i--)
+- {
+- if (cp->imult > 1)
+- fprintf(fp, " %s (%c == %d)\n", ifp, cwh[which], cp->NBs[i]);
+- else fprintf(fp, " else\n");
+- fprintf(fp, " {\n ATL_%cup%cBmm%d_%d_%d_b%c%s;\n }\n",
+- pre, cwh[which], cp->NBs[i], cp->imult, cp->fixed,
+- cbeta, MMARGS);
+- ifp = ifs;
+- }
+- }
+- }
+- for (cp=cp0; cp; cp = cp->next) /* fixed = 0 cases */
+- {
++/*
++ * All remaining kernels are selected by being a multiple of imult;
++ * fixed=0 will be called directly, while fixed=1 will have a nested
++ * if to find the right compiled version to call
++ */
++ for (cp=cp0; cp; cp = cp->next) /* fixed = 0/1 cases */
++ {
++ if (cp->fixed != 1 && cp->fixed != 0)
++ continue;
++ if (cp->imult > 1)
++ fprintf(fp, " %s (%c == %s)\n", ifp, cwh[which],
++ GetInc(cp->imult, GetDiv(cp->imult, st)));
++ else if (ifp == ifs) fprintf(fp, " else\n");
+ if (cp->fixed == 0)
+ {
+- if (cp->imult > 1)
+- fprintf(fp, " %s (%c == %s)\n", ifp, cwh[which],
+- GetInc(cp->imult, GetDiv(cp->imult, st)));
+- else if (ifp == ifs) fprintf(fp, " else\n");
+ fprintf(fp, " {\n ATL_%cup%cBmm0_%d_%d_b%c%s;\n }\n",
+ pre, cwh[which], cp->imult, cp->fixed, cbeta, MMARGS);
+ ifp = ifs;
+ }
++ else if (cp->fixed == 1)
++ {
++ fprintf(fp, " {\n");
++ if (cp->ncomps == 1)
++ fprintf(fp, " ATL_%cup%cBmm%d_%d_%d_b%c%s;\n",
++ pre, cwh[which], cp->NBs[0], cp->imult, cp->fixed,
++ cbeta, MMARGS);
++ else /* must select kernel by NB[i] */
++ {
++ sp = "if";
++ for (i=cp->ncomps-1; i >= 0; i--)
++ {
++ fprintf(fp, " %s (%c == %d)\n", sp, cwh[which], cp->NBs[i]);
++ fprintf(fp,
++ " {\n ATL_%cup%cBmm%d_%d_%d_b%c%s;\n }\n",
++ pre, cwh[which], cp->NBs[i], cp->imult, cp->fixed,
++ cbeta, MMARGS);
++ sp = "else if";
++ }
++ }
++ fprintf(fp, " }\n");
++ }
+ }
++
+ for (cp=cp0; cp && cp->imult != 1; cp = cp->next);
+ if (!cp)
+ {
+@@ -4330,3 +4349,5 @@
+ }
+ exit(0);
+ }
++
++
Modified: packages/atlas/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/rules?rev=36302&op=diff
==============================================================================
--- packages/atlas/trunk/debian/rules (original)
+++ packages/atlas/trunk/debian/rules Wed Mar 24 07:30:50 2010
@@ -6,6 +6,7 @@
DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+export LD_LIBRARY_PATH=$(CURDIR)/debian/tmp/usr/lib/atlas-base/:/usr/lib/libfakeroot/
CHECK_EXTENSIONS=""
@@ -37,7 +38,7 @@
# 0 means Unknown CPU. Leave Atlas find out
# 1 means no extension
ARCHS=base_0_1
-DEB_SHLIBDEPS_INCLUDE_libatlas3gf-base := $(CURDIR)/debian/libatlas3gf-base/usr/lib/atlas-base/:$(CURDIR)/debian/libatlas3gf-base/usr/lib/atlas-base/atlas/
+#DEB_SHLIBDEPS_INCLUDE_libatlas3gf-base := $(CURDIR)/debian/libatlas3gf-base/usr/lib/atlas-base/:$(CURDIR)/debian/libatlas3gf-base/usr/lib/atlas-base/atlas/
ifeq ($(DEB_HOST_ARCH_CPU),i386)
ifneq ($(DEB_BUILD_ARCH),kfreebsd-i386)
@@ -45,10 +46,10 @@
endif
ARCHS = base_10_1 sse_10_16 sse2_17_24 sse3_17_28 core2sse3_14_28
# 10 = PII 17 = P4
-DEB_SHLIBDEPS_INCLUDE_libatlas3gf-sse = $(CURDIR)/debian/libatlas3gf-sse/usr/lib/atlas-sse:$(CURDIR)/debian/libatlas3gf-sse/usr/lib/atlas-sse/atlas
-DEB_SHLIBDEPS_INCLUDE_libatlas3gf-sse2 = $(CURDIR)/debian/libatlas3gf-sse2/usr/lib/atlas-sse2:$(CURDIR)/debian/libatlas3gf-sse2/usr/lib/atlas-sse2/atlas
-DEB_SHLIBDEPS_INCLUDE_libatlas3gf-sse3 = $(CURDIR)/debian/libatlas3gf-sse3/usr/lib/atlas-sse3:$(CURDIR)/debian/libatlas3gf-sse3/usr/lib/atlas-sse3/atlas
-DEB_SHLIBDEPS_INCLUDE_libatlas3gf-core2sse3 = $(CURDIR)/debian/libatlas3gf-core2sse3/usr/lib/atlas-core2sse3:$(CURDIR)/debian/libatlas3gf-core2sse3/usr/lib/atlas-core2sse3/atlas
+#DEB_SHLIBDEPS_INCLUDE_libatlas3gf-sse = $(CURDIR)/debian/libatlas3gf-sse/usr/lib/atlas-sse:$(CURDIR)/debian/libatlas3gf-sse/usr/lib/atlas-sse/atlas
+#DEB_SHLIBDEPS_INCLUDE_libatlas3gf-sse2 = $(CURDIR)/debian/libatlas3gf-sse2/usr/lib/atlas-sse2:$(CURDIR)/debian/libatlas3gf-sse2/usr/lib/atlas-sse2/atlas
+#DEB_SHLIBDEPS_INCLUDE_libatlas3gf-sse3 = $(CURDIR)/debian/libatlas3gf-sse3/usr/lib/atlas-sse3:$(CURDIR)/debian/libatlas3gf-sse3/usr/lib/atlas-sse3/atlas
+#DEB_SHLIBDEPS_INCLUDE_libatlas3gf-core2sse3 = $(CURDIR)/debian/libatlas3gf-core2sse3/usr/lib/atlas-core2sse3:$(CURDIR)/debian/libatlas3gf-core2sse3/usr/lib/atlas-core2sse3/atlas
endif
@@ -56,9 +57,9 @@
ifeq ($(DEB_HOST_ARCH_CPU),amd64)
# 64 bits
MODE_BITWIDTH = 64
-DEB_SHLIBDEPS_INCLUDE_libatlas3gf-amd64sse3 = $(CURDIR)/debian/libatlas3gf-amd64sse3/usr/lib/atlas-amd64sse3:$(CURDIR)/debian/libatlas3gf-amd64sse3/usr/lib/atlas-amd64sse3/atlas
-DEB_SHLIBDEPS_INCLUDE_libatlas3gf-core2sse3 = $(CURDIR)/debian/libatlas3gf-core2sse3/usr/lib/atlas-core2sse3:$(CURDIR)/debian/libatlas3gf-core2sse3/usr/lib/atlas-core2sse3/atlas
-DEB_SHLIBDEPS_INCLUDE_libatlas3gf-corei7sse3 = $(CURDIR)/debian/libatlas3gf-corei7sse3/usr/lib/atlas-corei7sse3:$(CURDIR)/debian/libatlas3gf-corei7sse3/usr/lib/atlas-corei7sse3/atlas
+#DEB_SHLIBDEPS_INCLUDE_libatlas3gf-amd64sse3 = $(CURDIR)/debian/libatlas3gf-amd64sse3/usr/lib/atlas-amd64sse3:$(CURDIR)/debian/libatlas3gf-amd64sse3/usr/lib/atlas-amd64sse3/atlas
+#DEB_SHLIBDEPS_INCLUDE_libatlas3gf-core2sse3 = $(CURDIR)/debian/libatlas3gf-core2sse3/usr/lib/atlas-core2sse3:$(CURDIR)/debian/libatlas3gf-core2sse3/usr/lib/atlas-core2sse3/atlas
+#DEB_SHLIBDEPS_INCLUDE_libatlas3gf-corei7sse3 = $(CURDIR)/debian/libatlas3gf-corei7sse3/usr/lib/atlas-corei7sse3:$(CURDIR)/debian/libatlas3gf-corei7sse3/usr/lib/atlas-corei7sse3/atlas
ARCHS += amd64sse3_20_28 core2sse3_17_28 corei7sse3_18_28
endif
More information about the debian-science-commits
mailing list