Commit 930992c1 authored by Tiago de Freitas Pereira's avatar Tiago de Freitas Pereira

Merge branch 'matlab' into 'dask-pipelines'

Removed traces of bob.io.matlab

See merge request !47
parents c9066c89 ae3e815c
Pipeline #44766 failed with stage
in 95 minutes
...@@ -19,3 +19,4 @@ parts ...@@ -19,3 +19,4 @@ parts
sphinx sphinx
src/ src/
submitted.sql3 submitted.sql3
*.DS_Store
include README.rst buildout.cfg develop.cfg COPYING version.txt requirements.txt test-requirements.txt include README.rst buildout.cfg develop.cfg COPYING version.txt requirements.txt test-requirements.txt
recursive-include doc *.py *.rst recursive-include doc *.py *.rst
recursive-include bob/bio/vein/tests *.png *.mat *.txt *.hdf5 recursive-include bob/bio/vein/tests *.png *.txt *.hdf5
...@@ -19,7 +19,6 @@ import nose.tools ...@@ -19,7 +19,6 @@ import nose.tools
import pkg_resources import pkg_resources
import bob.io.base import bob.io.base
import bob.io.matlab
import bob.io.image import bob.io.image
from ..preprocessor import utils as preprocessor_utils from ..preprocessor import utils as preprocessor_utils
...@@ -118,9 +117,9 @@ def test_preprocessor(): ...@@ -118,9 +117,9 @@ def test_preprocessor():
input_filename = F(('preprocessors', '0019_3_1_120509-160517.png')) input_filename = F(('preprocessors', '0019_3_1_120509-160517.png'))
output_img_filename = F(('preprocessors', output_img_filename = F(('preprocessors',
'0019_3_1_120509-160517_img_lee_huang.mat')) '0019_3_1_120509-160517_img_lee_huang.mat.hdf5'))
output_fvr_filename = F(('preprocessors', output_fvr_filename = F(('preprocessors',
'0019_3_1_120509-160517_fvr_lee_huang.mat')) '0019_3_1_120509-160517_fvr_lee_huang.mat.hdf5'))
img = bob.io.base.load(input_filename) img = bob.io.base.load(input_filename)
...@@ -216,9 +215,9 @@ def test_repeated_line_tracking(): ...@@ -216,9 +215,9 @@ def test_repeated_line_tracking():
#Repeated Line Tracking method against Matlab reference #Repeated Line Tracking method against Matlab reference
input_img_filename = F(('extractors', 'miurarlt_input_img.mat')) input_img_filename = F(('extractors', 'miurarlt_input_img.mat.hdf5'))
input_fvr_filename = F(('extractors', 'miurarlt_input_fvr.mat')) input_fvr_filename = F(('extractors', 'miurarlt_input_fvr.mat.hdf5'))
output_filename = F(('extractors', 'miurarlt_output.mat')) output_filename = F(('extractors', 'miurarlt_output.mat.hdf5'))
# Load inputs # Load inputs
input_img = bob.io.base.load(input_img_filename) input_img = bob.io.base.load(input_img_filename)
...@@ -271,9 +270,9 @@ def test_wide_line_detector(): ...@@ -271,9 +270,9 @@ def test_wide_line_detector():
#Wide Line Detector method against Matlab reference #Wide Line Detector method against Matlab reference
input_img_filename = F(('extractors', 'huangwl_input_img.mat')) input_img_filename = F(('extractors', 'huangwl_input_img.mat.hdf5'))
input_fvr_filename = F(('extractors', 'huangwl_input_fvr.mat')) input_fvr_filename = F(('extractors', 'huangwl_input_fvr.mat.hdf5'))
output_filename = F(('extractors', 'huangwl_output.mat')) output_filename = F(('extractors', 'huangwl_output.mat.hdf5'))
# Load inputs # Load inputs
input_img = bob.io.base.load(input_img_filename) input_img = bob.io.base.load(input_img_filename)
...@@ -325,9 +324,9 @@ def test_miura_match(): ...@@ -325,9 +324,9 @@ def test_miura_match():
#Match Ratio method against Matlab reference #Match Ratio method against Matlab reference
template_filename = F(('algorithms', '0001_2_1_120509-135338.mat')) template_filename = F(('algorithms', '0001_2_1_120509-135338.mat.hdf5'))
probe_gen_filename = F(('algorithms', '0001_2_2_120509-135558.mat')) probe_gen_filename = F(('algorithms', '0001_2_2_120509-135558.mat.hdf5'))
probe_imp_filename = F(('algorithms', '0003_2_1_120509-141255.mat')) probe_imp_filename = F(('algorithms', '0003_2_1_120509-141255.mat.hdf5'))
template_vein = bob.io.base.load(template_filename) template_vein = bob.io.base.load(template_filename)
probe_gen_vein = bob.io.base.load(probe_gen_filename) probe_gen_vein = bob.io.base.load(probe_gen_filename)
...@@ -347,9 +346,9 @@ def test_correlate(): ...@@ -347,9 +346,9 @@ def test_correlate():
#Match Ratio method against Matlab reference #Match Ratio method against Matlab reference
template_filename = F(('algorithms', '0001_2_1_120509-135338.mat')) template_filename = F(('algorithms', '0001_2_1_120509-135338.mat.hdf5'))
probe_gen_filename = F(('algorithms', '0001_2_2_120509-135558.mat')) probe_gen_filename = F(('algorithms', '0001_2_2_120509-135558.mat.hdf5'))
probe_imp_filename = F(('algorithms', '0003_2_1_120509-141255.mat')) probe_imp_filename = F(('algorithms', '0003_2_1_120509-141255.mat.hdf5'))
template_vein = bob.io.base.load(template_filename) template_vein = bob.io.base.load(template_filename)
probe_gen_vein = bob.io.base.load(probe_gen_filename) probe_gen_vein = bob.io.base.load(probe_gen_filename)
......
...@@ -36,7 +36,6 @@ requirements: ...@@ -36,7 +36,6 @@ requirements:
- bob.extension - bob.extension
- bob.core - bob.core
- bob.io.base - bob.io.base
- bob.io.matlab
- bob.io.image - bob.io.image
- bob.ip.base - bob.ip.base
- bob.ip.color - bob.ip.color
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
import numpy import numpy
import bob.io.base import bob.io.base
import bob.io.matlab
from bob.bio.vein.extractor import MaximumCurvature from bob.bio.vein.extractor import MaximumCurvature
# Load inputs # Load inputs
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment