未验证 提交 a64c7c91 编写于 作者: J Jiaqi Liu 提交者: GitHub

【Cherry pick】 Expose paddle.static.auc, paddle.static.acc to users (#30311)

* Alias from  paddle.fluid.layers.auc to paddle.static.auc (#30206)

* add alias from  fluid.layers.auc to static.auc

* Update __init__.py

* add auc into all list

* alias acc, expose to users

* add auc into 'all' list (#30310)

* add auc into 'all' list

* alias acc, expose to users

* update sample code
上级 71ab8ae9
...@@ -51,27 +51,30 @@ def accuracy(input, label, k=1, correct=None, total=None): ...@@ -51,27 +51,30 @@ def accuracy(input, label, k=1, correct=None, total=None):
Examples: Examples:
.. code-block:: python .. code-block:: python
import paddle.fluid as fluid
import numpy as np import numpy as np
data = fluid.data(name="input", shape=[-1, 32, 32], dtype="float32") import paddle
label = fluid.data(name="label", shape=[-1,1], dtype="int") import paddle.static as static
fc_out = fluid.layers.fc(input=data, size=10) import paddle.nn.functional as F
predict = fluid.layers.softmax(input=fc_out)
result = fluid.layers.accuracy(input=predict, label=label, k=5) paddle.enable_static()
data = static.data(name="input", shape=[-1, 32, 32], dtype="float32")
label = static.data(name="label", shape=[-1,1], dtype="int")
fc_out = static.nn.fc(x=data, size=10)
predict = F.softmax(x=fc_out)
result = static.accuracy(input=predict, label=label, k=5)
place = fluid.CPUPlace() place = paddle.CPUPlace()
exe = fluid.Executor(place) exe = static.Executor(place)
exe.run(fluid.default_startup_program()) exe.run(static.default_startup_program())
x = np.random.rand(3, 32, 32).astype("float32") x = np.random.rand(3, 32, 32).astype("float32")
y = np.array([[1],[0],[1]]) y = np.array([[1],[0],[1]])
output= exe.run(feed={"input": x,"label": y}, output= exe.run(feed={"input": x,"label": y},
fetch_list=[result[0]]) fetch_list=[result[0]])
print(output) print(output)
#[array([0.6666667], dtype=float32)] #[array([0.], dtype=float32)]
""" """
if in_dygraph_mode(): if in_dygraph_mode():
if correct is None: if correct is None:
...@@ -153,26 +156,29 @@ def auc(input, ...@@ -153,26 +156,29 @@ def auc(input,
Examples: Examples:
.. code-block:: python .. code-block:: python
import paddle.fluid as fluid
import numpy as np import numpy as np
data = fluid.data(name="input", shape=[-1, 32,32], dtype="float32") import paddle
label = fluid.data(name="label", shape=[-1], dtype="int") import paddle.static as static
fc_out = fluid.layers.fc(input=data, size=2) import paddle.nn.functional as F
predict = fluid.layers.softmax(input=fc_out)
result=fluid.layers.auc(input=predict, label=label) paddle.enable_static()
data = static.data(name="input", shape=[-1, 32,32], dtype="float32")
label = static.data(name="label", shape=[-1], dtype="int")
fc_out = static.nn.fc(x=data, size=2)
predict = F.softmax(x=fc_out)
result = static.auc(input=predict, label=label)
place = fluid.CPUPlace() place = paddle.CPUPlace()
exe = fluid.Executor(place) exe = static.Executor(place)
exe.run(fluid.default_startup_program()) exe.run(static.default_startup_program())
x = np.random.rand(3,32,32).astype("float32") x = np.random.rand(3,32,32).astype("float32")
y = np.array([1,0,1]) y = np.array([1,0,1])
output= exe.run(feed={"input": x,"label": y}, output= exe.run(feed={"input": x,"label": y},
fetch_list=[result[0]]) fetch_list=[result[0]])
print(output) print(output)
#[array([0.5])] #[array([0.])]
""" """
helper = LayerHelper("auc", **locals()) helper = LayerHelper("auc", **locals())
check_variable_and_dtype(input, 'input', ['float32', 'float64'], 'auc') check_variable_and_dtype(input, 'input', ['float32', 'float64'], 'auc')
......
...@@ -45,6 +45,8 @@ __all__ = [ ...@@ -45,6 +45,8 @@ __all__ = [
'Variable', 'Variable',
'load_vars', 'load_vars',
'save_vars', 'save_vars',
'auc',
'accuracy',
] ]
from . import nn from . import nn
...@@ -91,3 +93,5 @@ from ..fluid.io import save_vars #DEFINE_ALIAS ...@@ -91,3 +93,5 @@ from ..fluid.io import save_vars #DEFINE_ALIAS
from ..fluid.layers import create_parameter #DEFINE_ALIAS from ..fluid.layers import create_parameter #DEFINE_ALIAS
from ..fluid.layers import create_global_var #DEFINE_ALIAS from ..fluid.layers import create_global_var #DEFINE_ALIAS
from ..fluid.layers.metric_op import auc #DEFINE_ALIAS
from ..fluid.layers.metric_op import accuracy #DEFINE_ALIAS
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册