File tree Expand file tree Collapse file tree 4 files changed +25
-12
lines changed Expand file tree Collapse file tree 4 files changed +25
-12
lines changed Original file line number Diff line number Diff line change @@ -72,7 +72,13 @@ ENV QT_VERSION_MAJOR="${QT_VERSION_MAJOR}"
72
72
# Build
73
73
#
74
74
RUN cmake -G Ninja -DLIMA_RESOURCES:STRING=build -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" -DWITH_DEBUG_MESSAGES=ON -DWITH_ARCH=OFF -DWITH_ASAN=OFF -DWITH_GUI=ON -DCMAKE_PREFIX_PATH=$LIBTORCH_PATH -DQT_VERSION_MAJOR=${QT_VERSION_MAJOR} ..
75
- RUN ninja && ninja install && ninja test && ninja package
75
+ RUN ninja && ninja install
76
+ # Some models are necessary for unit tests to work, let's use a previous
77
+ # version of lima-python to install them, then run tests and finally remove
78
+ # old aymara/lima and downloaded models
79
+ RUN wget -q https://github.com/aymara/lima-python/releases/download/continuous/aymara-0.5.0b6-cp37-abi3-manylinux_2_28_x86_64.whl && pip install ./aymara-0.5.0b6-cp37-abi3-manylinux_2_28_x86_64.whl && lima_models -i eng && && deeplima_models -i UD_English-EWT && pip uninstall -y aymara && (ctest || ctest --rerun-failed --output-on-failure) && rm -Rf $HOME/.local/share/lima
80
+
81
+ RUN ninja package
76
82
RUN install -D -t /usr/share/apps/lima/packages /src/lima/build/*.deb
77
83
78
84
# WORKDIR /usr/share/apps/lima/tests
Original file line number Diff line number Diff line change @@ -88,14 +88,6 @@ ENV NLTK_PTB_DP_FILE=/nltk_data/corpora/dependency_treebank/nltk-ptb.dp \
88
88
Qt_INSTALL_DIR=/opt/qt6 \
89
89
BOOST_ROOT=/opt/boost
90
90
91
- # Some models are necessary for unit tests to work, let's use a previous
92
- # version of lima-python to install them
93
- RUN wget -q https://github.com/aymara/lima-python/releases/download/continuous/aymara-0.5.0b6-cp37-abi3-manylinux_2_28_x86_64.whl
94
- RUN pip install ./aymara-0.5.0b6-cp37-abi3-manylinux_2_28_x86_64.whl
95
- RUN lima_models -i eng
96
- RUN deeplima_models -i UD_English-EWT
97
- RUN pip uninstall -y aymara
98
-
99
91
# Build
100
92
#
101
93
# -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo
@@ -115,7 +107,11 @@ RUN cmake -G Ninja \
115
107
-DWITH_ASAN=OFF \
116
108
-DWITH_GUI=ON ..
117
109
RUN ninja && ninja install
118
- RUN ctest || ctest --rerun-failed --output-on-failure
110
+
111
+ # Some models are necessary for unit tests to work, let's use a previous
112
+ # version of lima-python to install them, then run tests and finally remove
113
+ # old aymara/lima and downloaded models
114
+ RUN wget -q https://github.com/aymara/lima-python/releases/download/continuous/aymara-0.5.0b6-cp37-abi3-manylinux_2_28_x86_64.whl && pip install ./aymara-0.5.0b6-cp37-abi3-manylinux_2_28_x86_64.whl && lima_models -i eng && && deeplima_models -i UD_English-EWT && pip uninstall -y aymara && (ctest || ctest --rerun-failed --output-on-failure) && rm -Rf $HOME/.local/share/lima
119
115
120
116
#WORKDIR /opt/lima/share/apps/lima/tests
121
117
#RUN /bin/bash -c "set -o pipefail && tva --language=eng test-eng.*.xml 2>&1 | tee tva-eng.log"
Original file line number Diff line number Diff line change @@ -88,7 +88,13 @@ ENV CXXFLAGS=$CXXFLAGS
88
88
89
89
90
90
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" -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=ON ..
91
- RUN ninja && ninja install && ninja test
91
+ RUN ninja && ninja install
92
+
93
+ # Some models are necessary for unit tests to work, let's use a previous
94
+ # version of lima-python to install them, then run tests and finally remove
95
+ # old aymara/lima and downloaded models
96
+ RUN wget -q https://github.com/aymara/lima-python/releases/download/continuous/aymara-0.5.0b6-cp37-abi3-manylinux_2_28_x86_64.whl && pip install ./aymara-0.5.0b6-cp37-abi3-manylinux_2_28_x86_64.whl && lima_models -i eng && && deeplima_models -i UD_English-EWT && pip uninstall -y aymara && (ctest || ctest --rerun-failed --output-on-failure) && rm -Rf $HOME/.local/share/lima
97
+
92
98
RUN bash -c 'if [[ "$PACKAGES" == "yes" ]] ; then ninja package && install -D -t /usr/share/apps/lima/packages /src/lima/build/*.deb ; fi'
93
99
94
100
# WORKDIR /usr/share/apps/lima/tests
Original file line number Diff line number Diff line change @@ -92,4 +92,9 @@ ENV CUDA_HOME=/usr/local/cuda \
92
92
#
93
93
94
94
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" -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 ..
95
- RUN ninja && ninja install && ninja test
95
+ RUN ninja && ninja install
96
+
97
+ # Some models are necessary for unit tests to work, let's use a previous
98
+ # version of lima-python to install them, then run tests and finally remove
99
+ # old aymara/lima and downloaded models
100
+ RUN wget -q https://github.com/aymara/lima-python/releases/download/continuous/aymara-0.5.0b6-cp37-abi3-manylinux_2_28_x86_64.whl && pip install ./aymara-0.5.0b6-cp37-abi3-manylinux_2_28_x86_64.whl && lima_models -i eng && && deeplima_models -i UD_English-EWT && pip uninstall -y aymara && (ctest || ctest --rerun-failed --output-on-failure) && rm -Rf $HOME/.local/share/lima
You can’t perform that action at this time.
0 commit comments