Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
opencompass
Commits
1013dce6
Unverified
Commit
1013dce6
authored
Apr 28, 2024
by
Lyu Han
Committed by
GitHub
Apr 28, 2024
Browse files
adapt to lmdeploy v0.4.0 (#1073)
* adapt to lmdeploy v0.4.0 * compatible
parent
58a57a4c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
4 deletions
+18
-4
opencompass/models/lmdeploy_pytorch.py
opencompass/models/lmdeploy_pytorch.py
+12
-3
opencompass/models/turbomind.py
opencompass/models/turbomind.py
+6
-1
No files found.
opencompass/models/lmdeploy_pytorch.py
View file @
1013dce6
...
@@ -50,6 +50,7 @@ class LmdeployPytorchModel(BaseModel):
...
@@ -50,6 +50,7 @@ class LmdeployPytorchModel(BaseModel):
max_seq_len
=
max_seq_len
,
max_seq_len
=
max_seq_len
,
meta_template
=
meta_template
)
meta_template
=
meta_template
)
from
lmdeploy.pytorch
import
engine
as
tm
from
lmdeploy.pytorch
import
engine
as
tm
from
lmdeploy.version
import
version_info
if
engine_config
is
not
None
:
if
engine_config
is
not
None
:
from
lmdeploy.messages
import
PytorchEngineConfig
from
lmdeploy.messages
import
PytorchEngineConfig
...
@@ -71,6 +72,7 @@ class LmdeployPytorchModel(BaseModel):
...
@@ -71,6 +72,7 @@ class LmdeployPytorchModel(BaseModel):
self
.
generator_ids
=
[
i
+
1
for
i
in
range
(
concurrency
)]
self
.
generator_ids
=
[
i
+
1
for
i
in
range
(
concurrency
)]
self
.
gen_config
=
gen_config
self
.
gen_config
=
gen_config
self
.
end_str
=
end_str
self
.
end_str
=
end_str
self
.
major_version
,
self
.
minor_version
,
_
=
version_info
def
generate
(
def
generate
(
self
,
self
,
...
@@ -145,9 +147,16 @@ class LmdeployPytorchModel(BaseModel):
...
@@ -145,9 +147,16 @@ class LmdeployPytorchModel(BaseModel):
assert
type
(
assert
type
(
prompt
)
is
str
,
'We only support string for TurboMind Python API'
prompt
)
is
str
,
'We only support string for TurboMind Python API'
input_ids
=
self
.
tokenizer
.
encode
(
prompt
)
input_ids
=
self
.
tokenizer
.
encode
(
prompt
)
if
self
.
major_version
>=
0
and
self
.
minor_version
>=
4
:
outputs
=
generator
.
infer
(
session_id
,
input_ids
,
gen_config
=
gen_config
)
output_ids
=
outputs
.
token_ids
else
:
_
,
output_ids
,
_
=
generator
.
infer
(
session_id
,
_
,
output_ids
,
_
=
generator
.
infer
(
session_id
,
input_ids
,
input_ids
,
gen_config
=
gen_config
)
gen_config
=
gen_config
)
# stop engine
# stop engine
if
hasattr
(
generator
,
'end'
):
if
hasattr
(
generator
,
'end'
):
generator
.
end
(
session_id
)
generator
.
end
(
session_id
)
...
...
opencompass/models/turbomind.py
View file @
1013dce6
...
@@ -54,6 +54,7 @@ class TurboMindModel(BaseModel):
...
@@ -54,6 +54,7 @@ class TurboMindModel(BaseModel):
max_seq_len
=
max_seq_len
,
max_seq_len
=
max_seq_len
,
meta_template
=
meta_template
)
meta_template
=
meta_template
)
from
lmdeploy.turbomind
import
TurboMind
from
lmdeploy.turbomind
import
TurboMind
from
lmdeploy.version
import
version_info
if
engine_config
is
not
None
:
if
engine_config
is
not
None
:
from
lmdeploy.messages
import
TurbomindEngineConfig
from
lmdeploy.messages
import
TurbomindEngineConfig
...
@@ -70,6 +71,7 @@ class TurboMindModel(BaseModel):
...
@@ -70,6 +71,7 @@ class TurboMindModel(BaseModel):
self
.
generator_ids
=
[
i
+
1
for
i
in
range
(
concurrency
)]
self
.
generator_ids
=
[
i
+
1
for
i
in
range
(
concurrency
)]
self
.
gen_config
=
gen_config
self
.
gen_config
=
gen_config
self
.
end_str
=
end_str
self
.
end_str
=
end_str
self
.
major_version
,
self
.
minor_version
,
_
=
version_info
def
generate
(
self
,
def
generate
(
self
,
inputs
:
List
[
str
],
inputs
:
List
[
str
],
...
@@ -165,6 +167,9 @@ class TurboMindModel(BaseModel):
...
@@ -165,6 +167,9 @@ class TurboMindModel(BaseModel):
sequence_end
=
True
,
sequence_end
=
True
,
step
=
0
,
step
=
0
,
stream_output
=
False
):
stream_output
=
False
):
if
self
.
major_version
>=
0
and
self
.
minor_version
>=
4
:
output_ids
=
outputs
.
token_ids
else
:
_
,
output_ids
,
_
=
outputs
_
,
output_ids
,
_
=
outputs
response
=
self
.
tokenizer
.
decode
(
output_ids
)
response
=
self
.
tokenizer
.
decode
(
output_ids
)
response
=
valid_str
(
response
)
response
=
valid_str
(
response
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment