Improve env vars definition in dockerdockerfile

aymara · May 2, 2024 · 9f80676 · 9f80676
1 parent 435937d
commit 9f80676
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/continuous_integration/Dockerfile-ubuntu22.04-fia b/continuous_integration/Dockerfile-ubuntu22.04-fia
@@ -70,19 +70,21 @@ RUN echo "$(git show -s --format=%cI HEAD | sed -e 's/[^0-9]//g')-$(git rev-pars
 RUN mkdir -p /src/lima/build
 WORKDIR /src/lima/build
 
-ENV PERL5LIB /SVMTool-1.3.1/lib:$PERL5LIB
-ENV PATH /SVMTool-1.3.1/bin:/usr/share/apps/lima/scripts:/usr/bin:$PATH
-ENV NLTK_PTB_DP_FILE /nltk_data/corpora/dependency_treebank/nltk-ptb.dp
-ENV LIMA_DISABLE_FSW_TESTING true
-ENV LIMA_DISABLE_CPACK_DEBIAN_PACKAGE_SHLIBDEPS true
-ENV LIMA_DIST /usr
-ENV LIMA_CONF /usr/share/config/lima
-ENV LIMA_RESOURCES /root/.lima/resources/:/usr/share/apps/lima/resources
-ENV CFLAGS=$CFLAGS
-ENV CXXFLAGS=$CXXFLAGS
+ENV CUDA_HOME=/usr/local/cuda \
+    PERL5LIB=/SVMTool-1.3.1/lib:$PERL5LIB \
+    PATH=$CUDA_HOME/bin:/SVMTool-1.3.1/bin:/usr/share/apps/lima/scripts:/usr/bin:$PATH \
+    CFLAGS=$CFLAGS \
+    CXXFLAGS=$CXXFLAGS \
+    LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64 \
+    NLTK_PTB_DP_FILE=/nltk_data/corpora/dependency_treebank/nltk-ptb.dp \
+    LIMA_DISABLE_FSW_TESTING=true \
+    LIMA_DISABLE_CPACK_DEBIAN_PACKAGE_SHLIBDEPS=true \
+    LIMA_DIST=/usr \
+    LIMA_CONF=/usr/share/config/lima \
+    LIMA_RESOURCES=/root/.lima/resources/:/usr/share/apps/lima/resources
 
 # Build
 #
 
-RUN cmake -G Ninja -DWITH_LIMA_RESOURCES:BOOL=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:STRING=Release -DLIMA_VERSION_RELEASE:STRING="$(cat /src/lima/release)" -DSHORTEN_POR_CORPUS_FOR_SVMLEARN:BOOL=ON -DCTEST_OUTPUT_ON_FAILURE=ON -DTF_SOURCES_PATH:PATH="/usr/include/tensorflow-for-lima/" -DTORCH_CUDA_ARCH_LIST=6.1 -DCMAKE_PREFIX_PATH=/src/lima/extern/libtorch -DWITH_DEBUG_MESSAGES=ON -DWITH_ARCH=OFF -DWITH_ASAN=OFF -DWITH_GUI=OFF ..
+RUN cmake -G Ninja -DWITH_LIMA_RESOURCES:BOOL=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:STRING=Release -DLIMA_VERSION_RELEASE:STRING="$(cat /src/lima/release)" -DSHORTEN_POR_CORPUS_FOR_SVMLEARN:BOOL=ON -DCTEST_OUTPUT_ON_FAILURE=ON -DTF_SOURCES_PATH:PATH="/usr/include/tensorflow-for-lima/" -DTORCH_CUDA_ARCH_LIST=6.1 -DCMAKE_PREFIX_PATH=/src/lima/extern/libtorch -DWITH_DEBUG_MESSAGES=ON -DWITH_ARCH=OFF -DWITH_ASAN=OFF -DWITH_GUI=OFF -DCMAKE_CUDA_COMPILER:PATH=/usr/local/cuda/bin/nvcc ..
 RUN ninja && ninja install && ninja test