returnn 1.20230718.150009__tar.gz → 1.20230718.183712__tar.gz

{returnn-1.20230718.150009/returnn.egg-info → returnn-1.20230718.183712}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: returnn
-Version: 1.20230718.150009
+Version: 1.20230718.183712
 Summary: The RWTH extensible training framework for universal recurrent neural networks
 Home-page: https://github.com/rwth-i6/returnn/
 Author: Albert Zeyer

returnn-1.20230718.183712/_setup_info_generated.py

@@ -0,0 +1,2 @@
+version = '1.20230718.183712'
+long_version = '1.20230718.183712+git.b77467a'

{returnn-1.20230718.150009 → returnn-1.20230718.183712}/returnn/frontend/_utils.py

@@ -86,9 +86,9 @@ def bin_op_out_template(
     elif isinstance(b, Tensor):
         src_dtype = b.dtype
         src_device = b.device
-    a = rf.convert_to_tensor(a, dtype=src_dtype, device=src_device, _backend=backend)
+    a = rf.convert_to_tensor(a, dtype=src_dtype, device=src_device, keep_scalar_on_cpu=allow_scalar, _backend=backend)
     src_dtype = src_dtype or a.dtype
-    b = rf.convert_to_tensor(b, dtype=src_dtype, device=src_device, _backend=backend)
+    b = rf.convert_to_tensor(b, dtype=src_dtype, device=src_device, keep_scalar_on_cpu=allow_scalar, _backend=backend)
     # sanity checks
     # noinspection PyProtectedMember
     assert a._raw_backend == b._raw_backend, "Cannot combine tensors from two different frontends, e.g. TF and PT"

{returnn-1.20230718.150009 → returnn-1.20230718.183712}/returnn/frontend/array_.py

@@ -47,6 +47,7 @@ def convert_to_tensor(
     sparse_dim: Optional[Dim] = None,
     shape: Sequence[Dim] = None,
     device: Optional[str] = None,
+    keep_scalar_on_cpu: bool = False,
     name: Optional[str] = None,
     _backend: Optional[Type[Backend]] = None,
 ) -> Tensor[T]:
@@ -58,6 +59,7 @@ def convert_to_tensor(
     :param shape: alias for dims, for some older code
     :param name:
     :param device:
+    :param keep_scalar_on_cpu: if the value is already on the CPU, keep it there, even if `device` is sth else
     :param _backend:
     :return: tensor
     """
@@ -83,6 +85,8 @@ def convert_to_tensor(
                 dtype = value.dtype.name
             else:
                 raise ValueError(f"number {value} type {type(value)} needs explicit `dtype` specification")
+        if keep_scalar_on_cpu:
+            device = "cpu"
     elif isinstance(value, numpy.ndarray):
         if _backend is None:
             # Small exception: Do not use the NumpyBackend but the global backend in this case.

{returnn-1.20230718.150009 → returnn-1.20230718.183712}/returnn/frontend/device.py

@@ -15,7 +15,7 @@ __all__ = ["copy_to_device", "get_default_device", "set_default_device_ctx"]
 _default_device: Optional[str] = None
 
 
-def copy_to_device(x: Tensor, device: Optional[str]) -> Tensor:
+def copy_to_device(x: Tensor, device: Optional[str] = None) -> Tensor:
     """
     Copy tensor to device.
 
@@ -23,6 +23,8 @@ def copy_to_device(x: Tensor, device: Optional[str]) -> Tensor:
     :param device:
     :return: tensor on device
     """
+    if not device:
+        device = get_default_device()
     if not device:
         return x
     if x.raw_tensor is None:

{returnn-1.20230718.150009 → returnn-1.20230718.183712}/returnn/tensor/_tensor_extra.py

@@ -2730,7 +2730,6 @@ class _TensorMixin(_TensorMixinBase):
           if BT or TB major, and axis is T or None.
           In general compatible to placeholder, i.e. same ndim, with broadcast dims.
           We assert here that the axis is dynamic (:func:`is_axis_dynamic`), i.e. we have the size.
-        :rtype: tf.Tensor
         """
         if isinstance(axis, Dim):
             axis = self.get_axis_from_description(axis)

{returnn-1.20230718.150009 → returnn-1.20230718.183712}/returnn/torch/frontend/_backend.py

@@ -670,8 +670,7 @@ class TorchBackend(Backend[torch.Tensor]):
             value = torch.tensor(
                 value,
                 dtype=TorchBackend.as_dtype_raw(dtype),
-                # Keep scalars on CPU.
-                device=(device or rf.get_default_device()) if dims else "cpu",
+                device=device or rf.get_default_device(),
             )
         assert isinstance(value, torch.Tensor)
         return Tensor(name, dims=dims, dtype=dtype, sparse_dim=sparse_dim, raw_tensor=value)

{returnn-1.20230718.150009 → returnn-1.20230718.183712/returnn.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: returnn
-Version: 1.20230718.150009
+Version: 1.20230718.183712
 Summary: The RWTH extensible training framework for universal recurrent neural networks
 Home-page: https://github.com/rwth-i6/returnn/
 Author: Albert Zeyer

returnn-1.20230718.150009/_setup_info_generated.py

@@ -1,2 +0,0 @@
-version = '1.20230718.150009'
-long_version = '1.20230718.150009+git.0ecbfd7'