leaffunc:新增dropout

Author: miaobyte

doc/excuter/op-mem-cuda/list.md

@@ -103,15 +103,14 @@ namespace deepx::tf
         // 为每个tftype生成一个表格
         for (const auto &[tftype, tfs] : tf_by_type) {
             ss << "### " << tftype << "\n\n";
-            ss << "| Operation | Author | Func Def | Math Formula | IR Instruction |\n";
-            ss << "|-----------|--------|------------|--------------|----------------|\n";
+            ss << "| Operation | Author |  Math Formula | IR Instruction |\n";
+            ss << "|-----------|--------|--------------|----------------|\n";
 
             for (const auto &tf : tfs) {
                 ss << "| " << tf->name << " | ";
                 ss << (tf->metadata.author.empty() ? " none " : tf->metadata.author) << " | ";
-                ss << tf->to_string(false, true) << " | ";
                 ss << tf->math_formula() << " | ";
-                ss << tf->to_string(false, true) << " |\n";
+                ss << stdutil::escape_markdown(tf->to_string(false, true)) << " |\n";
             }
 
             ss << "\n";

doc/excuter/op-mem-ompsimd/list.md

@@ -8,9 +8,49 @@ namespace stdutil
         str.erase(str.find_last_not_of(" ") + 1);
     }
 
-    void trim(string &str,const string &chars)
+    void trim(string &str, const string &chars)
     {
         str.erase(0, str.find_first_not_of(chars));
         str.erase(str.find_last_not_of(chars) + 1);
     }
+
+    string escape_markdown(const string &str)
+    {
+        std::string result;
+        for (char c : str)
+        {
+            switch (c)
+            {
+            case '\\':
+                result += "\\\\";
+                break;
+            case '\"':
+                result += "\\\"";
+                break;
+            case '\'':
+                result += "\\\'";
+                break;
+            case '\n':
+                result += "\\n";
+                break;
+            case '\t':
+                result += "\\t";
+                break;
+            case '\r':
+                result += "\\r";
+                break;
+            case '\b':
+                result += "\\b";
+                break;
+            case '\f':
+                result += "\\f";
+                break;
+            default:
+                // 普通字符直接添加
+                result += c;
+            }
+        }
+        return result;
+    }
+
 } // namespace stdutil

excuter/cpp-common/src/deepx/tf/tffactory.cpp

@@ -10,6 +10,7 @@ namespace stdutil
     void trimspace(string &str);
     void trim(string &str,const string &chars=" \t\n\r\f\v");
 
+    string escape_markdown(const string &str);
 }
 
 

excuter/cpp-common/src/stdutil/string.cpp

@@ -10,18 +10,17 @@
 from .authormap import defaultauthor
 
 from .reduce import mean
-
 from .activite import *
-
 from .elementwise import *
 from .normalization import *
+from .changeshape import *
 __all__ = [
 
     #leaffunc
     "newtensor","rnewtensor","printtensor","load", #life
     "printtensor","save",#io
     "constant","constant_","full","zeros","ones","uniform","uniform_","arange","arange_","kaiming_uniform","kaiming_uniform_",
-    "add","sub","mul","div","sqrt","pow","exp","log",
+    "add","sub","mul","div","sqrt","pow","exp","log","invert","todtype","dropout",
     "matmul",
     "reducemax","reducemin","sum","prod",
     "reshape","permute","transpose","concat","broadcastTo","indexselect",

excuter/cpp-common/src/stdutil/string.hpp

@@ -29,6 +29,7 @@
         'powscalar':'miaobyte',
         'rpowscalar':'miaobyte',
         'sqrt':'miaobyte',
+        'dropout':'miaobyte',
         #changeshape
         'reshape':'miaobyte',
         'transpose':'miaobyte',

front/py/deepx/nn/functional/__init__.py

@@ -53,4 +53,26 @@ def rpow(a:Number,b:Tensor,out:Union[Tensor,str]=None)->Tensor:
 log=create_A_tf_C('log')
 
 #invert
-invert=create_A_tf_C('invert')
+invert=create_A_tf_C('invert')
+
+#todtype
+def todtype(t:Tensor,dest:Tensor):
+    assert isinstance(t,Tensor)
+    assert isinstance(dest,Tensor)
+    assert t.shape==dest.shape
+
+    from .rtf_elementwise import rtf_todtype
+    rtf_todtype(t,dest)
+
+#dropout
+def dropout(a:Tensor, p:float, out:Union[Tensor,str]='')->Tensor:
+    assert isinstance(a,Tensor)
+    outtensor=out
+    if isinstance(out,str) or out is None:
+        outtensor=newtensor(a.shape,dtype=a.dtype,name=out)
+    assert a.shape==outtensor.shape
+
+    from .rtf_elementwise import rtf_dropout
+    rtf_dropout(a,p,outtensor,defaultauthor['dropout'])
+    return out
+

front/py/deepx/nn/functional/authormap.py

@@ -21,14 +21,7 @@ def rnewtensor(t:Tensor):
 def copytensor(t:Tensor,out:Tensor):
     from .rtf_life import rtf_copytensor
     rtf_copytensor(t,out)
-    
-def todtype(t:Tensor,dest:Tensor):
-    assert isinstance(t,Tensor)
-    assert isinstance(dest,Tensor)
-    assert t.shape==dest.shape
 
-    from .rtf_life import rtf_todtype
-    rtf_todtype(t,dest)
 
 def deltensor(t:Tensor):
     from .rtf_life import rtf_deltensor

front/py/deepx/nn/functional/leaffunc_elementwise.py

@@ -3,6 +3,7 @@
 from deepx.scheduler import send
 from .rtf import A_B_op_C,A_scalar_op_C,A_op_C
 
+
 def rtf_add(a:Tensor, b:Tensor, out:Tensor, author='miaobyte')->Tensor:
     A_B_op_C("add",a,b,out,author)
     return out
@@ -107,4 +108,18 @@ def rtf_minscalar(a:Tensor, b:float, out:Tensor, author='miaobyte')->Tensor:
 
 def rtf_invert(a:Tensor, out:Tensor, author='miaobyte')->Tensor:
     A_op_C("invert",a,out,author)
+    return out
+
+def rtf_todtype(t:Tensor,dest:Tensor):
+    assert isinstance(t,Tensor)
+    assert isinstance(dest,Tensor)
+    assert t.shape==dest.shape
+
+    args=[Param.tensor(t)]
+    returns=[Param.tensor(dest)]
+    ir=DeepxIR("todtype", args, returns,'')
+    send(ir)
+
+def rtf_dropout(a:Tensor, p:float, out:Tensor, author='miaobyte')->Tensor:
+    A_B_op_C("dropout",a,p,out,author)
     return out