Merge pull request #406 from rapidsai/branch-22.10

rapidsai · Oct 12, 2022 · 1d264ff · 1d264ff
2 parents acc6d5e + e975bbc
commit 1d264ff
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
-# cuXfilter 22.08.00 (17 Aug 2022)
+# cuXfilter 22.10.00 (12 Oct 2022)
+
+## 🐛 Bug Fixes
+
+- fix test failing on non-matching indices for newer dask version ([#402](https://github.com/rapidsai/cuxfilter/pull/402)) [@AjayThorve](https://github.com/AjayThorve)
+- Notebook update: removed spaces in directory name ([#400](https://github.com/rapidsai/cuxfilter/pull/400)) [@mmccarty](https://github.com/mmccarty)
 
+## 🚀 New Features
+
+- Allow cupy 11 ([#401](https://github.com/rapidsai/cuxfilter/pull/401)) [@galipremsagar](https://github.com/galipremsagar)
+
+# cuXfilter 22.08.00 (17 Aug 2022)
 ## 🐛 Bug Fixes
 
 - fix/incorrect-bokeh-legend-attributes ([#381](https://github.com/rapidsai/cuxfilter/pull/381)) [@AjayThorve](https://github.com/AjayThorve)

diff --git a/README.md b/README.md
@@ -156,12 +156,12 @@ Please see the [Demo Docker Repository](https://hub.docker.com/r/rapidsai/rapids
 
 cuxfilter can be installed with conda ([miniconda](https://conda.io/miniconda.html), or the full [Anaconda distribution](https://www.anaconda.com/download)) from the `rapidsai` channel:
 
-For `cuxfilter version == 22.08` :
+For `cuxfilter version == 22.10` :
 
 ```bash
 # for CUDA 11.5
 conda install -c rapidsai -c nvidia -c numba -c conda-forge \
-    cuxfilter=22.08 python=3.7 cudatoolkit=11.5
+    cuxfilter=22.10 python=3.7 cudatoolkit=11.5
 
 ```
 

diff --git a/conda/environments/cuxfilter_dev_cuda11.0.yml b/conda/environments/cuxfilter_dev_cuda11.0.yml
@@ -7,14 +7,14 @@ channels:
 - conda-forge
 - anaconda
 dependencies:
-- cupy>=9.5.0,<11.0.0a0
-- cuspatial=22.08
-- python>=3.6,<3.8
-- cudf=22.08
+- cupy>=9.5.0,<12.0.0a0
+- cuspatial=22.10
+- python>=3.8,<3.10
+- cudf=22.10
 - dask>=2.12.0
 - distributed>=2.12.0
-- dask-cuda=22.08
-- dask-cudf=22.08
+- dask-cuda=22.10
+- dask-cudf=22.10
 - datashader>0.13, <0.14
 - holoviews>1.14.1, <=1.14.6
 - numba>=0.54

diff --git a/conda/environments/cuxfilter_dev_cuda11.2.yml b/conda/environments/cuxfilter_dev_cuda11.2.yml
@@ -7,14 +7,14 @@ channels:
 - conda-forge
 - anaconda
 dependencies:
-- cupy>=9.5.0,<11.0.0a0
-- cuspatial=22.08
-- python>=3.6,<3.8
-- cudf=22.08
+- cupy>=9.5.0,<12.0.0a0
+- cuspatial=22.10
+- python>=3.8,<3.10
+- cudf=22.10
 - dask>=2.12.0
 - distributed>=2.12.0
-- dask-cuda=22.08
-- dask-cudf=22.08
+- dask-cuda=22.10
+- dask-cudf=22.10
 - datashader>0.13, <0.14
 - holoviews>1.14.1, <=1.14.6
 - numba>=0.54

diff --git a/conda/environments/cuxfilter_dev_cuda11.4.yml b/conda/environments/cuxfilter_dev_cuda11.4.yml
@@ -7,14 +7,14 @@ channels:
 - conda-forge
 - anaconda
 dependencies:
-- cupy>=9.5.0,<11.0.0a0
-- cuspatial=22.08
-- python>=3.6,<3.8
-- cudf=22.08
+- cupy>=9.5.0,<12.0.0a0
+- cuspatial=22.10
+- python>=3.8,<3.10
+- cudf=22.10
 - dask>=2.12.0
 - distributed>=2.12.0
-- dask-cuda=22.08
-- dask-cudf=22.08
+- dask-cuda=22.10
+- dask-cudf=22.10
 - datashader>0.13, <0.14
 - holoviews>1.14.1, <=1.14.6
 - numba>=0.54

diff --git a/conda/environments/cuxfilter_dev_cuda11.5.yml b/conda/environments/cuxfilter_dev_cuda11.5.yml
@@ -7,14 +7,14 @@ channels:
 - conda-forge
 - anaconda
 dependencies:
-- cupy>=9.5.0,<11.0.0a0
-- cuspatial=22.08
-- python>=3.6,<3.8
-- cudf=22.08
+- cupy>=9.5.0,<12.0.0a0
+- cuspatial=22.10
+- python>=3.8,<3.10
+- cudf=22.10
 - dask>=2.12.0
 - distributed>=2.12.0
-- dask-cuda=22.08
-- dask-cudf=22.08
+- dask-cuda=22.10
+- dask-cudf=22.10
 - datashader>0.13, <0.14
 - holoviews>1.14.1, <=1.14.6
 - numba>=0.54

diff --git a/conda/recipes/cuxfilter/meta.yaml b/conda/recipes/cuxfilter/meta.yaml
@@ -34,7 +34,7 @@ requirements:
     - datashader>0.13, <0.14
     - holoviews>1.14.1, <=1.14.6
     - numba >=0.54
-    - cupy >=9.5.0,<11.0.0a0
+    - cupy >=9.5.0,<12.0.0a0
     - panel >=0.12.7,<0.13
     - pyppeteer>=0.2.6
     - bokeh>=2.4.2,<=2.5

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -27,9 +27,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '22.08'
+version = '22.10'
 # The full version, including alpha/beta/rc tags
-release = '22.08.00'
+release = '22.10.00'
 
 nbsphinx_allow_errors = True
 # -- General configuration ---------------------------------------------------

diff --git a/...ter with dask_cudf/Mortgage_example.ipynb → ...ter_with_dask_cudf/Mortgage_example.ipynb b/...ter with dask_cudf/Mortgage_example.ipynb → ...ter_with_dask_cudf/Mortgage_example.ipynb
diff --git a/...ter with dask_cudf/NYC_taxi_example.ipynb → ...ter_with_dask_cudf/NYC_taxi_example.ipynb b/...ter with dask_cudf/NYC_taxi_example.ipynb → ...ter_with_dask_cudf/NYC_taxi_example.ipynb
diff --git a/...ask_cudf/Protein_Interaction_Graphs.ipynb → ...ask_cudf/Protein_Interaction_Graphs.ipynb b/...ask_cudf/Protein_Interaction_Graphs.ipynb → ...ask_cudf/Protein_Interaction_Graphs.ipynb
diff --git a/notebooks/cuxfilter with dask_cudf/README.md → notebooks/cuxfilter_with_dask_cudf/README.md b/notebooks/cuxfilter with dask_cudf/README.md → notebooks/cuxfilter_with_dask_cudf/README.md
diff --git a/...th dask_cudf/auto_accidents_example.ipynb → ...th_dask_cudf/auto_accidents_example.ipynb b/...th dask_cudf/auto_accidents_example.ipynb → ...th_dask_cudf/auto_accidents_example.ipynb
diff --git a/python/cuxfilter/tests/charts/datashader/test_graph_assets.py b/python/cuxfilter/tests/charts/datashader/test_graph_assets.py
@@ -50,7 +50,11 @@ def test_calc_connected_edges(
             node_y_dtype=cp.float32,
         ).reset_index(drop=True)
 
-        res = res.compute() if isinstance(res, dask_cudf.DataFrame) else res
+        res = (
+            res.compute().reset_index(drop=True)
+            if isinstance(res, dask_cudf.DataFrame)
+            else res
+        )
         result = (
             result.compute()
             if isinstance(result, dask_cudf.DataFrame)