Asanyarray ascontiguousarray asfarray copy funcs #265
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -47,6 +47,47 @@ cimport numpy | |
| cimport dpnp.dpnp_utils as utils | ||
|
|
||
|
|
||
| # initially copyed from original | ||
|
There was a problem hiding this comment. @Alexander-Makaryev it looks like it is related to #89 |
||
| cdef class _flagsobj: | ||
|
There was a problem hiding this comment. I don not understand why we need this. It is better to reuse this from NumPy There was a problem hiding this comment. We need to get own behavior while we have no a full enough support of features like f-contiguous memory layout, strides, views (sharing the memory) etc. In fact at this moment we just return a constant values of flags and it will be easier to modify our own class "step by step". We can replace it with original Numpy class in future, when it will be possible to reuse original functionality. Possibly I am wrong) There was a problem hiding this comment. @Alexander-Makaryev We "return a constant values" because we support one data state only at this time. |
||
| aligned: bool | ||
| updateifcopy: bool | ||
| writeable: bool | ||
| writebackifcopy: bool | ||
| @property | ||
| def behaved(self) -> bool: ... | ||
|
|
||
| @property | ||
| def c_contiguous(self) -> bool: | ||
| return True | ||
|
|
||
| @property | ||
| def carray(self) -> bool: ... | ||
| @property | ||
| def contiguous(self) -> bool: ... | ||
|
|
||
| @property | ||
| def f_contiguous(self) -> bool: | ||
| return False | ||
|
|
||
| @property | ||
| def farray(self) -> bool: ... | ||
| @property | ||
| def fnc(self) -> bool: ... | ||
| @property | ||
| def forc(self) -> bool: ... | ||
| @property | ||
| def fortran(self) -> bool: ... | ||
| @property | ||
| def num(self) -> int: ... | ||
|
|
||
| @property | ||
| def owndata(self) -> bool: | ||
| return True | ||
|
|
||
| def __getitem__(self, key: str) -> bool: ... | ||
| def __setitem__(self, key: str, value: bool) -> None: ... | ||
|
|
||
|
|
||
| cdef class dparray: | ||
| """Multi-dimensional array using USM interface for an Intel GPU device. | ||
|
|
||
|
|
@@ -134,7 +175,7 @@ cdef class dparray: | |
| """ | ||
|
|
||
| string = "<DPNP DParray:name={}".format(self.__class__.__name__) | ||
| string += ": mem=0x{:x}".format( < size_t > self._dparray_data) | ||
| string += ": size={}".format(self.size) | ||
| string += ": shape={}".format(self.shape) | ||
| string += ": type={}".format(self.dtype) | ||
|
|
@@ -199,7 +240,7 @@ cdef class dparray: | |
| self._dparray_shape = newshape # TODO strides, enpty dimentions and etc. | ||
|
|
||
| @property | ||
| def flags(self) -> _flagsobj: | ||
| """Object containing memory-layout information. | ||
|
|
||
| It only contains ``c_contiguous``, ``f_contiguous``, and ``owndata`` attributes. | ||
|
|
@@ -209,7 +250,7 @@ cdef class dparray: | |
|
|
||
| """ | ||
|
|
||
| return _flagsobj() | ||
|
|
||
| @property | ||
| def strides(self): | ||
|
|
@@ -271,7 +312,7 @@ cdef class dparray: | |
| def __array_interface__(self): | ||
| # print(f"====__array_interface__====self._dparray_data={ < size_t > self._dparray_data}") | ||
| interface_dict = { | ||
| "data": ( < size_t > self._dparray_data, False), # last parameter is "Writable" | ||
| "strides": self.strides, | ||
| "descr": None, | ||
| "typestr": self.dtype.str, | ||
|
|
@@ -339,15 +380,15 @@ cdef class dparray: | |
| raise utils.checker_throw_index_error("__getitem__", lin_idx, self.size) | ||
|
|
||
| if self.dtype == numpy.float64: | ||
| return ( < double * > self._dparray_data)[lin_idx] | ||
| elif self.dtype == numpy.float32: | ||
| return ( < float * > self._dparray_data)[lin_idx] | ||
| elif self.dtype == numpy.int64: | ||
| return ( < long * > self._dparray_data)[lin_idx] | ||
| elif self.dtype == numpy.int32: | ||
| return ( < int * > self._dparray_data)[lin_idx] | ||
| elif self.dtype == numpy.bool: | ||
| return ( < cpp_bool * > self._dparray_data)[lin_idx] | ||
|
|
||
| utils.checker_throw_type_error("__getitem__", self.dtype) | ||
|
|
||
|
|
@@ -364,15 +405,15 @@ cdef class dparray: | |
| raise utils.checker_throw_index_error("__setitem__", lin_idx, self.size) | ||
|
|
||
| if self.dtype == numpy.float64: | ||
| ( < double * > self._dparray_data)[lin_idx] = <double > value | ||
| elif self.dtype == numpy.float32: | ||
| ( < float * > self._dparray_data)[lin_idx] = <float > value | ||
| elif self.dtype == numpy.int64: | ||
| ( < long * > self._dparray_data)[lin_idx] = <long > value | ||
| elif self.dtype == numpy.int32: | ||
| ( < int * > self._dparray_data)[lin_idx] = <int > value | ||
| elif self.dtype == numpy.bool: | ||
| ( < cpp_bool * > self._dparray_data)[lin_idx] = < cpp_bool > value | ||
| else: | ||
| utils.checker_throw_type_error("__setitem__", self.dtype) | ||
|
|
||
|
|
@@ -423,7 +464,7 @@ cdef class dparray: | |
| """ | ||
|
|
||
| if not utils.use_origin_backend(self): | ||
| c_order, fortran_order = self.flags.c_contiguous, self.flags.f_contiguous | ||
|
|
||
| if order not in {'C', 'F', 'A', 'K'}: | ||
| pass | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does not look like these changes belong to this PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, it is a result of applying of code style tool... The correct way is to apply code style tool during work on changes, but if someone missed it, then these changes occur when I apply code style. Sometimes it is hard to split these changes in new and old code. We should improve our CI to automatic check/apply of code style.