github
/
ColossalAI
mirror of https://github.com/hpcaitech/ColossalAI
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Inference] resolve rebase conflicts 

fix
feat/online-serving
CjhHa1 2024-04-11 10:12:31 +08:00
parent c064032865
commit 7bbb28e48b
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
colossalai/inference/core/engine.py
View File

@ -1,6 +1,6 @@
import time import time
from itertools import count from itertools import count
from typing import Dict, List, Optional, Tuple, Union, Iterable from typing import Dict, List, Optional, Tuple, Union
import numpy as np import numpy as np
import torch import torch

1
colossalai/shardformer/layer/embedding.py
View File

@ -248,7 +248,6 @@ class VocabParallelEmbedding1D(PaddingParallelModule):
he initializer of weight, defaults to normal initializer. he initializer of weight, defaults to normal initializer.
The ``args`` and ``kwargs`` used in :class:``torch.nn.functional.embedding`` should contain: The ``args`` and ``kwargs`` used in :class:``torch.nn.functional.embedding`` should contain:
::
max_norm (float, optional): If given, each embedding vector with norm larger than max_norm is max_norm (float, optional): If given, each embedding vector with norm larger than max_norm is
renormalized to have norm max_norm. Note: this will modify weight in-place. renormalized to have norm max_norm. Note: this will modify weight in-place.