diff --git a/zUtil_OAR/gt_mcc.m b/zUtil_OAR/gt_mcc.m index 453d80ae0d9de733359381308402adcfcde6165a..f1586e3429018740a8315f6753881df20748ad27 100644 --- a/zUtil_OAR/gt_mcc.m +++ b/zUtil_OAR/gt_mcc.m @@ -33,12 +33,7 @@ function compiled_fine = gt_mcc(myfunctionname, varargin) conf = parse_pv_pairs(conf, varargin); if (isempty(conf.out_path)) - if (isunix()) - cpu = getenv('HOSTTYPE'); - else - cpu = computer('arch'); - end - path_for_binaries = fullfile(GT_MATLAB_HOME, 'bin', 'compiled', cpu); + path_for_binaries = fullfile(GT_MATLAB_HOME, 'bin', 'compiled'); else path_for_binaries = conf.out_path; end diff --git a/zUtil_OAR/make_oar_matlab.m b/zUtil_OAR/make_oar_matlab.m index f749f614f78e210abd058d5aa1678e4ac2d976b1..f62c6e0965d6cf44b6d1f1679aecfdc9f2be4b71 100644 --- a/zUtil_OAR/make_oar_matlab.m +++ b/zUtil_OAR/make_oar_matlab.m @@ -51,7 +51,7 @@ function script_location = make_oar_matlab(pathdir, tmpdir, tmpname, oarpars) [exportLibary fullfile(matlabroot, 'sys', 'os', 'glnxa64') '"'], ... [exportLibary fullfile(matlabroot, 'sys', 'java', 'jre', 'glnxa64', 'jre', 'lib', 'amd64', 'server') '"'], ... ... % To make compiled functions visible - [exportPath fullfile(GT_MATLAB_HOME, 'bin', 'compiled', getenv('HOSTTYPE')) '"'] ]; + [exportPath fullfile(GT_MATLAB_HOME, 'bin', 'compiled') '"'] ]; script_content = [ header, '', libraries, '', '"$@"' ]; script_content(2, :) = {sprintf('\n')}; diff --git a/zUtil_Python/dct_compile_matlab_functions.py b/zUtil_Python/dct_compile_matlab_functions.py index 4d11a61934d7778a89a76eeae1653e0edf68f19b..a9a062570d06d9414a9036d09b4c3d488b64c788 100755 --- a/zUtil_Python/dct_compile_matlab_functions.py +++ b/zUtil_Python/dct_compile_matlab_functions.py @@ -73,7 +73,7 @@ class FunctionsBuilder(object): if script_dir is None: script_dir = os.path.join(self.dct_dir, 'bin', 'scripts') if bin_dir is None: - bin_dir = os.path.join(self.dct_dir, 'bin', 'compiled', os.getenv('HOSTTYPE')) + bin_dir = os.path.join(self.dct_dir, 'bin', 'compiled') self.script_dir = script_dir self.bin_dir = bin_dir