Skip to content
Snippets Groups Projects
Commit b3dfdfcc authored by Nicola Vigano's avatar Nicola Vigano
Browse files

Matlab 2015b: fixed a few bugs

parent 56656798
No related branches found
No related tags found
No related merge requests found
...@@ -180,7 +180,8 @@ function initialise_gt(ignore_id19) ...@@ -180,7 +180,8 @@ function initialise_gt(ignore_id19)
end end
[~, hostname] = system('hostname'); [~, hostname] = system('hostname');
if (any(~cellfun(@isempty, regexpi(hostname, {'rnice', 'crunch', 'gpu'})))) if (verLessThan('matlab','R2015b') ...
&& any(~cellfun(@isempty, regexpi(hostname, {'rnice', 'crunch', 'gpu'}))))
% This fixes a few problems with rendering on the ESRF cluster % This fixes a few problems with rendering on the ESRF cluster
opengl('software'); opengl('software');
end end
......
...@@ -37,11 +37,14 @@ function deps = gtGetFunctionDeps(functionNames, deps, pattern, exclude) ...@@ -37,11 +37,14 @@ function deps = gtGetFunctionDeps(functionNames, deps, pattern, exclude)
end end
for name = functionNames for name = functionNames
listing = depfun(name, '-toponly', '-quiet'); %#ok<DEPFUN> if (verLessThan('matlab', 'R2015b'))
% New suggested alternative is damn slow!! (78 seconds in this listing = depfun(name, '-toponly', '-quiet'); %#ok<DEPFUN>
% recursively filtered setting, otherwise 35 seconds, but still slow % New suggested alternative is damn slow!! (78 seconds in this
% if compared to the 1.4 seconds of depfun) % recursively filtered setting, otherwise 35 seconds, but still slow
% listing = matlab.codetools.requiredFilesAndProducts(name, 'toponly')'; % if compared to the 1.4 seconds of depfun)
else
listing = matlab.codetools.requiredFilesAndProducts(name, 'toponly')';
end
listing = setdiff(listing, intersect(deps, listing)); listing = setdiff(listing, intersect(deps, listing));
if (~isempty('pattern')) if (~isempty('pattern'))
listing = filterListing(listing, pattern, exclude); listing = filterListing(listing, pattern, exclude);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment