From 3b253134d60341fbb7c8314b2c86ced0e1475cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20de=20Chalendar?= Date: Tue, 30 Apr 2024 12:23:43 +0200 Subject: [PATCH] Vcpkg install correction --- .github/workflows/build-win.yml | 36 ++++++++++--------- continuous_integration/Dockerfile-debian12 | 5 +-- ...ile-manylinux_2_28_with_qt6_lima-manylinux | 6 +--- continuous_integration/Dockerfile-ubuntu22.04 | 12 +------ .../Dockerfile-ubuntu22.04-fia | 2 +- 5 files changed, 23 insertions(+), 38 deletions(-) diff --git a/.github/workflows/build-win.yml b/.github/workflows/build-win.yml index a8b28ffe9..03231a59b 100644 --- a/.github/workflows/build-win.yml +++ b/.github/workflows/build-win.yml @@ -39,24 +39,26 @@ jobs: cd .. git clone https://github.com/Microsoft/vcpkg.git cd vcpkg - git checkout --force 2020.01 .\bootstrap-vcpkg.bat - .\vcpkg.exe install cppzmq:x64-windows qt:x64-windows boost:x64-windows - - name: Install Qt - uses: jurplel/install-qt-action@v3 - with: - version: '6.5.2' - - name: Install boost - uses: MarkusJx/install-boost@v2.4.5 - id: install-boost - with: - boost_version: 1.84.0 - # OPTIONAL: Specify a custon install location - # boost_install_dir: C:\some_directory - # OPTIONAL: Specify a platform version - platform_version: 2019 - # OPTIONAL: Specify a toolset - toolset: msvc + .\vcpkg.exe install cppzmq:x64-windows + .\vcpkg.exe install qt:x64-windows + .\vcpkg.exe install boost:x64-windows + .\vcpkg.exe install qwt:x64-windows + # - name: Install Qt + # uses: jurplel/install-qt-action@v3 + # with: + # version: '6.5.2' + # - name: Install boost + # uses: MarkusJx/install-boost@v2.4.5 + # id: install-boost + # with: + # boost_version: 1.84.0 + # # OPTIONAL: Specify a custon install location + # # boost_install_dir: C:\some_directory + # # OPTIONAL: Specify a platform version + # platform_version: 2019 + # # OPTIONAL: Specify a toolset + # toolset: msvc - name: Running cmake (windows) run: | cd ${{ github.workspace }} diff --git a/continuous_integration/Dockerfile-debian12 b/continuous_integration/Dockerfile-debian12 index 7d981dad1..b39e5768d 100644 --- a/continuous_integration/Dockerfile-debian12 +++ b/continuous_integration/Dockerfile-debian12 @@ -14,7 +14,7 @@ ARG QT_VERSION_MAJOR="6" COPY --from=aymara_svmtoolpp-debian12 /opt/svmtool++ /usr # Setup -RUN apt-get update && apt-get install -y locales locales-all apt-utils lsb-release git gcc g++ make curl python3-nltk gawk wget python3 ninja-build qt6-base-dev qt6-tools-dev libenchant-2-dev libtre-dev libboost-all-dev gnupg build-essential libssl-dev nodejs npm dos2unix unzip libeigen3-dev python3-pip python-is-python3 cmake qml6-module-qtqml qt6-base-dev qt6-tools-dev libqt6concurrent6 libqt6qml6 qt6-base-dev-tools qt6-charts-dev qt6-declarative-dev qt6-declarative-dev-tools qt6-httpserver-dev qt6-multimedia-dev +RUN apt-get update && apt-get install -y locales locales-all apt-utils lsb-release git gcc g++ make curl python3-nltk gawk wget python3 ninja-build qt6-base-dev qt6-tools-dev libenchant-2-dev libtre-dev libboost-all-dev gnupg build-essential libssl-dev nodejs npm dos2unix unzip libeigen3-dev python3-pip python-is-python3 cmake qml6-module-qtqml qt6-base-dev qt6-tools-dev libqt6concurrent6 libqt6qml6 qt6-base-dev-tools qt6-charts-dev qt6-declarative-dev qt6-declarative-dev-tools qt6-httpserver-dev qt6-multimedia-dev python3-arpy python3-requests python3-tqdm RUN wget https://launchpad.net/~limapublisher/+archive/ubuntu/ppa/+files/libtensorflow-for-lima-generic_1.9-ubuntu7~20.04_amd64.deb -q \ && dpkg -i libtensorflow-for-lima-generic_1.9-ubuntu7~20.04_amd64.deb \ @@ -84,9 +84,6 @@ RUN install -D -t /usr/share/apps/lima/packages /src/lima/build/*.deb # install github-release to be able to deploy packages RUN wget https://github.com/aktau/github-release/releases/download/v0.7.2/linux-amd64-github-release.tar.bz2 -q && tar xjf linux-amd64-github-release.tar.bz2 && cp bin/linux/amd64/github-release /usr/bin -# install python packages necessary to use the language resources install script -RUN /bin/bash -c "if [ \"$USE_TENSORFLOW\" = true ] ; then apt-get install -y -qq python3-arpy python3-requests python3-tqdm ; fi" - # # install English and French UD models # RUN /bin/bash -c "if [ \"$USE_TENSORFLOW\" = true ] ; then lima_models.py -l english ; fi" # RUN /bin/bash -c "if [ \"$USE_TENSORFLOW\" = true ] ; then lima_models.py -l french ; fi" diff --git a/continuous_integration/Dockerfile-manylinux_2_28_with_qt6_lima-manylinux b/continuous_integration/Dockerfile-manylinux_2_28_with_qt6_lima-manylinux index 687f2ee98..a2fcf722d 100644 --- a/continuous_integration/Dockerfile-manylinux_2_28_with_qt6_lima-manylinux +++ b/continuous_integration/Dockerfile-manylinux_2_28_with_qt6_lima-manylinux @@ -111,9 +111,5 @@ RUN /bin/bash -c "set -o pipefail && tva --language=eng test-eng.*.xml 2>&1 | te RUN /bin/bash -c "set -o pipefail && tva --language=fre test-fre.default.xml test-fre.disambiguated.xml test-fre.hyphen.xml test-fre.idiom.xml test-fre.sa.xml test-fre.se.xml test-fre.simpleword.xml test-fre.tokenizer.xml 2>&1 | tee tva-fre.log" WORKDIR /opt/lima/share/apps/lima/tests/xmlreader RUN /bin/bash -c "set -o pipefail && tvx --language=eng --language=fre test-fre.xmlreader.xml 2>&1 | tee tvx-fre.log" -# -# ## install English and French UD models -# #RUN /bin/bash -c "if [ \"$USE_TENSORFLOW\" = true ] ; then lima_models.py -l english ; fi" -# #RUN /bin/bash -c "if [ \"$USE_TENSORFLOW\" = true ] ; then lima_models.py -l french ; fi" -# + WORKDIR / diff --git a/continuous_integration/Dockerfile-ubuntu22.04 b/continuous_integration/Dockerfile-ubuntu22.04 index fecc0ecf1..38f26411b 100644 --- a/continuous_integration/Dockerfile-ubuntu22.04 +++ b/continuous_integration/Dockerfile-ubuntu22.04 @@ -8,7 +8,7 @@ ENV DEBIAN_FRONTEND=noninteractive COPY --from=aymara_svmtoolpp-ubuntu22.04 /opt/svmtool++ /usr -RUN apt-get update && apt-get install -y locales unzip bash coreutils apt-utils lsb-release git gcc g++ build-essential make cmake cmake-data curl python3-nltk gawk wget python3 python3-pip ninja-build qt6-base-dev qt6-base-dev-tools libqt6concurrent6 qml6-module-qtqml qt6-tools-dev libqt6concurrent6 qt6-base-dev-tools qt6-declarative-dev qt6-declarative-dev-tools qt6-multimedia-dev libtre-dev libboost-all-dev nodejs npm libicu-dev libeigen3-dev dos2unix python-is-python3 nvidia-cuda-toolkit nvidia-cudnn +RUN apt-get update && apt-get install -y locales unzip bash coreutils apt-utils lsb-release git gcc g++ build-essential make cmake cmake-data curl python3-nltk gawk wget python3 python3-pip ninja-build qt6-base-dev qt6-base-dev-tools libqt6concurrent6 qml6-module-qtqml qt6-tools-dev libqt6concurrent6 qt6-base-dev-tools qt6-declarative-dev qt6-declarative-dev-tools qt6-multimedia-dev libtre-dev libboost-all-dev nodejs npm libicu-dev libeigen3-dev dos2unix python-is-python3 nvidia-cuda-toolkit nvidia-cudnn python3-arpy python3-requests python3-tqdm @@ -92,13 +92,3 @@ RUN bash -c 'if [[ "$PACKAGES" == "yes" ]] ; then ninja package && install -D -t # install github-release to be able to deploy packages RUN bash -c 'if [[ "$PACKAGES" == "yes" ]] ; then /usr/bin/wget https://github.com/aktau/github-release/releases/download/v0.7.2/linux-amd64-github-release.tar.bz2 && /bin/tar xjf linux-amd64-github-release.tar.bz2 && /bin/cp bin/linux/amd64/github-release /usr/bin ; fi ' - - -# install python packages necessary to use the language resources install script -RUN /bin/bash -c 'if [[ "$USE_TENSORFLOW" == true ]] ; then pip3 install arpy requests tqdm ; fi' - -# Stop dowloading lima models as appveyor build timeouts -# # install English and French UD models -# RUN /bin/bash -c "if [ \"$USE_TENSORFLOW\" = true ] ; then lima_models.py -l english ; fi" -# RUN /bin/bash -c "if [ \"$USE_TENSORFLOW\" = true ] ; then lima_models.py -l french ; fi" - diff --git a/continuous_integration/Dockerfile-ubuntu22.04-fia b/continuous_integration/Dockerfile-ubuntu22.04-fia index 1bfd0c967..d232ac07a 100644 --- a/continuous_integration/Dockerfile-ubuntu22.04-fia +++ b/continuous_integration/Dockerfile-ubuntu22.04-fia @@ -8,7 +8,7 @@ ENV DEBIAN_FRONTEND=noninteractive COPY --from=aymara_svmtoolpp-ubuntu22.04 /opt/svmtool++ /usr -RUN apt-get update && apt-get install -y locales unzip bash coreutils apt-utils lsb-release git gcc g++ build-essential make cmake cmake-data curl python3-nltk gawk wget python3 python3-pip ninja-build qt6-base-dev qt6-base-dev-tools libqt6concurrent6 qml6-module-qtqml qt6-tools-dev libqt6concurrent6 qt6-base-dev-tools qt6-declarative-dev qt6-declarative-dev-tools qt6-multimedia-dev libtre-dev libboost-all-dev nodejs npm libicu-dev libeigen3-dev dos2unix python-is-python3 nvidia-cuda-toolkit nvidia-cudnn +RUN apt-get update && apt-get install -y locales unzip bash coreutils apt-utils lsb-release git gcc g++ build-essential make cmake cmake-data curl python3-nltk gawk wget python3 python3-pip ninja-build qt6-base-dev qt6-base-dev-tools libqt6concurrent6 qml6-module-qtqml qt6-tools-dev libqt6concurrent6 qt6-base-dev-tools qt6-declarative-dev qt6-declarative-dev-tools qt6-multimedia-dev libtre-dev libboost-all-dev nodejs npm libicu-dev libeigen3-dev dos2unix python-is-python3 nvidia-cuda-toolkit nvidia-cudnn python3-arpy python3-requests python3-tqdm # Use clang or gcc RUN bash -c 'if [[ "$COMPILER" == "clang" ]] ; then apt-get install -y -qq llvm clang clang-tidy clang-tools && update-alternatives --set cc /usr/bin/clang && update-alternatives --set c++ /usr/bin/clang++ ; else apt-get install -y -qq gcc g++ -qq ; fi'