Out of place cholesky now returns triangular matrix for all backends

pavanky · pavanky · commit 4f209e81abdb · 2015-04-30T15:44:49.000-04:00
diff --git a/src/api/cpp/lapack.cpp b/src/api/cpp/lapack.cpp
@@ -63,9 +63,9 @@ namespace af
 
     array cholesky(const array &in, int *info, const bool is_upper)
     {
-        array out = in.copy();
-        AF_THROW(af_cholesky_inplace(info, out.get(), is_upper));
-        return out;
+        af_array out;
+        AF_THROW(af_cholesky(&out, info, in.get(), is_upper));
+        return array(out);
     }
 
     void choleskyInplace(array &in, int *info, const bool is_upper)
diff --git a/src/backend/cpu/cholesky.cpp b/src/backend/cpu/cholesky.cpp
@@ -17,6 +17,7 @@
 #include <iostream>
 #include <cassert>
 #include <err_cpu.hpp>
+#include <triangle.hpp>
 
 #include <lapack_helper.hpp>
 
@@ -47,6 +48,10 @@ Array<T> cholesky(int *info, const Array<T> &in, const bool is_upper)
 {
     Array<T> out = copyArray<T>(in);
     *info = cholesky_inplace(out, is_upper);
+
+    if (is_upper) triangle<T, true >(out, out);
+    else          triangle<T, false>(out, out);
+
     return out;
 }
 
diff --git a/src/backend/cuda/cholesky.cu b/src/backend/cuda/cholesky.cu
@@ -18,6 +18,7 @@
 #include <iostream>
 #include <memory.hpp>
 #include <copy.hpp>
+#include <triangle.hpp>
 
 #include <math.hpp>
 #include <err_common.hpp>
@@ -94,6 +95,10 @@ Array<T> cholesky(int *info, const Array<T> &in, const bool is_upper)
 
     Array<T> out = copyArray<T>(in);
     *info = cholesky_inplace(out, is_upper);
+
+    if (is_upper) triangle<T, true >(out, out);
+    else          triangle<T, false>(out, out);
+
     return out;
 }
 
diff --git a/src/backend/opencl/cholesky.cpp b/src/backend/opencl/cholesky.cpp
@@ -13,6 +13,7 @@
 #include <magma/magma.h>
 #include <blas.hpp>
 #include <err_opencl.hpp>
+#include <triangle.hpp>
 
 #if defined(WITH_OPENCL_LINEAR_ALGEBRA)
 
@@ -48,6 +49,10 @@ Array<T> cholesky(int *info, const Array<T> &in, const bool is_upper)
 
         Array<T> out = copyArray<T>(in);
         *info = cholesky_inplace(out, is_upper);
+
+        if (is_upper) triangle<T, true >(out, out);
+        else          triangle<T, false>(out, out);
+
         return out;
 
     } catch (cl::Error &err) {

Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,9 @@ namespace af`
`63`	`63`
`64`	`64`	`array cholesky(const array &in, int *info, const bool is_upper)`
`65`	`65`	`{`
`66`		`- array out = in.copy();`
`67`		`- AF_THROW(af_cholesky_inplace(info, out.get(), is_upper));`
`68`		`- return out;`
	`66`	`+ af_array out;`
	`67`	`+ AF_THROW(af_cholesky(&out, info, in.get(), is_upper));`
	`68`	`+ return array(out);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`void choleskyInplace(array &in, int *info, const bool is_upper)`