Skip to content

Commit

Permalink
reviewer feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
calderjo committed May 23, 2024
1 parent 37cc17f commit 65db483
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 5 deletions.
4 changes: 3 additions & 1 deletion Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
1 change: 1 addition & 0 deletions tests/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
2 changes: 1 addition & 1 deletion tests/test_cudf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tests/test_cuml.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/test_datashader.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion tests/test_geoviews.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 65db483

Please sign in to comment.