lzhengning
/
JittorMirror
mirror of https://github.com/Jittor/Jittor
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Jittor/jittor

This commit is contained in:
Dun Liang 2020-12-07 22:49:33 +08:00
parent 30fc5b32fd 260a052db9
commit 514b60dea8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/jittor/nn.py
View File

@ -555,6 +555,8 @@ class Conv(Module):
y = y + b
return y
Conv2d = Conv
class Conv1d(Module):
def __init__(self, in_channels, out_channels, kernel_size, stride=1, padding=0, dilation=1, groups=1, bias=True):
self.in_channels = in_channels
@ -852,7 +854,7 @@ class Sigmoid(Module):
def execute(self, x) :
return x.sigmoid()
def softplus(x,bata=1,threshold=20):
def softplus(x,beta=1,threshold=20):
return 1 / beta * jt.log(1 + (beta * x).exp())
def hardtanh(x,min_val=-1,max_val=1):