Skip to content

Commit f9d6aaf

Browse files
committed
add printing for SuiteSparse paths
1 parent eddb16c commit f9d6aaf

File tree

1 file changed

+40
-10
lines changed

1 file changed

+40
-10
lines changed

matlab_install.m

Lines changed: 40 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@ function matlab_install(SuiteSparse_path)
55
% SuiteSparse toolbox by Tim Davis:
66
% http://www.cise.ufl.edu/research/sparse/SuiteSparse/current/SuiteSparse/
77
%
8-
% This package includes the SuiteSparse version 3.4.
8+
% This package includes the SuiteSparse version 4.4.2.
99
%
1010
% * To install without SuiteSparse run matlab_install
1111
% * To install with SuiteSparse run matlab_install('SuiteSparseOn')
1212
%
1313
% The function matlab_install compiles the mex-files and prints on
1414
% the screen, which directories should be added to Matlab paths.
1515

16-
% Copyright (c) 2008-2012 Jarno Vanhatalo
16+
% Copyright (c) 2008-2012, 2016 Jarno Vanhatalo
17+
% Copyright (c) 2016 Eero Siivola
1718

1819
% This software is distributed under the GNU General Public
1920
% License (version 3 or later); please refer to the file
@@ -29,14 +30,44 @@ function matlab_install(SuiteSparse_path)
2930
fprintf(' gpcf_ppcs0 \n gpcf_ppcs1 \n gpcf_ppcs2 \n gpcf_ppcs3 \n\n\n')
3031
elseif strcmp(SuiteSparse_path, 'SuiteSparseOn')
3132
cdir = pwd;
32-
cd SuiteSparse //Change this to correspond your own settings!
33+
cd SuiteSparse % Change this to correspond your own settings!
3334
SuiteSparse_path = path_spaces([pwd '/']);
3435

3536

3637
% Compile SuiteSparse
3738
fprintf('Compiling SuiteSparse. This may take a while \n \n')
3839
SuiteSparse_install(false);
3940

41+
paths{1} = SuiteSparse_path;
42+
paths{2} = [SuiteSparse_path 'UMFPACK/MATLAB'];
43+
paths{3} = [SuiteSparse_path 'CHOLMOD/MATLAB'];
44+
paths{4} = [SuiteSparse_path 'AMD/MATLAB'];
45+
paths{5} = [SuiteSparse_path 'COLAMD/MATLAB'];
46+
paths{6} = [SuiteSparse_path 'CCOLAMD/MATLAB'];
47+
paths{7} = [SuiteSparse_path 'CAMD/MATLAB'];
48+
paths{8} = [SuiteSparse_path 'CXSparse/MATLAB/Demo'];
49+
paths{9} = [SuiteSparse_path 'CXSparse/MATLAB/CSparse'];
50+
paths{10} = [SuiteSparse_path 'LDL/MATLAB'];
51+
paths{11} = [SuiteSparse_path 'BTF/MATLAB'];
52+
paths{12} = [SuiteSparse_path 'KLU/MATLAB'];
53+
paths{13} = [SuiteSparse_path 'SPQR/MATLAB'];
54+
paths{14} = [SuiteSparse_path 'RBio/RBio'];
55+
paths{15} = [SuiteSparse_path 'MATLAB_Tools'];
56+
paths{16} = [SuiteSparse_path 'MATLAB_Tools/Factorize'];
57+
paths{17} = [SuiteSparse_path 'MATLAB_Tools/MESHND'];
58+
paths{18} = [SuiteSparse_path 'MATLAB_Tools/LINFACTOR'];
59+
paths{19} = [SuiteSparse_path 'MATLAB_Tools/find_components'];
60+
paths{20} = [SuiteSparse_path 'MATLAB_Tools/GEE'];
61+
paths{21} = [SuiteSparse_path 'MATLAB_Tools/shellgui'];
62+
paths{22} = [SuiteSparse_path 'MATLAB_Tools/waitmex'];
63+
paths{23} = [SuiteSparse_path 'MATLAB_Tools/spqr_rank'];
64+
paths{24} = [SuiteSparse_path 'MATLAB_Tools/spqr_rank/SJget'];
65+
paths{25} = [SuiteSparse_path 'MATLAB_Tools/UFcollection'];
66+
paths{26} = [SuiteSparse_path 'MATLAB_Tools/SSMULT'];
67+
paths{27} = [SuiteSparse_path 'MATLAB_Tools/dimacs10'];
68+
paths{28} = [SuiteSparse_path 'MATLAB_Tools/spok'];
69+
paths{29} = [SuiteSparse_path 'MATLAB_Tools/sparseinv'];
70+
4071
cd(cdir)
4172
fprintf('Compiling GPstuff. This may take a while \n \n')
4273
else
@@ -84,13 +115,12 @@ function matlab_install(SuiteSparse_path)
84115
fprintf ('addpath %s\n', S{i}) ;
85116
end
86117

87-
% SuiteSparse paths not available in the newest SuiteSparse version
88-
% if nargin==1
89-
% fprintf ('\n')
90-
% for k = 1:length (paths)
91-
% fprintf ('addpath %s\n', paths {k}) ;
92-
% end
93-
% end
118+
if nargin==1
119+
fprintf ('\n')
120+
for k = 1:length (paths)
121+
fprintf ('addpath %s\n', paths {k}) ;
122+
end
123+
end
94124
end
95125

96126
function path = path_spaces(path)

0 commit comments

Comments
 (0)