Commit 743b5301 authored by Tiago de Freitas Pereira's avatar Tiago de Freitas Pereira

Merge branch 'matlab' into 'master'

Removed traces of bob.io.matlab

Closes #1

See merge request !7
parents 0870b4aa 91cb7f7d
Pipeline #44778 passed with stages
in 9 minutes and 53 seconds
include README.rst bootstrap-buildout.py buildout.cfg develop.cfg version.txt requirements.txt include README.rst bootstrap-buildout.py buildout.cfg develop.cfg version.txt requirements.txt
recursive-include doc *.py *.rst recursive-include doc *.py *.rst
recursive-include bob *.sql3 Youtube*.mat Youtube*.txt recursive-include bob *.sql3 Youtube*.hdf5 Youtube*.txt
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
import os import os
import bob.db.base import bob.db.base
import bob.io.base import bob.io.base
import bob.io.matlab
import pkg_resources import pkg_resources
from .models import * from .models import *
...@@ -20,7 +19,7 @@ def add_directories(session, verbose): ...@@ -20,7 +19,7 @@ def add_directories(session, verbose):
# read the video_names file and the video_labels # read the video_names file and the video_labels
if verbose: print("Adding clients and files ...") if verbose: print("Adding clients and files ...")
with open(pkg_resources.resource_filename('bob.db.youtube', 'protocol/Youtube_names.txt')) as names: # the video_names field -- exported to text file with open(pkg_resources.resource_filename('bob.db.youtube', 'protocol/Youtube_names.txt')) as names: # the video_names field -- exported to text file
labels = bob.io.base.load(pkg_resources.resource_filename('bob.db.youtube', 'protocol/Youtube_labels.mat')) # the video_labels field -- exported to a single Matlab file labels = bob.io.base.load(pkg_resources.resource_filename('bob.db.youtube', 'protocol/Youtube_labels.mat.hdf5')) # the video_labels field -- exported to a single Matlab file
# iterate over the video names # iterate over the video names
for index, line in enumerate(names): for index, line in enumerate(names):
assert len(line) > 0 assert len(line) > 0
...@@ -44,7 +43,7 @@ def add_pairs(session, verbose): ...@@ -44,7 +43,7 @@ def add_pairs(session, verbose):
# read the splits filename # read the splits filename
if verbose: print("Adding pairs ...") if verbose: print("Adding pairs ...")
splits = bob.io.base.load(pkg_resources.resource_filename('bob.db.youtube', 'protocol/Youtube_splits.mat')) # the Splits field -- exported to a single Matlab file splits = bob.io.base.load(pkg_resources.resource_filename('bob.db.youtube', 'protocol/Youtube_splits.mat.hdf5')) # the Splits field -- exported to a single Matlab file
session.flush() session.flush()
for fold in range(splits.shape[2]): for fold in range(splits.shape[2]):
......
...@@ -23,7 +23,6 @@ requirements: ...@@ -23,7 +23,6 @@ requirements:
- setuptools {{ setuptools }} - setuptools {{ setuptools }}
- six {{ six }} - six {{ six }}
- bob.io.base - bob.io.base
- bob.io.matlab
- bob.db.base - bob.db.base
run: run:
- python - python
......
...@@ -12,7 +12,6 @@ develop = src/bob.extension ...@@ -12,7 +12,6 @@ develop = src/bob.extension
src/bob.blitz src/bob.blitz
src/bob.core src/bob.core
src/bob.io.base src/bob.io.base
src/bob.io.matlab
src/bob.db.base src/bob.db.base
. .
...@@ -26,7 +25,6 @@ bob.extension = git https://gitlab.idiap.ch/bob/bob.extension ...@@ -26,7 +25,6 @@ bob.extension = git https://gitlab.idiap.ch/bob/bob.extension
bob.blitz = git https://gitlab.idiap.ch/bob/bob.blitz bob.blitz = git https://gitlab.idiap.ch/bob/bob.blitz
bob.core = git https://gitlab.idiap.ch/bob/bob.core bob.core = git https://gitlab.idiap.ch/bob/bob.core
bob.io.base = git https://gitlab.idiap.ch/bob/bob.io.base bob.io.base = git https://gitlab.idiap.ch/bob/bob.io.base
bob.io.matlab = git https://gitlab.idiap.ch/bob/bob.io.matlab
bob.db.base = git https://gitlab.idiap.ch/bob/bob.db.base bob.db.base = git https://gitlab.idiap.ch/bob/bob.db.base
[scripts] [scripts]
......
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