SPEX test coverage; added spex_free_*_array methods

Author: DrTimothyAldenDavis

SPEX/Config/Tcov_Makefile.in

@@ -87,6 +87,9 @@ OBJ_Util = \
     spex_create_mpfr_array.o \
     spex_create_mpq_array.o \
     spex_create_mpz_array.o \
+    spex_free_mpfr_array.o \
+    spex_free_mpq_array.o \
+    spex_free_mpz_array.o \
     spex_cumsum.o \
     spex_expand_double_array.o \
     spex_expand_mpfr_array.o \
@@ -112,8 +115,7 @@ OBJ_Util = \
     SPEX_determine_symmetry.o \
     SPEX_transpose.o \
     spex_amd.o \
-    spex_colamd.o \
-    spex_create_mpq.o
+    spex_colamd.o
 
 $(OBJ_Util): ../Include/SPEX.h ../SPEX_Utilities/Source/spex_util_internal.h
 
@@ -256,6 +258,9 @@ vtests4llu: all
 	$(V) ./tcov_for_lu 0 1 1 > lu5.out
 	$(V) ./tcov_for_lu2 ../ExampleMats/Trefethen_500.mat.txt ../ExampleMats/Trefethen_500.rhs.txt > test_for_lu2.out
 
+vtest2: all
+	$(V) ./tcov_for_lu2 ../ExampleMats/Trefethen_500.mat.txt ../ExampleMats/Trefethen_500.rhs.txt > test_for_lu2.out
+
 # run test for SPEX_Cholesky with valgrind
 vtests4chol: all
 	$(V) ./tcov_for_cholesky ../ExampleMats/mesh1e1.mat.txt ../ExampleMats/mesh1e1.rhs.txt > test_for_cholesky.out

SPEX/SPEX_LU/Source/spex_left_lu_get_largest_pivot.c

@@ -18,7 +18,7 @@
  */
 
 #define SPEX_FREE_ALL          \
-    SPEX_MPZ_CLEAR(big);
+    SPEX_mpz_clear (big);
 
 #include "spex_lu_internal.h"
 
@@ -51,7 +51,7 @@ SPEX_info spex_left_lu_get_largest_pivot
     int r ;
     (*pivot) = -1 ;
     mpz_t big ;
-    SPEX_MPZ_SET_NULL (big);
+    SPEX_mpz_set_null (big);
     SPEX_MPZ_INIT (big);
 
     //--------------------------------------------------------------------------

SPEX/SPEX_LU/Source/spex_left_lu_get_pivot.c

@@ -25,8 +25,8 @@
  */
 
 #define SPEX_FREE_ALL           \
-    SPEX_MPQ_CLEAR (tol);      \
-    SPEX_MPQ_CLEAR (ratio);
+    SPEX_mpq_clear (tol);       \
+    SPEX_mpq_clear (ratio);
 
 #include "spex_lu_internal.h"
 
@@ -67,8 +67,8 @@ SPEX_info spex_left_lu_get_pivot
 
     int sgn, r;
     mpq_t tol, ratio;
