refactor: directly use nplike.asarray

scikit-hep · Jan 20, 2023 · f52401e · f52401e
1 parent b3e541b
commit f52401e
Showing 1 changed file with 9 additions and 14 deletions.
diff --git a/src/awkward/_nplikes.py b/src/awkward/_nplikes.py
@@ -484,13 +484,12 @@ def raw(self, array: ArrayLike, nplike: NumpyLike) -> ArrayLike:
         if isinstance(nplike, Numpy):
             return array
         elif isinstance(nplike, Cupy):
-            cupy = Cupy.instance()
-            return cupy.asarray(array, dtype=array.dtype, order="C")
+            return nplike.asarray(array, order="C")
         elif isinstance(nplike, ak._typetracer.TypeTracer):
-            return ak._typetracer.TypeTracerArray(dtype=array.dtype, shape=array.shape)
+            return nplike.asarray(array)
         elif isinstance(nplike, Jax):
             jax = Jax.instance()
-            return jax.asarray(array, dtype=array.dtype)
+            return jax.asarray(array)
         else:
             raise ak._errors.wrap_error(
                 TypeError(
@@ -596,13 +595,11 @@ def raw(self, array: ArrayLike, nplike: NumpyLike) -> ArrayLike:
         if isinstance(nplike, Cupy):
             return array
         elif isinstance(nplike, Numpy):
-            numpy = Numpy.instance()
-            return numpy.asarray(array.get(), dtype=array.dtype, order="C")
+            return nplike.asarray(array.get(), dtype=array.dtype, order="C")
         elif isinstance(nplike, ak._typetracer.TypeTracer):
-            return ak._typetracer.TypeTracerArray(dtype=array.dtype, shape=array.shape)
+            return nplike.asarray(array, dtype=array.dtype)
         elif isinstance(nplike, Jax):
-            jax = Jax.instance()
-            return jax.asarray(array.get(), dtype=array.dtype)
+            return nplike.asarray(array.get(), dtype=array.dtype)
         else:
             raise ak._errors.wrap_error(
                 TypeError(
@@ -763,13 +760,11 @@ def raw(self, array: ArrayLike, nplike: NumpyLike) -> ArrayLike:
         if isinstance(nplike, Jax):
             return array
         elif isinstance(nplike, ak._nplikes.Cupy):
-            cupy = ak._nplikes.Cupy.instance()
-            return cupy.asarray(array)
+            return nplike.asarray(array)
         elif isinstance(nplike, ak._nplikes.Numpy):
-            numpy = ak._nplikes.Numpy.instance()
-            return numpy.asarray(array)
+            return nplike.asarray(array)
         elif isinstance(nplike, ak._typetracer.TypeTracer):
-            return ak._typetracer.TypeTracerArray(dtype=array.dtype, shape=array.shape)
+            return nplike.asarray(array, dtype=array.dtype)
         else:
             raise ak._errors.wrap_error(
                 TypeError(