Skip to content

Commit b9920c1

Browse files
committed
Move some libs to conda for mkl boost
1 parent c76ac23 commit b9920c1

File tree

1 file changed

+22
-10
lines changed

1 file changed

+22
-10
lines changed

Dockerfile

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,13 @@ RUN \
597597
'jupyterlab=2.2.*' \
598598
# TODO: temp fix: yarl version 1.5 is required for lots of libraries.
599599
'yarl==1.5.*' \
600-
numpy && \
600+
# TODO install scipy, numpy, sklearn, and numexpr via conda for mkl optimizaed versions: https://docs.anaconda.com/mkl-optimizations/
601+
# TODO: Newer scipy versions will be downgraded
602+
'scipy==1.4.*' \
603+
# TODO: Newer numpy versions will be downgraded
604+
'numpy==1.18.*' \
605+
scikit-learn \
606+
numexpr && \
601607
# installed via apt-get and pip: protobuf \
602608
# installed via apt-get: zlib && \
603609
# Install minimal pip requirements
@@ -618,10 +624,10 @@ RUN \
618624
'python='$PYTHON_VERSION \
619625
boost \
620626
mkl-include && \
621-
# TODO - Install was not working
627+
# Install mkldnn
622628
conda install -y --freeze-installed -c mingfeima mkldnn && \
623629
# Install pytorch - cpu only
624-
conda install -y -c pytorch "pytorch==1.7.*" torchvision torchaudio cpuonly && \
630+
conda install -y -c pytorch "pytorch==1.7.*" cpuonly && \
625631
# Install light pip requirements
626632
pip install --no-cache-dir --upgrade --upgrade-strategy only-if-needed -r ${RESOURCES_PATH}/libraries/requirements-light.txt && \
627633
# If light light flavor - exit here
@@ -647,10 +653,8 @@ RUN \
647653
pip install --no-cache-dir tensorflow-graphics==2020.5.20 && \
648654
# GCC OpenMP (GOMP) support library
649655
apt-get install -y --no-install-recommends libgomp1 && \
650-
# Install libjpeg turbo for speedup in image processing
651-
#TODO conda install -y 'python='$PYTHON_VERSION libjpeg-turbo && \
652-
# Faiss - A library for efficient similarity search and clustering of dense vectors.
653-
#TODO conda install -y -c pytorch faiss-cpu && \
656+
# Install Intel(R) Compiler Runtime - numba optimization
657+
conda install -y --freeze-installed -c numba icc_rt && \
654658
# Install full pip requirements
655659
pip install --no-cache-dir --upgrade --upgrade-strategy only-if-needed -r ${RESOURCES_PATH}/libraries/requirements-full.txt && \
656660
# Setup Spacy
@@ -704,7 +708,7 @@ RUN \
704708
jupyter nbextension enable execute_time/ExecuteTime --sys-prefix && \
705709
jupyter nbextension enable collapsible_headings/main --sys-prefix && \
706710
jupyter nbextension enable codefolding/main --sys-prefix && \
707-
# TODO: tensorboard support is not working right now: Activate Jupyter Tensorboard
711+
# Install and activate Jupyter Tensorboard
708712
pip install --no-cache-dir git+https://github.com/InfuseAI/jupyter_tensorboard.git && \
709713
jupyter tensorboard enable --sys-prefix && \
710714
# TODO moved to configuration files = resources/jupyter/nbconfig Edit notebook config
@@ -873,7 +877,7 @@ RUN \
873877
rm prettier-vscode-$PRETTIER_VERSION.vsix && \
874878
mv extension $HOME/.vscode/extensions/prettier-vscode-$PRETTIER_VERSION.vsix && \
875879
# Install vs code jupyter
876-
VS_JUPYTER_VERSION="2020.11.399280825" && \
880+
VS_JUPYTER_VERSION="2020.12.414227025" && \
877881
wget --retry-on-http-error=429 --waitretry 15 --tries 5 --no-verbose https://marketplace.visualstudio.com/_apis/public/gallery/publishers/ms-toolsai/vsextensions/jupyter/$VS_JUPYTER_VERSION/vspackage -O ms-toolsai.jupyter-$VS_JUPYTER_VERSION.vsix && \
878882
bsdtar -xf ms-toolsai.jupyter-$VS_JUPYTER_VERSION.vsix extension && \
879883
rm ms-toolsai.jupyter-$VS_JUPYTER_VERSION.vsix && \
@@ -908,7 +912,7 @@ RUN \
908912
RUN \
909913
# Strict channel priority currently makes problems with installing with conda
910914
conda config --system --set channel_priority false && \
911-
apt-get update && \
915+
# apt-get update && \
912916
# TODO: lib contains high vulnerability
913917
# apt-get install -y --no-install-recommends libffi-dev \
914918
# Required by magenta
@@ -930,6 +934,14 @@ RUN \
930934
clean-layer.sh && \
931935
exit 0 ; \
932936
fi && \
937+
# Install libjpeg turbo for speedup in image processing
938+
conda install -y --freeze-installed libjpeg-turbo && \
939+
# Add snakemake for workflow management
940+
conda install -y -c bioconda -c conda-forge snakemake-minimal && \
941+
# Add mamba as conda alternativ
942+
conda install -y -c conda-forge mamba && \
943+
# Faiss - A library for efficient similarity search and clustering of dense vectors.
944+
conda install -y --freeze-installed faiss-cpu && \
933945
# New Python Libraries:
934946
# pip install --no-cache-dir
935947
# Cleanup

0 commit comments

Comments
 (0)