|
 |
60e211 |
From 5ef079e305fdfe7275e6a241704fb071f7c9345d Mon Sep 17 00:00:00 2001
|
|
|
60e211 |
From: "R. Clint Whaley" <whaley@cs.utsa.edu>
|
|
|
60e211 |
Date: Sat, 2 Nov 2013 13:04:29 -0500
|
|
|
60e211 |
Subject: [PATCH] fixed possible memory leek in threaded QR
|
|
|
60e211 |
|
|
|
60e211 |
---
|
|
|
60e211 |
AtlasBase/Students/qr.base | 12 ++++++------
|
|
|
60e211 |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
60e211 |
|
|
|
60e211 |
diff --git a/src/threads/lapack/ATL_tgeqr2.c b/src/threads/lapack/ATL_tgeqr2.c
|
|
|
60e211 |
index 2263042..daf44a9 100644
|
|
|
60e211 |
--- a/src/threads/lapack/ATL_tgeqr2.c
|
|
|
60e211 |
+++ b/src/threads/lapack/ATL_tgeqr2.c
|
|
|
60e211 |
@@ -10372,7 +10372,7 @@ int ATL_tgexx2(int M, int N, TYPE *A, int LDA, TYPE *TAU, TYPE *WORK,
|
|
|
60e211 |
/* We use a data-owner split, each thread gets 1/p of the data, */
|
|
|
60e211 |
/* and does all computation related to it. */
|
|
|
60e211 |
/*----------------------------------------------------------------------------*/
|
|
|
60e211 |
- TYPE *myA = A, *myOldA = A, *allMem, *workMem;
|
|
|
60e211 |
+ TYPE *myA = A, *myOldA = A, *allMem=NULL, *workMem;
|
|
|
60e211 |
int i, j, k, b0, b, th;
|
|
|
60e211 |
long unsigned int CPU;
|
|
|
60e211 |
size_t mem[ATL_NTHREADS], totmem, workSize;
|
|
|
60e211 |
@@ -10523,9 +10523,8 @@ int ATL_tgexx2(int M, int N, TYPE *A, int LDA, TYPE *TAU, TYPE *WORK,
|
|
|
60e211 |
ATL_goparallel(th, ATL_geqr2Worker, ts, NULL);
|
|
|
60e211 |
|
|
|
60e211 |
|
|
|
60e211 |
- #if defined(local_copy)
|
|
|
60e211 |
- free(allMem); /* release copied area. */
|
|
|
60e211 |
- #endif /* defined(local_copy) */
|
|
|
60e211 |
+ if (allMem)
|
|
|
60e211 |
+ free(allMem); /* release copied area. */
|
|
|
60e211 |
free(workMem); /* release work area. */
|
|
|
60e211 |
return(0); /* Done with dgeqr2. */
|
|
|
60e211 |
} /* END ATL_t_dgeqr2. */
|
|
|
60e211 |
diff --git a/src/threads/lapack/ATL_tgeql2.c b/src/threads/lapack/ATL_tgeql2.c
|
|
|
60e211 |
index 2263042..daf44a9 100644
|
|
|
60e211 |
--- a/src/threads/lapack/ATL_tgeql2.c
|
|
|
60e211 |
+++ b/src/threads/lapack/ATL_tgeql2.c
|
|
|
60e211 |
@@ -11660,7 +11659,7 @@ int ATL_tgexx2(int M, int N, TYPE *A, int LDA, TYPE *TAU, TYPE *WORK,
|
|
|
60e211 |
/* We use a data-owner split, each thread gets 1/p of the data, */
|
|
|
60e211 |
/* and does all computation related to it. */
|
|
|
60e211 |
/*----------------------------------------------------------------------------*/
|
|
|
60e211 |
- TYPE *myA = A, *allMem, *workMem;
|
|
|
60e211 |
+ TYPE *myA = A, *allMem=NULL, *workMem;
|
|
|
60e211 |
int i, j, k, b0, b, th;
|
|
|
60e211 |
long unsigned int CPU;
|
|
|
60e211 |
size_t mem[ATL_NTHREADS], totmem, workSize;
|
|
|
60e211 |
@@ -11823,7 +11822,8 @@ int ATL_tgexx2(int M, int N, TYPE *A, int LDA, TYPE *TAU, TYPE *WORK,
|
|
|
60e211 |
ATL_goparallel(th, ATL_geql2Worker, ts, NULL);
|
|
|
60e211 |
|
|
|
60e211 |
|
|
|
60e211 |
- if (myCopy) free(allMem); /* release copied area. */
|
|
|
60e211 |
+ if (allMem)
|
|
|
60e211 |
+ free(allMem); /* release copied area. */
|
|
|
60e211 |
free(workMem); /* release work area. */
|
|
|
60e211 |
return(0); /* Done with dgeql2. */
|
|
|
60e211 |
} /* END ATL_t_dgeql2 */
|