rm linalg::apply and linalg::elementwiseproduct

shogun-toolbox · Mar 13, 2017 · 75e77f1 · 75e77f1
1 parent 2b429f2
commit 75e77f1
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 737 deletions.
diff --git a/src/shogun/kernel/ExponentialARDKernel.cpp b/src/shogun/kernel/ExponentialARDKernel.cpp
@@ -244,7 +244,7 @@ SGMatrix<float64_t> CExponentialARDKernel::get_weighted_vector(SGVector<float64_
 			{
 			return CMath::exp(value);
 			});
-		res=linalg::elementwise_product(weights, rtmp);
+		res=linalg::element_prod(weights, rtmp);
 	}
 	return res;
 }

diff --git a/src/shogun/lib/GPUMatrix.h b/src/shogun/lib/GPUMatrix.h
@@ -41,6 +41,7 @@
 
 #include <shogun/lib/common.h>
 #include <memory>
+#include <viennacl/linalg/matrix_operations.hpp>
 
 #ifndef SWIG // SWIG should skip this part
 namespace viennacl

diff --git a/src/shogun/mathematics/linalg/internal/implementation/Apply.h b/src/shogun/mathematics/linalg/internal/implementation/Apply.h
diff --git a/src/shogun/mathematics/linalg/internal/implementation/ElementwiseProduct.h b/src/shogun/mathematics/linalg/internal/implementation/ElementwiseProduct.h