-    SPEX_MPQ_SET_NULL(tol);
-    SPEX_MPQ_SET_NULL(ratio);
+    SPEX_mpq_set_null (tol);
+    SPEX_mpq_set_null (ratio);
 
     if (order == SPEX_SMALLEST)
     {

SPEX/SPEX_LU/Source/spex_left_lu_get_smallest_pivot.c

@@ -16,7 +16,7 @@
  */
 
 #define SPEX_FREE_ALL           \
-    SPEX_MPZ_CLEAR(small);
+    SPEX_mpz_clear (small);
 
 #include "spex_lu_internal.h"
 
@@ -49,7 +49,7 @@ SPEX_info spex_left_lu_get_smallest_pivot
     (*pivot) = -1;
     j = n;
     flag = top;
-    mpz_t small; SPEX_MPZ_SET_NULL(small);
+    mpz_t small; SPEX_mpz_set_null (small);
     SPEX_MPZ_INIT(small);
 
     //--------------------------------------------------------------------------

SPEX/SPEX_Utilities/Source/SPEX_factorization_free.c

@@ -29,7 +29,7 @@ SPEX_info SPEX_factorization_free
 
     if ((F_handle != NULL) && (*F_handle != NULL))
     {
-        SPEX_MPQ_CLEAR((*F_handle)->scale_for_A);
+        SPEX_mpq_clear ((*F_handle)->scale_for_A);
 
         SPEX_matrix_free(&((*F_handle)->L), option);
         SPEX_matrix_free(&((*F_handle)->U), option);

SPEX/SPEX_Utilities/Source/SPEX_gmp.c

@@ -2178,7 +2178,10 @@ SPEX_info SPEX_mpq_clear
     mpq_t x
 )
 {
-    SPEX_MPQ_CLEAR (x) ;
+    if (x != NULL)
+    {
+        SPEX_MPQ_CLEAR (x) ;
+    }
     return (SPEX_OK);
 }
 

SPEX/SPEX_Utilities/Source/SPEX_matrix_allocate.c

@@ -24,15 +24,15 @@
 
 #define SPEX_FREE_ALL                       \
 {                                           \
-    SPEX_matrix_free (&A, option);         \
+    SPEX_matrix_free (&A, option);          \
 }
 
 #include "spex_util_internal.h"
 
 #if defined (__GNUC__)
     #if ( __GNUC__ == 11)
         // gcc 11 has a bug that triggers a spurious warning for the call
-        // to SPEX_mpq_init (A->scale), from -Wstringop-overflow.  see
+        // to SPEX_MPQ_INIT (A->scale), from -Wstringop-overflow.  see
         // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101854
         #pragma GCC diagnostic ignored "-Wstringop-overflow"
     #endif
@@ -110,7 +110,7 @@ SPEX_info SPEX_matrix_allocate
     A->x_shallow = false ;
 
     // A->scale = 1
-    SPEX_CHECK (spex_create_mpq (A->scale));
+    SPEX_MPQ_INIT (A->scale) ;
     SPEX_MPQ_SET_UI (A->scale, 1, 1);
 
     //--------------------------------------------------------------------------

SPEX/SPEX_Utilities/Source/SPEX_matrix_check.c

@@ -9,10 +9,12 @@
 
 //------------------------------------------------------------------------------
 
-#define SPEX_FREE_ALL    \
-    SPEX_FREE (work);   \
-    SPEX_MPZ_CLEAR(q);   \
-    SPEX_MPZ_CLEAR(r);
+#define SPEX_FREE_ALL       \
+{                           \
+    SPEX_FREE (work);       \
+    SPEX_mpz_clear (q);     \
+    SPEX_mpz_clear (r);     \
+}
 
 #include "spex_util_internal.h"
 
@@ -21,7 +23,7 @@
     lines++ ;                               \
     if (pr == 2 && lines > 30)              \
     {                                       \
-        SPEX_PRINTF ("    ...\n");         \
+        SPEX_PRINTF ("    ...\n");          \
         pr = 1 ;                            \
     }
 
@@ -143,8 +145,8 @@ SPEX_info SPEX_matrix_check     // returns a SPEX status code
     // paranoia:  check prec here: cast to mprf_prec_t, and back, assert
     // equality, if not equal then return SPEX_PANIC
     mpz_t q, r;
-    SPEX_MPZ_SET_NULL(q);
-    SPEX_MPZ_SET_NULL(r);
+    SPEX_mpz_set_null (q);
+    SPEX_mpz_set_null (r);
 
     int64_t lines = 0 ;     // # of lines printed so far
 

SPEX/SPEX_Utilities/Source/SPEX_matrix_free.c

@@ -38,67 +38,45 @@ SPEX_info SPEX_matrix_free
     //--------------------------------------------------------------------------
     // free any non-shallow components
     //--------------------------------------------------------------------------
-   
-        // free the integer pattern
-        if (!(A->p_shallow)) SPEX_FREE (A->p);
-        if (!(A->i_shallow)) SPEX_FREE (A->i);
-        if (!(A->j_shallow)) SPEX_FREE (A->j);
-
-        // free the values
-        if (!(A->x_shallow))
+
+    // free the integer pattern
+    if (!(A->p_shallow)) SPEX_FREE (A->p);
+    if (!(A->i_shallow)) SPEX_FREE (A->i);
+    if (!(A->j_shallow)) SPEX_FREE (A->j);
+
+    // free the values
+    if (!(A->x_shallow))
+    {
+        switch (A->type)
         {
-            switch (A->type)
-            {
-                case SPEX_MPZ:
-                    if ( A->x.mpz != NULL)
-                    {
-                        for (int64_t i = 0; i < A->nzmax; i++)
-                        {
-                            SPEX_MPZ_CLEAR( A->x.mpz[i]);
-                        }
-                    }
-                    SPEX_FREE (A->x.mpz);
-                    break ;
-
-                case SPEX_MPQ:
-                    if ( A->x.mpq != NULL)
-                    {
-                        for (int64_t i = 0; i < A->nzmax; i++)
-                        {
-                            SPEX_MPQ_CLEAR( A->x.mpq[i]);
-                        }
-                    }
-                    SPEX_FREE (A->x.mpq);
-                    break ;
-
-                case SPEX_MPFR:
-                    if ( A->x.mpfr != NULL)
-                    {
-                        for (int64_t i = 0; i < A->nzmax; i++)
-                        {
-                            SPEX_MPFR_CLEAR( A->x.mpfr[i]);
-                        }
-                    }
-                    SPEX_FREE (A->x.mpfr);
-                    break ;
-
-                case SPEX_INT64:
-                    SPEX_FREE (A->x.int64);
-                    break ;
-
-                case SPEX_FP64:
-                    SPEX_FREE (A->x.fp64);
-                    break ;
-
-                default:
-                    // do nothing
-                    break ;
-            }
-        }
+            case SPEX_MPZ:
+                spex_free_mpz_array (&(A->x.mpz), A->nzmax) ;
+                break ;
+
+            case SPEX_MPQ:
+                spex_free_mpq_array (&(A->x.mpq), A->nzmax) ;
+                break ;
 
+            case SPEX_MPFR:
+                spex_free_mpfr_array (&(A->x.mpfr), A->nzmax) ;
+                break ;
+
+            case SPEX_INT64:
+                SPEX_FREE (A->x.int64) ;
+                break ;
+
+            case SPEX_FP64:
+                SPEX_FREE (A->x.fp64) ;
+                break ;
+
+            default:
+                // do nothing
+                break ;
+        }
+    }
 
     // A->scale is never shallow
-    SPEX_MPQ_CLEAR (A->scale);
+    SPEX_mpq_clear (A->scale);
 
     //--------------------------------------------------------------------------
     // free the header

SPEX/SPEX_Utilities/Source/spex_cast_array.c

@@ -35,8 +35,7 @@
 //      y_scale = 1.
 //
 
-#define SPEX_FREE_ALL \
-SPEX_MPQ_CLEAR(temp);       \
+#define SPEX_FREE_ALL SPEX_mpq_clear (temp) ;
 
 #include "spex_util_internal.h"
 #if defined (__GNUC__)
@@ -67,7 +66,7 @@ SPEX_info spex_cast_array
     }
     SPEX_info info ;
     int r;
-    mpq_t temp; SPEX_MPQ_SET_NULL(temp);
+    mpq_t temp; SPEX_mpq_set_null (temp);
 
     mpfr_rnd_t round = SPEX_OPTION_ROUND (option);