From d6a01fd9146dab6e3cedca60e36f0f7c3cecc076 Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Tue, 21 May 2024 23:36:50 +0000 Subject: [PATCH 01/14] cuml --- Dockerfile.tmpl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index 2db698d6..1728c9b6 100644 --- a/Dockerfile.tmpl +++ b/Dockerfile.tmpl @@ -99,6 +99,7 @@ ENV PROJ_LIB=/opt/conda/share/proj # the remaining pip commands: https://www.anaconda.com/using-pip-in-a-conda-environment/ RUN conda config --add channels nvidia && \ conda config --add channels rapidsai && \ + conda config --set solver libmamba && \ # b/299991198 remove curl/libcurl install once DLVM base image includes version >= 7.86 conda install -c conda-forge mamba curl libcurl && \ # Base image channel order: conda-forge (highest priority), defaults. @@ -112,13 +113,13 @@ RUN mamba install -y -c conda-forge spacy cupy cuda-version=$CUDA_MAJOR_VERSION. /tmp/clean-layer.sh {{ else }} RUN pip install spacy && \ - /tmp/clean-layer.sh + /tmp/clean-layer.sht {{ end}} {{ if eq .Accelerator "gpu" }} # b/232247930: uninstall pyarrow to avoid double installation with the GPU specific version. RUN pip uninstall -y pyarrow && \ - mamba install -y cudf cuml && \ + conda install -y cudf=24.4 cuml=24.4 && \ /tmp/clean-layer.sh # TODO: b/296444923 - Resolve pandas dependency another way From a9935f4c7b89e5131456040013fe8463237528d9 Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Tue, 21 May 2024 23:53:23 +0000 Subject: [PATCH 02/14] fix typo --- Dockerfile.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index 1728c9b6..25b6f7a1 100644 --- a/Dockerfile.tmpl +++ b/Dockerfile.tmpl @@ -113,7 +113,7 @@ RUN mamba install -y -c conda-forge spacy cupy cuda-version=$CUDA_MAJOR_VERSION. /tmp/clean-layer.sh {{ else }} RUN pip install spacy && \ - /tmp/clean-layer.sht + /tmp/clean-layer.sh {{ end}} {{ if eq .Accelerator "gpu" }} From 046d12a3030490d5307d38564f0e06f3e8fb9d40 Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Wed, 22 May 2024 22:57:49 +0000 Subject: [PATCH 03/14] mmmm --- Dockerfile.tmpl | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index 25b6f7a1..769d0268 100644 --- a/Dockerfile.tmpl +++ b/Dockerfile.tmpl @@ -109,23 +109,13 @@ RUN conda config --add channels nvidia && \ # Install spacy {{ if eq .Accelerator "gpu" }} -RUN mamba install -y -c conda-forge spacy cupy cuda-version=$CUDA_MAJOR_VERSION.$CUDA_MINOR_VERSION && \ +RUN pip uninstall -y pyarrow && \ + conda install -y -c conda-forge spacy cudf=24.4 cuml=24.4 dask-cudf=24.4 cupy cuda-version=$CUDA_MAJOR_VERSION.$CUDA_MINOR_VERSION && \ /tmp/clean-layer.sh {{ else }} RUN pip install spacy && \ /tmp/clean-layer.sh {{ end}} -{{ if eq .Accelerator "gpu" }} - -# b/232247930: uninstall pyarrow to avoid double installation with the GPU specific version. -RUN pip uninstall -y pyarrow && \ - conda install -y cudf=24.4 cuml=24.4 && \ - /tmp/clean-layer.sh - -# TODO: b/296444923 - Resolve pandas dependency another way -RUN sed -i 's/^is_extension_type/# is_extension_type/g' /opt/conda/lib/python3.10/site-packages/cudf/api/types.py \ - && sed -i 's/^is_categorical/# is_categorical/g' /opt/conda/lib/python3.10/site-packages/cudf/api/types.py -{{ end }} # Install PyTorch {{ if eq .Accelerator "gpu" }} From dc76e8dbf6385b111273153dc3e1359df9e0cb74 Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Thu, 23 May 2024 02:29:48 +0000 Subject: [PATCH 04/14] wwww --- Dockerfile.tmpl | 2 +- tests/common.py | 9 +++++++++ tests/test_datashader.py | 11 +++++++---- tests/test_geoviews.py | 9 ++++++--- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index 769d0268..fdedb294 100644 --- a/Dockerfile.tmpl +++ b/Dockerfile.tmpl @@ -110,7 +110,7 @@ RUN conda config --add channels nvidia && \ # Install spacy {{ if eq .Accelerator "gpu" }} RUN pip uninstall -y pyarrow && \ - conda install -y -c conda-forge spacy cudf=24.4 cuml=24.4 dask-cudf=24.4 cupy cuda-version=$CUDA_MAJOR_VERSION.$CUDA_MINOR_VERSION && \ + conda install -y -c conda-forge spacy cudf=24.4 cuml=24.4 cupy cuda-version=$CUDA_MAJOR_VERSION.$CUDA_MINOR_VERSION && \ /tmp/clean-layer.sh {{ else }} RUN pip install spacy && \ diff --git a/tests/common.py b/tests/common.py index e53e6a7c..47baaaf3 100644 --- a/tests/common.py +++ b/tests/common.py @@ -2,6 +2,15 @@ import os import unittest +import subprocess + +def getAcceleratorName(): + try: + deviceName = subprocess.check_output(['nvidia-smi', '--query-gpu=name', '--format=csv,noheader']) + return deviceName.decode('utf-8').strip(); + except FileNotFoundError: + return("nvidia-smi not found.") gpu_test = unittest.skipIf(len(os.environ.get('CUDA_VERSION', '')) == 0, 'Not running GPU tests') +p100_exempt = unittest.skipIf(getAcceleratorName() == "Tesla P100-PCIE-16GB", 'Not running p100 exempt tests') tpu_test = unittest.skipIf(len(os.environ.get('ISTPUVM', '')) == 0, 'Not running TPU tests') diff --git a/tests/test_datashader.py b/tests/test_datashader.py index c8ff9295..900c8be4 100644 --- a/tests/test_datashader.py +++ b/tests/test_datashader.py @@ -1,12 +1,15 @@ import unittest -import numpy as np -import pandas as pd -import datashader as ds -import datashader.transfer_functions as tf +from common import p100_exempt +@p100_exempt class TestDatashader(unittest.TestCase): # based on https://github.com/pyviz/datashader/blob/master/datashader/tests/test_pipeline.py + import numpy as np + import pandas as pd + import datashader as ds + import datashader.transfer_functions as tf + def test_pipeline(self): df = pd.DataFrame({ 'x': np.array(([0.] * 10 + [1] * 10)), diff --git a/tests/test_geoviews.py b/tests/test_geoviews.py index 869fc0f1..422fe8de 100644 --- a/tests/test_geoviews.py +++ b/tests/test_geoviews.py @@ -1,10 +1,13 @@ import unittest -import geoviews.feature as gf -import holoviews as hv -from cartopy import crs +from common import p100_exempt +@p100_exempt class TestGeoviews(unittest.TestCase): + import geoviews.feature as gf + import holoviews as hv + from cartopy import crs + def test_viz(self): hv.extension('matplotlib') (gf.ocean + gf.land + gf.ocean * gf.land * gf.coastline * gf.borders).options( From 592bc46da4917a40e5be8acbc61144bad20e7106 Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Thu, 23 May 2024 02:33:46 +0000 Subject: [PATCH 05/14] wkkw --- Dockerfile.tmpl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index fdedb294..c58c827c 100644 --- a/Dockerfile.tmpl +++ b/Dockerfile.tmpl @@ -101,13 +101,14 @@ RUN conda config --add channels nvidia && \ conda config --add channels rapidsai && \ conda config --set solver libmamba && \ # b/299991198 remove curl/libcurl install once DLVM base image includes version >= 7.86 - conda install -c conda-forge mamba curl libcurl && \ + conda install -c conda-forge curl libcurl && \ # Base image channel order: conda-forge (highest priority), defaults. # End state: rapidsai (highest priority), nvidia, conda-forge, defaults. - mamba install -y mkl cartopy imagemagick pyproj "shapely<2" && \ + conda install -y mkl cartopy imagemagick pyproj "shapely<2" && \ /tmp/clean-layer.sh # Install spacy +# b/232247930: uninstall pyarrow to avoid double installation with the GPU specific version. {{ if eq .Accelerator "gpu" }} RUN pip uninstall -y pyarrow && \ conda install -y -c conda-forge spacy cudf=24.4 cuml=24.4 cupy cuda-version=$CUDA_MAJOR_VERSION.$CUDA_MINOR_VERSION && \ From e7527259d7fde8ed4556eaa8428f9b847aa12efb Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Thu, 23 May 2024 03:17:24 +0000 Subject: [PATCH 06/14] wk --- Dockerfile.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index c58c827c..206b20b9 100644 --- a/Dockerfile.tmpl +++ b/Dockerfile.tmpl @@ -101,10 +101,10 @@ RUN conda config --add channels nvidia && \ conda config --add channels rapidsai && \ conda config --set solver libmamba && \ # b/299991198 remove curl/libcurl install once DLVM base image includes version >= 7.86 - conda install -c conda-forge curl libcurl && \ + conda install -c conda-forge mamba curl libcurl && \ # Base image channel order: conda-forge (highest priority), defaults. # End state: rapidsai (highest priority), nvidia, conda-forge, defaults. - conda install -y mkl cartopy imagemagick pyproj "shapely<2" && \ + mamba install -y mkl cartopy imagemagick pyproj "shapely<2" && \ /tmp/clean-layer.sh # Install spacy From 8d44ce44fd874d8f2718a73f6c28d766a56577e9 Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Thu, 23 May 2024 06:35:55 +0000 Subject: [PATCH 07/14] wwf --- tests/test_datashader.py | 13 +++++++------ tests/test_geoviews.py | 9 +++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/tests/test_datashader.py b/tests/test_datashader.py index 900c8be4..b8aca424 100644 --- a/tests/test_datashader.py +++ b/tests/test_datashader.py @@ -2,15 +2,16 @@ from common import p100_exempt -@p100_exempt class TestDatashader(unittest.TestCase): - # based on https://github.com/pyviz/datashader/blob/master/datashader/tests/test_pipeline.py - import numpy as np - import pandas as pd - import datashader as ds - import datashader.transfer_functions as tf + @p100_exempt def test_pipeline(self): + # based on https://github.com/pyviz/datashader/blob/master/datashader/tests/test_pipeline.py + import numpy as np + import pandas as pd + import datashader as ds + import datashader.transfer_functions as tf + df = pd.DataFrame({ 'x': np.array(([0.] * 10 + [1] * 10)), 'y': np.array(([0.] * 5 + [1] * 5 + [0] * 5 + [1] * 5)), diff --git a/tests/test_geoviews.py b/tests/test_geoviews.py index 422fe8de..b3fff6b7 100644 --- a/tests/test_geoviews.py +++ b/tests/test_geoviews.py @@ -2,13 +2,14 @@ from common import p100_exempt -@p100_exempt class TestGeoviews(unittest.TestCase): - import geoviews.feature as gf - import holoviews as hv - from cartopy import crs + @p100_exempt def test_viz(self): + import geoviews.feature as gf + import holoviews as hv + from cartopy import crs + hv.extension('matplotlib') (gf.ocean + gf.land + gf.ocean * gf.land * gf.coastline * gf.borders).options( 'Feature', projection=crs.Geostationary(), global_extent=True From 190008f38d02e41f3b078136ba4eda2b996ac4a9 Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Thu, 23 May 2024 17:36:11 +0000 Subject: [PATCH 08/14] add test --- tests/test_cudf.py | 20 ++++++++++++++++++++ tests/test_cuml.py | 19 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 tests/test_cudf.py create mode 100644 tests/test_cuml.py diff --git a/tests/test_cudf.py b/tests/test_cudf.py new file mode 100644 index 00000000..a69f88fd --- /dev/null +++ b/tests/test_cudf.py @@ -0,0 +1,20 @@ +import unittest + +from common import gpu_test, p100_exempt + + +class TestCudfDataFrame(unittest.TestCase): + @gpu_test + @p100_exempt + def test_cudf_dataframe_operations(self): + import cudf + + data = {'col1': [1, 2, 3], 'col2': [4, 5, 6]} + gdf = cudf.DataFrame({'col1': [1, 2, 3], 'col2': [4, 5, 6]}) + + gdf['col3'] = gdf['col1'] + gdf['col2'] + + expected_col3 = cudf.Series([5, 7, 9]) + self.assertEqual(gdf.shape, (3, 2)) + self.assertEqual(list(gdf.columns), ['col1', 'col2']) + self.assertTrue(gdf['col3'].equals(expected_col3)) \ No newline at end of file diff --git a/tests/test_cuml.py b/tests/test_cuml.py new file mode 100644 index 00000000..e68a6eba --- /dev/null +++ b/tests/test_cuml.py @@ -0,0 +1,19 @@ +import unittest + +from common import gpu_test, p100_exempt + + +class TestCumlPCA(unittest.TestCase): + @gpu_test + @p100_exempt + def test_pca_fit_transform(self): + import unittest + import numpy as np + from cuml.decomposition import PCA + + x = np.array([[1.0, 2.0], [2.0, 4.0], [3.0, 6.0], [-1.0, -2.0], [-2.0, -4.0]]) + pca = PCA(n_components=1) + + x_transformed = pca.fit_transform(x) + + self.assertEqual(x_transformed.shape, (5, 1)) \ No newline at end of file From 37cc17f42cddd5397aa11d84e9f79b2b56f29c79 Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Thu, 23 May 2024 17:52:27 +0000 Subject: [PATCH 09/14] names --- tests/test_cudf.py | 2 +- tests/test_cuml.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_cudf.py b/tests/test_cudf.py index a69f88fd..1e5cd100 100644 --- a/tests/test_cudf.py +++ b/tests/test_cudf.py @@ -3,7 +3,7 @@ from common import gpu_test, p100_exempt -class TestCudfDataFrame(unittest.TestCase): +class TestCudf(unittest.TestCase): @gpu_test @p100_exempt def test_cudf_dataframe_operations(self): diff --git a/tests/test_cuml.py b/tests/test_cuml.py index e68a6eba..4cfa1398 100644 --- a/tests/test_cuml.py +++ b/tests/test_cuml.py @@ -3,7 +3,7 @@ from common import gpu_test, p100_exempt -class TestCumlPCA(unittest.TestCase): +class TestCuml(unittest.TestCase): @gpu_test @p100_exempt def test_pca_fit_transform(self): From 65db483ebfeb50142ac87188d4542af3d41abc60 Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Thu, 23 May 2024 21:00:47 +0000 Subject: [PATCH 10/14] reviewer feedback --- Dockerfile.tmpl | 4 +++- tests/common.py | 1 + tests/test_cudf.py | 2 +- tests/test_cuml.py | 2 +- tests/test_datashader.py | 2 +- tests/test_geoviews.py | 3 ++- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index 206b20b9..2d9c1c39 100644 --- a/Dockerfile.tmpl +++ b/Dockerfile.tmpl @@ -109,9 +109,11 @@ RUN conda config --add channels nvidia && \ # Install spacy # b/232247930: uninstall pyarrow to avoid double installation with the GPU specific version. +# b/341938540: unistall grpc-cpp to allow >=v24.4 cudf and cuml to be installed. {{ if eq .Accelerator "gpu" }} RUN pip uninstall -y pyarrow && \ - conda install -y -c conda-forge spacy cudf=24.4 cuml=24.4 cupy cuda-version=$CUDA_MAJOR_VERSION.$CUDA_MINOR_VERSION && \ + mamba remove grpc-cpp && \ + mamba install -y -c conda-forge spacy cudf>=24.4 cuml>=24.4 cupy cuda-version=$CUDA_MAJOR_VERSION.$CUDA_MINOR_VERSION && \ /tmp/clean-layer.sh {{ else }} RUN pip install spacy && \ diff --git a/tests/common.py b/tests/common.py index 47baaaf3..175a6206 100644 --- a/tests/common.py +++ b/tests/common.py @@ -12,5 +12,6 @@ def getAcceleratorName(): return("nvidia-smi not found.") gpu_test = unittest.skipIf(len(os.environ.get('CUDA_VERSION', '')) == 0, 'Not running GPU tests') +# b/342143152 P100s are slowly being unsupported in new release of popular ml tools such as RAPIDS. p100_exempt = unittest.skipIf(getAcceleratorName() == "Tesla P100-PCIE-16GB", 'Not running p100 exempt tests') tpu_test = unittest.skipIf(len(os.environ.get('ISTPUVM', '')) == 0, 'Not running TPU tests') diff --git a/tests/test_cudf.py b/tests/test_cudf.py index 1e5cd100..26ae9344 100644 --- a/tests/test_cudf.py +++ b/tests/test_cudf.py @@ -5,7 +5,7 @@ class TestCudf(unittest.TestCase): @gpu_test - @p100_exempt + @p100_exempt # b/342143152: cuDL(>=24.4v) is inompatible with p100 GPUs. def test_cudf_dataframe_operations(self): import cudf diff --git a/tests/test_cuml.py b/tests/test_cuml.py index 4cfa1398..4de54a02 100644 --- a/tests/test_cuml.py +++ b/tests/test_cuml.py @@ -5,7 +5,7 @@ class TestCuml(unittest.TestCase): @gpu_test - @p100_exempt + @p100_exempt # b/342143152: cuML(>=24.4v) is inompatible with p100 GPUs. def test_pca_fit_transform(self): import unittest import numpy as np diff --git a/tests/test_datashader.py b/tests/test_datashader.py index b8aca424..ad3afe15 100644 --- a/tests/test_datashader.py +++ b/tests/test_datashader.py @@ -4,7 +4,7 @@ class TestDatashader(unittest.TestCase): - @p100_exempt + @p100_exempt # b/342143152: Uses cuDF(>=24.4v), which is no longer capitble with p100 GPUs. def test_pipeline(self): # based on https://github.com/pyviz/datashader/blob/master/datashader/tests/test_pipeline.py import numpy as np diff --git a/tests/test_geoviews.py b/tests/test_geoviews.py index b3fff6b7..2636cc6f 100644 --- a/tests/test_geoviews.py +++ b/tests/test_geoviews.py @@ -4,7 +4,8 @@ class TestGeoviews(unittest.TestCase): - @p100_exempt + @p100_exempt # b/342143152: Uses cuDF(>=24.4v), which is no longer capitble with p100 GPUs. + def test_viz(self): import geoviews.feature as gf import holoviews as hv From 86a15be8c888f9081d550e413b1c0b6da09cb86a Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Thu, 23 May 2024 21:11:06 +0000 Subject: [PATCH 11/14] line --- tests/test_cudf.py | 2 +- tests/test_cuml.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_cudf.py b/tests/test_cudf.py index 26ae9344..1327b5e4 100644 --- a/tests/test_cudf.py +++ b/tests/test_cudf.py @@ -17,4 +17,4 @@ def test_cudf_dataframe_operations(self): expected_col3 = cudf.Series([5, 7, 9]) self.assertEqual(gdf.shape, (3, 2)) self.assertEqual(list(gdf.columns), ['col1', 'col2']) - self.assertTrue(gdf['col3'].equals(expected_col3)) \ No newline at end of file + self.assertTrue(gdf['col3'].equals(expected_col3)) diff --git a/tests/test_cuml.py b/tests/test_cuml.py index 4de54a02..bbb7f0c6 100644 --- a/tests/test_cuml.py +++ b/tests/test_cuml.py @@ -16,4 +16,4 @@ def test_pca_fit_transform(self): x_transformed = pca.fit_transform(x) - self.assertEqual(x_transformed.shape, (5, 1)) \ No newline at end of file + self.assertEqual(x_transformed.shape, (5, 1)) From cc402877b9e4c7b8fbf57ef455fffbbb0ca29277 Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Fri, 24 May 2024 09:23:26 +0000 Subject: [PATCH 12/14] fix mamba --- Dockerfile.tmpl | 2 +- tests/common.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index 2d9c1c39..8566f1c8 100644 --- a/Dockerfile.tmpl +++ b/Dockerfile.tmpl @@ -112,7 +112,7 @@ RUN conda config --add channels nvidia && \ # b/341938540: unistall grpc-cpp to allow >=v24.4 cudf and cuml to be installed. {{ if eq .Accelerator "gpu" }} RUN pip uninstall -y pyarrow && \ - mamba remove grpc-cpp && \ + mamba remove --force grpc-cpp && \ mamba install -y -c conda-forge spacy cudf>=24.4 cuml>=24.4 cupy cuda-version=$CUDA_MAJOR_VERSION.$CUDA_MINOR_VERSION && \ /tmp/clean-layer.sh {{ else }} diff --git a/tests/common.py b/tests/common.py index 175a6206..30a7bb0f 100644 --- a/tests/common.py +++ b/tests/common.py @@ -7,7 +7,7 @@ def getAcceleratorName(): try: deviceName = subprocess.check_output(['nvidia-smi', '--query-gpu=name', '--format=csv,noheader']) - return deviceName.decode('utf-8').strip(); + return deviceName.decode('utf-8').strip() except FileNotFoundError: return("nvidia-smi not found.") From 519bdf3d7f74f5d6ab9fd47c1c76ec5b8273d6bd Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Fri, 24 May 2024 09:32:20 +0000 Subject: [PATCH 13/14] fix mamba 2 --- Dockerfile.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index 8566f1c8..240de659 100644 --- a/Dockerfile.tmpl +++ b/Dockerfile.tmpl @@ -112,7 +112,7 @@ RUN conda config --add channels nvidia && \ # b/341938540: unistall grpc-cpp to allow >=v24.4 cudf and cuml to be installed. {{ if eq .Accelerator "gpu" }} RUN pip uninstall -y pyarrow && \ - mamba remove --force grpc-cpp && \ + mamba remove -y --force grpc-cpp && \ mamba install -y -c conda-forge spacy cudf>=24.4 cuml>=24.4 cupy cuda-version=$CUDA_MAJOR_VERSION.$CUDA_MINOR_VERSION && \ /tmp/clean-layer.sh {{ else }} From e7c96820d23d9cbd027f5a28f4f42c44369f0350 Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Fri, 24 May 2024 21:02:52 +0000 Subject: [PATCH 14/14] fix test 11 --- tests/test_cudf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_cudf.py b/tests/test_cudf.py index 1327b5e4..cae69a6c 100644 --- a/tests/test_cudf.py +++ b/tests/test_cudf.py @@ -15,6 +15,6 @@ def test_cudf_dataframe_operations(self): gdf['col3'] = gdf['col1'] + gdf['col2'] expected_col3 = cudf.Series([5, 7, 9]) - self.assertEqual(gdf.shape, (3, 2)) - self.assertEqual(list(gdf.columns), ['col1', 'col2']) + self.assertEqual(gdf.shape, (3, 3)) + self.assertEqual(list(gdf.columns), ['col1', 'col2', 'col3']) self.assertTrue(gdf['col3'].equals(expected_col3))