Skip to content
Snippets Groups Projects

Minor fixes

Merged Guillaume HEUSCH requested to merge minor-fixes into master

Just changed some stuff, so that all this is working with numpy arrays, and not necessarily frame containers ...

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • @onikisins is the best person to review this.

  • Yeah sure, it's 3 lines of code anyway ... so it shouldn't require a thorough examination ;)

  • @heusch , I guess you are aware that builds are failing? Also, would be nice to have unit tests checking if both FrameContainers and numpy arrays are processed properly. Thanks!

    Edited by Olegs NIKISINS
  • added 1 commit

    • bb659cb3 - [test] added test for helper functions converting array to FrameContainer and vice versa

    Compare with previous version

  • For the builds, yes I am aware of that... But as far as I understand, this has nothing to do with the code I added, maybe @amohammadi could help here.

    As for the tests, well ... I added another function, but such cases are already taken care of in your tests. Anyway, tests are failing for another reason anyway (which, again, has nothing to do with what I did)

    Failure: AttributeError (module 'bob' has no attribute 'db') ... ERROR
    
    ======================================================================
    ERROR: Failure: AttributeError (module 'bob' has no attribute 'db')
    ----------------------------------------------------------------------
    Traceback (most recent call last):
      File "/idiap/user/heusch/miniconda2/envs/bob_py3/lib/python3.6/site-packages/nose/failure.py", line 39, in runTest
        raise self.exc_val.with_traceback(self.tb)
      File "/idiap/user/heusch/miniconda2/envs/bob_py3/lib/python3.6/site-packages/nose/loader.py", line 417, in loadTestsFromName
        addr.filename, addr.module)
      File "/idiap/user/heusch/miniconda2/envs/bob_py3/lib/python3.6/site-packages/nose/importer.py", line 47, in importFromPath
        return self.importFromDir(dir_path, fqname)
      File "/idiap/user/heusch/miniconda2/envs/bob_py3/lib/python3.6/site-packages/nose/importer.py", line 94, in importFromDir
        mod = load_module(part_fqname, fh, filename, desc)
      File "/idiap/user/heusch/miniconda2/envs/bob_py3/lib/python3.6/imp.py", line 244, in load_module
        return load_package(name, filename)
      File "/idiap/user/heusch/miniconda2/envs/bob_py3/lib/python3.6/imp.py", line 216, in load_package
        return _load(spec)
      File "<frozen importlib._bootstrap>", line 675, in _load
      File "<frozen importlib._bootstrap>", line 655, in _load_unlocked
      File "<frozen importlib._bootstrap_external>", line 678, in exec_module
      File "<frozen importlib._bootstrap>", line 205, in _call_with_frames_removed
      File "/remote/idiap.svm/user.active/heusch/work/dev/gitlab/bob.pad.base/bob/pad/base/__init__.py", line 1, in <module>
        from .utils import *
      File "/remote/idiap.svm/user.active/heusch/work/dev/gitlab/bob.pad.base/bob/pad/base/utils/__init__.py", line 1, in <module>
        from .helper_functions import *
      File "/remote/idiap.svm/user.active/heusch/work/dev/gitlab/bob.pad.base/bob/pad/base/utils/helper_functions.py", line 5, in <module>
        import bob.bio.video
      File "/idiap/user/heusch/miniconda2/envs/bob_py3/lib/python3.6/site-packages/bob/bio/video/__init__.py", line 1, in <module>
        from .utils import *
      File "/idiap/user/heusch/miniconda2/envs/bob_py3/lib/python3.6/site-packages/bob/bio/video/utils/__init__.py", line 1, in <module>
        from .FrameContainer import FrameContainer, load_compressed, save_compressed
      File "/idiap/user/heusch/miniconda2/envs/bob_py3/lib/python3.6/site-packages/bob/bio/video/utils/FrameContainer.py", line 4, in <module>
        import bob.bio.base
      File "/idiap/user/heusch/miniconda2/envs/bob_py3/lib/python3.6/site-packages/bob/bio/base/__init__.py", line 1, in <module>
        from .utils import *
      File "/idiap/user/heusch/miniconda2/envs/bob_py3/lib/python3.6/site-packages/bob/bio/base/utils/__init__.py", line 7, in <module>
        from .io import *
      File "/idiap/user/heusch/miniconda2/envs/bob_py3/lib/python3.6/site-packages/bob/bio/base/utils/io.py", line 10, in <module>
        from .. import database
      File "/idiap/user/heusch/miniconda2/envs/bob_py3/lib/python3.6/site-packages/bob/bio/base/database/__init__.py", line 1, in <module>
        from .file import BioFile
      File "/idiap/user/heusch/miniconda2/envs/bob_py3/lib/python3.6/site-packages/bob/bio/base/database/file.py", line 7, in <module>
        class BioFile(bob.db.base.File):
    AttributeError: module 'bob' has no attribute 'db'
    
    ----------------------------------------------------------------------
    Ran 1 test in 0.910s
    
    FAILED (errors=1)
    
  • We are building the dependencies again. You need to wait for bob.conda to become green: https://gitlab.idiap.ch/bob/bob.conda/pipelines/17186

  • added 1 commit

    • 7b84446c - [test] corrected the np vs numpy in the test from frame container to array

    Compare with previous version

  • added 1 commit

    • 77fe5d32 - [test] another correction to test if array is numpy.array

    Compare with previous version

  • added 1 commit

    • ddb7d6e8 - [test] yet another correction (previous one was sloppy) to test if array is numpy.array

    Compare with previous version

  • added 1 commit

    • 58c8e125 - [test] test if array is numpy.ndarray and not numpy.array ...

    Compare with previous version

  • added 1 commit

    • 3dfae8d1 - [utils] corrected an indentation error causing troubles during conversion…

    Compare with previous version

  • added 1 commit

    • 825e4156 - [doc] fixed some references

    Compare with previous version

  • @onikisins I added a test for the changes I made, and the pipeline is green, could you please merge this one ? Thanks

  • @heusch , thank you! Will merge now.

  • Olegs NIKISINS mentioned in commit 350cd6cf

    mentioned in commit 350cd6cf

Please register or sign in to reply
Loading