Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit 907b57c

Browse files
author
Matthias Koeppe
committed
Merge #32593
2 parents af06e5b + acca6c2 commit 907b57c

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

src/sage/matrix/matrix2.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ from sage.rings.complex_double import CDF
9494
from sage.rings.real_mpfr import RealField
9595
from sage.rings.complex_mpfr import ComplexField
9696
from sage.rings.finite_rings.integer_mod_ring import IntegerModRing
97-
from sage.misc.derivative import multi_derivative
9897
import sage.rings.abc
9998
from sage.arith.numerical_approx cimport digits_to_bits
10099
from copy import copy
@@ -15124,6 +15123,7 @@ cdef class Matrix(Matrix1):
1512415123
sage: v.derivative(x,x)
1512515124
(0, 0, 2)
1512615125
"""
15126+
from sage.misc.derivative import multi_derivative
1512715127
return multi_derivative(self, args)
1512815128

1512915129
def exp(self):

src/sage/modules/free_module_element.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ from sage.rings.infinity import Infinity, AnInfinity
123123
from sage.rings.integer_ring import ZZ
124124
from sage.rings.real_double import RDF
125125
from sage.rings.complex_double import CDF
126-
from sage.misc.derivative import multi_derivative
127126

128127
from sage.rings.ring cimport Ring
129128
from sage.rings.integer cimport Integer, smallInteger
@@ -3968,6 +3967,7 @@ cdef class FreeModuleElement(Vector): # abstract base class
39683967
sage: v.derivative(x,x)
39693968
(0, 0, 2)
39703969
"""
3970+
from sage.misc.derivative import multi_derivative
39713971
return multi_derivative(self, args)
39723972
39733973
diff = derivative

src/sage/modules/vector_space_morphism.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,8 +688,10 @@ def linear_transformation(arg0, arg1=None, arg2=None, side='left'):
688688
from sage.modules.module import is_VectorSpace
689689
from sage.modules.free_module import VectorSpace
690690
from sage.categories.homset import Hom
691-
from sage.symbolic.ring import SR
692-
from sage.modules.vector_callable_symbolic_dense import Vector_callable_symbolic_dense
691+
try:
692+
from sage.modules.vector_callable_symbolic_dense import Vector_callable_symbolic_dense
693+
except ImportError:
694+
Vector_callable_symbolic_dense = ()
693695

694696
if not side in ['left', 'right']:
695697
raise ValueError("side must be 'left' or 'right', not {0}".format(side))
@@ -734,6 +736,7 @@ def linear_transformation(arg0, arg1=None, arg2=None, side='left'):
734736
elif isinstance(arg2, (list, tuple)):
735737
pass
736738
elif isinstance(arg2, Vector_callable_symbolic_dense):
739+
from sage.symbolic.ring import SR
737740
args = arg2.parent().base_ring()._arguments
738741
exprs = arg2.change_ring(SR)
739742
m = len(args)

0 commit comments

Comments
 (0)