CSparse: add octave support

Author: homka122

CSparse/MATLAB/CSparse/cs_make.m

@@ -42,6 +42,8 @@
 % CSparse, Copyright (c) 2006-2022, Timothy A. Davis. All Rights Reserved.
 % SPDX-License-Identifier: LGPL-2.1+
 
+have_octave = (exist ('OCTAVE_VERSION', 'builtin') == 5) ;
+
 try
     % ispc does not appear in MATLAB 5.3
     pc = ispc ;
@@ -50,17 +52,23 @@
     pc = ~isunix ;
 end
 
+mexcmd = 'mex'
 if (~isempty (strfind (computer, '64')))
     fprintf ('Compiling CSparse (64-bit)\n') ;
-    mexcmd = 'mex -largeArrayDims' ;
+
+    if (~have_octave)
+        mexcmd = [mexcmd ' -largeArrayDims'] ;
+    end
 else
     fprintf ('Compiling CSparse (32-bit)\n') ;
-    mexcmd = 'mex' ;
 end
 
 % MATLAB 8.3.0 now has a -silent option to keep 'mex' from burbling too much
-if (~verLessThan ('matlab', '8.3.0'))
-    mexcmd = [mexcmd ' -silent'] ;
+if (have_octave)
+    mexcmd = [mexcmd ' --silent '] ;
+    warning("off", "Matlab-style short-circuit operation performed for operator |")
+elseif (~verLessThan ('matlab', '8.3.0'))
+    mexcmd = [mexcmd ' -silent '] ;
 end
 
 % CSparse source files, in ../../Source, such as ../../Source/cs_add.c.

CSparse/MATLAB/Demo/cs_demo.m

@@ -31,16 +31,18 @@ function cs_demo (do_pause, matrixpath)
 help cs_demo3
 cs_demo3 (do_pause, matrixpath) ;
 
+addpath("./private")
+
 fprintf ('\n\n-------------------------------------------------------\n') ;
-help private/ex_1
+help ex_1
 ex_1
 
 fprintf ('\n\n-------------------------------------------------------\n') ;
-help private/ex2
+help ex2
 ex2
 
 fprintf ('\n\n-------------------------------------------------------\n') ;
-help private/ex3
+help ex3
 ex3
 
 fprintf ('\nAll CSparse demos finished.\n') ;

CSparse/MATLAB/Test/cs_test_make.m

@@ -9,6 +9,8 @@ function cs_test_make (force)
 % CSparse, Copyright (c) 2006-2022, Timothy A. Davis. All Rights Reserved.
 % SPDX-License-Identifier: LGPL-2.1+
 
+have_octave = (exist ('OCTAVE_VERSION', 'builtin') == 5) ;
+
 try
     % ispc does not appear in MATLAB 5.3
     pc = ispc ;
@@ -17,12 +19,18 @@ function cs_test_make (force)
     pc = ~isunix ;
 end
 
+mexcmd = 'mex'
 if (~isempty (strfind (computer, '64')))
     fprintf ('Compiling CSparse (64-bit)\n') ;
-    mexcmd = 'mex -largeArrayDims' ;
+    if (~have_octave)
+        mexcmd = [mexcmd ' -largeArrayDims'] ;
+    end
 else
     fprintf ('Compiling CSparse (32-bit)\n') ;
-    mexcmd = 'mex' ;
+end
+
+if (have_octave)
+    warning ("off", "Octave:possible-matlab-short-circuit-operator")
 end
 
 if (pc)

CSparse/MATLAB/cs_install.m

@@ -26,6 +26,8 @@ function cs_install (do_pause)
 % Copyright (c) 2006-2022, Timothy A. Davis. All Rights Reserved.
 % SPDX-License-Identifier: LGPL-2.1+
 
+have_octave = (exist ('OCTAVE_VERSION', 'builtin') == 5) ;
+
 fprintf ('Compiling and installing CSparse\n') ;
 if (nargin < 1)
     do_pause = 0 ;
@@ -37,9 +39,23 @@ function cs_install (do_pause)
 addpath ([pwd '/CSparse']) ;
 addpath ([pwd '/Demo']) ;
 
-if (verLessThan ('matlab', '8.4'))
-    fprintf ('ssget not installed (MATLAB 8.4 or later required)\n') ;
+if (have_octave)
+    warning ("off", "Octave:possible-matlab-short-circuit-operator")
+    install_ssget
 else
+    if (verLessThan ('matlab', '8.4'))
+        fprintf ('ssget not installed (MATLAB 8.4 or later required)\n') ;
+    else
+        install_ssget
+    end
+end
+
+cd ('CSparse') ;
+cs_make (1) ;
+cd ('../Demo') ;
+cs_demo (do_pause)
+
+function install_ssget ()
     % install ssget, unless it's already in the path
     try
         % if this fails, then ssget is not yet installed
@@ -59,9 +75,3 @@ function cs_install (do_pause)
             fprintf ('ssget not installed\n') ;
         end
     end
-end
-
-cd ('CSparse') ;
-cs_make (1) ;
-cd ('../Demo') ;
-cs_demo (do_pause)