COLAMD: add octave support

tests don't work
SparseLinearAlgebra · May 17, 2024 · 857650b · 857650b
1 parent 5d4127f
commit 857650b
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 9 deletions.
diff --git a/COLAMD/MATLAB/colamd_make.m b/COLAMD/MATLAB/colamd_make.m
@@ -13,15 +13,25 @@
 % Acknowledgements: This work was supported by the National Science Foundation,
 % under grants DMS-9504974 and DMS-9803599.
 
+have_octave = (exist ('OCTAVE_VERSION', 'builtin') == 5) ;
+
 details = 0 ;	    % 1 if details of each command are to be printed
 d = '' ;
-if (~isempty (strfind (computer, '64')))
+if (~have_octave && ~isempty (strfind (computer, '64')))
     d = '-largeArrayDims' ;
 end
 
-% MATLAB 8.3.0 now has a -silent option to keep 'mex' from burbling too much
-if (~verLessThan ('matlab', '8.3.0'))
-    d = ['-silent ' d] ;
+if (have_octave)
+    d = ['--silent ' d];
+else
+    % MATLAB 8.3.0 now has a -silent option to keep 'mex' from burbling too much
+    if (~verLessThan ('matlab', '8.3.0'))
+        d = ['-silent ' d] ;
+    end
+end
+
+if (have_octave)
+    d = ['-DOCTAVE ' d]
 end
 
 src = '../Source/colamd_l.c ../../SuiteSparse_config/SuiteSparse_config.c' ;

diff --git a/COLAMD/MATLAB/colamd_test.m b/COLAMD/MATLAB/colamd_test.m
@@ -20,6 +20,8 @@
 % Acknowledgements: This work was supported by the National Science Foundation,
 % under grants DMS-9504974 and DMS-9803599.
 
+have_octave = (exist ('OCTAVE_VERSION', 'builtin') == 5) ;
+
 help colamd_test
 
 
@@ -32,6 +34,10 @@
     end
     cmd = sprintf (...
         'mex -O %s -I../../SuiteSparse_config -I../Include ', d) ;
+    if(have_octave)
+        warning ("off", "Octave:possible-matlab-short-circuit-operator")
+        cmd = [cmd '-DOCTAVE ']
+    end
     src = '../Source/colamd_l.c ../../SuiteSparse_config/SuiteSparse_config.c' ;
     if (~(ispc || ismac))
         % for POSIX timing routine
@@ -422,6 +428,8 @@ function check_perm (p, A)
 % mtype 2: rectangular
 % mtype 3: symmetric (mmax is ignored)
 
+have_octave = (exist ('OCTAVE_VERSION', 'builtin') == 5) ;
+
 n = irand (nmax) ;
 if (mtype ~= 2)
     % square
@@ -430,7 +438,11 @@ function check_perm (p, A)
     m = irand (mmax) ;
 end
 
-A = sprand (m, n, 10 / max (m,n)) ;
+if (have_octave)
+  A = sprand (m, n, rand() / 10) ;
+else
+  A = sprand (m, n, 10 / max(m, n)) ;
+end
 
 if (drows > 0)
     % add dense rows

diff --git a/COLAMD/MATLAB/colamdmex.c b/COLAMD/MATLAB/colamdmex.c
@@ -39,10 +39,12 @@
 
 #include "colamd.h"
 #include "mex.h"
-#include "matrix.h"
 #include <stdlib.h>
 #include <string.h>
 
+#ifndef OCTAVE
+#include "matrix.h"
+#endif
 /* ========================================================================== */
 /* === colamd mexFunction =================================================== */
 /* ========================================================================== */

diff --git a/COLAMD/MATLAB/colamdtestmex.c b/COLAMD/MATLAB/colamdtestmex.c
@@ -53,10 +53,14 @@
 
 #include "colamd.h"
 #include "mex.h"
-#include "matrix.h"
 #include <stdlib.h>
 #include <string.h>
 
+#ifndef OCTAVE
+#include "matrix.h"
+#endif
+
+
 static void dump_matrix
 (
     int64_t A [ ],

diff --git a/COLAMD/MATLAB/symamdmex.c b/COLAMD/MATLAB/symamdmex.c
@@ -41,9 +41,12 @@
 
 #include "colamd.h"
 #include "mex.h"
-#include "matrix.h"
 #include <stdlib.h>
 
+#ifndef OCTAVE
+#include "matrix.h"
+#endif
+
 /* ========================================================================== */
 /* === symamd mexFunction =================================================== */
 /* ========================================================================== */

diff --git a/COLAMD/MATLAB/symamdtestmex.c b/COLAMD/MATLAB/symamdtestmex.c
@@ -54,10 +54,13 @@
 
 #include "colamd.h"
 #include "mex.h"
-#include "matrix.h"
 #include <stdlib.h>
 #include <string.h>
 
+#ifndef OCTAVE
+#include "matrix.h"
+#endif
+
 static void dump_matrix
 (
     int64_t A [ ],