From 68712645c0baa4493735250eee24c7b5bf79ae99 Mon Sep 17 00:00:00 2001 From: Tim Davis Date: Fri, 16 Jun 2023 10:51:24 -0500 Subject: [PATCH] matlab comments --- GraphBLAS/Config/GB_config.h | 4 ++-- GraphBLAS/GraphBLAS/Config/GB_config.h | 2 +- SuiteSparse_install.m | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/GraphBLAS/Config/GB_config.h b/GraphBLAS/Config/GB_config.h index aee263151a..17787706ef 100644 --- a/GraphBLAS/Config/GB_config.h +++ b/GraphBLAS/Config/GB_config.h @@ -57,12 +57,12 @@ // GB_C_LIBRARIES: libraries to link with when using direct compile/link: #ifndef GB_C_LIBRARIES -#define GB_C_LIBRARIES " -lm -ldl /usr/lib/gcc/x86_64-linux-gnu/7/libgomp.so /usr/lib/x86_64-linux-gnu/libpthread.so" +#define GB_C_LIBRARIES " -lm -ldl /usr/lib/gcc/x86_64-linux-gnu/9/libgomp.so /usr/lib/x86_64-linux-gnu/libpthread.so" #endif // GB_CMAKE_LIBRARIES: libraries to link with when using cmake #ifndef GB_CMAKE_LIBRARIES -#define GB_CMAKE_LIBRARIES "m;dl;/usr/lib/gcc/x86_64-linux-gnu/7/libgomp.so;/usr/lib/x86_64-linux-gnu/libpthread.so" +#define GB_CMAKE_LIBRARIES "m;dl;/usr/lib/gcc/x86_64-linux-gnu/9/libgomp.so;/usr/lib/x86_64-linux-gnu/libpthread.so" #endif #endif diff --git a/GraphBLAS/GraphBLAS/Config/GB_config.h b/GraphBLAS/GraphBLAS/Config/GB_config.h index 8cbd17d877..117d8be76b 100644 --- a/GraphBLAS/GraphBLAS/Config/GB_config.h +++ b/GraphBLAS/GraphBLAS/Config/GB_config.h @@ -15,7 +15,7 @@ // GB_C_COMPILER: the C compiler used to compile GraphBLAS: #ifndef GB_C_COMPILER -#define GB_C_COMPILER "/usr/bin/gcc" +#define GB_C_COMPILER "/usr/bin/cc" #endif // GB_C_FLAGS: the C compiler flags used to compile GraphBLAS. Used diff --git a/SuiteSparse_install.m b/SuiteSparse_install.m index 29aa1b632a..4d2f5b7349 100644 --- a/SuiteSparse_install.m +++ b/SuiteSparse_install.m @@ -48,11 +48,12 @@ function SuiteSparse_install (do_demo) % Before using SuiteSparse_install, you must compile the GraphBLAS library for % use in MATLAB. In the system shell while in the SuiteSparse folder, type % "make gbmatlab". You must then either install the libgraphblas_matlab.so -% library system-wide ( cd GraphBLAS/GraphBLAS ; sudo make install), or install -% your own copy ( make gblocal ) and then add the SuiteSparse/lib folder to -% your LD_LIBRARY_PATH. Restart MATLAB after compiling libgraphblas_matlab.so. +% library system-wide ( cd GraphBLAS/GraphBLAS ; make ; sudo make install), or +% install % your own copy ( make local ; make install ) and then add the +% SuiteSparse/lib folder to your LD_LIBRARY_PATH. Restart MATLAB after +% compiling libgraphblas_matlab.so. % -% Copyright (c) 1990-2022, Timothy A. Davis, http://suitesparse.com. +% Copyright (c) 1990-2023, Timothy A. Davis, http://suitesparse.com. % % In collaboration with (in alphabetical order): Patrick Amestoy, David % Bateman, Jinhao Chen, Yanqing Chen, Iain Duff, Les Foster, John Gilbert,