Merge f5161cc into 6d8ae68

conbench · Apr 7, 2021 · 182388b · 182388b
2 parents 6d8ae68 + f5161cc
commit 182388b
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 22 deletions.
diff --git a/conbench/api/_examples.py b/conbench/api/_examples.py
@@ -75,8 +75,6 @@ def _api_benchmark_entity(
             "dataset_columns": 18,
             "dataset_rows": 998,
             "file_type": "parquet",
-            "gc_collect": True,
-            "gc_disable": True,
             "input_type": "arrow",
             "name": name,
         },

diff --git a/conbench/runner.py b/conbench/runner.py
@@ -136,10 +136,6 @@ def benchmark(self, f, name, tags, context, run, options):
             "time_unit": "s",
         }
 
-        # TODO: don't add to tags for now for backwards compatibility
-        del timing_options["drop_caches"]
-
-        tags.update(timing_options)
         context.update(self.language)
         benchmark, _ = self.record(
             result,

diff --git a/conbench/tests/api/_expected_docs.py b/conbench/tests/api/_expected_docs.py
@@ -101,8 +101,6 @@
                                 "dataset_columns": 18,
                                 "dataset_rows": 998,
                                 "file_type": "parquet",
-                                "gc_collect": True,
-                                "gc_disable": True,
                                 "id": "some-case-uuid-1",
                                 "input_type": "arrow",
                                 "name": "file-write",
@@ -171,8 +169,6 @@
                                 "dataset_columns": 18,
                                 "dataset_rows": 998,
                                 "file_type": "parquet",
-                                "gc_collect": True,
-                                "gc_disable": True,
                                 "id": "some-case-uuid-1",
                                 "input_type": "arrow",
                                 "name": "file-write",
@@ -242,8 +238,6 @@
                                     "dataset_columns": 18,
                                     "dataset_rows": 998,
                                     "file_type": "parquet",
-                                    "gc_collect": True,
-                                    "gc_disable": True,
                                     "id": "some-case-uuid-1",
                                     "input_type": "arrow",
                                     "name": "file-write",
@@ -305,8 +299,6 @@
                                     "dataset_columns": 18,
                                     "dataset_rows": 998,
                                     "file_type": "parquet",
-                                    "gc_collect": True,
-                                    "gc_disable": True,
                                     "id": "some-case-uuid-1",
                                     "input_type": "arrow",
                                     "name": "file-write",

diff --git a/conbench/tests/api/test_benchmarks.py b/conbench/tests/api/test_benchmarks.py
@@ -86,8 +86,6 @@
         "dataset_columns": 18,
         "dataset_rows": 998,
         "file_type": "parquet",
-        "gc_collect": True,
-        "gc_disable": True,
         "input_type": "arrow",
         "name": "file-write",
     },

diff --git a/conbench/tests/benchmark/test_runner.py b/conbench/tests/benchmark/test_runner.py
@@ -68,8 +68,6 @@
     },
     "tags": {
         "year": "2020",
-        "gc_collect": True,
-        "gc_disable": True,
         "name": "addition",
     },
 }
@@ -85,8 +83,6 @@ def test_runner_without_cases():
     assert not BenchmarkFacadeSchema.create.validate(result)
     expected_tags = {
         "year": "2020",
-        "gc_collect": True,
-        "gc_disable": True,
         "name": "addition",
     }
     assert output == 2
@@ -111,8 +107,6 @@ def test_runner_with_cases():
         "fruit": "apple",
         "count": 1,
         "dataset": "sample",
-        "gc_collect": True,
-        "gc_disable": True,
         "name": "subtraction",
     }
     assert output == 99