retreat least selection choose | increase timeout | config

Author: starrryz

src/Nncase.EGraph/Passes/EGraphExtensions.cs

@@ -47,8 +47,14 @@ public static BaseExpr Extract(this IEGraph eGraph, EClass root, CompileOptions
         var costModel = new CostModel.EGraphCostEvaluator(root.Find(), compileOptions, basefunc_cost_evaluator, false).Evaluate();
 
         // switch to smoothe (need to do : choose 1 from 2 by inheriting the same interface)
-        return new SmoothEExtractor(compileOptions, costModel).Extract(root.Find(), eGraph, constrains ?? Array.Empty<EGraphExtractConstrains>());
+        // var in_expr = new SmoothEExtractor(compileOptions, costModel).Extract(root.Find(), eGraph, constrains ?? Array.Empty<EGraphExtractConstrains>());
 
-        // return new EGraphExtractor(costModel).Extract(root.Find(), eGraph, constrains ?? Array.Empty<EGraphExtractConstrains>());
+        // // first soft in smoothe, next hard in cp-sat
+        // var in_egraph = new EGraph();
+        // var root_new = in_egraph.Add(in_expr);
+        // in_egraph.Rebuild();
+        // var costModel1 = new CostModel.EGraphCostEvaluator(root_new.Find(), compileOptions, basefunc_cost_evaluator, false).Evaluate();
+        // return new EGraphExtractor(costModel1).Extract(root_new.Find(), in_egraph, constrains ?? Array.Empty<EGraphExtractConstrains>());
+        return new EGraphExtractor(costModel).Extract(root.Find(), eGraph, constrains ?? Array.Empty<EGraphExtractConstrains>());
     }
 }

src/Nncase.EGraph/Passes/SmoothEExtractor.cs

@@ -194,7 +194,7 @@ public BaseExpr Extract(EClass root, IEGraph eGraph, EGraphExtractConstrains[] c
         proc.BeginOutputReadLine();
         proc.BeginErrorReadLine();
 
-        bool finished = proc.WaitForExit((int)TimeSpan.FromMinutes(15).TotalMilliseconds);
+        bool finished = proc.WaitForExit((int)TimeSpan.FromMinutes(60).TotalMilliseconds);
         if (!finished)
         {
             try
@@ -238,14 +238,22 @@ public BaseExpr Extract(EClass root, IEGraph eGraph, EGraphExtractConstrains[] c
         // rescued by recursive search the whole dir
         if (foundSelection is null)
         {
-            var cand = new DirectoryInfo(smootheRepoDir)
-                .EnumerateFiles("*_selection.json", SearchOption.AllDirectories)
-                .OrderByDescending(f => f.LastWriteTimeUtc)
-                .FirstOrDefault();
-            if (cand is not null)
-            {
-                foundSelection = cand.FullName;
-            }
+            // var cand = new DirectoryInfo(smootheRepoDir)
+            //     .EnumerateFiles("full_layer_selection.json", SearchOption.AllDirectories)
+            //     .OrderByDescending(f => f.LastWriteTimeUtc)
+            //     .FirstOrDefault();
+            // if (cand is not null)
+            // {
+            //     foundSelection = cand.FullName;
+            //     // throw new FileNotFoundException(
+            //     //     $"SmoothE selection file use existed: '{foundSelection}'.\n" +
+            //     //     "Searched locations:\n" +
+            //     //     string.Join(Environment.NewLine, candidateSelectionPaths));
+            // }
+            throw new FileNotFoundException(
+                    $"SmoothE selection file not find: '{selectionFileName}'.\n" +
+                    "Searched locations:\n" +
+                    string.Join(Environment.NewLine, candidateSelectionPaths));
         }
 
         // no method is valid, throw error

tests/config.toml

@@ -120,12 +120,12 @@ args = 'tests/llm/prompt.txt'
 [target]
 
 [target.cpu]
-eval = true
-infer = true
+eval = false
+infer = false
 similarity_name = 'cosine'
 
 [target.cpu.mode.noptq]
-enabled = true
+enabled = false
 threshold = 0.999
 
 [target.cpu.mode.ptq]
@@ -164,7 +164,7 @@ enabled = true
 threshold = 0.96
 
 [target.xpu]
-eval = false
+eval = true
 infer = true
 similarity_name = 'cosine'
 
@@ -173,7 +173,7 @@ enabled = true
 threshold = 0.999
 
 [target.xpu.mode.ptq]
-enabled = false
+enabled = true
 threshold = 0.9
 
 [target.xpu.target_options]

tests/importer/huggingface_/test_qwen2.py

@@ -30,7 +30,7 @@ def test_qwen2(request):
     [huggingface_options]
     output_logits = true
     output_hidden_states = false
-    num_layers = 1
+    num_layers = -1
 
     [generator]
     [generator.inputs]