fixing matrix allocation in Kernel and Distance

close istream in OutputStream test before deleting the file
shogun-toolbox · Mar 20, 2020 · ca81ec2 · ca81ec2
1 parent e56697c
commit ca81ec2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/src/shogun/distance/Distance.cpp b/src/shogun/distance/Distance.cpp
@@ -267,8 +267,6 @@ void Distance::init()
 template <class T>
 SGMatrix<T> Distance::get_distance_matrix()
 {
-	T* result = NULL;
-
 	require(has_features(), "no features assigned to distance");
 	init(lhs, rhs);
 
@@ -283,7 +281,7 @@ SGMatrix<T> Distance::get_distance_matrix()
 
 	SG_DEBUG("returning distance matrix of size {}x{}", m, n)
 
-	result=SG_MALLOC(T, total_num);
+	SGMatrix<T> result (m,n);
 
 	PRange<int64_t> pb = PRange<int64_t>(
 	    range(total_num), "PROGRESS: ", UTF8, []() { return true; });
@@ -342,7 +340,7 @@ SGMatrix<T> Distance::get_distance_matrix()
 	}
 	pb.complete();
 
-	return SGMatrix<T>(result,m,n,true);
+	return result;
 }
 
 template SGMatrix<float64_t> Distance::get_distance_matrix<float64_t>();

diff --git a/src/shogun/kernel/Kernel.cpp b/src/shogun/kernel/Kernel.cpp
@@ -1306,8 +1306,6 @@ template <class T> void* Kernel::get_kernel_matrix_helper(void* p)
 template <class T>
 SGMatrix<T> Kernel::get_kernel_matrix()
 {
-	T* result = NULL;
-
 	require(has_features(), "no features assigned to kernel");
 
 	int32_t m=get_num_vec_lhs();
@@ -1320,7 +1318,7 @@ SGMatrix<T> Kernel::get_kernel_matrix()
 
 	SG_DEBUG("returning kernel matrix of size {}x{}", m, n)
 
-	result=SG_MALLOC(T, total_num);
+	SGMatrix<T> result(m,n);
 
 	int32_t num_threads=env()->get_num_threads();
 	K_THREAD_PARAM<T> params;
@@ -1331,7 +1329,7 @@ SGMatrix<T> Kernel::get_kernel_matrix()
 	for (t = 0; t < num_threads; ++t)
 	{
 		params.kernel = this;
-		params.result = result;
+		params.result = result.matrix;
 		params.start = compute_row_start(t*step, n, symmetric);
 		params.end = compute_row_start((t+1)*step, n, symmetric);
 		params.total_start=t*step;
@@ -1346,7 +1344,7 @@ SGMatrix<T> Kernel::get_kernel_matrix()
 	if (total_num % num_threads != 0)
 	{
 		params.kernel = this;
-		params.result = result;
+		params.result = result.matrix;
 		params.start = compute_row_start(t*step, n, symmetric);
 		params.end = m;
 		params.total_start=t*step;
@@ -1360,7 +1358,7 @@ SGMatrix<T> Kernel::get_kernel_matrix()
 
 	pb.complete();
 
-	return SGMatrix<T>(result,m,n,true);
+	return result;
 }
 
 

diff --git a/tests/unit/io/stream/OutputStream_unittest.cc b/tests/unit/io/stream/OutputStream_unittest.cc
@@ -26,6 +26,7 @@ TEST(FileOutputStream, write)
 	ifstream is(fname);
 	char str_in[5];
 	is.get(&str_in[0], 5);
+	is.close();
 	EXPECT_EQ(test_str, string(str_in));
 	r = fs_registry->delete_file(fname);
 	ASSERT_FALSE(r);