sage.misc.timing: Split out from sage.misc.misc

Author: Matthias Koeppe

pkgs/sagemath-objects/MANIFEST.in

@@ -83,6 +83,7 @@ graft sage/libs/gmp
 
 ## FIXME: Needed for doctesting
 include sage/misc/misc.*              # walltime, cputime used in sage.doctest
+include sage/misc/timing.p*
 
 
 global-exclude *.c

src/sage/coding/binary_code.pyx

@@ -47,7 +47,7 @@ from cpython.object cimport PyObject_RichCompare
 from cysignals.memory cimport sig_malloc, sig_realloc, sig_free
 
 from sage.structure.element import is_Matrix
-from sage.misc.misc import cputime
+from sage.misc.timing import cputime
 from sage.rings.integer cimport Integer
 from copy import copy
 from sage.data_structures.bitset_base cimport *

src/sage/databases/cremona.py

@@ -51,7 +51,7 @@
 import sage.schemes.elliptic_curves.constructor as elliptic
 from .sql_db import SQLDatabase, verify_column
 from sage.features.databases import DatabaseCremona
-from sage.misc.misc import walltime
+from sage.misc.timing import walltime
 
 import re
 import string

src/sage/doctest/forker.py

@@ -54,7 +54,7 @@
 import IPython.lib.pretty
 
 import sage.misc.randstate as randstate
-from sage.misc.misc import walltime
+from sage.misc.timing import walltime
 from .util import Timer, RecordingDict, count_noun
 from .sources import DictAsObject
 from .parsing import OriginalSource, reduce_hex, unparse_optional_tags
@@ -1275,7 +1275,7 @@ def report_success(self, out, test, example, got, *, check_duration=0):
             sage: from sage.doctest.forker import SageDocTestRunner
             sage: from sage.doctest.sources import FileDocTestSource
             sage: from sage.doctest.control import DocTestDefaults; DD = DocTestDefaults()
-            sage: from sage.misc.misc import walltime
+            sage: from sage.misc.timing import walltime
             sage: from sage.env import SAGE_SRC
             sage: import doctest, sys, os
             sage: DTR = SageDocTestRunner(SageOutputChecker(), verbose=True, sage_options=DD, optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
@@ -1449,7 +1449,7 @@ def report_overtime(self, out, test, example, got, *, check_duration=0):
             sage: from sage.doctest.forker import SageDocTestRunner
             sage: from sage.doctest.sources import FileDocTestSource
             sage: from sage.doctest.control import DocTestDefaults; DD = DocTestDefaults()
-            sage: from sage.misc.misc import walltime
+            sage: from sage.misc.timing import walltime
             sage: from sage.env import SAGE_SRC
             sage: import doctest, sys, os
             sage: DTR = SageDocTestRunner(SageOutputChecker(), verbose=True, sage_options=DD, optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)

src/sage/doctest/util.py

@@ -19,7 +19,7 @@
 #                  https://www.gnu.org/licenses/
 # ****************************************************************************
 
-from sage.misc.misc import walltime, cputime
+from sage.misc.timing import walltime, cputime
 
 
 def count_noun(number, noun, plural=None, pad_number=False, pad_noun=False):

src/sage/geometry/fan.py

@@ -253,7 +253,7 @@
 from sage.graphs.digraph import DiGraph
 from sage.matrix.constructor import matrix
 from sage.misc.cachefunc import cached_method
-from sage.misc.misc import walltime
+from sage.misc.timing import walltime
 from sage.misc.misc_c import prod
 from sage.modules.free_module import span
 from sage.modules.free_module_element import vector

src/sage/geometry/fan_morphism.py

@@ -677,6 +677,7 @@ def _subdivide_domain_fan(self, check, verbose):
         domain_fan = self._domain_fan
         lattice_dim = self.domain().dimension()
         if verbose:
+            from sage.misc.timing import walltime
             start = walltime()
             print("Placing ray images", end=" ")
         # Figure out where 1-dimensional cones (i.e. rays) are mapped.

src/sage/groups/perm_gps/partn_ref/refinement_binary.pyx

@@ -1063,6 +1063,7 @@ def random_tests(num=50, n_max=50, k_max=6, nwords_max=200, perms_per_code=10, d
         sage: sage.groups.perm_gps.partn_ref.refinement_binary.random_tests()  # long time (up to 5s on sage.math, 2012)
         All passed: ... random tests on ... codes.
     """
+    from sage.misc.timing import walltime
     from sage.misc.prandom import random, randint
     from sage.combinat.permutation import Permutations
     from sage.matrix.constructor import random_matrix, matrix

src/sage/groups/perm_gps/partn_ref/refinement_matrices.pyx

@@ -331,6 +331,7 @@ def random_tests(n=10, nrows_max=50, ncols_max=50, nsymbols_max=10, perms_per_ma
         sage: sage.groups.perm_gps.partn_ref.refinement_matrices.random_tests()  # long time (up to 30s on sage.math, 2011)
         All passed: ... random tests on ... matrices.
     """
+    from sage.misc.timing import walltime
     from sage.misc.prandom import random, randint
     from sage.combinat.permutation import Permutations
     from sage.matrix.constructor import random_matrix, matrix

src/sage/interfaces/tests.py

@@ -43,7 +43,7 @@
 """
 
 from .all import *
-from sage.misc.misc import cputime, walltime
+from sage.misc.timing import cputime, walltime
 import sys
 
 def manyvars(s, num=70000, inlen=1, step=2000):