forked from pool/python-dask-expr
Compare commits
14 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 24390ad46c | |||
| bdcea5eeae | |||
| 23e10f01fb | |||
| 47603d047f | |||
| 7f9a93127f | |||
| d85db5c6be | |||
| 566a293749 | |||
| f3441115c4 | |||
| 3e81556c2c | |||
| e474d2a19e | |||
| 35d00b47a0 | |||
| 40835d8b33 | |||
| 46e5ea8f04 | |||
| 159bd95082 |
64
dask-expr-pr1173-blockwise.patch
Normal file
64
dask-expr-pr1173-blockwise.patch
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
From 7b6d178a31cdc52816908ba93aae3f6e3bbae680 Mon Sep 17 00:00:00 2001
|
||||||
|
From: James Bourbeau <jrbourbeau@gmail.com>
|
||||||
|
Date: Wed, 4 Dec 2024 10:41:15 -0600
|
||||||
|
Subject: [PATCH 1/2] Use new blockwise unpack collection in array
|
||||||
|
|
||||||
|
---
|
||||||
|
dask_expr/array/blockwise.py | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/dask_expr/array/blockwise.py b/dask_expr/array/blockwise.py
|
||||||
|
index 838539e0..23792434 100644
|
||||||
|
--- a/dask_expr/array/blockwise.py
|
||||||
|
+++ b/dask_expr/array/blockwise.py
|
||||||
|
@@ -18,7 +18,7 @@
|
||||||
|
from dask.array.utils import compute_meta
|
||||||
|
from dask.base import is_dask_collection
|
||||||
|
from dask.blockwise import blockwise as core_blockwise
|
||||||
|
-from dask.delayed import unpack_collections
|
||||||
|
+from dask.blockwise import _blockwise_unpack_collections_task_spec
|
||||||
|
from dask.tokenize import tokenize
|
||||||
|
from dask.utils import cached_property, funcname
|
||||||
|
|
||||||
|
@@ -142,7 +142,7 @@ def _layer(self):
|
||||||
|
for arg, ind in arginds:
|
||||||
|
if ind is None:
|
||||||
|
arg = normalize_arg(arg)
|
||||||
|
- arg, collections = unpack_collections(arg)
|
||||||
|
+ arg, collections = _blockwise_unpack_collections_task_spec(arg)
|
||||||
|
dependencies.extend(collections)
|
||||||
|
else:
|
||||||
|
if (
|
||||||
|
@@ -163,7 +163,7 @@ def _layer(self):
|
||||||
|
kwargs2 = {}
|
||||||
|
for k, v in self.kwargs.items():
|
||||||
|
v = normalize_arg(v)
|
||||||
|
- v, collections = unpack_collections(v)
|
||||||
|
+ v, collections = _blockwise_unpack_collections_task_spec(v)
|
||||||
|
dependencies.extend(collections)
|
||||||
|
kwargs2[k] = v
|
||||||
|
|
||||||
|
|
||||||
|
From fd6f081bcce4f36190b87ce26ae278cc3de71d04 Mon Sep 17 00:00:00 2001
|
||||||
|
From: James Bourbeau <jrbourbeau@gmail.com>
|
||||||
|
Date: Wed, 4 Dec 2024 10:46:47 -0600
|
||||||
|
Subject: [PATCH 2/2] Lint
|
||||||
|
|
||||||
|
---
|
||||||
|
dask_expr/array/blockwise.py | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/dask_expr/array/blockwise.py b/dask_expr/array/blockwise.py
|
||||||
|
index 23792434..4553f05c 100644
|
||||||
|
--- a/dask_expr/array/blockwise.py
|
||||||
|
+++ b/dask_expr/array/blockwise.py
|
||||||
|
@@ -17,8 +17,8 @@
|
||||||
|
)
|
||||||
|
from dask.array.utils import compute_meta
|
||||||
|
from dask.base import is_dask_collection
|
||||||
|
-from dask.blockwise import blockwise as core_blockwise
|
||||||
|
from dask.blockwise import _blockwise_unpack_collections_task_spec
|
||||||
|
+from dask.blockwise import blockwise as core_blockwise
|
||||||
|
from dask.tokenize import tokenize
|
||||||
|
from dask.utils import cached_property, funcname
|
||||||
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:50008a3639febcd024dd00fc684d6bf5aec11a42156c212771cf9634979ac9fa
|
|
||||||
size 303055
|
|
||||||
3
dask_expr-1.1.20-gh.tar.gz
Normal file
3
dask_expr-1.1.20-gh.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:118ee4100c97fa2b1fb487a7ed5e47939b3203862597b1cdacdfc5cb59dbf438
|
||||||
|
size 307480
|
||||||
@@ -1,3 +1,60 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 5 21:53:04 UTC 2024 - Ben Greiner <code@bnavigator.de>
|
||||||
|
|
||||||
|
- Update to 1.1.20
|
||||||
|
* Fix value_counts with split_out != 1 (#1170) Patrick Hoefler
|
||||||
|
* Remove recursion in task spec (#1158) Florian Jetter
|
||||||
|
* Deprecated and remove from_legacy_dataframe usage (#1168)
|
||||||
|
Patrick Hoefler
|
||||||
|
* Remove from_dask_dataframe (#1167) Patrick Hoefler
|
||||||
|
* Avoid exponentially growing graph for Assign-Projection
|
||||||
|
combinations (#1164) Patrick Hoefler
|
||||||
|
* Introduce more caching when walking the expression (#1165)
|
||||||
|
Patrick Hoefler
|
||||||
|
* Use Taskspec fuse implementation (#1162) Florian Jetter
|
||||||
|
* Fix orphaned dependencies in Fused expression (#1163) Patrick
|
||||||
|
Hoefler
|
||||||
|
- Add dask-expr-pr1173-blockwise.patch
|
||||||
|
* Use new blockwise unpack collection in array
|
||||||
|
* gh#dask/dask-expr#1173
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Nov 22 12:06:57 UTC 2024 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
- reenable python313, numba is available
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Nov 20 14:24:56 UTC 2024 - Benjamin Greiner <code@bnavigator.de>
|
||||||
|
|
||||||
|
- Disable python313: no numba, no dask
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Nov 19 12:35:06 UTC 2024 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
- update to 1.1.19:
|
||||||
|
* rebuild for dask 2024.11.2
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Nov 12 08:47:46 UTC 2024 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
- update to 1.1.18:
|
||||||
|
* Add support for Python 3.13
|
||||||
|
* Migrate Blockwise to use taskspec
|
||||||
|
* Migrate shuffle and merge to `P2PBarrierTask`
|
||||||
|
* Improve Aggregation docstring explicitly mentionning
|
||||||
|
SeriesGroupBy
|
||||||
|
* Migrate P2P shuffle and merge to TaskSpec
|
||||||
|
* Internal cleanup of P2P code
|
||||||
|
* Fix meta calculation for to_datetime
|
||||||
|
* Fix ``Merge`` divisions after filtering partitions
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 10 15:42:20 UTC 2024 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
- update to 1.1.15:
|
||||||
|
* Add concatenate flag to .compute()
|
||||||
|
* Import from tokenize
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Sep 8 14:24:41 UTC 2024 - Ben Greiner <code@bnavigator.de>
|
Sun Sep 8 14:24:41 UTC 2024 - Ben Greiner <code@bnavigator.de>
|
||||||
|
|
||||||
@@ -53,7 +110,7 @@ Thu Aug 29 14:38:23 UTC 2024 - Ben Greiner <code@bnavigator.de>
|
|||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jul 8 04:34:30 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
|
Mon Jul 8 04:34:30 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
|
||||||
|
|
||||||
- Update to 1.1.6:
|
- Update to 1.1.6:
|
||||||
* Patch release for Dask 2024.6.2
|
* Patch release for Dask 2024.6.2
|
||||||
* Fix resample divisions propagation
|
* Fix resample divisions propagation
|
||||||
* Fix categorize if columns are dropped
|
* Fix categorize if columns are dropped
|
||||||
|
|||||||
@@ -26,12 +26,14 @@
|
|||||||
%bcond_with test
|
%bcond_with test
|
||||||
%endif
|
%endif
|
||||||
Name: python-dask-expr%{psuffix}
|
Name: python-dask-expr%{psuffix}
|
||||||
Version: 1.1.13
|
Version: 1.1.20
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: High Level Expressions for Dask
|
Summary: High Level Expressions for Dask
|
||||||
License: BSD-3-Clause
|
License: BSD-3-Clause
|
||||||
URL: https://github.com/dask/dask-expr
|
URL: https://github.com/dask/dask-expr
|
||||||
Source0: https://github.com/dask/dask-expr/archive/refs/tags/v%{version}.tar.gz#/dask_expr-%{version}-gh.tar.gz
|
Source0: https://github.com/dask/dask-expr/archive/refs/tags/v%{version}.tar.gz#/dask_expr-%{version}-gh.tar.gz
|
||||||
|
# PATCH-FIX-UPSTREAM dask-expr-pr1173-blockwise.patch gh#dask/dask-expr#1173
|
||||||
|
Patch0: https://github.com/dask/dask-expr/pull/1173.patch#/dask-expr-pr1173-blockwise.patch
|
||||||
BuildRequires: %{python_module base >= 3.10}
|
BuildRequires: %{python_module base >= 3.10}
|
||||||
BuildRequires: %{python_module pip}
|
BuildRequires: %{python_module pip}
|
||||||
BuildRequires: %{python_module setuptools >= 62.6}
|
BuildRequires: %{python_module setuptools >= 62.6}
|
||||||
@@ -39,7 +41,7 @@ BuildRequires: %{python_module versioneer-toml}
|
|||||||
BuildRequires: %{python_module wheel}
|
BuildRequires: %{python_module wheel}
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: python-rpm-macros
|
BuildRequires: python-rpm-macros
|
||||||
Requires: python-dask = 2024.8.2
|
Requires: python-dask = 2024.12.0
|
||||||
Requires: python-pandas >= 2
|
Requires: python-pandas >= 2
|
||||||
Requires: python-pyarrow >= 14.0.1
|
Requires: python-pyarrow >= 14.0.1
|
||||||
Provides: python-dask_expr = %{version}-%{release}
|
Provides: python-dask_expr = %{version}-%{release}
|
||||||
|
|||||||
Reference in New Issue
Block a user