revise *.pc, handle "undef I"

GraphBLAS · Dec 9, 2023 · 17ef14c · 17ef14c
1 parent 6a797b9
commit 17ef14c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/config/LAGraph.pc.in b/config/LAGraph.pc.in
@@ -12,7 +12,7 @@ URL: https://github.com/DrTimothyAldenDavis/SuiteSparse
 Description: Library plus test harness for collecting algorithms that use GraphBLAS in SuiteSparse
 Version: @LAGraph_VERSION_MAJOR@.@LAGraph_VERSION_MINOR@.@LAGraph_VERSION_SUB@
 Requires.private: GraphBLAS
-Libs: -L${libdir} -llagraph
+Libs: -L${libdir} -llagraph@CMAKE_RELEASE_POSTFIX@
 Libs.private: -lgraphblas @LAGRAPH_STATIC_LIBS@
 Cflags: -I${includedir} -DLG_DLL
 Cflags.private: -ULG_DLL
diff --git a/include/LAGraphX.h b/include/LAGraphX.h
@@ -582,12 +582,13 @@ GrB_Info LAGraph_BF_full_mxv
  * @param[in]   s        index of the source
  * @param[in]   n        number of nodes
  * @param[in]   nz       number of edges
- * @param[in]   I        row index vector (size n)
+ * @param[in]   Ilist    row index vector (size n)
  * @param[in]   J        column index vector (size nz)
- * @param[in]   W        weight vector (size nz), W(i) = weight of edge (I(i),J(i))
+ * @param[in]   W        weight vector (size nz), W(i) = weight of edge 
+ *                       (Ilist(i),J(i))
  *
  * @retval GrB_SUCCESS        if completed successfully
- * @retval GrB_NULL_POINTER   If pd, ppi, I, J, or W is NULL
+ * @retval GrB_NULL_POINTER   If pd, ppi, Ilist, J, or W is NULL
  * @retval GrB_INVALID_VALUE  if s is not a valid vertex index
  * @retval GrB_OUT_OF_MEMORY  if allocation fails.
  * @retval GrB_NO_VALUE       if A has a negative weight cycle
@@ -603,7 +604,7 @@ GrB_Info LAGraph_BF_pure_c
     const int64_t s,
     const int64_t n,
     const int64_t nz,
-    const int64_t *I,
+    const int64_t *Ilist,
     const int64_t *J,
     const int32_t *W
 ) ;
@@ -619,12 +620,13 @@ GrB_Info LAGraph_BF_pure_c
  * @param[in]   s        index of the source
  * @param[in]   n        number of nodes
  * @param[in]   nz       number of edges
- * @param[in]   I        row index vector (size n)
+ * @param[in]   Ilist    row index vector (size n)
  * @param[in]   J        column index vector (size nz)
- * @param[in]   W        weight vector (size nz), W(i) = weight of edge (I(i),J(i))
+ * @param[in]   W        weight vector (size nz), W(i) = weight of edge
+ *                       (Ilist(i),J(i))
  *
  * @retval GrB_SUCCESS        if completed successfully
- * @retval GrB_NULL_POINTER   If pd, ppi, I, J, or W is NULL
+ * @retval GrB_NULL_POINTER   If pd, ppi, Ilist, J, or W is NULL
  * @retval GrB_INVALID_VALUE  if s is not a valid vertex index
  * @retval GrB_OUT_OF_MEMORY  if allocation fails.
  * @retval GrB_NO_VALUE       if A has a negative weight cycle
@@ -640,7 +642,7 @@ GrB_Info LAGraph_BF_pure_c_double
     const int64_t s,
     const int64_t n,
     const int64_t nz,
-    const int64_t *I,
+    const int64_t *Ilist,
     const int64_t *J,
     const double  *W
 ) ;

diff --git a/src/test/include/LG_test.h b/src/test/include/LG_test.h
@@ -16,6 +16,7 @@
 
 #include <GraphBLAS.h>
 #include <LAGraph.h>
+#undef I
 
 #if ( _MSC_VER && !__INTEL_COMPILER && LG_TEST_DLL )
     #ifdef LG_TEST_LIBRARY

diff --git a/src/utility/LG_internal.h b/src/utility/LG_internal.h
@@ -27,6 +27,7 @@
 
 #include <ctype.h>
 #include "LAGraph.h"
+#undef I
 
 #if defined ( __linux__ )
 #include <malloc.h>