merge

Author: DrTimothyAldenDavis

CMakeLists.txt

@@ -2,7 +2,7 @@
 # SuiteSparse/CMakeLists.txt:  root CMake build rules
 #-------------------------------------------------------------------------------
 
-# Copyright (c) 2023-2024, Timothy A. Davis, All Rights Reserved.
+# Copyright (c) 2023-2025, Timothy A. Davis, All Rights Reserved.
 # Just this particular file is under the Apache-2.0 license; each package has
 # its own license.
 # SPDX-License-Identifier: Apache-2.0

ChangeLog

@@ -1,4 +1,4 @@
-June 2, 2025: version 7.11.0
+July 25, 2025: version 7.11.0
 
     * LAGraph v1.2: many new experimental algorithms, LAGraph_Random in src/
     * GraphBLAS v10.1.1: risc-V vectorization, GRAPHBLAS_VANILLA (optional;

GraphBLAS/CUDA/GB_cuda_init.c

@@ -63,8 +63,8 @@ GrB_Info GB_cuda_init (void)
     }
 
     // FIXME: default device set to 1 to avoid hardware failure ...
-    GB_cuda_set_device (0) ;            // make GPU 1 the default device
-    GB_Context_gpu_id_set (NULL, 0) ;   // set GxB_CONTEXT_WORLD->gpu_id to 1
+    GB_cuda_set_device (1) ;            // make GPU 1 the default device
+    GB_Context_gpu_id_set (NULL, 1) ;   // set GxB_CONTEXT_WORLD->gpu_id to 1
 
     // also check for jit cache, pre-load library of common kernels ...
     return (GrB_SUCCESS) ;

GraphBLAS/Doc/ChangeLog

@@ -1,8 +1,12 @@
-June 2, 2025: version 10.1.1
+July 25, 2025: version 10.1.1
 
     * gcc can now be used the Power or s390:  workaround added;
         see Source/mxm/factory/GB_AxB_saxpy3_symbolic_fine_template.c.
 	This resolves the issue found in v10.1.0.
+    * OpenMP usage: replace omp critical with lock/unlock.
+    * MATLAB: added method for getting/setting the JIT cache path.
+    * JIT file lock/unlock: removed; if multiple user processes use
+        GraphBLAS at the same time, each must set their own unique JIT cache.
 
 June 1, 2025: version 10.1.0
 

GraphBLAS/Doc/GraphBLAS_UserGuide.pdf

@@ -1,5 +1,5 @@
 % version of SuiteSparse:GraphBLAS
 \date{VERSION
 10.1.1,
-June 3, 2025}
+July 25, 2025}
 

GraphBLAS/Doc/GraphBLAS_version.tex

@@ -19,8 +19,8 @@ \section{The SuiteSparse:GraphBLAS JIT} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \subsection{Using the JIT}
 
 Using the JIT in a user application is simple:  by default, there is nothing to
-do.  The current release, LAGraph v1.1.4, can use the JIT (and PreJIT) kernels
-without changing a single line of code.
+do.  LAGraph can use the JIT (and PreJIT) kernels without changing a single
+line of code, for example.
 
 Currently, the JIT compiles kernels for the CPU only, but a CUDA JIT is in
 progress to exploit NVIDIA GPUs, in collaboration with Joe Eaton and
@@ -38,10 +38,9 @@ \subsection{Using the JIT}
 cannot be determined and the \verb'GRAPHBLAS_CACHE_PATH' environment variable
 is not set, then JIT compilation is disabled and only PreJIT kernels can be
 used.  The optional environment variable, \verb'GRAPHBLAS_CACHE_PATH', is also
-read by \verb'GrB_init' when the user application runs.  The filesystem holding
-the cache folder must also support file locking.  See Section~\ref{cache_path}
-for a description of the valid characters that can appear in the cache path
-and for more suggestions about file locking.
+read by \verb'GrB_init' when the user application runs.  See
+Section~\ref{cache_path} for a description of the valid characters that can
+appear in the cache path.
 
 The user application can modify the location of the cache folder after calling
 \verb'GrB_init'.  It can also modify the C compiler and its flags, and can
@@ -331,27 +330,9 @@ \subsubsection{\sf GxB\_JIT\_CACHE\_PATH}
 character (\verb':') to allow for the use of Windows drive letters.  Any
 character outside of these rules is converted into an underscore (\verb'_').
 
-On distributed file systems that do not support file locking, sometimes the
-\verb'/tmp' directory is located on a file system that is not distributed, and
-is thus suitable to use for the GraphBLAS JIT cache.  In this case, try
-creating a symbolic link in your home file folder (for Linux or Mac):
-
-    {\small
-    \begin{verbatim}
-    cd
-    ln -s /tmp/me/.SuiteSparse \end{verbatim} }
-
-where \verb'me' is your user name.  Next, in your startup script
-(\verb'.bashrc' for example), add these commands:
-
-    {\small
-    \begin{verbatim}
-    mkdir /tmp/me
-    mkdir /tmp/me/.SuiteSparse \end{verbatim} }
-
-Then whenever you log into a system that has your home file folder on a
-distributed file system, the default \verb'~/.SuiteSparse' cache folder will be
-a symbolic link to a folder on a file system that does support file locking.
+If your run multiple user applications that each use the same version of
+GraphBLAS, then each of your applications must set their own unique JIT cache
+path.  Only one user application at a time may use the default JIT cache path.
 
 %-------------------------------------------------------------------------------
 \subsection{Compilation options: {\sf GRAPHBLAS\_USE\_JIT} and {\sf GRAPHBLAS\_COMPACT}}

GraphBLAS/Doc/UserGuide/GrB_jit.tex

@@ -5,12 +5,16 @@ \section{Release Notes}
 
 \begin{itemize}
 
