[SCM] ATLAS packaging for Debian branch, master, updated. upstream/3.8.4-16-gede4b56
Sébastien Villemot
sebastien at debian.org
Wed Jun 5 16:07:34 UTC 2013
The following commit has been merged in the master branch:
commit 99e2901c9e8acaa9a5c02f6be2cbd3763457650c
Author: Sébastien Villemot <sebastien at debian.org>
Date: Wed Jun 5 14:44:26 2013 +0200
Remove empty and unused patches
diff --git a/debian/patches/01_force_kernel_failure.diff.do.not.apply b/debian/patches/01_force_kernel_failure.diff.do.not.apply
deleted file mode 100644
index 00a82db..0000000
--- a/debian/patches/01_force_kernel_failure.diff.do.not.apply
+++ /dev/null
@@ -1,249 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_force_kernel_failure.dpatch.dpatch by <david at evans>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Force build failure for SSE1/2 kernels when ATL_SSE1/2 is not defined.
-
- at DPATCH@
-
-diff --git a/include/contrib/camm_util.h b/include/contrib/camm_util.h
-index 6b150d3..f1c2fee 100644
---- a/include/contrib/camm_util.h
-+++ b/include/contrib/camm_util.h
-@@ -334,7 +334,10 @@ typedef struct {
- #endif
-
- #undef mxx
--#define mxx(a_) str(%%xmm ## a_)
-+#define mxx(a_) \
-+{ \
-+ str(%%xmm ## a_); \
-+}
- #undef prp
- #define prp(a_,b_) "rcpp" SSESUF mxx(a_) "," mxx(b_) "\n\t"
- #undef prps
-diff --git a/tune/blas/gemm/CASES/ATL_dmm6x1x72_sse2.c b/tune/blas/gemm/CASES/ATL_dmm6x1x72_sse2.c
-index ebf5246..dec12d8 100644
---- a/tune/blas/gemm/CASES/ATL_dmm6x1x72_sse2.c
-+++ b/tune/blas/gemm/CASES/ATL_dmm6x1x72_sse2.c
-@@ -29,6 +29,9 @@
- */
- #include "atlas_asm.h"
-
-+#ifndef ATL_SSE2
-+ #error "This kernel requires SSE2"
-+#endif
-
- #if !defined(ATL_GAS_x8632) && !defined(ATL_GAS_x8664)
- #error "This kernel requires x86 gas 32 or 64 bit x86 assembler!"
-diff --git a/tune/blas/gemm/CASES/ATL_dmm8x1x120_L1pf.c b/tune/blas/gemm/CASES/ATL_dmm8x1x120_L1pf.c
-index 2845e21..a39f7d2 100644
---- a/tune/blas/gemm/CASES/ATL_dmm8x1x120_L1pf.c
-+++ b/tune/blas/gemm/CASES/ATL_dmm8x1x120_L1pf.c
-@@ -37,6 +37,9 @@
- * to use a smaller block factor (for better application performance).
- * This kernel does not do well for complex.
- */
-+#ifndef ATL_SSE2
-+ #error "This kernel requires SSE2"
-+#endif
- #ifndef ATL_GAS_x8664
- #error "This kernel requires x86-64 assembly!"
- #endif
-diff --git a/tune/blas/gemm/CASES/ATL_dmm8x1x120_sse2.c b/tune/blas/gemm/CASES/ATL_dmm8x1x120_sse2.c
-index 983de68..8223854 100644
---- a/tune/blas/gemm/CASES/ATL_dmm8x1x120_sse2.c
-+++ b/tune/blas/gemm/CASES/ATL_dmm8x1x120_sse2.c
-@@ -29,6 +29,9 @@
- */
- #include "atlas_asm.h"
-
-+#ifndef ATL_SSE2
-+ #error "This kernel requires SSE2"
-+#endif
-
- /*
- * This routine designed for Core2, which seems to have relatively few
-diff --git a/tune/blas/gemm/CASES/ATL_dmm_sse2_K.c b/tune/blas/gemm/CASES/ATL_dmm_sse2_K.c
-index 8f59344..230363a 100644
---- a/tune/blas/gemm/CASES/ATL_dmm_sse2_K.c
-+++ b/tune/blas/gemm/CASES/ATL_dmm_sse2_K.c
-@@ -36,6 +36,9 @@
- * K%2==0 && K%4!=0 cases.
- */
-
-+#ifndef ATL_SSE1
-+ #error "This kernel requires SSE1"
-+#endif
- /*****************************************************************************/
- /* ATL_mm_p4_d_2K.c */
- /*****************************************************************************/
-diff --git a/tune/blas/gemm/CASES/ATL_gemm_SSE.c b/tune/blas/gemm/CASES/ATL_gemm_SSE.c
-index 33c6c9a..9ebede7 100644
---- a/tune/blas/gemm/CASES/ATL_gemm_SSE.c
-+++ b/tune/blas/gemm/CASES/ATL_gemm_SSE.c
-@@ -1,5 +1,8 @@
-
- #include "camm_util.h"
-+#ifndef ATL_SSE1
-+ #error "This kernel requires SSE1!"
-+#endif
- #ifndef ATL_GAS_x8632
- #error "This kernel requires gas x86-32 assembler!"
- #endif
-diff --git a/tune/blas/gemm/CASES/ATL_smm10x1x120_sse.c b/tune/blas/gemm/CASES/ATL_smm10x1x120_sse.c
-index a97333d..b7c723e 100644
---- a/tune/blas/gemm/CASES/ATL_smm10x1x120_sse.c
-+++ b/tune/blas/gemm/CASES/ATL_smm10x1x120_sse.c
-@@ -34,6 +34,9 @@
- * so we have to be very careful about alignment, and things seem to work
- * better if we keep a register block within 128 bytes
- */
-+#ifndef ATL_SSE2
-+ #error "This kernel requires SSE2"
-+#endif
- #if !defined(MB)
- #define MB 0
- #endif
-diff --git a/tune/blas/gemm/CASES/ATL_smm4x1x256_sse.c b/tune/blas/gemm/CASES/ATL_smm4x1x256_sse.c
-index 6d02fb0..ea97560 100644
---- a/tune/blas/gemm/CASES/ATL_smm4x1x256_sse.c
-+++ b/tune/blas/gemm/CASES/ATL_smm4x1x256_sse.c
-@@ -30,6 +30,9 @@
- #include "atlas_asm.h"
-
-
-+#ifndef ATL_SSE2
-+ #error "This kernel requires SSE2"
-+#endif
- #if !defined(MB)
- #define MB 0
- #endif
-diff --git a/tune/blas/gemm/CASES/ATL_smm4x1x60_4_sse2.c b/tune/blas/gemm/CASES/ATL_smm4x1x60_4_sse2.c
-index 0fca6ac..dbb6b7c 100644
---- a/tune/blas/gemm/CASES/ATL_smm4x1x60_4_sse2.c
-+++ b/tune/blas/gemm/CASES/ATL_smm4x1x60_4_sse2.c
-@@ -36,6 +36,9 @@
- *Purposely kept small so it is retained in cache, and easy to translate when
- *not
- */
-+#ifndef ATL_SSE2
-+ #error "This kernel requires SSE2"
-+#endif
-
- #ifndef ATL_GAS_x8632
- #error "This kernel requires gas x86-32 assembler!"
-diff --git a/tune/blas/gemm/CASES/ATL_smm6x1x120_sse.c b/tune/blas/gemm/CASES/ATL_smm6x1x120_sse.c
-index 288357e..85b705a 100644
---- a/tune/blas/gemm/CASES/ATL_smm6x1x120_sse.c
-+++ b/tune/blas/gemm/CASES/ATL_smm6x1x120_sse.c
-@@ -29,6 +29,9 @@
- */
- #include "atlas_asm.h"
-
-+#ifndef ATL_SSE2
-+ #error "This kernel requires SSE2"
-+#endif
-
- #ifdef ATL_GAS_x8664
- #define movl movq
-diff --git a/tune/blas/gemm/CASES/ATL_smm6x1x80_sse.c b/tune/blas/gemm/CASES/ATL_smm6x1x80_sse.c
-index 6e85a1c..5eaefd4 100644
---- a/tune/blas/gemm/CASES/ATL_smm6x1x80_sse.c
-+++ b/tune/blas/gemm/CASES/ATL_smm6x1x80_sse.c
-@@ -29,6 +29,9 @@
- */
- #include "atlas_asm.h"
-
-+#ifndef ATL_SSE2
-+ #error "This kernel requires SSE2"
-+#endif
-
- #if !defined(ATL_GAS_x8632) && !defined(ATL_GAS_x8664)
- #error "This kernel requires x86 gas 32 or 64 bit assembler!"
-diff --git a/tune/blas/gemm/CASES/ATL_smm_sse1_K.c b/tune/blas/gemm/CASES/ATL_smm_sse1_K.c
-index c96c6e9..100bac5 100644
---- a/tune/blas/gemm/CASES/ATL_smm_sse1_K.c
-+++ b/tune/blas/gemm/CASES/ATL_smm_sse1_K.c
-@@ -33,6 +33,10 @@
- * then uses Camm Maguire's general routine for other cases of K-cleanup.
- */
-
-+#ifndef ATL_SSE1
-+ #error "This kernel requires SSE1"
-+#endif
-+
- /*****************************************************************************/
- /* ATL_mm_sse1_4K.c */
- /*****************************************************************************/
-diff --git a/tune/blas/gemv/CASES/ATL_gemv_SSE.c b/tune/blas/gemv/CASES/ATL_gemv_SSE.c
-index 1a5a0ea..290b3f2 100644
---- a/tune/blas/gemv/CASES/ATL_gemv_SSE.c
-+++ b/tune/blas/gemv/CASES/ATL_gemv_SSE.c
-@@ -34,6 +34,9 @@
- #include "atlas_misc.h"
-
- #include "camm_util.h"
-+#ifndef ATL_SSE1
-+ #error "This kernel requires gas x86-32 assembler!"
-+#endif
- #ifndef ATL_GAS_x8632
- #error "This kernel requires gas x86-32 assembler!"
- #endif
-diff --git a/tune/blas/level1/COPY/copy_x86.c b/tune/blas/level1/COPY/copy_x86.c
-index 208e1d4..d3efb21 100644
---- a/tune/blas/level1/COPY/copy_x86.c
-+++ b/tune/blas/level1/COPY/copy_x86.c
-@@ -1,5 +1,9 @@
- #include "atlas_asm.h"
-
-+#ifndef ATL_SSE1
-+ #error "This kernel requires SSE1"
-+#endif
-+
- #ifdef ATL_GAS_x8632
- #define movQ movl
- #define addq addl
-diff --git a/tune/blas/level1/IAMAX/iamax8_x86.c b/tune/blas/level1/IAMAX/iamax8_x86.c
-index 23d2449..6fed96e 100644
---- a/tune/blas/level1/IAMAX/iamax8_x86.c
-+++ b/tune/blas/level1/IAMAX/iamax8_x86.c
-@@ -1,6 +1,10 @@
-
- #include "atlas_asm.h"
-
-+#ifndef ATL_SSE1
-+ #error "This kernel requires SSE1"
-+#endif
-+
- #ifdef SREAL
-
- #ifdef ATL_GAS_x8632
-diff --git a/tune/blas/level1/IAMAX/iamax_sse.c b/tune/blas/level1/IAMAX/iamax_sse.c
-index dc9f385..bbbaa72 100644
---- a/tune/blas/level1/IAMAX/iamax_sse.c
-+++ b/tune/blas/level1/IAMAX/iamax_sse.c
-@@ -1,5 +1,9 @@
- #include "atlas_asm.h"
-
-+#ifndef ATL_SSE1
-+ #error "This kernel requires SSE1"
-+#endif
-+
- #ifdef SREAL
-
- #ifdef ATL_GAS_x8632
-diff --git a/tune/blas/level1/SET/set_x86.c b/tune/blas/level1/SET/set_x86.c
-index 6c25846..c5d4832 100644
---- a/tune/blas/level1/SET/set_x86.c
-+++ b/tune/blas/level1/SET/set_x86.c
-@@ -1,5 +1,9 @@
- #include "atlas_asm.h"
-
-+#ifndef ATL_SSE1
-+ #error "This kernel requires SSE1."
-+#endif
-+
- #ifdef SREAL
-
- #ifdef ATL_GAS_x8632
diff --git a/debian/patches/12_check-exists.diff b/debian/patches/12_check-exists.diff
deleted file mode 100644
index ccb2a6c..0000000
--- a/debian/patches/12_check-exists.diff
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: ATLAS/Make.top
-===================================================================
---- ATLAS.orig/Make.top 2013-01-09 17:42:09.000000000 +0100
-+++ ATLAS/Make.top 2013-01-09 17:42:11.000000000 +0100
-@@ -704,3 +704,4 @@
- chmod 0644 $(INSTdir)/atlas/lib$$lib.so.3 ;\
- chmod 0644 $(INSTdir)/atlas/lib$$lib.so.3.0 ;\
- done;
-+
diff --git a/debian/patches/23_fix_unresolvable_on_sh4.diff b/debian/patches/23_fix_unresolvable_on_sh4.diff
deleted file mode 100644
index 23a6861..0000000
--- a/debian/patches/23_fix_unresolvable_on_sh4.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ATLAS/makes/Make.lib
-===================================================================
---- ATLAS.orig/makes/Make.lib 2012-07-16 15:34:19.000000000 +0200
-+++ ATLAS/makes/Make.lib 2012-07-16 15:39:35.000000000 +0200
-@@ -101,7 +101,7 @@
-
- libatlas.so.3.0 : libatlas.a
- ld $(LDFLAGS) -shared -soname libatlas.so.3 -o $@ \
-- --whole-archive libatlas.a --no-whole-archive -lc $(LIBS)
-+ --whole-archive libatlas.a --no-whole-archive -lc $(LIBS) $(F77SYSLIB)
- liblapack_atlas.so.3.0 : liblapack_atlas.a libatlas.so libcblas.so libf77blas.so
- ld $(LDFLAGS) -shared -soname liblapack_atlas.so.3 -o $@ \
- --whole-archive liblapack_atlas.a \
diff --git a/debian/patches/series b/debian/patches/series
index 3c30d10..a258485 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,12 +7,10 @@
08_install_shared_lib_call.diff
09_mkdir_inst_dir.diff
10_s390.diff
-12_check-exists.diff
16_warning-removed.diff
17_hppa.diff
18_alpha.diff
20_armel.diff
21_mips2.diff
22_sh.diff
-#23_fix_unresolvable_on_sh4.diff
kfreebsd.diff
--
ATLAS packaging for Debian
More information about the debian-science-commits
mailing list