From 9eb1579a92f177e7d63cdc90cccf4ed75d337898 Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Wed, 17 Nov 2021 07:22:38 -0800 Subject: [PATCH 1/2] upgrade clang to 11.1.0 --- conda/environments/cudf_dev_cuda11.0.yml | 4 ++-- conda/environments/cudf_dev_cuda11.2.yml | 4 ++-- conda/environments/cudf_dev_cuda11.5.yml | 4 ++-- cpp/scripts/run-clang-format.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conda/environments/cudf_dev_cuda11.0.yml b/conda/environments/cudf_dev_cuda11.0.yml index 803e4f0ba26..2669635622b 100644 --- a/conda/environments/cudf_dev_cuda11.0.yml +++ b/conda/environments/cudf_dev_cuda11.0.yml @@ -7,8 +7,8 @@ channels: - rapidsai-nightly - conda-forge dependencies: - - clang=11.0.0 - - clang-tools=11.0.0 + - clang=11.1.0 + - clang-tools=11.1.0 - cupy>7.1.0,<10.0.0a0 - rmm=21.12.* - cmake>=3.20.1 diff --git a/conda/environments/cudf_dev_cuda11.2.yml b/conda/environments/cudf_dev_cuda11.2.yml index 2281d361ebd..d14bd70a3c9 100644 --- a/conda/environments/cudf_dev_cuda11.2.yml +++ b/conda/environments/cudf_dev_cuda11.2.yml @@ -7,8 +7,8 @@ channels: - rapidsai-nightly - conda-forge dependencies: - - clang=11.0.0 - - clang-tools=11.0.0 + - clang=11.1.0 + - clang-tools=11.1.0 - cupy>7.1.0,<10.0.0a0 - rmm=21.12.* - cmake>=3.20.1 diff --git a/conda/environments/cudf_dev_cuda11.5.yml b/conda/environments/cudf_dev_cuda11.5.yml index 63800fe786b..728c91c7887 100644 --- a/conda/environments/cudf_dev_cuda11.5.yml +++ b/conda/environments/cudf_dev_cuda11.5.yml @@ -7,8 +7,8 @@ channels: - rapidsai-nightly - conda-forge dependencies: - - clang=11.0.0 - - clang-tools=11.0.0 + - clang=11.1.0 + - clang-tools=11.1.0 - cupy>7.1.0,<10.0.0a0 - rmm=21.12.* - cmake>=3.20.1 diff --git a/cpp/scripts/run-clang-format.py b/cpp/scripts/run-clang-format.py index 178bf2f0c78..a7c83da22c5 100755 --- a/cpp/scripts/run-clang-format.py +++ b/cpp/scripts/run-clang-format.py @@ -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 From 4d422785b9e1787fcaf137affa8b4319eb8f2292 Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Thu, 18 Nov 2021 11:23:35 -0800 Subject: [PATCH 2/2] fix pytest --- python/cudf/cudf/tests/test_concat.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/cudf/cudf/tests/test_concat.py b/python/cudf/cudf/tests/test_concat.py index bb96f3c4290..46707a283af 100644 --- a/python/cudf/cudf/tests/test_concat.py +++ b/python/cudf/cudf/tests/test_concat.py @@ -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") @@ -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] = (