-\item June 2, 2025: version 10.1.1
+\item June 7, 2025: version 10.1.1
 
     \begin{itemize}
     \item gcc can now be used the Power or s390:  workaround added;
         see \verb'Source/mxm/factory/GB_AxB_saxpy3_symbolic_fine_template.c.'
 	This resolves the issue found in v10.1.0.
+    \item OpenMP usage: replace \verb'omp critical' with lock/unlock.
+    \item MATLAB: added method for getting/setting the JIT cache path.
+    \item JIT file lock/unlock: removed; if multiple user processes use
+        GraphBLAS at the same time, each must set their own unique JIT cache.
     \end{itemize}
 
 \item June 1, 2025: version 10.1.0

GraphBLAS/Doc/UserGuide/GrB_release.tex

@@ -1,8 +1,9 @@
-function [status] = jit (status)
+function [status,path] = jit (status,path)
 %GRB.JIT controls the GraphBLAS JIT
 %
 %   status = GrB.jit ;      % get the current status of the JIT
 %   status = GrB.jit (status) ;  % control the JIT and get its status
+%   [status,path] = GrB.jit (status,path) ; % get/set JIT cache path
 %
 % The GraphBLAS JIT allows GraphBLAS to compile new kernels at run-time
 % that are specifically tuned for the particular operators, types, and
@@ -20,21 +21,56 @@
 %   'flush'     clear all loaded JIT kernels, then turn the JIT on;
 %               (the same as GrB.jit ('off') ; GrB.jit ('on')).
 %
-% Refer to the GraphBLAS User Guide for details (GxB_JIT_C_CONTROL).
+% The 2nd input/output parameter is a string that defines the JIT cache
+% path.  If you run multiple instances of MATLAB at the same time, each
+% must use a different cache folder.  The default cache on Linux/Mac is
+% ~/.SuiteSparse/GrB10.1.1 (for GraphBLAS v10.1.1 for example).  On
+% Windows, it is located inside your AppData\Local folder.  If you change
+% to another location, adding the GraphBLAS version is recommended; see
+% the last example below.
+%
+% Refer to the GraphBLAS User Guide for details (GxB_JIT_C_CONTROL
+% and GxB_JIT_CACHE_PATH).
 %
 % Example:
 %
 %   [status] = GrB.jit
 %   [status] = GrB.jit ('on')
+%   [status,path] = GrB.jit
+%   [status,path] = GrB.jit ('on', [userpath filesep 'my_other_cache')
+%
+%   % setting the JIT cache path with the GraphBLAS version included:
+%   v = GrB.ver
+%   [status,path] = GrB.jit ('on', [userpath filesep 'myGrB' v.Version])
 %
 % See also GrB.threads, GrB.clear.
 
 % SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2025, All Rights Reserved.
 % SPDX-License-Identifier: Apache-2.0
 
 if (nargin == 0)
-    [status] = gbjit ;
+
+    if (nargout <= 1)
+        [status] = gbjit ;
+    else
+        [status, path] = gbjit ;
+    end
+
 elseif (nargin == 1)
-    [status] = gbjit (status) ;
+
+    if (nargout <= 1)
+        [status] = gbjit (status) ;
+    else
+        [status, path] = gbjit (status) ;
+    end
+
+else
+
+    if (nargout <= 1)
+        [status] = gbjit (status, path) ;
+    else
+        [status, path] = gbjit (status, path) ;
+    end
+
 end
 

GraphBLAS/GraphBLAS/@GrB/jit.m

@@ -10,11 +10,11 @@
 // Usage:
 
 // [status] = gbjit
-// [status] = gbjit (status)
+// [status, path] = gbjit (status, path)
 
 #include "gb_interface.h"
 
-#define USAGE "usage: [status] = GrB.jit (status) ;"
+#define USAGE "usage: [status, path] = GrB.jit (status, path) ;"
 
 void mexFunction
 (
@@ -29,7 +29,7 @@ void mexFunction
     // check inputs
     //--------------------------------------------------------------------------
 
-    gb_usage (nargin <= 1 && nargout <= 1, USAGE) ;
+    gb_usage (nargin <= 2 && nargout <= 2, USAGE) ;
 
     //--------------------------------------------------------------------------
     // set the JIT control, if requested
@@ -98,6 +98,39 @@ void mexFunction
         }
     }
 
+    //--------------------------------------------------------------------------
+    // set the JIT cache path, if requested
+    //--------------------------------------------------------------------------
+
+    if (nargin > 1)
+    {
+        if (!mxIsChar (pargin[1]))
+        {
+            ERROR ("path must be a string") ;
+        }
+        size_t pathlen = mxGetNumberOfElements (pargin [1]) + 2 ;
+        char *path = mxMalloc (pathlen + 2) ;
+        path [0] = '\0' ;
+        mxGetString (pargin [1], path, pathlen) ;
+        OK (GrB_Global_set_String (GrB_GLOBAL, path, GxB_JIT_CACHE_PATH)) ;
+        mxFree (path) ;
+    }
+
+    //--------------------------------------------------------------------------
+    // get the JIT cache path, if requested
+    //--------------------------------------------------------------------------
+
+    if (nargout > 1)
+    {
+        size_t pathlen = 0 ;
+        OK (GrB_Global_get_SIZE (GrB_GLOBAL, &pathlen, GxB_JIT_CACHE_PATH)) ;
+        char *path = mxMalloc (pathlen + 2) ;
+        path [0] = '\0' ;
+        OK (GrB_Global_get_String (GrB_GLOBAL, path, GxB_JIT_CACHE_PATH)) ;
+        pargout [1] = mxCreateString (path) ;
+        mxFree (path) ;
+    }
+
     //--------------------------------------------------------------------------
     // return result
     //--------------------------------------------------------------------------