From d623c9376a1fd7e373247dcad2f9ac9e53654301 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 17 Nov 2021 19:01:13 -0600 Subject: [PATCH 1/2] change minimum pin of cupy (#9636) This PR updates minimum version pinning of `cupy` that is compatible with CEC. --- conda/environments/cudf_dev_cuda11.0.yml | 2 +- conda/environments/cudf_dev_cuda11.2.yml | 2 +- conda/environments/cudf_dev_cuda11.5.yml | 2 +- conda/recipes/cudf/meta.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conda/environments/cudf_dev_cuda11.0.yml b/conda/environments/cudf_dev_cuda11.0.yml index 803e4f0ba26..5954525b924 100644 --- a/conda/environments/cudf_dev_cuda11.0.yml +++ b/conda/environments/cudf_dev_cuda11.0.yml @@ -9,7 +9,7 @@ channels: dependencies: - clang=11.0.0 - clang-tools=11.0.0 - - cupy>7.1.0,<10.0.0a0 + - cupy>=9.5.0,<10.0.0a0 - rmm=21.12.* - cmake>=3.20.1 - cmake_setuptools>=0.1.3 diff --git a/conda/environments/cudf_dev_cuda11.2.yml b/conda/environments/cudf_dev_cuda11.2.yml index 2281d361ebd..0d1989fa213 100644 --- a/conda/environments/cudf_dev_cuda11.2.yml +++ b/conda/environments/cudf_dev_cuda11.2.yml @@ -9,7 +9,7 @@ channels: dependencies: - clang=11.0.0 - clang-tools=11.0.0 - - cupy>7.1.0,<10.0.0a0 + - cupy>=9.5.0,<10.0.0a0 - rmm=21.12.* - cmake>=3.20.1 - cmake_setuptools>=0.1.3 diff --git a/conda/environments/cudf_dev_cuda11.5.yml b/conda/environments/cudf_dev_cuda11.5.yml index 63800fe786b..d759ca94fbf 100644 --- a/conda/environments/cudf_dev_cuda11.5.yml +++ b/conda/environments/cudf_dev_cuda11.5.yml @@ -9,7 +9,7 @@ channels: dependencies: - clang=11.0.0 - clang-tools=11.0.0 - - cupy>7.1.0,<10.0.0a0 + - cupy>=9.5.0,<10.0.0a0 - rmm=21.12.* - cmake>=3.20.1 - cmake_setuptools>=0.1.3 diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml index 615135a6f6b..6d56b0c0c94 100644 --- a/conda/recipes/cudf/meta.yaml +++ b/conda/recipes/cudf/meta.yaml @@ -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 From 012bfe902949ffad967ecf96e153dd7094c878a0 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Thu, 18 Nov 2021 13:35:06 -0600 Subject: [PATCH 2/2] [REVIEW] Upgrade `clang` to 11.1.0 (#9716) * upgrade clang to 11.1.0 * fix pytest --- 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 +- python/cudf/cudf/tests/test_concat.py | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conda/environments/cudf_dev_cuda11.0.yml b/conda/environments/cudf_dev_cuda11.0.yml index 5954525b924..4d106409e1e 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>=9.5.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 0d1989fa213..46785603c0e 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>=9.5.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 d759ca94fbf..635d838640d 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>=9.5.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 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] = (