Merge with master, all tests passed

Signed-off-by: Micaela Verucchi <micaelaverucchi@gmail.com>
2021-07-20 12:48:41 +02:00
parent 4ca69836e9 c306b36860
commit 84ff978ccb
73 changed files with 5207 additions and 305 deletions
@@ -52,6 +52,10 @@ dnnType* Activation::infer(dataDim_t &dim, dnnType* srcData) {
    else if(act_mode == ACTIVATION_MISH) {
        activationMishForward(srcData, dstData, dim.tot());

+    }
+    else if(act_mode == ACTIVATION_LOGISTIC) {
+        activationLOGISTICForward(srcData, dstData, dim.tot());
+
    } else {
        dnnType alpha = dnnType(1);
        dnnType beta  = dnnType(0);