Merge pull request #814 from DrTimothyAldenDavis/dev2

update paru_dev2 with recent PRs to dev2
DrTimothyAldenDavis · May 23, 2024 · 620b59f · 620b59f
2 parents 9bb54f1 + cd185a8
commit 620b59f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Example/Include/my_internal.h b/Example/Include/my_internal.h
@@ -2,7 +2,7 @@
 // SuiteSparse/Example/Include/my_internal.h
 //------------------------------------------------------------------------------
 
-// Copyright (c) 2022-2023, Timothy A. Davis, All Rights Reserved.
+// Copyright (c) 2022-2024, Timothy A. Davis, All Rights Reserved.
 // SPDX-License-Identifier: BSD-3-clause
 
 //------------------------------------------------------------------------------
@@ -110,7 +110,9 @@
 #endif
 
 // OpenMP include file:
+#ifdef _OPENMP
 #include <omp.h>
+#endif
 
 // GMP and MPFR
 #include <gmp.h>

diff --git a/SPEX/CMakeLists.txt b/SPEX/CMakeLists.txt
@@ -496,7 +496,7 @@ if ( SUITESPARSE_DEMOS )
         target_link_libraries ( spex_demo_threaded          PUBLIC SPEX_static SuiteSparse::AMD_static SuiteSparse::COLAMD_static )
     endif ( )
 
-    if ( SPEX_USE_OPENMP )
+    if ( SPEX_HAS_OPENMP )
         if ( BUILD_SHARED_LIBS )
             target_link_libraries ( spex_demo_threaded PUBLIC OpenMP::OpenMP_C )
         endif ( )

diff --git a/UMFPACK/Include/umfpack.h b/UMFPACK/Include/umfpack.h
@@ -126,8 +126,8 @@
 #define UMFPACK_SIZE_OF_ENTRY 7         /* sizeof (Entry), real or complex */
 #define UMFPACK_NDENSE_ROW 8            /* number of dense rows */
 #define UMFPACK_NEMPTY_ROW 9            /* number of empty rows */
-#define UMFPACK_NDENSE_COL 10           /* number of dense rows */
-#define UMFPACK_NEMPTY_COL 11           /* number of empty rows */
+#define UMFPACK_NDENSE_COL 10           /* number of dense cols */
+#define UMFPACK_NEMPTY_COL 11           /* number of empty cols */
 #define UMFPACK_SYMBOLIC_DEFRAG 12      /* # of memory compactions */
 #define UMFPACK_SYMBOLIC_PEAK_MEMORY 13 /* memory used by symbolic analysis */
 #define UMFPACK_SYMBOLIC_SIZE 14        /* size of Symbolic object, in Units */