diff --git a/dct_launch.py b/dct_launch.py index 530b4f5bbe98a8e37aef41a1d754d548824e2c9d..485bbbfa72240b5cab14d1389185a9552f9bcdb1 100755 --- a/dct_launch.py +++ b/dct_launch.py @@ -79,7 +79,7 @@ class DCTLauncher(object): env_var = os.environ["LD_LIBRARY_PATH"] os.environ["LD_LIBRARY_PATH"] = ":".join([env_var, lib]) - cmd = [self.conf.getMatlabCommand()] + cmd = [os.path.join(self.conf.getMatlabPath(), "bin", "matlab")] for arg in self.args: cmd.append(arg) cmd.append("-r") diff --git a/initialise_gt.m b/initialise_gt.m index 406b994bf9b722a9a4b308be56559acc5d223120..39deeb5f93099e56c4c47c275fc3dd627e30a102 100755 --- a/initialise_gt.m +++ b/initialise_gt.m @@ -189,15 +189,15 @@ function initialise_gt(ignore_id19) end % Check which version of matlab compiled the oar executables - if isfield(xmlConf, 'matlab_command') - matlabCommand = xmlConf.('matlab_command'); + if isfield(xmlConf, 'matlab') && isfield(xmlConf.matlab, 'version') + matlabVersion = xmlConf.matlab.version; currentMatlabRelease = version('-release'); - if (~strcmpi(['matlab' currentMatlabRelease], matlabCommand)) + if (~strcmpi(currentMatlabRelease, matlabVersion)) warning('MATLAB_COMPILED:version_mismatch', ... ['You are now running matlab "%s", but the matlab ' ... 'command specified in conf.xml is "%s".\nThere is no ' ... 'guarantee that OAR jobs will work'], ... - currentMatlabRelease, matlabCommand); + currentMatlabRelease, matlabVersion); end else warning('XML:no_matlab_executable_version', ...