Skip to content

Commit 606e632

Browse files
authored
Fix None dtype for some unary tensor functions (#2603)
1 parent 0b70425 commit 606e632

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+84
-92
lines changed

mars/dataframe/align.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def __init__(
9494
_index_shuffle_size=index_shuffle_size,
9595
_column_shuffle_size=column_shuffle_size,
9696
_column_shuffle_segments=column_shuffle_segments,
97-
_sparse=sparse,
97+
sparse=sparse,
9898
_dtype=dtype,
9999
_dtypes=dtypes,
100100
_output_types=output_types,

mars/dataframe/contrib/raydataset/dataset.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ def __getstate__(self):
3939

4040
# The default __setstate__ will update _MLDataset's __dict__;
4141

42-
4342
else:
4443
_Dataset = None
4544

mars/dataframe/contrib/raydataset/mldataset.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ def __getstate__(self):
9999

100100
# The default __setstate__ will update _MLDataset's __dict__;
101101

102-
103102
else:
104103
_MLDataset = None
105104

mars/dataframe/datasource/from_tensor.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ def __init__(
5353
_input=input_,
5454
_index=index,
5555
_dtypes=dtypes,
56-
_gpu=gpu,
57-
_sparse=sparse,
56+
gpu=gpu,
57+
sparse=sparse,
5858
_output_types=[OutputType.dataframe],
5959
**kw,
6060
)
@@ -595,8 +595,8 @@ def __init__(
595595
_input=input_,
596596
_index=index,
597597
_dtype=dtype,
598-
_gpu=gpu,
599-
_sparse=sparse,
598+
gpu=gpu,
599+
sparse=sparse,
600600
_output_types=[OutputType.series],
601601
**kw,
602602
)

mars/dataframe/datasource/read_sql.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def __init__(
132132
_high_limit=high_limit,
133133
_nrows=nrows,
134134
_output_types=output_types,
135-
_gpu=gpu,
135+
gpu=gpu,
136136
**kw,
137137
)
138138
if not self.output_types:

mars/dataframe/datastore/to_csv.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ class DataFrameToCSVStat(TensorOperand, TensorOperandMixin):
436436

437437
def __init__(self, path=None, storage_options=None, dtype=None, **kw):
438438
super().__init__(
439-
_path=path, _storage_options=storage_options, _dtype=dtype, **kw
439+
_path=path, _storage_options=storage_options, dtype=dtype, **kw
440440
)
441441

442442
@property

mars/dataframe/indexing/iloc.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ class DataFrameIlocGetItem(DataFrameOperand, HeadTailOptimizedOperandMixin):
255255

256256
def __init__(self, indexes=None, gpu=False, sparse=False, output_types=None, **kw):
257257
super().__init__(
258-
_indexes=indexes, _gpu=gpu, _sparse=sparse, _output_types=output_types, **kw
258+
_indexes=indexes, gpu=gpu, sparse=sparse, _output_types=output_types, **kw
259259
)
260260
if not self.output_types:
261261
self.output_types = [OutputType.dataframe]
@@ -411,8 +411,8 @@ def __init__(
411411
super().__init__(
412412
_indexes=indexes,
413413
_value=value,
414-
_gpu=gpu,
415-
_sparse=sparse,
414+
gpu=gpu,
415+
sparse=sparse,
416416
_output_types=output_types,
417417
**kw,
418418
)
@@ -504,7 +504,7 @@ class SeriesIlocGetItem(DataFrameOperand, HeadTailOptimizedOperandMixin):
504504

505505
def __init__(self, indexes=None, gpu=False, sparse=False, output_types=None, **kw):
506506
super().__init__(
507-
_indexes=indexes, _gpu=gpu, _sparse=sparse, _output_types=output_types, **kw
507+
_indexes=indexes, gpu=gpu, sparse=sparse, _output_types=output_types, **kw
508508
)
509509
if not self.output_types:
510510
self.output_types = [OutputType.series]
@@ -586,8 +586,8 @@ def __init__(self, indexes=None, value=None, gpu=False, sparse=False, **kw):
586586
super().__init__(
587587
_indexes=indexes,
588588
_value=value,
589-
_gpu=gpu,
590-
_sparse=sparse,
589+
gpu=gpu,
590+
sparse=sparse,
591591
_output_types=[OutputType.series],
592592
**kw,
593593
)
@@ -668,7 +668,7 @@ class IndexIlocGetItem(DataFrameOperand, DataFrameOperandMixin):
668668

669669
def __init__(self, indexes=None, gpu=False, sparse=False, output_types=None, **kw):
670670
super().__init__(
671-
_indexes=indexes, _gpu=gpu, _sparse=sparse, _output_types=output_types, **kw
671+
_indexes=indexes, gpu=gpu, sparse=sparse, _output_types=output_types, **kw
672672
)
673673
if not self.output_types:
674674
self.output_types = [OutputType.index]

mars/dataframe/indexing/loc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class DataFrameLocGetItem(DataFrameOperand, DataFrameOperandMixin):
117117

118118
def __init__(self, indexes=None, gpu=False, sparse=False, output_types=None, **kw):
119119
super().__init__(
120-
_indexes=indexes, _gpu=gpu, _sparse=sparse, _output_types=output_types, **kw
120+
_indexes=indexes, gpu=gpu, sparse=sparse, _output_types=output_types, **kw
121121
)
122122

123123
@property

mars/dataframe/merge/concat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ def __init__(
7575
_verify_integrity=verify_integrity,
7676
_sort=sort,
7777
_copy=copy,
78-
_sparse=sparse,
7978
_output_types=output_types,
79+
sparse=sparse,
8080
**kw
8181
)
8282

mars/dataframe/merge/merge.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ def __init__(
161161
_copy=copy,
162162
_indicator=indicator,
163163
_validate=validate,
164-
_sparse=sparse,
165164
_output_types=output_types,
165+
sparse=sparse,
166166
**kw
167167
)
168168

0 commit comments

Comments
 (0)