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
1326aff7
Unverified
Commit
1326aff7
authored
Jul 17, 2023
by
Leymore
Committed by
GitHub
Jul 17, 2023
Browse files
[Feature] Add logger info and remove dataset bugs (#61)
* Add logger info and remove dataset bugs * fix typo
parent
77a1cc44
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
7 deletions
+17
-7
configs/datasets/FewCLUE_chid/FewCLUE_chid_ppl_8f2872.py
configs/datasets/FewCLUE_chid/FewCLUE_chid_ppl_8f2872.py
+1
-1
opencompass/datasets/GaokaoBench.py
opencompass/datasets/GaokaoBench.py
+1
-1
opencompass/datasets/agieval/agieval.py
opencompass/datasets/agieval/agieval.py
+2
-3
opencompass/datasets/mmlu.py
opencompass/datasets/mmlu.py
+1
-1
opencompass/tasks/openicl_eval.py
opencompass/tasks/openicl_eval.py
+2
-0
opencompass/tasks/openicl_infer.py
opencompass/tasks/openicl_infer.py
+10
-1
No files found.
configs/datasets/FewCLUE_chid/FewCLUE_chid_ppl_8f2872.py
View file @
1326aff7
...
...
@@ -21,7 +21,7 @@ chid_infer_cfg = dict(
retriever
=
dict
(
type
=
ZeroRetriever
),
inferencer
=
dict
(
type
=
PPLInferencer
))
chid_eval_cfg
=
dict
(
evaluator
=
dict
(
type
=
AccEvaluator
)
,
pred_role
=
"BOT"
)
chid_eval_cfg
=
dict
(
evaluator
=
dict
(
type
=
AccEvaluator
))
chid_datasets
=
[
dict
(
...
...
opencompass/datasets/GaokaoBench.py
View file @
1326aff7
...
...
@@ -14,7 +14,7 @@ class GaokaoBenchDataset(BaseDataset):
@
staticmethod
def
load
(
path
:
str
):
with
open
(
path
)
as
f
:
with
open
(
path
,
encoding
=
'utf-8'
)
as
f
:
data
=
json
.
load
(
f
)
return
Dataset
.
from_list
(
data
[
'example'
])
...
...
opencompass/datasets/agieval/agieval.py
View file @
1326aff7
...
...
@@ -6,11 +6,10 @@ from datasets import Dataset
from
opencompass.openicl.icl_evaluator
import
BaseEvaluator
from
opencompass.registry
import
ICL_EVALUATORS
,
LOAD_DATASET
from
..base
import
BaseDataset
from
.math_equivalence
import
is_equiv
from
.post_process
import
parse_math_answer
from
..base
import
BaseDataset
@
LOAD_DATASET
.
register_module
()
class
AGIEvalDataset
(
BaseDataset
):
...
...
@@ -40,7 +39,7 @@ class AGIEvalDataset_v2(BaseDataset):
def
load
(
path
:
str
,
name
:
str
,
setting_name
:
str
):
assert
setting_name
in
'zero-shot'
,
'only support zero-shot setting'
filename
=
osp
.
join
(
path
,
name
+
'.jsonl'
)
with
open
(
filename
)
as
f
:
with
open
(
filename
,
encoding
=
'utf-8'
)
as
f
:
_data
=
[
json
.
loads
(
line
.
strip
())
for
line
in
f
]
data
=
[]
for
_d
in
_data
:
...
...
opencompass/datasets/mmlu.py
View file @
1326aff7
...
...
@@ -17,7 +17,7 @@ class MMLUDataset(BaseDataset):
for
split
in
[
'dev'
,
'test'
]:
raw_data
=
[]
filename
=
osp
.
join
(
path
,
split
,
f
'
{
name
}
_
{
split
}
.csv'
)
with
open
(
filename
)
as
f
:
with
open
(
filename
,
encoding
=
'utf-8'
)
as
f
:
reader
=
csv
.
reader
(
f
)
for
row
in
reader
:
assert
len
(
row
)
==
6
...
...
opencompass/tasks/openicl_eval.py
View file @
1326aff7
...
...
@@ -125,6 +125,8 @@ class OpenICLEvalTask(BaseTask):
self
.
logger
.
error
(
f
'Task
{
task_abbr_from_cfg
(
self
.
cfg
)
}
:
{
result
[
"error"
]
}
'
)
return
else
:
self
.
logger
.
info
(
f
'Task
{
task_abbr_from_cfg
(
self
.
cfg
)
}
:
{
result
}
'
)
# Save result
out_path
=
get_infer_output_path
(
self
.
model_cfg
,
self
.
dataset_cfg
,
...
...
opencompass/tasks/openicl_infer.py
View file @
1326aff7
...
...
@@ -11,7 +11,8 @@ from opencompass.registry import (ICL_INFERENCERS, ICL_PROMPT_TEMPLATES,
ICL_RETRIEVERS
,
TASKS
)
from
opencompass.tasks.base
import
BaseTask
from
opencompass.utils
import
(
build_dataset_from_cfg
,
build_model_from_cfg
,
get_infer_output_path
,
get_logger
)
get_infer_output_path
,
get_logger
,
task_abbr_from_cfg
)
@
TASKS
.
register_module
(
force
=
(
__name__
==
'__main__'
))
# A hack for script run
...
...
@@ -30,6 +31,7 @@ class OpenICLInferTask(BaseTask):
run_cfg
=
self
.
model_cfgs
[
0
].
get
(
'run_cfg'
,
{})
self
.
num_gpus
=
run_cfg
.
get
(
'num_gpus'
,
0
)
self
.
num_procs
=
run_cfg
.
get
(
'num_procs'
,
1
)
self
.
logger
=
get_logger
()
def
get_command
(
self
,
cfg_path
,
template
):
"""Get the command template for the task.
...
...
@@ -51,6 +53,7 @@ class OpenICLInferTask(BaseTask):
return
template
.
format
(
task_cmd
=
command
)
def
run
(
self
):
self
.
logger
.
info
(
f
'Task
{
task_abbr_from_cfg
(
self
.
cfg
)
}
'
)
for
model_cfg
,
dataset_cfgs
in
zip
(
self
.
model_cfgs
,
self
.
dataset_cfgs
):
self
.
max_out_len
=
model_cfg
.
get
(
'max_out_len'
,
None
)
self
.
batch_size
=
model_cfg
.
get
(
'batch_size'
,
None
)
...
...
@@ -61,6 +64,10 @@ class OpenICLInferTask(BaseTask):
self
.
dataset_cfg
=
dataset_cfg
self
.
infer_cfg
=
self
.
dataset_cfg
[
'infer_cfg'
]
self
.
dataset
=
build_dataset_from_cfg
(
self
.
dataset_cfg
)
self
.
sub_cfg
=
{
'models'
:
[
self
.
model_cfg
],
'datasets'
:
[[
self
.
dataset_cfg
]],
}
out_path
=
get_infer_output_path
(
self
.
model_cfg
,
self
.
dataset_cfg
,
osp
.
join
(
self
.
work_dir
,
'predictions'
))
...
...
@@ -69,6 +76,8 @@ class OpenICLInferTask(BaseTask):
self
.
_inference
()
def
_inference
(
self
):
self
.
logger
.
info
(
f
'Start inferencing
{
task_abbr_from_cfg
(
self
.
sub_cfg
)
}
'
)
assert
hasattr
(
self
.
infer_cfg
,
'ice_template'
)
or
hasattr
(
self
.
infer_cfg
,
'prompt_template'
),
\
'Both ice_template and prompt_template cannot be None simultaneously.'
# noqa: E501
...
...
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