Small activation function bug fixes.

Author: Brandyn Tucknott

lib/Layer.chpl

@@ -245,21 +245,6 @@ module Layer {
             return new moduleAttributes("Hardswish", moduleName);
     }
 
-    class Hardsigmoid : Module(?) {
-
-        proc init(type eltType = defaultEltType) {
-            super.init(eltType);
-            init this;
-            this.moduleName = "Hardsigmoid";            
-        }
-
-        override proc forward(input: dynamicTensor(eltType)): dynamicTensor(eltType) do
-            return input.hardsigmoid();
-        
-        override proc attributes(): moduleAttributes do
-            return new moduleAttributes("Hardsigmoid", moduleName);
-    }
-
     class Hardshrink : Module(?) {
         var alpha: eltType;
 
@@ -271,7 +256,7 @@ module Layer {
         }
 
         override proc forward(input: dynamicTensor(eltType)): dynamicTensor(eltType) do
-            return input.hardShrink(beta, threshold);
+            return input.hardShrink(alpha);
 
         override proc attributes(): moduleAttributes do
             return new moduleAttributes(
@@ -290,7 +275,7 @@ module Layer {
             this.minVal = minVal;
             this.maxVal = maxVal;
             init this;
-            this.moduleName = "Hardtanh";            
+            this.moduleName = "Hardtanh";
         }
 
         override proc forward(input: dynamicTensor(eltType)): dynamicTensor(eltType) do
@@ -348,16 +333,16 @@ module Layer {
             return new moduleAttributes(
                 "Threshold",
                 moduleName,
-                ("threshold",lower),
-                ("value",upper)
+                ("threshold",threshold),
+                ("value",value)
             );
     }
 
     class CELU : Module(?) {
         var alpha: eltType;
 
         proc init(type eltType = defaultEltType, alpha: eltType=1.0) {
-            super.init(eltType)
+            super.init(eltType);
             this.alpha = alpha;
             init this;
             this.moduleName = "CELU";

lib/NDArray.chpl

@@ -1261,7 +1261,7 @@ inline proc ndarray.leakyrelu(negativeSlope: eltType=0.01) {
     ref rld = rl.data;
     forall i in dom.every() {
         const x = thisData[i];
-        rld[i] = Math.max(0, x) + negativeSlope * Math.min(0, x);
+        rld[i] = Math.max(0.0, x) + negativeSlope * Math.min(0.0, x);
     }
     return rl;
 }

test/tiny/brandyn_relu.chpl

@@ -6,4 +6,8 @@ proc main() {
     var relu = new shared ReLU();
     writeln(relu(Tensor.zeros(4) - 1));
     writeln("Should be: [0, 0, 0, 0]"); // output according to pytorch
+
+    relu = new shared ReLU();
+    writeln(relu(Tensor.zeros(4) + 1.5));
+    writeln("Should be: [1.5, 1.5, 1.5, 1.5]"); // output according to pytorch
 }