Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove map from bag keynames #4500

Merged
merged 2 commits into from Feb 19, 2019

Conversation

Projects
None yet
2 participants
@mrocklin
Copy link
Member

commented Feb 19, 2019

This isn't very informative

Fixes #4450

  • Tests added / passed
  • Passes flake8 dask
Remove map from bag keynames
This isn't very informative

Fixes #4450
@jcrist

This comment has been minimized.

Copy link
Member

commented Feb 19, 2019

This causes dask.tests.test_base.test_compute_no_opt to fail due to a change in the keynames. I think changing the offending line as follows should work:

diff --git a/dask/tests/test_base.py b/dask/tests/test_base.py
index ab99e31..72eac8b 100644
--- a/dask/tests/test_base.py
+++ b/dask/tests/test_base.py
@@ -505,17 +505,17 @@ def test_compute_no_opt():
     keys = []
     with Callback(pretask=lambda key, *args: keys.append(key)):
         o.compute(scheduler='single-threaded', optimize_graph=False)
-    assert len([k for k in keys if '-mul-' in k[0]]) == 4
-    assert len([k for k in keys if '-add-' in k[0]]) == 4
+    assert len([k for k in keys if 'mul-' in k[0]]) == 4
+    assert len([k for k in keys if 'add-' in k[0]]) == 4
     # Check that without the kwarg, the optimization does happen
     keys = []
     with Callback(pretask=lambda key, *args: keys.append(key)):
         o.compute(scheduler='single-threaded')
     # Names of fused tasks have been merged, and the original key is an alias.
     # Otherwise, the lengths below would be 4 and 0.
-    assert len([k for k in keys if '-mul-' in k[0]]) == 8
-    assert len([k for k in keys if '-add-' in k[0]]) == 4
-    assert len([k for k in keys if 'add-map-mul' in k[0]]) == 4  # See? Renamed
+    assert len([k for k in keys if 'mul-' in k[0]]) == 8
+    assert len([k for k in keys if 'add-' in k[0]]) == 4
+    assert len([k for k in keys if 'add-mul' in k[0]]) == 4  # See? Renamed
@jcrist

This comment has been minimized.

Copy link
Member

commented Feb 19, 2019

LGTM. Merging.

@jcrist jcrist merged commit d6880be into dask:master Feb 19, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@jcrist jcrist deleted the mrocklin:bag-keynames branch Feb 19, 2019

jorge-pessoa pushed a commit to jorge-pessoa/dask that referenced this pull request May 14, 2019

Remove map from bag keynames (dask#4500)
* Remove map from bag keynames

This isn't very informative

Fixes dask#4450

* fix tests in base
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.