Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ RUN conda config --add channels conda-forge && \
conda config --add channels nvidia && \
conda config --add channels rapidsai && \
# ^ rapidsai is the highest priority channel, default lowest, conda-forge 2nd lowest.
conda install mkl blas && \
# b/161473620#comment7 pin required to prevent resolver from picking pysal 1.x., pysal 2.2.x is also downloading data on import.
conda install cartopy=0.19 imagemagick=7.0 pyproj==3.1.0 pysal==2.1.0 && \
/tmp/clean-layer.sh
Expand Down
4 changes: 2 additions & 2 deletions tests/test_numpy.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ def test_array(self):
# Numpy must be linked to the MKL. (Occasionally, a third-party package will muck up the installation
# and numpy will be reinstalled with an OpenBLAS backing.)
def test_mkl(self):
# This will throw an exception if the MKL is not linked correctly.
get_info("blas_mkl")
# This will throw an exception if the MKL is not linked correctly or return an empty dict.
self.assertTrue(get_info("blas_mkl"))