[REVIEW] Allow "LabelEncoder" to accept cupy and numpy arrays as input. #4620

daxiongshu · 2022-03-07T17:06:24Z

This is to resolve issue #4589

sync with upstream

Sync with upstream

sync with upstream

merge with upstream

sync with upstream

daxiongshu · 2022-03-30T14:58:06Z

python/cuml/preprocessing/LabelEncoder.py


    def get_param_names(self):
        return super().get_param_names() + [
            "handle_unknown",
        ]
+
+    def _to_cudf_series(self, y):


@tvdboom @lowener @dantegd Thank you all so much for the comments. I've made changes accordingly. Are there existing functions to replace this function? def _to_cudf_series

Especially when y is string datatype. It seems input_to_cuml_array(y) doesn't work:

/raid/data/ml/anaconda3/envs/cuml_dev/lib/python3.8/site-packages/cudf/core/column/column.py in __cuda_array_interface__(self) 1025 @property 1026 def __cuda_array_interface__(self): -> 1027 raise NotImplementedError( 1028 f"dtype {self.dtype} is not yet supported via " 1029 "`__cuda_array_interface__`" NotImplementedError: dtype object is not yet supported via `__cuda_array_interface__`

daxiongshu · 2022-04-01T02:54:09Z

rerun tests

daxiongshu · 2022-04-11T18:46:31Z

@lowener @tvdboom @dantegd Please help me fix the current CI test errors. When the output of LabelEncoder.transform is consumed inside another cuml.Base module’s function, the decorator @cuml.internals.api_base_return_array I added in LabelEncoder no longer works.
CI error
Another reproducer
Thank you very much!

lowener

LGTM

…rapidsai-branch-22.06

codecov-commenter · 2022-05-07T03:20:52Z

Codecov Report

Merging #4620 (a6d091b) into branch-22.06 (7e91505) will decrease coverage by 7.69%.
The diff coverage is 94.11%.

@@               Coverage Diff                @@
##           branch-22.06    #4620      +/-   ##
================================================
- Coverage         96.56%   88.87%   -7.70%     
================================================
  Files               113      371     +258     
  Lines             13699    34695   +20996     
================================================
+ Hits              13229    30835   +17606     
- Misses              470     3860    +3390

Flag	Coverage Δ
dask	`34.23% <29.41%> (+16.64%)`	⬆️
non-dask	`84.20% <94.11%> (-12.22%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
python/cuml/preprocessing/LabelEncoder.py	`93.24% <85.71%> (ø)`
python/cuml/tests/test_label_encoder.py	`100.00% <100.00%> (ø)`
python/cuml/dask/decomposition/__init__.py	`100.00% <0.00%> (ø)`
python/cuml/common/numba_utils.py	`0.00% <0.00%> (ø)`
python/cuml/dask/naive_bayes/__init__.py	`100.00% <0.00%> (ø)`
python/cuml/benchmark/bench_helper_funcs.py	`64.53% <0.00%> (ø)`
python/cuml/pipeline/__init__.py	`100.00% <0.00%> (ø)`
python/cuml/dask/preprocessing/LabelEncoder.py	`93.33% <0.00%> (ø)`
...l/_thirdparty/sklearn/preprocessing/_imputation.py	`86.32% <0.00%> (ø)`
python/cuml/dask/common/__init__.py	`100.00% <0.00%> (ø)`
... and 254 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7e91505...a6d091b. Read the comment docs.

cjnolet

LGTM

cjnolet · 2022-05-23T15:23:23Z

@gpucibot merge

…sai#4620) This is to resolve issue rapidsai#4589 Authors: - Jiwei Liu (https://github.com/daxiongshu) Approvers: - Micka (https://github.com/lowener) - Corey J. Nolet (https://github.com/cjnolet) URL: rapidsai#4620

daxiongshu added 21 commits July 26, 2020 12:49

Merge pull request #15 from rapidsai/branch-0.15

cf87af4

sync with upstream

Merge pull request #18 from rapidsai/branch-0.17

e3b7848

sync with upstream

Merge pull request #19 from rapidsai/branch-0.17

e6d8ec3

sync with upstream

Merge pull request #20 from rapidsai/branch-0.18

8b1b7c3

Sync with upstream

Merge pull request #22 from rapidsai/branch-0.19

7a51c5a

sync with upstream

Merge pull request #23 from rapidsai/branch-0.19

d7a2f60

sync with upstream

Merge pull request #27 from rapidsai/branch-21.06

6366e9e

merge with upstream

Merge branch 'rapidsai:branch-21.10' into branch-21.10

7757342

Merge pull request #32 from rapidsai/branch-22.02

6349067

sync with upstream

Merge branch 'rapidsai:branch-22.02' into branch-22.02

6c408e5

Merge branch 'rapidsai:branch-22.04' into branch-22.04

3f4b89d

Merge branch 'rapidsai:branch-22.04' into branch-22.04

e305ae3

Merge branch 'rapidsai:branch-22.04' into branch-22.04

d3ee54a

Merge branch 'rapidsai:branch-22.04' into branch-22.04

39311f9

Merge branch 'rapidsai:branch-22.04' into branch-22.04

591ad28

add test

49f2259

cupy works

1f3a78c

reuse functions

bd6c690

inverse works

6e97522

inverse_transform test passed

42572f6

flake8 passed

f7523f2

daxiongshu requested a review from a team as a code owner March 7, 2022 17:06

daxiongshu added the non-breaking Non-breaking change label Mar 7, 2022

github-actions bot added the Cython / Python Cython or Python issue label Mar 7, 2022

daxiongshu added the feature request New feature or request label Mar 7, 2022

daxiongshu added 2 commits March 7, 2022 09:17

doc string

1488ed1

year 2022

26d2f1a

caryr35 added this to PR-WIP in v22.04 Release via automation Mar 7, 2022

caryr35 moved this from PR-WIP to PR-Needs review in v22.04 Release Mar 7, 2022

fix dask_cudf.Series

9d1c779

daxiongshu added 6 commits March 29, 2022 22:35

Merge branch 'rapidsai:branch-22.04' into fe_lbl_cupy

423d1c5

reuse API

511249d

restore docsrinig

45fdabe

restore docsrinig

5163dc5

restore docsrinig

9339dea

remove unused

872876e

daxiongshu commented Mar 30, 2022

View reviewed changes

daxiongshu changed the base branch from branch-22.04 to branch-22.06 April 1, 2022 03:29

daxiongshu added 2 commits April 7, 2022 20:08

Merge branch 'rapidsai:branch-22.06' into fe_lbl_cupy

344a48e

Merge branch 'rapidsai:branch-22.06' into fe_lbl_cupy

a3cd990

caryr35 added this to PR-WIP in v22.06 Release via automation Apr 12, 2022

caryr35 moved this from PR-WIP to PR-Needs review in v22.06 Release Apr 12, 2022

caryr35 removed this from PR-Needs review in v22.04 Release Apr 12, 2022

daxiongshu added 3 commits April 13, 2022 20:21

roll back to return cudf Series

85b9b05

return cudf.Series

7ba8e80

Merge branch 'rapidsai:branch-22.06' into fe_lbl_cupy

d22f7c0

lowener approved these changes Apr 26, 2022

View reviewed changes

daxiongshu added 2 commits May 6, 2022 18:05

Merge branch 'branch-22.06' of https://github.com/rapidsai/cuml into …

7097a18

…rapidsai-branch-22.06

Merge branch 'rapidsai-branch-22.06' into fe_lbl_cupy

a6d091b

daxiongshu added 4 - Waiting on Reviewer Waiting for reviewer to review or respond and removed 4 - Waiting on Author Waiting for author to respond to review labels May 7, 2022

v22.06 Release automation moved this from PR-Needs review to PR-Reviewer approved May 23, 2022

cjnolet approved these changes May 23, 2022

View reviewed changes

rapids-bot bot merged commit 70105ad into rapidsai:branch-22.06 May 23, 2022

v22.06 Release automation moved this from PR-Reviewer approved to Done May 23, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[REVIEW] Allow "LabelEncoder" to accept cupy and numpy arrays as input. #4620

[REVIEW] Allow "LabelEncoder" to accept cupy and numpy arrays as input. #4620

daxiongshu commented Mar 7, 2022

daxiongshu Mar 30, 2022

daxiongshu commented Apr 1, 2022

daxiongshu commented Apr 11, 2022

lowener left a comment

codecov-commenter commented May 7, 2022

cjnolet left a comment

cjnolet commented May 23, 2022

[REVIEW] Allow "LabelEncoder" to accept cupy and numpy arrays as input. #4620

[REVIEW] Allow "LabelEncoder" to accept cupy and numpy arrays as input. #4620

Conversation

daxiongshu commented Mar 7, 2022

daxiongshu Mar 30, 2022

Choose a reason for hiding this comment

daxiongshu commented Apr 1, 2022

daxiongshu commented Apr 11, 2022

lowener left a comment

Choose a reason for hiding this comment

codecov-commenter commented May 7, 2022

Codecov Report

cjnolet left a comment

Choose a reason for hiding this comment

cjnolet commented May 23, 2022