Bugfix rare model

CHANGELOG.md

@@ -21,6 +21,7 @@
   * Bugfix: Compatibility with torch 2.2 and numpy 2.0
   * Bugfix!: The download location of the RARE2012 model changed. The new source code results in slightly different predictions.
   * Feature: The RARE2007 model is now available as `pysaliency.external_models.RARE2007`. It's execution requires MATLAB.
+  * matlab scripts are now called with the `-batch` option instead of `-nodisplay -nosplash -r`, which should behave better.
 
 
 * 0.2.22:

pysaliency/external_models/matlab_models.py

@@ -270,7 +270,9 @@ def __init__(self, location=None, **kwargs):
 
     def _setup(self):
         source_location = os.path.join(self.location, 'gbvs')
-        download_extract_patch('http://www.vision.caltech.edu/~harel/share/gbvs.zip',
+        url = "http://www.vision.caltech.edu/~harel/share/gbvs.zip"
+
+        download_extract_patch(url,
                                'c5a86b9549c2c0bbd1b7f7e5b663b031',
                                source_location,
                                location_in_archive=True,

pysaliency/utils/__init__.py

@@ -330,7 +330,8 @@ def run_matlab_cmd(cmd, cwd=None):
     matlab = get_matlab_or_octave()
     args = []
     if os.path.basename(matlab).startswith('matlab'):
-        args += ['-nodesktop', '-nosplash', '-r']
+        # args += ['-nodesktop', '-nosplash', '-r']
+        args += ['-batch']
         args.append("try;{};catch exc;disp(getReport(exc));disp('__ERROR__');exit(1);end;quit".format(cmd))
     else:
         args += ['--traditional', '--eval']
@@ -364,6 +365,8 @@ def download_file(url, target, verify_ssl=True):
             for data in r.iter_content(32*1024):
                 f.write(data)
                 progress_bar.update(32*1024)
+    if r.status_code in [403, 404, 500, 503]:
+        raise ValueError("Error downloading file from {}. Status code: {}".format(url, r.status_code))
 
 
 def download_and_check(url, target, md5_hash, verify_ssl=True):