update classnames and templates

supuchun · Nov 22, 2022 · 814f976 · 814f976
1 parent bed51c6
commit 814f976
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/cn_clip/eval/zeroshot_evaluation.py b/cn_clip/eval/zeroshot_evaluation.py
@@ -16,7 +16,6 @@
 from cn_clip.training.main import convert_models_to_fp32
 from cn_clip.clip.utils import image_transform
 from cn_clip.eval.data import get_zeroshot_dataset, _preprocess_text
-from cn_clip.eval.imagenet_zeroshot_templates import imagenet_classnames, openai_imagenet_template
 from cn_clip.eval.cvinw_zeroshot_templates import (
     openai_templates,
     flower_templates,
@@ -251,7 +250,7 @@ def run(model, classifier, dataloader, args):
 
     # Make inference and evaluation
     print('Using classifier')
-    classifier = zero_shot_classifier(model, imagenet_classnames, openai_imagenet_template, args)
+    classifier = zero_shot_classifier(model, classnames, templates, args)
     results = {}
     top1, top5, logits = run(model, classifier, data[args.dataset].dataloader, args)
 

diff --git a/run_scripts/zeroshot_eval.sh b/run_scripts/zeroshot_eval.sh
@@ -13,7 +13,7 @@ resume=${5}
 label_file=${path}/${dataset}/label_cn.txt
 index=${6:-}
 
-python -u src/eval/zeroshot_evaluation.py \
+python -u cn_clip/eval/zeroshot_evaluation.py \
     --datapath="${datapath}" \
     --label-file=${label_file} \
     --save-dir=${savedir} \