[openblas] 03/04: Remove patches applied upstream:
Sébastien Villemot
sebastien at debian.org
Fri Jun 13 19:29:42 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastien pushed a commit to branch master
in repository openblas.
commit 492ab50b633bb065590e72634b8e89e6af12bbd9
Author: Sébastien Villemot <sebastien at debian.org>
Date: Fri Jun 13 16:30:50 2014 +0200
Remove patches applied upstream:
* dgemv-crash.patch
* fork-handler.patch
* qemu-athlon.patch
* wrong-parameter-for-zherk-zher2.patch
Git-Dch: Full
---
debian/patches/dgemv-crash.patch | 15 ----
debian/patches/fork-handler.patch | 92 ----------------------
debian/patches/kfreebsd-soname.patch | 4 +-
debian/patches/libblas3-soname.patch | 12 +--
debian/patches/qemu-athlon.patch | 39 ---------
debian/patches/remove-openmp-warning.patch | 2 +-
debian/patches/series | 4 -
debian/patches/test-custom-package.patch | 4 +-
.../patches/wrong-parameter-for-zherk-zher2.patch | 30 -------
9 files changed, 11 insertions(+), 191 deletions(-)
diff --git a/debian/patches/dgemv-crash.patch b/debian/patches/dgemv-crash.patch
deleted file mode 100644
index ec27f97..0000000
--- a/debian/patches/dgemv-crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Bug: https://github.com/xianyi/OpenBLAS/issues/304
-Description: Fixed buffer overflow bug in kernel/x86_64/dgemv_t.S
-Origin: beffee7d914
-
---- a/kernel/x86_64/dgemv_t.S
-+++ b/kernel/x86_64/dgemv_t.S
-@@ -171,7 +171,7 @@
- .L0x:
- xorq M,M
- addq $1,M
-- salq $22,M
-+ salq $21,M
- subq M,MMM
- jge .L00
-
diff --git a/debian/patches/fork-handler.patch b/debian/patches/fork-handler.patch
deleted file mode 100644
index 53d909f..0000000
--- a/debian/patches/fork-handler.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Description: Add fork handler
- This patches fixes hangs of OpenBLAS when called from a program using OpenMP.
- Note that this will only work if OpenBLAS is compiled with pthreads
- (i.e. no OpenMP).
-Origin: upstream, https://github.com/xianyi/OpenBLAS/commit/138a8413903776242cb3c184df9838ba54d04044
-Bug: https://github.com/xianyi/OpenBLAS/issues/294
-Bug-Debian: http://bugs.debian.org/739331
-Last-Update: 2014-02-20
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/driver/others/blas_server.c
-+++ b/driver/others/blas_server.c
-@@ -74,6 +74,21 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- #include <sys/resource.h>
- #endif
-
-+#ifndef likely
-+#ifdef __GNUC__
-+#define likely(x) __builtin_expect(!!(x), 1)
-+#else
-+#define likely(x) (x)
-+#endif
-+#endif
-+#ifndef unlikely
-+#ifdef __GNUC__
-+#define unlikely(x) __builtin_expect(!!(x), 0)
-+#else
-+#define unlikely(x) (x)
-+#endif
-+#endif
-+
- #ifdef SMP_SERVER
-
- #undef MONITOR
-@@ -584,6 +599,10 @@ static BLASULONG exec_queue_lock = 0;
-
- int exec_blas_async(BLASLONG pos, blas_queue_t *queue){
-
-+#ifdef SMP_SERVER
-+ // Handle lazy re-init of the thread-pool after a POSIX fork
-+ if (unlikely(blas_server_avail == 0)) blas_thread_init();
-+#endif
- BLASLONG i = 0;
- blas_queue_t *current = queue;
- #if defined(OS_LINUX) && !defined(NO_AFFINITY) && !defined(PARAMTEST)
-@@ -708,7 +727,11 @@ int exec_blas_async_wait(BLASLONG num, b
- /* Execute Threads */
- int exec_blas(BLASLONG num, blas_queue_t *queue){
-
-- int (*routine)(blas_arg_t *, void *, void *, double *, double *, BLASLONG);
-+#ifdef SMP_SERVER
-+ // Handle lazy re-init of the thread-pool after a POSIX fork
-+ if (unlikely(blas_server_avail == 0)) blas_thread_init();
-+#endif
-+ int (*routine)(blas_arg_t *, void *, void *, double *, double *, BLASLONG);
-
- #ifdef TIMING_DEBUG
- BLASULONG start, stop;
---- a/driver/others/memory.c
-+++ b/driver/others/memory.c
-@@ -253,6 +253,21 @@ int goto_get_num_procs (void) {
- return blas_cpu_number;
- }
-
-+void openblas_fork_handler()
-+{
-+ // This handler shuts down the OpenBLAS-managed PTHREAD pool when OpenBLAS is
-+ // built with "make USE_OPENMP=0".
-+ // Hanging can still happen when OpenBLAS is built against the libgomp
-+ // implementation of OpenMP. The problem is tracked at:
-+ // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60035
-+ // In the mean time build with USE_OPENMP=0 or link against another
-+ // implementation of OpenMP.
-+ int err;
-+ err = pthread_atfork (BLASFUNC(blas_thread_shutdown), NULL, NULL);
-+ if(err != 0)
-+ fprintf(stderr, "OpenBLAS Warning ... cannot install fork handler. You may meet hang after fork.\n");
-+}
-+
- int blas_get_cpu_number(void){
- char *p;
- #if defined(OS_LINUX) || defined(OS_WINDOWS) || defined(OS_FREEBSD) || defined(OS_DARWIN)
-@@ -1268,6 +1283,9 @@ void CONSTRUCTOR gotoblas_init(void) {
-
- if (gotoblas_initialized) return;
-
-+#ifdef SMP
-+ openblas_fork_handler();
-+#endif
-
- #ifdef PROFILE
- moncontrol (0);
diff --git a/debian/patches/kfreebsd-soname.patch b/debian/patches/kfreebsd-soname.patch
index dab6e92..03bc8ba 100644
--- a/debian/patches/kfreebsd-soname.patch
+++ b/debian/patches/kfreebsd-soname.patch
@@ -7,7 +7,7 @@ Last-Update: 2014-02-20
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/exports/Makefile
+++ b/exports/Makefile
-@@ -115,7 +115,7 @@ symbol.$(SUFFIX) : symbol.S
+@@ -99,7 +99,7 @@ $(LIBDYNNAME) : ../$(LIBNAME) osx.def
dllinit.$(SUFFIX) : dllinit.c
$(CC) $(CFLAGS) -c -o $(@F) -s $<
@@ -16,7 +16,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
so : ../$(LIBSONAME)
-@@ -134,7 +134,7 @@ endif
+@@ -121,7 +121,7 @@ endif
endif
#http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
diff --git a/debian/patches/libblas3-soname.patch b/debian/patches/libblas3-soname.patch
index 757dfbe..9807776 100644
--- a/debian/patches/libblas3-soname.patch
+++ b/debian/patches/libblas3-soname.patch
@@ -9,23 +9,23 @@ Last-Update: 2014-02-20
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/exports/Makefile
+++ b/exports/Makefile
-@@ -117,7 +117,7 @@ dllinit.$(SUFFIX) : dllinit.c
+@@ -101,7 +101,7 @@ dllinit.$(SUFFIX) : dllinit.c
ifeq ($(OSNAME), $(filter $(OSNAME),Linux FreeBSD))
-so : ../$(LIBSONAME)
+so : ../$(LIBSONAME) ../libblas.so.3
- ../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
-@@ -131,6 +131,11 @@ else
+ ../$(LIBSONAME) : ../$(LIBNAME) linktest.c
+ ifneq ($(C_COMPILER), LSB)
+@@ -118,6 +118,11 @@ else
endif
rm -f linktest
-+../libblas.so.3 : ../$(LIBNAME) linux.def linktest.c
++../libblas.so.3 : ../$(LIBNAME) linktest.c
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ \
+ -Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
-+ -Wl,--retain-symbols-file=linux.def -Wl,-soname,libblas.so.3 $(EXTRALIB)
++ -Wl,-soname,libblas.so.3 $(EXTRALIB)
+
endif
diff --git a/debian/patches/qemu-athlon.patch b/debian/patches/qemu-athlon.patch
deleted file mode 100644
index 0a358b2..0000000
--- a/debian/patches/qemu-athlon.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Avoid failure on qemu guests declaring an Athlon CPU without 3dnow!
- babin.debian.org is a qemu guest which declares the CPU model and family of an
- Athlon CPU. The dynamic engine of OpenBLAS recognizes that machine as an Athlon
- CPU and uses the corresponding kernel. However, that machine does not have
- 3dnow! extensions, and OpenBLAS therefore crashes because of illegal
- instructions.
- .
- The present patch verifies that, on machines declaring an Athlon CPU model and
- family, the 3dnow and 3dnowext feature flags are indeed present. If they are
- not, it fallbacks on the most generic x86 kernel.
-Author: Sébastien Villemot <sebastien at debian.org>
-Bug: https://github.com/xianyi/OpenBLAS/issues/272
-Applied-Upstream: https://github.com/xianyi/OpenBLAS/commit/eae4cfa3f67e2ff18c301087172bf5e36bdc54f1
-Last-Update: 2013-08-28
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/driver/others/dynamic.c
-+++ b/driver/others/dynamic.c
-@@ -224,7 +224,19 @@
- }
-
- if (vendor == VENDOR_AMD){
-- if (family <= 0xe) return &gotoblas_ATHLON;
-+ if (family <= 0xe) {
-+ // Verify that CPU has 3dnow and 3dnowext before claiming it is Athlon
-+ cpuid(0x80000000, &eax, &ebx, &ecx, &edx);
-+ if (eax & 0xffff >= 0x01) {
-+ cpuid(0x80000001, &eax, &ebx, &ecx, &edx);
-+ if ((edx & (1 << 30)) == 0 || (edx & (1 << 31)) == 0)
-+ return NULL;
-+ }
-+ else
-+ return NULL;
-+
-+ return &gotoblas_ATHLON;
-+ }
- if (family == 0xf){
- if ((exfamily == 0) || (exfamily == 2)) {
- if (ecx & (1 << 0)) return &gotoblas_OPTERON_SSE3;
diff --git a/debian/patches/remove-openmp-warning.patch b/debian/patches/remove-openmp-warning.patch
index 84acf58..6584beb 100644
--- a/debian/patches/remove-openmp-warning.patch
+++ b/debian/patches/remove-openmp-warning.patch
@@ -8,7 +8,7 @@ Last-Update: 2014-02-17
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/driver/others/blas_server.c
+++ b/driver/others/blas_server.c
-@@ -719,16 +719,6 @@ int exec_blas(BLASLONG num, blas_queue_t
+@@ -742,16 +742,6 @@ int exec_blas(BLASLONG num, blas_queue_t
#ifdef SMP_DEBUG
fprintf(STDERR, "Exec_blas is called. Number of executing threads : %ld\n", num);
#endif
diff --git a/debian/patches/series b/debian/patches/series
index c82d882..4f02367 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,5 @@
kfreebsd-soname.patch
libblas3-soname.patch
test-custom-package.patch
-qemu-athlon.patch
remove-openmp-warning.patch
-fork-handler.patch
-dgemv-crash.patch
-wrong-parameter-for-zherk-zher2.patch
computational-error-of-dgemv_n.patch
diff --git a/debian/patches/test-custom-package.patch b/debian/patches/test-custom-package.patch
index 1c4b827..c7c639a 100644
--- a/debian/patches/test-custom-package.patch
+++ b/debian/patches/test-custom-package.patch
@@ -7,7 +7,7 @@ Last-Update: 2013-07-26
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Makefile
+++ b/Makefile
-@@ -108,7 +108,6 @@
+@@ -106,7 +106,6 @@ endif
tests :
ifndef NOFORTRAN
@@ -15,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
ifndef CROSS
touch $(LIBNAME)
ifndef NO_FBLAS
-@@ -122,7 +121,6 @@
+@@ -120,7 +119,6 @@ ifndef NO_CBLAS
endif
endif
endif
diff --git a/debian/patches/wrong-parameter-for-zherk-zher2.patch b/debian/patches/wrong-parameter-for-zherk-zher2.patch
deleted file mode 100644
index 80acd6c..0000000
--- a/debian/patches/wrong-parameter-for-zherk-zher2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Detect the wrong parameter for zherk/zher2k.
-Bug: https://github.com/xianyi/OpenBLAS/issues/333
-Origin: 3e0a7b9
-
---- a/interface/syr2k.c
-+++ b/interface/syr2k.c
-@@ -146,8 +146,10 @@ void NAME(char *UPLO, char *TRANS,
- if (uplo_arg == 'L') uplo = 1;
-
- if (trans_arg == 'N') trans = 0;
-+#ifndef HEMM
- if (trans_arg == 'T') trans = 1;
- if (trans_arg == 'R') trans = 0;
-+#endif
- if (trans_arg == 'C') trans = 1;
-
- nrowa = args.n;
---- a/interface/syrk.c
-+++ b/interface/syrk.c
-@@ -149,8 +149,10 @@ void NAME(char *UPLO, char *TRANS,
- if (uplo_arg == 'L') uplo = 1;
-
- if (trans_arg == 'N') trans = 0;
-+#ifndef HEMM
- if (trans_arg == 'T') trans = 1;
- if (trans_arg == 'R') trans = 0;
-+#endif
- if (trans_arg == 'C') trans = 1;
-
- nrowa = args.n;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openblas.git
More information about the debian-science-commits
mailing list