Move test_result_analyzer.py to the test directory. (#6130)

pytorch · Jan 12, 2024 · 1fbe935 · 1fbe935
1 parent efd5e58
commit 1fbe935
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 24 deletions.
diff --git a/.circleci/common.sh b/.circleci/common.sh
@@ -151,11 +151,6 @@ function run_torch_xla_python_tests() {
           # echo "Running MNIST Test"
           # python test/test_train_mp_mnist_amp.py --fake_data --num_epochs=1
         fi
-      elif [[ "$RUN_XLA_OP_TESTS1" == "xla_op1" ]]; then
-          # Benchmark tests.
-          # Only run on CPU, for xla_op1.
-          echo "Running Benchmark tests."
-          ./benchmarks/test/run_tests.sh
       fi
     fi
   popd

diff --git a/benchmarks/test/run_tests.sh b/benchmarks/test/run_tests.sh
diff --git a/benchmarks/test/example.json → test/benchmarks/output-example.json b/benchmarks/test/example.json → test/benchmarks/output-example.json
diff --git a/test/benchmarks/run_tests.sh b/test/benchmarks/run_tests.sh
@@ -42,6 +42,7 @@ function run_python_tests {
   python3 "$CDIR/test_experiment_runner.py"
   python3 "$CDIR/test_benchmark_experiment.py"
   python3 "$CDIR/test_benchmark_model.py"
+  python3 "$CDIR/test_result_analyzer.py"
 }
 
 function run_tests {

diff --git a/benchmarks/test/test_result_analyzer.py → test/benchmarks/test_result_analyzer.py b/benchmarks/test/test_result_analyzer.py → test/benchmarks/test_result_analyzer.py
@@ -1,5 +1,5 @@
 import argparse
-import functools
+import json
 import numpy
 import unittest
 import os
@@ -10,6 +10,8 @@
 fns_skip_head = (numpy.mean, numpy.std)
 fns_all = fns_whole + fns_skip_head
 
+_DATALINE = None
+
 
 def apply(fn, data):
   return fn(data)
@@ -19,17 +21,17 @@ def apply_skip_head(fn, data):
   return fn(data[1:])
 
 
-@functools.cache
 def get_dirname():
   return os.path.dirname(__file__)
 
 
-@functools.cache
 def get_dataline():
-  import json
-  example_json = os.path.join(get_dirname(), "example.json")
-  with open(example_json, "r") as f:
-    return json.load(f)
+  global _DATALINE
+  if _DATALINE is None:
+    example_json = os.path.join(get_dirname(), "output-example.json")
+    with open(example_json, "r") as f:
+      _DATALINE = json.load(f)
+  return _DATALINE
 
 
 class TestResultAnalyzer(unittest.TestCase):