diff --git a/fastNLP/__init__.py b/fastNLP/__init__.py index 2ca2c427..95d6f12c 100644 --- a/fastNLP/__init__.py +++ b/fastNLP/__init__.py @@ -45,7 +45,8 @@ __all__ = [ "AccuracyMetric", "SpanFPreRecMetric", - "ExtractiveQAMetric", + "CMRC2018Metric", + "ClassifyFPreRecMetric", "Optimizer", "SGD", diff --git a/fastNLP/core/__init__.py b/fastNLP/core/__init__.py index f8e9c995..62bf4a77 100644 --- a/fastNLP/core/__init__.py +++ b/fastNLP/core/__init__.py @@ -62,6 +62,7 @@ __all__ = [ "AccuracyMetric", "SpanFPreRecMetric", "CMRC2018Metric", + "ClassifyFPreRecMetric", "Optimizer", "SGD", @@ -84,7 +85,7 @@ from .dataset import DataSet from .field import FieldArray, Padder, AutoPadder, EngChar2DPadder from .instance import Instance from .losses import LossFunc, CrossEntropyLoss, L1Loss, BCELoss, NLLLoss, LossInForward, CMRC2018Loss -from .metrics import AccuracyMetric, SpanFPreRecMetric, CMRC2018Metric +from .metrics import AccuracyMetric, SpanFPreRecMetric, CMRC2018Metric, ClassifyFPreRecMetric from .optimizer import Optimizer, SGD, Adam, AdamW from .sampler import SequentialSampler, BucketSampler, RandomSampler, Sampler from .tester import Tester diff --git a/fastNLP/core/metrics.py b/fastNLP/core/metrics.py index a76d7ecc..4c05e94b 100644 --- a/fastNLP/core/metrics.py +++ b/fastNLP/core/metrics.py @@ -6,7 +6,8 @@ __all__ = [ "MetricBase", "AccuracyMetric", "SpanFPreRecMetric", - "CMRC2018Metric" + "CMRC2018Metric", + "ClassifyFPreRecMetric" ] import inspect diff --git a/fastNLP/core/tester.py b/fastNLP/core/tester.py index 8e2ac8a7..be76a29c 100644 --- a/fastNLP/core/tester.py +++ b/fastNLP/core/tester.py @@ -72,7 +72,7 @@ class Tester(object): """ :param ~fastNLP.DataSet data: 需要测试的数据集 - :param torch.nn.module model: 使用的模型 + :param torch.nn.Module model: 使用的模型 :param ~fastNLP.core.metrics.MetricBase,List[~fastNLP.core.metrics.MetricBase] metrics: 测试时使用的metrics :param int batch_size: evaluation时使用的batch_size有多大。 :param str,int,torch.device,list(int) device: 将模型load到哪个设备。默认为None,即Trainer不对模型