Merge remote-tracking branch 'upstream/master' into rtti_branch

openvinotoolkit · Dec 11, 2024 · b74bcae · b74bcae
2 parents 37f5c1c + bf8be26
commit b74bcae
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/docs/sphinx_setup/_static/download/GenAI_Quick_Start_Guide.pdf b/docs/sphinx_setup/_static/download/GenAI_Quick_Start_Guide.pdf
diff --git a/samples/python/benchmark/bert_benchmark/bert_benchmark.py b/samples/python/benchmark/bert_benchmark/bert_benchmark.py
@@ -9,8 +9,8 @@
 import tempfile
 from time import perf_counter
 
-import datasets
 import openvino as ov
+import datasets
 from openvino.runtime import get_version
 from transformers import AutoTokenizer
 from transformers.onnx import export

diff --git a/src/plugins/intel_cpu/tools/commit_slider/commit_slider.py b/src/plugins/intel_cpu/tools/commit_slider/commit_slider.py
@@ -96,8 +96,10 @@
     if curCfgData['userLogPath']:
         permLogPath = curCfgData['userLogPath']
 
-    safeClearDir(permLogPath, curCfgData)
-    if not curCfgData['clearLogsAposteriori']:
+    if curCfgData['clearLogsAposteriori']:
+        safeClearDir(permLogPath, curCfgData)
+    elif not tempLogPath == permLogPath:
+        safeClearDir(permLogPath, curCfgData)
         copy_tree(tempLogPath, permLogPath)
 
     safeClearDir(permCachePath, curCfgData)

diff --git a/src/plugins/intel_cpu/tools/commit_slider/tests/test_util.py b/src/plugins/intel_cpu/tools/commit_slider/tests/test_util.py
@@ -251,12 +251,14 @@ def requireBinarySearchData(td: TestData, rsc: map):
     )
     [setattr(td, key, td.commonRsc[key] \
             if not key in td.testCfg or \
-            not isinstance(td.testCfg[key], str) \
+            not (isinstance(td.testCfg[key], str) or \
+                 isinstance(td.testCfg[key], bool)) \
             else td.testCfg[key]) for key in [
         'repoStructure',
         'userCachePath',
         'userLogPath',
-        'clearLogsAposteriori', 'clearCache',
+        'clearLogsAposteriori',
+        'clearCache',
         'mainFile', 'repoPath'
     ]]
     td.patternPrefix = td.commonRsc['patchGeneratorPrefix']

diff --git a/src/plugins/intel_cpu/tools/commit_slider/utils/modes.py b/src/plugins/intel_cpu/tools/commit_slider/utils/modes.py
@@ -165,7 +165,7 @@ def preliminaryCheck(self, list, cfg):
         if cfg["preliminaryCheckCfg"]["checkBenchmarkModelPath"]:
             cmdStr = cfg["appCmd"]
             matcher = re.search(
-                "benchmark.*-m[\s*]([^\S]*)",
+                r"benchmark.*-m[\s*]([^\S]*)",
                 cmdStr,
                 flags=re.MULTILINE
                 )
@@ -287,7 +287,7 @@ def getCommitInfo(self, commit):
 class AccuracyCheckerMode(Mode):
     def __init__(self, cfg):
         super().__init__(cfg)
-        self.thresholdPattern = ":\s([0-9]*[.][0-9]*)%.*abs error"
+        self.thresholdPattern = r":\s([0-9]*[.][0-9]*)%.*abs error"
         self.curMetric = None
         self.createCash()
 

diff --git a/tests/llm/accuracy_conformance.py b/tests/llm/accuracy_conformance.py
@@ -98,7 +98,7 @@ def teardown_module():
     test_scope,
 )
 def test_accuracy_conformance(model_path, model_type, precision, gt_data, device):
-    target_model = OVModelForCausalLM.from_pretrained(model_path, device=device)
+    target_model = OVModelForCausalLM.from_pretrained(model_path, device=device, ov_config={"KV_CACHE_PRECISION": "f16"})
     tokenizer = AutoTokenizer.from_pretrained(model_path)
 
     evaluator = wwb.Evaluator(