FIX-#2844: Check for both types of ray.ObjectRef #2851
Merged
Conversation
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
Resolves modin-project#2844 Signed-off-by: Devin Petersohn <devin.petersohn@gmail.com>
Codecov Report
@@ Coverage Diff @@
## master #2851 +/- ##
===========================================
- Coverage 82.34% 69.34% -13.00%
===========================================
Files 132 132
Lines 14480 15166 +686
===========================================
- Hits 11923 10517 -1406
- Misses 2557 4649 +2092
Continue to review full report at Codecov.
|
|
|
|
|
Ray Client is only in ray 1.2.0, which is probably why these tests are failing. You'll need to upgrade the Ray version for these tests to pass. |
…lient import. Signed-off-by: Rehan S. Durrani <rdurrani@berkeley.edu>
Signed-off-by: Rehan S. Durrani <rdurrani@berkeley.edu>
Signed-off-by: Rehan S. Durrani <rdurrani@berkeley.edu>
RehanSD
reviewed
Mar 11, 2021
| @@ -20,11 +20,18 @@ | |||
| import ray | |||
| from ray.worker import RayTaskError | |||
| from ray.services import get_node_ip_address | |||
| from packaging import version | |||
| ObjectIDType = ray.ObjectRef | |||
There was a problem hiding this comment.
Is this a good name @devin-petersohn, or would you prefer something like object_id_cls?
Signed-off-by: Devin Petersohn <devin.petersohn@gmail.com>
RehanSD
reviewed
Mar 12, 2021
| @@ -206,7 +213,7 @@ def ip(self): | |||
| self.drain_call_queue() | |||
| else: | |||
| self._ip_cache = self.apply(lambda df: df)._ip_cache | |||
| if isinstance(self._ip_cache, ray.ObjectID): | |||
| if isinstance(self._ip_cache, (ray.ObjectID, ClientObjectRef)): | |||
There was a problem hiding this comment.
Suggested change
| if isinstance(self._ip_cache, (ray.ObjectID, ClientObjectRef)): | |
| if isinstance(self._ip_cache, ObjectIDType): |
Signed-off-by: Rehan S. Durrani <rdurrani@berkeley.edu>
williamma12
reviewed
Mar 17, 2021
There was a problem hiding this comment.
This fix by itself looks good to me.
However, would it be cleaner if we made ObjectIDType a class variable instead? Every engine would have to know its own ObjectIDType so that can add some more consistency between the different children of BaseFramePartition
|
hey @devin-petersohn is there anything blocking this PR? |
|
@richardliaw Sorry for the delay. I don't think there are any specific blockers here. @williamma12 I think it would be fine to merge this and add that minor refactoring as a future step. This is still consistent and correct at least. We will need to add some testing for Ray client, which we don't have set up yet. |
williamma12
approved these changes
Mar 19, 2021
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resolves #2844
Signed-off-by: Devin Petersohn devin.petersohn@gmail.com
What do these changes do?
flake8 modinblack --check modingit commit -s