Skip to content

Commit

Permalink
Merge pull request #4537 from jakirkham/use_elif_deserialize
Browse files Browse the repository at this point in the history
Use `elif` in Dask deserialize check
  • Loading branch information
jakirkham authored Mar 17, 2020
2 parents 7cd8c3a + b062095 commit 1410b60
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@
- PR #4406 Fix sorted merge issue with null values and ascending=False
- PR #4445 Fix string issue for parquet reader and support `keep_index` for `scatter_to_tables`
- PR #4423 Tighten up Dask serialization checks
- PR #4537 Use `elif` in Dask deserialize check
- PR #4438 Fix repl-template error for replace_with_backrefs
- PR #4434 Fix join_strings logic with all-null strings and non-null narep
- PR #4465 Fix use_pandas_index having no effect in libcudf++ parquet reader
Expand Down
2 changes: 1 addition & 1 deletion python/cudf/cudf/comm/serialize.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def deserialize_cudf_object(header, frames):
# some frames are empty -- meta/empty partitions/etc
if len(f) > 0:
assert hasattr(f, "__cuda_array_interface__")
if header["serializer"] == "dask":
elif header["serializer"] == "dask":
frames = [memoryview(f) for f in frames]

cudf_typ = pickle.loads(header["type-serialized"])
Expand Down

0 comments on commit 1410b60

Please sign in to comment.