remove -

ezyang · Dec 6, 2024 · f7b618d · f7b618d
1 parent fa967b6
commit f7b618d
Show file tree

Hide file tree

Showing 9 changed files with 1,411 additions and 1,388 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -380,7 +380,7 @@ pub fn parse_path(path: &PathBuf, config: ParseConfig) -> anyhow::Result<ParseOu
                 .as_ref()
                 .map_or(format!("unknown_{lineno}"), |c| match c {
                     CompileId::UserInitiated(d) => {
-                        format!("-_{}_{}_{}", d.frame_id, d.frame_compile_id, d.attempt)
+                        format!("{}_{}_{}", d.frame_id, d.frame_compile_id, d.attempt)
                     }
                     CompileId::CompiledAutogradInitiated {
                         compiled_autograd_id,

diff --git a/src/parsers.rs b/src/parsers.rs
@@ -58,7 +58,7 @@ fn simple_file_output(
         .as_ref()
         .map_or(format!("unknown_{lineno}"), |c| match c {
             CompileId::UserInitiated(d) => {
-                format!("-_{}_{}_{}", d.frame_id, d.frame_compile_id, d.attempt)
+                format!("{}_{}_{}", d.frame_id, d.frame_compile_id, d.attempt)
             }
             CompileId::CompiledAutogradInitiated {
                 compiled_autograd_id,

diff --git a/src/types.rs b/src/types.rs
@@ -169,7 +169,7 @@ impl fmt::Display for CompileId {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             CompileId::UserInitiated(d) => {
-                write!(f, "[-/{}]", _format_dynamo_id(d))
+                write!(f, "[{}]", _format_dynamo_id(d))
             }
             CompileId::CompiledAutogradInitiated {
                 compiled_autograd_id,

diff --git a/tests/inputs/cache_hit_miss.log b/tests/inputs/cache_hit_miss.log
diff --git a/tests/inputs/chromium_events.log b/tests/inputs/chromium_events.log
diff --git a/tests/inputs/comp_failure.log b/tests/inputs/comp_failure.log
diff --git a/tests/inputs/comp_metrics.log b/tests/inputs/comp_metrics.log
diff --git a/tests/inputs/simple.log b/tests/inputs/simple.log
diff --git a/tests/integration_test.rs b/tests/integration_test.rs
@@ -11,13 +11,12 @@ fn prefix_exists(map: &HashMap<PathBuf, String>, prefix: &str) -> bool {
 #[test]
 fn test_parse_simple() {
     let expected_files = [
-        "-_0_0_0/aot_forward_graph",
-        "-_0_0_0/dynamo_output_graph",
+        "0_0_0/aot_forward_graph",
+        "0_0_0/dynamo_output_graph",
         "index.html",
         "failures_and_restarts.html",
-        "-_0_0_0/inductor_post_grad_graph",
-        "-_0_0_0/inductor_output_code",
-        "-_0_0_0/dynamo_guards",
+        "0_0_0/inductor_post_grad_graph",
+        "0_0_0/inductor_output_code",
     ];
     // Read the test file
     // simple.log was generated from the following:
@@ -43,12 +42,12 @@ fn test_parse_simple() {
 #[test]
 fn test_parse_compilation_metrics() {
     let expected_files = [
-        "-_0_0_1/dynamo_output_graph",
-        "-_0_0_1/compilation_metrics",
-        "-_1_0_1/dynamo_output_graph",
-        "-_1_0_1/compilation_metrics",
-        "-_2_0_0/dynamo_output_graph",
-        "-_2_0_0/compilation_metrics",
+        "0_0_1/dynamo_output_graph",
+        "0_0_1/compilation_metrics",
+        "1_0_1/dynamo_output_graph",
+        "1_0_1/compilation_metrics",
+        "2_0_0/dynamo_output_graph",
+        "2_0_0/compilation_metrics",
         "index.html",
         "failures_and_restarts.html",
     ];
@@ -76,8 +75,8 @@ fn test_parse_compilation_metrics() {
 #[test]
 fn test_parse_compilation_failures() {
     let expected_files = [
-        "-_0_0_0/dynamo_output_graph",
-        "-_0_0_0/compilation_metrics",
+        "0_0_0/dynamo_output_graph",
+        "0_0_0/compilation_metrics",
         "index.html",
         "failures_and_restarts.html",
     ];
@@ -104,10 +103,10 @@ fn test_parse_compilation_failures() {
 
 #[test]
 fn test_parse_artifact() {
-    let expected_files = ["-_0_0_0/fx_graph_cache_hash", "index.html"];
+    let expected_files = ["0_0_0/fx_graph_cache_hash", "index.html"];
     // Read the test file
     // artifacts.log was generated from the following:
-    // NOTE: test output looks nothing like artifacts.log
+    // NOTE: this test command looks wrong, and is not producing anything close to artifacts.log
     // TORCH_TRACE=~/trace_logs/test python test/inductor/test_torchinductor.py  -k TORCH_TRACE=~/trace_logs/comp_metrics python test/dynamo/test_misc.py -k test_graph_break_compilation_metrics_on_failure
     let path = Path::new("tests/inputs/artifacts.log").to_path_buf();
     let config = tlparse::ParseConfig {
@@ -154,9 +153,9 @@ fn test_parse_chromium_event() {
 #[test]
 fn test_cache_hit_miss() {
     let expected_files = [
-        "-_1_0_0/fx_graph_cache_miss_33.json",
-        "-_1_0_0/fx_graph_cache_miss_9.json",
-        "-_1_0_0/fx_graph_cache_hit_20.json",
+        "1_0_0/fx_graph_cache_miss_33.json",
+        "1_0_0/fx_graph_cache_miss_9.json",
+        "1_0_0/fx_graph_cache_hit_20.json",
         "index.html",
     ];
     // Generated via TORCH_TRACE=~/trace_logs/test python test/inductor/test_codecache.py -k test_flex_attention_caching