| 1 |
markusle 07/12/21 14:50:31 |
| 2 |
|
| 3 |
Added: itpp-4.0.1-zdotu-debian.patch |
| 4 |
Log: |
| 5 |
Added a patch from upstream and cleaned up the ebuild. |
| 6 |
(Portage version: 2.1.4_rc10) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-libs/itpp/files/itpp-4.0.1-zdotu-debian.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/itpp/files/itpp-4.0.1-zdotu-debian.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/itpp/files/itpp-4.0.1-zdotu-debian.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: itpp-4.0.1-zdotu-debian.patch |
| 15 |
=================================================================== |
| 16 |
diff --git a/itpp/base/blas.h b/itpp/base/blas.h |
| 17 |
index 91e415b..e23ca68 100644 |
| 18 |
--- a/itpp/base/blas.h |
| 19 |
+++ b/itpp/base/blas.h |
| 20 |
@@ -88,21 +88,21 @@ extern "C" { |
| 21 |
const double *x, const int *incx, |
| 22 |
const double *y, const int *incy); |
| 23 |
|
| 24 |
-#if defined(HAVE_ZDOTU_RETURN) |
| 25 |
- std::complex<double> zdotu_(const int *n, |
| 26 |
- const std::complex<double> *x, const int *incx, |
| 27 |
- const std::complex<double> *y, const int *incy); |
| 28 |
-#elif defined(HAVE_ZDOTU_VOID) |
| 29 |
+#if defined(HAVE_ZDOTU_VOID) |
| 30 |
void zdotu_(std::complex<double> *dot, |
| 31 |
const int *n, |
| 32 |
const std::complex<double> *x, const int *incx, |
| 33 |
const std::complex<double> *y, const int *incy); |
| 34 |
+#elif defined(HAVE_ZDOTU_RETURN) |
| 35 |
+ std::complex<double> zdotu_(const int *n, |
| 36 |
+ const std::complex<double> *x, const int *incx, |
| 37 |
+ const std::complex<double> *y, const int *incy); |
| 38 |
#else |
| 39 |
void zdotusub_(std::complex<double> *dot, |
| 40 |
const int *n, |
| 41 |
const std::complex<double> *x, const int *incx, |
| 42 |
const std::complex<double> *y, const int *incy); |
| 43 |
-#endif |
| 44 |
+#endif // HAVE_ZDOTU_VOID |
| 45 |
|
| 46 |
// ---------------------------------------------------------------------- |
| 47 |
// BLAS 2 functions |
| 48 |
diff --git a/itpp/base/vec.h b/itpp/base/vec.h |
| 49 |
index 6da1126..8708766 100644 |
| 50 |
--- a/itpp/base/vec.h |
| 51 |
+++ b/itpp/base/vec.h |
| 52 |
@@ -925,13 +925,13 @@ namespace itpp { |
| 53 |
it_assert_debug(v1.datasize == v2.datasize, "cvec::dot: wrong sizes"); |
| 54 |
int incr = 1; |
| 55 |
std::complex<double> output; |
| 56 |
-#if defined(HAVE_ZDOTU_RETURN) |
| 57 |
- output = blas::zdotu_(&v1.datasize, v1.data, &incr, v2.data, &incr); |
| 58 |
-#elif defined(HAVE_ZDOTU_VOID) |
| 59 |
+#if defined(HAVE_ZDOTU_VOID) |
| 60 |
blas::zdotu_(&output, &v1.datasize, v1.data, &incr, v2.data, &incr); |
| 61 |
+#elif defined(HAVE_ZDOTU_RETURN) |
| 62 |
+ output = blas::zdotu_(&v1.datasize, v1.data, &incr, v2.data, &incr); |
| 63 |
#else |
| 64 |
blas::zdotusub_(&output, &v1.datasize, v1.data, &incr, v2.data, &incr); |
| 65 |
-#endif // HAVE_ZDOTU_RETURN |
| 66 |
+#endif // HAVE_ZDOTU_VOID |
| 67 |
return output; |
| 68 |
} |
| 69 |
#endif // HAVE_BLAS |
| 70 |
|
| 71 |
|
| 72 |
|
| 73 |
-- |
| 74 |
gentoo-commits@g.o mailing list |
Archives