Merge branch 'master' of github.com:jolibrain/deepdetect into dlib

jolibrain · Jun 14, 2018 · c86a2a6 · c86a2a6
2 parents d5abc88 + 9503c57
commit c86a2a6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -16,6 +16,7 @@ DeepDetect relies on external machine learning libraries through a very generic
 |            | Training | Prediction | Classification | Object Detection | Segmentation | Regression | Autoencoder | OCR / Seq2Seq |
 |------------|----------|------------|----------------|-----------|-----------|------------|-------------|-------------|
 | Caffe      | Y        | Y          | Y              | Y         |   Y       |   Y        | Y           | Y           |
+| Caffe2     | N        | Y          | N              | N         |   N       |   N        | N           | N           |
 | XGBoost    | Y        | Y          | Y              | N         |   N       |   Y        | N/A         | N           |
 | Tensorflow | N        | Y          | Y              | N         |   N       |   N        | N           | N           |
 | T-SNE      | Y        | N/A        | N/A            | N/A       |   N/A     |   N/A      | N/A         | N           |
@@ -27,16 +28,18 @@ DeepDetect relies on external machine learning libraries through a very generic
 |            | Training | Prediction |
 |------------|----------|------------|
 | Caffe      | Y        | Y          |
-| XGBoost    | Y        | N          |
-| Tensorflow | Y        | Y          |
-| T-SNE      | N        | N          |
+| Caffe2     | N        | Y          |
+| XGBoost    | Y        | Y          |
+| Tensorflow | N        | Y          |
+| T-SNE      | Y        | N          |
 | Dlib       | N        | Y          |
 
 #### Input data support per library (current):
 
 |            | CSV | SVM | Text words | Text characters | Images |
 |------------|-----|-----|------------|-----------------|--------|
 | Caffe      | Y   | Y   | Y          | Y               | Y      |
+| Caffe2     | N   | N   | N          | N               | Y      |
 | XGBoost    | Y   | Y   | Y          | N               | N      |
 | Tensorflow | N   | N   | N          | N               | Y      |
 | T-SNE      | Y   | N   | N          | N               | Y      | (*)

diff --git a/src/backends/tsne/tsneinputconns.h b/src/backends/tsne/tsneinputconns.h
@@ -44,6 +44,18 @@ namespace dd
     int _D = -1; /**< problem dimensions */
     int _N = -1; /**< number of samples */
 
+    // for API info only
+    int width() const
+    {
+      return -1;
+    }
+
+    // for API info only
+    int height() const
+    {
+      return -1;
+    }
+
     //TODO: parameters, ids
   };