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.

Sign up for GitHub

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

Forward-merge branch-21.12 to branch-22.02 #9730

Merged
merged 3 commits into from
Nov 19, 2021
Merged

Forward-merge branch-21.12 to branch-22.02 #9730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d623c93
change minimum pin of cupy (#9636)
galipremsagar Nov 18, 2021
012bfe9
[REVIEW] Upgrade `clang` to 11.1.0 (#9716)
galipremsagar Nov 18, 2021
967a333
Merge branch-21.12 into branch-22.02
bdice Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions conda/environments/cudf_dev_cuda11.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ channels:
- rapidsai-nightly
- conda-forge
dependencies:
- clang=11.0.0
- clang-tools=11.0.0
- cupy>7.1.0,<10.0.0a0
- clang=11.1.0
- clang-tools=11.1.0
- cupy>=9.5.0,<10.0.0a0
- rmm=22.02.*
- cmake>=3.20.1
- cmake_setuptools>=0.1.3
Expand Down
6 changes: 3 additions & 3 deletions conda/environments/cudf_dev_cuda11.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ channels:
- rapidsai-nightly
- conda-forge
dependencies:
- clang=11.0.0
- clang-tools=11.0.0
- cupy>7.1.0,<10.0.0a0
- clang=11.1.0
- clang-tools=11.1.0
- cupy>=9.5.0,<10.0.0a0
- rmm=22.02.*
- cmake>=3.20.1
- cmake_setuptools>=0.1.3
Expand Down
8 changes: 4 additions & 4 deletions conda/environments/cudf_dev_cuda11.5.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ channels:
- rapidsai-nightly
- conda-forge
dependencies:
- clang=11.0.0
- clang-tools=11.0.0
- cupy>7.1.0,<10.0.0a0
- rmm=21.12.*
- clang=11.1.0
- clang-tools=11.1.0
- cupy>=9.5.0,<10.0.0a0
- rmm=22.02.*
- cmake>=3.20.1
- cmake_setuptools>=0.1.3
- python>=3.7,<3.9
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cudf/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ requirements:
- python
- typing_extensions
- pandas >=1.0,<1.4.0dev0
- cupy >7.1.0,<10.0.0a0
- cupy >=9.5.0,<10.0.0a0
- numba >=0.53.1
- numpy
- {{ pin_compatible('pyarrow', max_pin='x.x.x') }} *cuda
Expand Down
2 changes: 1 addition & 1 deletion cpp/scripts/run-clang-format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import sys
import tempfile

EXPECTED_VERSION = "11.0.0"
EXPECTED_VERSION = "11.1.0"
VERSION_REGEX = re.compile(r"clang-format version ([0-9.]+)")
# NOTE: populate this list with more top-level dirs as we add more of them to
# the cudf repo
Expand Down
4 changes: 2 additions & 2 deletions python/cudf/cudf/tests/test_concat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ def test_concat_empty_dataframes(df, other, ignore_index):
if expected.shape != df.shape:
for key, col in actual[actual.columns].iteritems():
if is_categorical_dtype(col.dtype):
if expected[key].dtype != "category":
if not is_categorical_dtype(expected[key].dtype):
# TODO: Pandas bug:
# https://github.com/pandas-dev/pandas/issues/42840
expected[key] = expected[key].fillna("-1").astype("str")
Expand Down Expand Up @@ -1186,7 +1186,7 @@ def test_concat_join_empty_dataframes(
if axis == 0:
for key, col in actual[actual.columns].iteritems():
if is_categorical_dtype(col.dtype):
if expected[key].dtype != "category":
if not is_categorical_dtype(expected[key].dtype):
# TODO: Pandas bug:
# https://github.com/pandas-dev/pandas/issues/42840
expected[key] = (
Expand Down