summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2016-01-16 20:32:48 -0700
committerCharles Harris <charlesr.harris@gmail.com>2016-01-16 20:32:48 -0700
commit2f7827702ef6b6ac4b318103d5c0dfe2ff6e7eb3 (patch)
tree47132bf1484d5354358d19f13e4c8bbd324d3f89
parentad4b5b03470a4ca2ef3150faa721a0e239b3c203 (diff)
parentab6ba2cbc460c8a7c000815bee8595776ce4ec98 (diff)
downloadnumpy-2f7827702ef6b6ac4b318103d5c0dfe2ff6e7eb3.tar.gz
Merge pull request #7038 from jakirkham/cblasfuncs_sty_fixes
STY: Wrap some long lines in `cblasfuncs.c`
-rw-r--r--numpy/core/src/multiarray/cblasfuncs.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/numpy/core/src/multiarray/cblasfuncs.c b/numpy/core/src/multiarray/cblasfuncs.c
index b11505c0e..ef05c7205 100644
--- a/numpy/core/src/multiarray/cblasfuncs.c
+++ b/numpy/core/src/multiarray/cblasfuncs.c
@@ -133,7 +133,8 @@ syrk(int typenum, enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE trans,
for (i = 0; i < n; i++) {
for (j = i + 1; j < n; j++) {
- *((npy_double*)PyArray_GETPTR2(R, j, i)) = *((npy_double*)PyArray_GETPTR2(R, i, j));
+ *((npy_double*)PyArray_GETPTR2(R, j, i)) =
+ *((npy_double*)PyArray_GETPTR2(R, i, j));
}
}
break;
@@ -143,7 +144,8 @@ syrk(int typenum, enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE trans,
for (i = 0; i < n; i++) {
for (j = i + 1; j < n; j++) {
- *((npy_float*)PyArray_GETPTR2(R, j, i)) = *((npy_float*)PyArray_GETPTR2(R, i, j));
+ *((npy_float*)PyArray_GETPTR2(R, j, i)) =
+ *((npy_float*)PyArray_GETPTR2(R, i, j));
}
}
break;
@@ -153,7 +155,8 @@ syrk(int typenum, enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE trans,
for (i = 0; i < n; i++) {
for (j = i + 1; j < n; j++) {
- *((npy_cdouble*)PyArray_GETPTR2(R, j, i)) = *((npy_cdouble*)PyArray_GETPTR2(R, i, j));
+ *((npy_cdouble*)PyArray_GETPTR2(R, j, i)) =
+ *((npy_cdouble*)PyArray_GETPTR2(R, i, j));
}
}
break;
@@ -163,7 +166,8 @@ syrk(int typenum, enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE trans,
for (i = 0; i < n; i++) {
for (j = i + 1; j < n; j++) {
- *((npy_cfloat*)PyArray_GETPTR2(R, j, i)) = *((npy_cfloat*)PyArray_GETPTR2(R, i, j));
+ *((npy_cfloat*)PyArray_GETPTR2(R, j, i)) =
+ *((npy_cfloat*)PyArray_GETPTR2(R, i, j));
}
}
break;
@@ -319,8 +323,8 @@ cblas_matrixproduct(int typenum, PyArrayObject *ap1, PyArrayObject *ap2,
*/
if (nd == 1) {
/*
- * Either PyArray_NDIM(ap1) is 1 dim or PyArray_NDIM(ap2) is 1 dim
- * and the other is 2-dim
+ * Either PyArray_NDIM(ap1) is 1 dim or PyArray_NDIM(ap2) is
+ * 1 dim and the other is 2 dim
*/
dimensions[0] = (PyArray_NDIM(oap1) == 2) ?
PyArray_DIM(oap1, 0) : PyArray_DIM(oap2, 1);
@@ -729,7 +733,8 @@ cblas_matrixproduct(int typenum, PyArrayObject *ap1, PyArrayObject *ap2,
}
}
else {
- gemm(typenum, Order, Trans1, Trans2, L, N, M, ap1, lda, ap2, ldb, ret);
+ gemm(typenum, Order, Trans1, Trans2, L, N, M, ap1, lda, ap2, ldb,
+ ret);
}
NPY_END_ALLOW_THREADS;
}