Skip to content
Snippets Groups Projects
Commit dbd31330 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Merge branch 'torch' into 'master'

Add bob.learn.tensorflow and bob.learn.pytorch

See merge request !16
parents 25ed0a26 db59564c
Branches
Tags v6.0.0
1 merge request!16Add bob.learn.tensorflow and bob.learn.pytorch
Pipeline #35102 passed
*.swo *.swo
*.swp *.swp
*~ *~
doc/bob/
doc/bob.ap/ doc/bob.ap/
doc/bob.bio.base/ doc/bob.bio.base/
doc/bob.bio.caffe_face/ doc/bob.bio.caffe_face/
...@@ -29,6 +28,7 @@ doc/bob.db.cbsr_nir_vis_2/ ...@@ -29,6 +28,7 @@ doc/bob.db.cbsr_nir_vis_2/
doc/bob.db.cohface/ doc/bob.db.cohface/
doc/bob.db.cuhk_cufs/ doc/bob.db.cuhk_cufs/
doc/bob.db.cuhk_cufsf/ doc/bob.db.cuhk_cufsf/
doc/bob.db.fargo/
doc/bob.db.frgc/ doc/bob.db.frgc/
doc/bob.db.fv3d/ doc/bob.db.fv3d/
doc/bob.db.gbu/ doc/bob.db.gbu/
...@@ -61,7 +61,6 @@ doc/bob.db.voxforge/ ...@@ -61,7 +61,6 @@ doc/bob.db.voxforge/
doc/bob.db.wine/ doc/bob.db.wine/
doc/bob.db.xm2vts/ doc/bob.db.xm2vts/
doc/bob.db.youtube/ doc/bob.db.youtube/
doc/bob.db.fargo/
doc/bob.extension/ doc/bob.extension/
doc/bob.fusion.base/ doc/bob.fusion.base/
doc/bob.io.audio/ doc/bob.io.audio/
...@@ -90,6 +89,8 @@ doc/bob.learn.em/ ...@@ -90,6 +89,8 @@ doc/bob.learn.em/
doc/bob.learn.libsvm/ doc/bob.learn.libsvm/
doc/bob.learn.linear/ doc/bob.learn.linear/
doc/bob.learn.mlp/ doc/bob.learn.mlp/
doc/bob.learn.pytorch/
doc/bob.learn.tensorflow/
doc/bob.math/ doc/bob.math/
doc/bob.measure/ doc/bob.measure/
doc/bob.pad.base/ doc/bob.pad.base/
...@@ -98,7 +99,8 @@ doc/bob.pad.vein/ ...@@ -98,7 +99,8 @@ doc/bob.pad.vein/
doc/bob.pad.voice/ doc/bob.pad.voice/
doc/bob.rppg.base/ doc/bob.rppg.base/
doc/bob.sp/ doc/bob.sp/
doc/gridtk/ doc/bob/
doc/extra-intersphinx.txt doc/extra-intersphinx.txt
doc/gridtk/
doc/nitpick-exceptions.txt doc/nitpick-exceptions.txt
sphinx/ sphinx/
...@@ -102,6 +102,8 @@ requirements: ...@@ -102,6 +102,8 @@ requirements:
- bob.learn.libsvm - bob.learn.libsvm
- bob.learn.linear - bob.learn.linear
- bob.learn.mlp - bob.learn.mlp
- bob.learn.pytorch
- bob.learn.tensorflow
- bob.math - bob.math
- bob.measure - bob.measure
- bob.pad.base - bob.pad.base
......
...@@ -55,6 +55,8 @@ Machine Learning ...@@ -55,6 +55,8 @@ Machine Learning
* :ref:`bob.learn.libsvm` * :ref:`bob.learn.libsvm`
* :ref:`bob.learn.em` * :ref:`bob.learn.em`
* :ref:`bob.learn.boosting` * :ref:`bob.learn.boosting`
* :ref:`bob.learn.tensorflow`
* :ref:`bob.learn.pytorch`
Modules for Developers Modules for Developers
---------------------- ----------------------
...@@ -250,6 +252,8 @@ Index of all Packages ...@@ -250,6 +252,8 @@ Index of all Packages
bob.learn.libsvm <bob/bob.learn.libsvm/doc/index.rst> bob.learn.libsvm <bob/bob.learn.libsvm/doc/index.rst>
bob.learn.linear <bob/bob.learn.linear/doc/index.rst> bob.learn.linear <bob/bob.learn.linear/doc/index.rst>
bob.learn.mlp <bob/bob.learn.mlp/doc/index.rst> bob.learn.mlp <bob/bob.learn.mlp/doc/index.rst>
bob.learn.pytorch <bob/bob.learn.pytorch/doc/index.rst>
bob.learn.tensorflow <bob/bob.learn.tensorflow/doc/index.rst>
bob.math <bob/bob.math/doc/index.rst> bob.math <bob/bob.math/doc/index.rst>
bob.measure <bob/bob.measure/doc/index.rst> bob.measure <bob/bob.measure/doc/index.rst>
bob.pad.base <bob/bob.pad.base/doc/index.rst> bob.pad.base <bob/bob.pad.base/doc/index.rst>
......
...@@ -26,6 +26,7 @@ bob/bob.db.cbsr_nir_vis_2 ...@@ -26,6 +26,7 @@ bob/bob.db.cbsr_nir_vis_2
bob/bob.db.cohface bob/bob.db.cohface
bob/bob.db.cuhk_cufs bob/bob.db.cuhk_cufs
bob/bob.db.cuhk_cufsf bob/bob.db.cuhk_cufsf
bob/bob.db.fargo
bob/bob.db.frgc bob/bob.db.frgc
bob/bob.db.fv3d bob/bob.db.fv3d
bob/bob.db.gbu bob/bob.db.gbu
...@@ -58,7 +59,6 @@ bob/bob.db.voxforge ...@@ -58,7 +59,6 @@ bob/bob.db.voxforge
bob/bob.db.wine bob/bob.db.wine
bob/bob.db.xm2vts bob/bob.db.xm2vts
bob/bob.db.youtube bob/bob.db.youtube
bob/bob.db.fargo
bob/bob.extension bob/bob.extension
bob/bob.fusion.base bob/bob.fusion.base
bob/bob.io.audio bob/bob.io.audio
...@@ -87,6 +87,8 @@ bob/bob.learn.em ...@@ -87,6 +87,8 @@ bob/bob.learn.em
bob/bob.learn.libsvm bob/bob.learn.libsvm
bob/bob.learn.linear bob/bob.learn.linear
bob/bob.learn.mlp bob/bob.learn.mlp
bob/bob.learn.pytorch
bob/bob.learn.tensorflow
bob/bob.math bob/bob.math
bob/bob.measure bob/bob.measure
bob/bob.pad.base bob/bob.pad.base
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment