update

Author: oliverchampion

conftest.py

@@ -264,7 +264,8 @@ def algorithmlist(algorithms):
     for algorithm in algorithms["algorithms"]:
         algorithm_dict = algorithms.get(algorithm, {})
         requires_matlab = algorithm_dict.get("requires_matlab", False)
-        yield algorithm, requires_matlab, algorithm_dict.get('deep_learning', False)
+        if not algorithm_dict.get('deep_learning', False):
+            yield algorithm, requires_matlab
 
 
 def bound_input(datafile, algorithms):

tests/IVIMmodels/unit_tests/test_ivim_fit.py

@@ -81,8 +81,8 @@ def to_list_if_needed(value):
         assert elapsed_time < max_time, f"Algorithm {name} took {elapsed_time} seconds, which is longer than 2 second to fit per voxel" #less than 0.5 seconds per voxel
 
 def test_default_bounds_and_initial_guesses(algorithmlist,eng):
-    algorithm, kwargs = algorithmlist
-    if kwargs.get("requires_matlab", False):
+    algorithm, requires_matlab = algorithmlist
+    if requires_matlab:
         if eng is None:
             pytest.skip(reason="Running without matlab; if Matlab is available please run pytest --withmatlab")
         else:
@@ -157,7 +157,7 @@ def test_bounds(bound_input, eng):
             assert passDp, f"Fit still passes when initial guess Ds is out of fit bounds; potentially initial guesses not respected for: {name}" '''
 
 def test_volume(algorithmlist,eng, threeddata):
-    algorithm, kwargs = algorithmlist
+    algorithm, requires_matlab = algorithmlist
     data, Dim, fim, Dpim, bvals = threeddata
     # Get index of b=0
     b0_index = np.where(bvals == 0.)[0][0]
@@ -166,7 +166,7 @@ def test_volume(algorithmlist,eng, threeddata):
     invalid_mask = data[:, :, :, b0_index] < 0.01
     data[invalid_mask,:] = np.nan
 
-    if kwargs.get("requires_matlab", False):
+    if requires_matlab:
         if eng is None:
             pytest.skip(reason="Running without matlab; if Matlab is available please run pytest --withmatlab")
         else:
@@ -190,7 +190,7 @@ def test_volume(algorithmlist,eng, threeddata):
 
 
 def test_parallel(algorithmlist,eng,threeddata):
-    algorithm, kwargs = algorithmlist
+    algorithm, requires_matlab = algorithmlist
     data, Dim, fim, Dpim, bvals = threeddata
     # Get index of b=0
     b0_index = np.where(bvals == 0)[0][0]
@@ -199,7 +199,7 @@ def test_parallel(algorithmlist,eng,threeddata):
     invalid_mask = data[:, :, :, b0_index] < 0.01
     data[invalid_mask,:] = np.nan
     print('testing ' + str(np.sum(~invalid_mask)) + ' voxels of a matrix size ' + str(np.shape(data)))
-    if kwargs.get("requires_matlab", False):
+    if requires_matlab:
         if eng is None:
             pytest.skip(reason="Running without matlab; if Matlab is available please run pytest --withmatlab")
         else: