[Model] Deprecate the score task (this will not affect users). (#37537)
Signed-off-by: wang.yuqi <yuqi.wang@daocloud.io>
This commit is contained in:
@@ -56,29 +56,31 @@ class EmbeddingPoolerHead(SequencePoolerHead):
|
||||
|
||||
if isinstance(pooled_data, list):
|
||||
pooled_data = torch.stack(pooled_data)
|
||||
# pooled_data shape: [batchsize, hidden_dimension]
|
||||
# pooled_data shape: [batchsize, hidden_size]
|
||||
|
||||
if self.head_dtype is not None:
|
||||
pooled_data = pooled_data.to(self.head_dtype)
|
||||
|
||||
# Apply ST projector
|
||||
if self.projector is not None:
|
||||
pooled_data = self.projector(pooled_data)
|
||||
# pooled_data shape: [batchsize, embedding_dimension]
|
||||
embeddings = self.projector(pooled_data)
|
||||
else:
|
||||
embeddings = pooled_data
|
||||
# embeddings shape: [batchsize, embedding_size]
|
||||
|
||||
# for matryoshka representation
|
||||
dimensions_list = [pooling_param.dimensions for pooling_param in pooling_params]
|
||||
if any(d is not None for d in dimensions_list):
|
||||
# change the output dimension
|
||||
assert len(pooled_data) == len(dimensions_list)
|
||||
if len(set(dimensions_list)) == 1 and not isinstance(pooled_data, list):
|
||||
assert len(embeddings) == len(dimensions_list)
|
||||
if len(set(dimensions_list)) == 1 and not isinstance(embeddings, list):
|
||||
# if all dimensions are the same
|
||||
d = dimensions_list[0]
|
||||
pooled_data = pooled_data[..., :d]
|
||||
embeddings = embeddings[..., :d]
|
||||
else:
|
||||
pooled_data = [
|
||||
embeddings = [
|
||||
vecs if d is None else vecs[..., :d]
|
||||
for vecs, d in zip(pooled_data, dimensions_list)
|
||||
for vecs, d in zip(embeddings, dimensions_list)
|
||||
]
|
||||
|
||||
# for normalize
|
||||
@@ -86,15 +88,15 @@ class EmbeddingPoolerHead(SequencePoolerHead):
|
||||
flags = [p.use_activation for p in pooling_params]
|
||||
if len(set(flags)) == 1:
|
||||
if flags[0]:
|
||||
pooled_data = self.activation(pooled_data)
|
||||
embeddings = self.activation(embeddings)
|
||||
else:
|
||||
pooled_data = [
|
||||
embeddings = [
|
||||
self.activation(vecs) if f else vecs
|
||||
for vecs, f in zip(pooled_data, flags)
|
||||
for vecs, f in zip(embeddings, flags)
|
||||
]
|
||||
|
||||
# pooled_data shape: [batchsize, embedding_dimension]
|
||||
return pooled_data
|
||||
# embeddings shape: [batchsize, embedding_size]
|
||||
return embeddings
|
||||
|
||||
|
||||
class ClassifierPoolerHead(SequencePoolerHead):
|
||||
@@ -113,7 +115,7 @@ class ClassifierPoolerHead(SequencePoolerHead):
|
||||
self.activation = activation
|
||||
|
||||
def get_supported_tasks(self) -> Set[PoolingTask]:
|
||||
return {"classify", "score"}
|
||||
return {"classify"}
|
||||
|
||||
def forward(
|
||||
self,
|
||||
@@ -131,21 +133,23 @@ class ClassifierPoolerHead(SequencePoolerHead):
|
||||
pooled_data = pooled_data.to(self.head_dtype)
|
||||
|
||||
if self.classifier is not None:
|
||||
pooled_data = self.classifier(pooled_data)
|
||||
# pooled_data shape: [batchsize, num_labels]
|
||||
logits = self.classifier(pooled_data)
|
||||
else:
|
||||
logits = pooled_data
|
||||
|
||||
# logits shape: [batchsize, num_labels]
|
||||
if self.logit_bias is not None:
|
||||
pooled_data -= self.logit_bias
|
||||
logits -= self.logit_bias
|
||||
|
||||
if self.activation is not None:
|
||||
flags = [p.use_activation for p in pooling_params]
|
||||
if len(set(flags)) == 1:
|
||||
pooled_data = self.activation(pooled_data) if flags[0] else pooled_data
|
||||
logits = self.activation(logits) if flags[0] else logits
|
||||
else:
|
||||
pooled_data = [
|
||||
logits = [
|
||||
self.activation(vecs) if f else vecs
|
||||
for vecs, f in zip(pooled_data, flags)
|
||||
for vecs, f in zip(logits, flags)
|
||||
]
|
||||
|
||||
# pooled_data shape: [batchsize, num_labels]
|
||||
return pooled_data
|
||||
# logits shape: [batchsize, num_labels]
|
||||
return logits
|
||||
|
||||
@@ -17,7 +17,7 @@ SequencePoolingMethodOutput: TypeAlias = torch.Tensor | list[torch.Tensor]
|
||||
|
||||
class SequencePoolingMethod(nn.Module, ABC):
|
||||
def get_supported_tasks(self) -> Set[PoolingTask]:
|
||||
return {"token_embed", "token_classify", "embed", "classify", "score"}
|
||||
return {"token_embed", "token_classify", "embed", "classify"}
|
||||
|
||||
def get_pooling_updates(self, task: PoolingTask) -> PoolingParamsUpdate:
|
||||
return PoolingParamsUpdate()
|
||||
|
||||
@@ -108,7 +108,7 @@ def pooler_for_classify(
|
||||
*,
|
||||
pooling: SequencePoolingMethod | SequencePoolingFn | None = None,
|
||||
classifier: ClassifierFn | None = None,
|
||||
act_fn: PoolerActivation | str | None = None,
|
||||
act_fn: PoolerActivation | None = None,
|
||||
):
|
||||
if pooling is None:
|
||||
pooling = get_seq_pooling_method(pooler_config.get_seq_pooling_type())
|
||||
|
||||
Reference in New Issue
Block a user