From 7778a898b90795ed266ad6e6ac9e7fa3ad951041 Mon Sep 17 00:00:00 2001
From: Felix Schindler <felix.schindler@wwu.de>
Date: Wed, 7 Aug 2019 12:04:13 +0200
Subject: [PATCH] [python] fix timings
---
python/dune/xt/common/__init__.py | 3 +++
python/dune/xt/common/timings.cc | 2 +-
python/dune/xt/common/timings.py | 14 --------------
3 files changed, 4 insertions(+), 15 deletions(-)
delete mode 100644 python/dune/xt/common/timings.py
diff --git a/python/dune/xt/common/__init__.py b/python/dune/xt/common/__init__.py
index 075ba77be..0e9bea5c2 100644
--- a/python/dune/xt/common/__init__.py
+++ b/python/dune/xt/common/__init__.py
@@ -20,3 +20,6 @@ for mod_name in (
):
guarded_import(globals(), 'dune.xt.common', mod_name)
+# make sure the singleton exists
+timings()
+
diff --git a/python/dune/xt/common/timings.cc b/python/dune/xt/common/timings.cc
index d9a848ebd..e3942f368 100644
--- a/python/dune/xt/common/timings.cc
+++ b/python/dune/xt/common/timings.cc
@@ -45,5 +45,5 @@ PYBIND11_MODULE(_timings, m)
.def("output_all_measures",
[](Timings& self) { self.output_all_measures(); },
"outputs per rank and global averages of all measures");
- m.def("instance", &timings, py::return_value_policy::reference);
+ m.def("timings", &timings, py::return_value_policy::reference);
}
diff --git a/python/dune/xt/common/timings.py b/python/dune/xt/common/timings.py
deleted file mode 100644
index 69b8f393a..000000000
--- a/python/dune/xt/common/timings.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# ~~~
-# This file is part of the dune-xt-common project:
-# https://github.com/dune-community/dune-xt-common
-# Copyright 2009-2018 dune-xt-common developers and contributors. All rights reserved.
-# License: Dual licensed as BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
-# or GPL-2.0+ (http://opensource.org/licenses/gpl-license)
-# with "runtime exception" (http://www.dune-project.org/license.html)
-# Authors:
-# René Fritze (2018)
-# ~~~
-
-from dune.xt._timings import *
-
-timings = instance()
\ No newline at end of file
--
GitLab