[openblas] 03/06: Remove patches applied upstream:
Sébastien Villemot
sebastien at debian.org
Sat Nov 7 20:48:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastien pushed a commit to branch master
in repository openblas.
commit 6e43b58a5533e1569877e1b8e6eab51e7a84a86a
Author: Sébastien Villemot <sebastien at debian.org>
Date: Sat Nov 7 21:37:36 2015 +0100
Remove patches applied upstream:
+ debian/patches/arm-arch-detection.patch
+ debian/patches/arm64.patch
+ debian/patches/disable-gemm3m-tests.patch
Gbp-Dch: Full
---
debian/patches/arm-arch-detection.patch | 19 -
debian/patches/arm64.patch | 15 -
debian/patches/disable-gemm3m-tests.patch | 655 ------------------------------
debian/patches/series | 3 -
4 files changed, 692 deletions(-)
diff --git a/debian/patches/arm-arch-detection.patch b/debian/patches/arm-arch-detection.patch
deleted file mode 100644
index 4db1924..0000000
--- a/debian/patches/arm-arch-detection.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix detection of ARM architectures
- This ensures that the setup is not incorrectly detected as cross-building.
- This would prevent the testsuite from being run.
-Author: Sébastien Villemot <sebastien at debian.org>
-Forwarded: https://github.com/xianyi/OpenBLAS/pull/560
-Last-Update: 2015-04-29
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/c_check
-+++ b/c_check
-@@ -4,6 +4,8 @@
- $hostos = `uname -s | sed -e s/\-.*//`; chop($hostos);
- $hostarch = `uname -m | sed -e s/i.86/x86/`;chop($hostarch);
- $hostarch = "x86_64" if ($hostarch eq "amd64");
-+$hostarch = "arm" if ($hostarch =~ /^arm.*/);
-+$hostarch = "arm64" if ($hostarch eq "aarch64");
-
- $binary = $ENV{"BINARY"};
-
diff --git a/debian/patches/arm64.patch b/debian/patches/arm64.patch
deleted file mode 100644
index 326f28d..0000000
--- a/debian/patches/arm64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix bug in build system for arm64
-Origin: upstream, https://github.com/xianyi/OpenBLAS/commit/e5b96e55a727bee4010a2ae4c96c6f71327ba96b
-Applied-Upstream: 0.2.15
-Reviewed-by: Sébastien Villemot <sebastien at debian.org>
-Last-Update: 2015-04-29
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/kernel/arm64/KERNEL.XGENE1 b/kernel/arm64/KERNEL.XGENE1
-new file mode 100644
-index 0000000..6ee0c73
---- /dev/null
-+++ b/kernel/arm64/KERNEL.XGENE1
-@@ -0,0 +1 @@
-+include $(KERNELDIR)/KERNEL.ARMV8
-\ No newline at end of file
diff --git a/debian/patches/disable-gemm3m-tests.patch b/debian/patches/disable-gemm3m-tests.patch
deleted file mode 100644
index 87d4770..0000000
--- a/debian/patches/disable-gemm3m-tests.patch
+++ /dev/null
@@ -1,655 +0,0 @@
-Description: Strip code for GEMM3M tests
- They cause FTBFS on arm*.
-Author: Sébastien Villemot <sebastien at debian.org>
-Bug: https://github.com/xianyi/OpenBLAS/issues/559
-Last-Update: 2015-04-29
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/ctest/c_c3chke.c
-+++ b/ctest/c_c3chke.c
-@@ -46,235 +46,7 @@ void F77_c3chke(char * rout) {
- }
-
-
-- if (strncmp( sf,"cblas_cgemm3m" ,13)==0) {
-- cblas_rout = "cblas_cgemm3" ;
--
-- cblas_info = 1;
-- cblas_cgemm3m( INVALID, CblasNoTrans, CblasNoTrans, 0, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 1;
-- cblas_cgemm3m( INVALID, CblasNoTrans, CblasTrans, 0, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 1;
-- cblas_cgemm3m( INVALID, CblasTrans, CblasNoTrans, 0, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 1;
-- cblas_cgemm3m( INVALID, CblasTrans, CblasTrans, 0, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 2; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, INVALID, CblasNoTrans, 0, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 2; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, INVALID, CblasTrans, 0, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 3; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasNoTrans, INVALID, 0, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 3; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasTrans, INVALID, 0, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 4; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasNoTrans, CblasNoTrans, INVALID, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 4; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasNoTrans, CblasTrans, INVALID, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 4; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasTrans, CblasNoTrans, INVALID, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 4; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasTrans, CblasTrans, INVALID, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 5; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasNoTrans, CblasNoTrans, 0, INVALID, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 5; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasNoTrans, CblasTrans, 0, INVALID, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 5; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasTrans, CblasNoTrans, 0, INVALID, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 5; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasTrans, CblasTrans, 0, INVALID, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 6; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasNoTrans, CblasNoTrans, 0, 0, INVALID,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 6; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasNoTrans, CblasTrans, 0, 0, INVALID,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 6; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasTrans, CblasNoTrans, 0, 0, INVALID,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 6; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasTrans, CblasTrans, 0, 0, INVALID,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 9; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasNoTrans, CblasNoTrans, 2, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 2 );
-- chkxer();
-- cblas_info = 9; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasNoTrans, CblasTrans, 2, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 2 );
-- chkxer();
-- cblas_info = 9; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasTrans, CblasNoTrans, 0, 0, 2,
-- ALPHA, A, 1, B, 2, BETA, C, 1 );
-- chkxer();
-- cblas_info = 9; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasTrans, CblasTrans, 0, 0, 2,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 11; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasNoTrans, CblasNoTrans, 0, 0, 2,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 11; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasTrans, CblasNoTrans, 0, 0, 2,
-- ALPHA, A, 2, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 11; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasNoTrans, CblasTrans, 0, 2, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 11; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasTrans, CblasTrans, 0, 2, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 14; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasNoTrans, CblasNoTrans, 2, 0, 0,
-- ALPHA, A, 2, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 14; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasNoTrans, CblasTrans, 2, 0, 0,
-- ALPHA, A, 2, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 14; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasTrans, CblasNoTrans, 2, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 14; RowMajorStrg = FALSE;
-- cblas_cgemm3m( CblasColMajor, CblasTrans, CblasTrans, 2, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 4; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasNoTrans, CblasNoTrans, INVALID, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 4; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasNoTrans, CblasTrans, INVALID, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 4; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasTrans, CblasNoTrans, INVALID, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 4; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasTrans, CblasTrans, INVALID, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 5; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasNoTrans, CblasNoTrans, 0, INVALID, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 5; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasNoTrans, CblasTrans, 0, INVALID, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 5; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasTrans, CblasNoTrans, 0, INVALID, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 5; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasTrans, CblasTrans, 0, INVALID, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 6; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasNoTrans, CblasNoTrans, 0, 0, INVALID,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 6; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasNoTrans, CblasTrans, 0, 0, INVALID,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 6; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasTrans, CblasNoTrans, 0, 0, INVALID,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 6; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasTrans, CblasTrans, 0, 0, INVALID,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 9; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasNoTrans, CblasNoTrans, 0, 0, 2,
-- ALPHA, A, 1, B, 1, BETA, C, 2 );
-- chkxer();
-- cblas_info = 9; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasNoTrans, CblasTrans, 0, 0, 2,
-- ALPHA, A, 1, B, 2, BETA, C, 2 );
-- chkxer();
-- cblas_info = 9; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasTrans, CblasNoTrans, 2, 0, 0,
-- ALPHA, A, 1, B, 2, BETA, C, 1 );
-- chkxer();
-- cblas_info = 9; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasTrans, CblasTrans, 2, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 11; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasNoTrans, CblasNoTrans, 0, 2, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 11; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasTrans, CblasNoTrans, 0, 2, 0,
-- ALPHA, A, 2, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 11; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasNoTrans, CblasTrans, 0, 0, 2,
-- ALPHA, A, 2, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 11; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasTrans, CblasTrans, 0, 0, 2,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 14; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasNoTrans, CblasNoTrans, 0, 2, 0,
-- ALPHA, A, 1, B, 2, BETA, C, 1 );
-- chkxer();
-- cblas_info = 14; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasNoTrans, CblasTrans, 0, 2, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 14; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasTrans, CblasNoTrans, 0, 2, 0,
-- ALPHA, A, 1, B, 2, BETA, C, 1 );
-- chkxer();
-- cblas_info = 14; RowMajorStrg = TRUE;
-- cblas_cgemm3m( CblasRowMajor, CblasTrans, CblasTrans, 0, 2, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
--
-- } else if (strncmp( sf,"cblas_cgemm" ,11)==0) {
-+ if (strncmp( sf,"cblas_cgemm" ,11)==0) {
- cblas_rout = "cblas_cgemm" ;
-
-
---- a/ctest/c_cblas3.c
-+++ b/ctest/c_cblas3.c
-@@ -567,81 +567,3 @@ void F77_ctrsm(int *order, char *rtlf, c
-
-
-
--void F77_cgemm3m(int *order, char *transpa, char *transpb, int *m, int *n,
-- int *k, CBLAS_TEST_COMPLEX *alpha, CBLAS_TEST_COMPLEX *a, int *lda,
-- CBLAS_TEST_COMPLEX *b, int *ldb, CBLAS_TEST_COMPLEX *beta,
-- CBLAS_TEST_COMPLEX *c, int *ldc ) {
--
-- CBLAS_TEST_COMPLEX *A, *B, *C;
-- int i,j,LDA, LDB, LDC;
-- enum CBLAS_TRANSPOSE transa, transb;
--
-- get_transpose_type(transpa, &transa);
-- get_transpose_type(transpb, &transb);
--
-- if (*order == TEST_ROW_MJR) {
-- if (transa == CblasNoTrans) {
-- LDA = *k+1;
-- A=(CBLAS_TEST_COMPLEX*)malloc((*m)*LDA*sizeof(CBLAS_TEST_COMPLEX));
-- for( i=0; i<*m; i++ )
-- for( j=0; j<*k; j++ ) {
-- A[i*LDA+j].real=a[j*(*lda)+i].real;
-- A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-- }
-- }
-- else {
-- LDA = *m+1;
-- A=(CBLAS_TEST_COMPLEX* )malloc(LDA*(*k)*sizeof(CBLAS_TEST_COMPLEX));
-- for( i=0; i<*k; i++ )
-- for( j=0; j<*m; j++ ) {
-- A[i*LDA+j].real=a[j*(*lda)+i].real;
-- A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-- }
-- }
--
-- if (transb == CblasNoTrans) {
-- LDB = *n+1;
-- B=(CBLAS_TEST_COMPLEX* )malloc((*k)*LDB*sizeof(CBLAS_TEST_COMPLEX) );
-- for( i=0; i<*k; i++ )
-- for( j=0; j<*n; j++ ) {
-- B[i*LDB+j].real=b[j*(*ldb)+i].real;
-- B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-- }
-- }
-- else {
-- LDB = *k+1;
-- B=(CBLAS_TEST_COMPLEX* )malloc(LDB*(*n)*sizeof(CBLAS_TEST_COMPLEX));
-- for( i=0; i<*n; i++ )
-- for( j=0; j<*k; j++ ) {
-- B[i*LDB+j].real=b[j*(*ldb)+i].real;
-- B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-- }
-- }
--
-- LDC = *n+1;
-- C=(CBLAS_TEST_COMPLEX* )malloc((*m)*LDC*sizeof(CBLAS_TEST_COMPLEX));
-- for( j=0; j<*n; j++ )
-- for( i=0; i<*m; i++ ) {
-- C[i*LDC+j].real=c[j*(*ldc)+i].real;
-- C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
-- }
-- cblas_cgemm3m( CblasRowMajor, transa, transb, *m, *n, *k, alpha, A, LDA,
-- B, LDB, beta, C, LDC );
-- for( j=0; j<*n; j++ )
-- for( i=0; i<*m; i++ ) {
-- c[j*(*ldc)+i].real=C[i*LDC+j].real;
-- c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
-- }
-- free(A);
-- free(B);
-- free(C);
-- }
-- else if (*order == TEST_COL_MJR)
-- cblas_cgemm3m( CblasColMajor, transa, transb, *m, *n, *k, alpha, a, *lda,
-- b, *ldb, beta, c, *ldc );
-- else
-- cblas_cgemm3m( UNDEFINED, transa, transb, *m, *n, *k, alpha, a, *lda,
-- b, *ldb, beta, c, *ldc );
--}
--
--
---- a/ctest/c_z3chke.c
-+++ b/ctest/c_z3chke.c
-@@ -49,237 +49,7 @@ void F77_z3chke(char * rout) {
-
-
-
-- if (strncmp( sf,"cblas_zgemm3m" ,13)==0) {
-- cblas_rout = "cblas_zgemm3" ;
--
-- cblas_info = 1;
-- cblas_zgemm3m( INVALID, CblasNoTrans, CblasNoTrans, 0, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 1;
-- cblas_zgemm3m( INVALID, CblasNoTrans, CblasTrans, 0, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 1;
-- cblas_zgemm3m( INVALID, CblasTrans, CblasNoTrans, 0, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 1;
-- cblas_zgemm3m( INVALID, CblasTrans, CblasTrans, 0, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 2; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, INVALID, CblasNoTrans, 0, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 2; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, INVALID, CblasTrans, 0, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 3; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasNoTrans, INVALID, 0, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 3; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasTrans, INVALID, 0, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 4; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasNoTrans, CblasNoTrans, INVALID, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 4; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasNoTrans, CblasTrans, INVALID, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 4; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasTrans, CblasNoTrans, INVALID, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 4; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasTrans, CblasTrans, INVALID, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 5; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasNoTrans, CblasNoTrans, 0, INVALID, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 5; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasNoTrans, CblasTrans, 0, INVALID, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 5; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasTrans, CblasNoTrans, 0, INVALID, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 5; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasTrans, CblasTrans, 0, INVALID, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 6; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasNoTrans, CblasNoTrans, 0, 0, INVALID,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 6; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasNoTrans, CblasTrans, 0, 0, INVALID,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 6; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasTrans, CblasNoTrans, 0, 0, INVALID,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 6; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasTrans, CblasTrans, 0, 0, INVALID,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 9; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasNoTrans, CblasNoTrans, 2, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 2 );
-- chkxer();
-- cblas_info = 9; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasNoTrans, CblasTrans, 2, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 2 );
-- chkxer();
-- cblas_info = 9; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasTrans, CblasNoTrans, 0, 0, 2,
-- ALPHA, A, 1, B, 2, BETA, C, 1 );
-- chkxer();
-- cblas_info = 9; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasTrans, CblasTrans, 0, 0, 2,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 11; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasNoTrans, CblasNoTrans, 0, 0, 2,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 11; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasTrans, CblasNoTrans, 0, 0, 2,
-- ALPHA, A, 2, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 11; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasNoTrans, CblasTrans, 0, 2, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 11; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasTrans, CblasTrans, 0, 2, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 14; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasNoTrans, CblasNoTrans, 2, 0, 0,
-- ALPHA, A, 2, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 14; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasNoTrans, CblasTrans, 2, 0, 0,
-- ALPHA, A, 2, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 14; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasTrans, CblasNoTrans, 2, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 14; RowMajorStrg = FALSE;
-- cblas_zgemm3m( CblasColMajor, CblasTrans, CblasTrans, 2, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 4; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasNoTrans, CblasNoTrans, INVALID, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 4; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasNoTrans, CblasTrans, INVALID, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 4; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasTrans, CblasNoTrans, INVALID, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 4; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasTrans, CblasTrans, INVALID, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 5; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasNoTrans, CblasNoTrans, 0, INVALID, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 5; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasNoTrans, CblasTrans, 0, INVALID, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 5; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasTrans, CblasNoTrans, 0, INVALID, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 5; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasTrans, CblasTrans, 0, INVALID, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 6; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasNoTrans, CblasNoTrans, 0, 0, INVALID,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 6; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasNoTrans, CblasTrans, 0, 0, INVALID,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 6; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasTrans, CblasNoTrans, 0, 0, INVALID,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 6; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasTrans, CblasTrans, 0, 0, INVALID,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 9; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasNoTrans, CblasNoTrans, 0, 0, 2,
-- ALPHA, A, 1, B, 1, BETA, C, 2 );
-- chkxer();
-- cblas_info = 9; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasNoTrans, CblasTrans, 0, 0, 2,
-- ALPHA, A, 1, B, 2, BETA, C, 2 );
-- chkxer();
-- cblas_info = 9; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasTrans, CblasNoTrans, 2, 0, 0,
-- ALPHA, A, 1, B, 2, BETA, C, 1 );
-- chkxer();
-- cblas_info = 9; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasTrans, CblasTrans, 2, 0, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 11; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasNoTrans, CblasNoTrans, 0, 2, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 11; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasTrans, CblasNoTrans, 0, 2, 0,
-- ALPHA, A, 2, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 11; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasNoTrans, CblasTrans, 0, 0, 2,
-- ALPHA, A, 2, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 11; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasTrans, CblasTrans, 0, 0, 2,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 14; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasNoTrans, CblasNoTrans, 0, 2, 0,
-- ALPHA, A, 1, B, 2, BETA, C, 1 );
-- chkxer();
-- cblas_info = 14; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasNoTrans, CblasTrans, 0, 2, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
-- cblas_info = 14; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasTrans, CblasNoTrans, 0, 2, 0,
-- ALPHA, A, 1, B, 2, BETA, C, 1 );
-- chkxer();
-- cblas_info = 14; RowMajorStrg = TRUE;
-- cblas_zgemm3m( CblasRowMajor, CblasTrans, CblasTrans, 0, 2, 0,
-- ALPHA, A, 1, B, 1, BETA, C, 1 );
-- chkxer();
--
--
--
-- } else if (strncmp( sf,"cblas_zgemm" ,11)==0) {
-+ if (strncmp( sf,"cblas_zgemm" ,11)==0) {
- cblas_rout = "cblas_zgemm" ;
-
- cblas_info = 1;
---- a/ctest/c_zblas3.c
-+++ b/ctest/c_zblas3.c
-@@ -563,81 +563,3 @@ void F77_ztrsm(int *order, char *rtlf, c
- a, *lda, b, *ldb);
- }
-
--
--void F77_zgemm3m(int *order, char *transpa, char *transpb, int *m, int *n,
-- int *k, CBLAS_TEST_ZOMPLEX *alpha, CBLAS_TEST_ZOMPLEX *a, int *lda,
-- CBLAS_TEST_ZOMPLEX *b, int *ldb, CBLAS_TEST_ZOMPLEX *beta,
-- CBLAS_TEST_ZOMPLEX *c, int *ldc ) {
--
-- CBLAS_TEST_ZOMPLEX *A, *B, *C;
-- int i,j,LDA, LDB, LDC;
-- enum CBLAS_TRANSPOSE transa, transb;
--
-- get_transpose_type(transpa, &transa);
-- get_transpose_type(transpb, &transb);
--
-- if (*order == TEST_ROW_MJR) {
-- if (transa == CblasNoTrans) {
-- LDA = *k+1;
-- A=(CBLAS_TEST_ZOMPLEX*)malloc((*m)*LDA*sizeof(CBLAS_TEST_ZOMPLEX));
-- for( i=0; i<*m; i++ )
-- for( j=0; j<*k; j++ ) {
-- A[i*LDA+j].real=a[j*(*lda)+i].real;
-- A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-- }
-- }
-- else {
-- LDA = *m+1;
-- A=(CBLAS_TEST_ZOMPLEX* )malloc(LDA*(*k)*sizeof(CBLAS_TEST_ZOMPLEX));
-- for( i=0; i<*k; i++ )
-- for( j=0; j<*m; j++ ) {
-- A[i*LDA+j].real=a[j*(*lda)+i].real;
-- A[i*LDA+j].imag=a[j*(*lda)+i].imag;
-- }
-- }
--
-- if (transb == CblasNoTrans) {
-- LDB = *n+1;
-- B=(CBLAS_TEST_ZOMPLEX* )malloc((*k)*LDB*sizeof(CBLAS_TEST_ZOMPLEX) );
-- for( i=0; i<*k; i++ )
-- for( j=0; j<*n; j++ ) {
-- B[i*LDB+j].real=b[j*(*ldb)+i].real;
-- B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-- }
-- }
-- else {
-- LDB = *k+1;
-- B=(CBLAS_TEST_ZOMPLEX* )malloc(LDB*(*n)*sizeof(CBLAS_TEST_ZOMPLEX));
-- for( i=0; i<*n; i++ )
-- for( j=0; j<*k; j++ ) {
-- B[i*LDB+j].real=b[j*(*ldb)+i].real;
-- B[i*LDB+j].imag=b[j*(*ldb)+i].imag;
-- }
-- }
--
-- LDC = *n+1;
-- C=(CBLAS_TEST_ZOMPLEX* )malloc((*m)*LDC*sizeof(CBLAS_TEST_ZOMPLEX));
-- for( j=0; j<*n; j++ )
-- for( i=0; i<*m; i++ ) {
-- C[i*LDC+j].real=c[j*(*ldc)+i].real;
-- C[i*LDC+j].imag=c[j*(*ldc)+i].imag;
-- }
-- cblas_zgemm3m( CblasRowMajor, transa, transb, *m, *n, *k, alpha, A, LDA,
-- B, LDB, beta, C, LDC );
-- for( j=0; j<*n; j++ )
-- for( i=0; i<*m; i++ ) {
-- c[j*(*ldc)+i].real=C[i*LDC+j].real;
-- c[j*(*ldc)+i].imag=C[i*LDC+j].imag;
-- }
-- free(A);
-- free(B);
-- free(C);
-- }
-- else if (*order == TEST_COL_MJR)
-- cblas_zgemm3m( CblasColMajor, transa, transb, *m, *n, *k, alpha, a, *lda,
-- b, *ldb, beta, c, *ldc );
-- else
-- cblas_zgemm3m( UNDEFINED, transa, transb, *m, *n, *k, alpha, a, *lda,
-- b, *ldb, beta, c, *ldc );
--}
--
diff --git a/debian/patches/series b/debian/patches/series
index 0c39fbb..2f301a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,3 @@ always-run-testsuite.patch
remove-openmp-warning.patch
no-embedded-lapack.patch
shared-blas-lapack.patch
-arm64.patch
-arm-arch-detection.patch
-disable-gemm3m-tests.patch
--
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