diff --git a/.github/workflows/build-win.yml b/.github/workflows/build-win.yml index 03231a59b..bae1aeabb 100644 --- a/.github/workflows/build-win.yml +++ b/.github/workflows/build-win.yml @@ -40,10 +40,7 @@ jobs: git clone https://github.com/Microsoft/vcpkg.git cd vcpkg .\bootstrap-vcpkg.bat - .\vcpkg.exe install cppzmq:x64-windows - .\vcpkg.exe install qt:x64-windows - .\vcpkg.exe install boost:x64-windows - .\vcpkg.exe install qwt:x64-windows + .\vcpkg.exe install qt:x64-windows boost:x64-windows qwt:x64-windows # - name: Install Qt # uses: jurplel/install-qt-action@v3 # with: diff --git a/INSTALL.md b/INSTALL.md index e0c1f1363..ff054a012 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -14,7 +14,7 @@ do so. Build dependencies: - Tools: cmake, ninja, C++ (tested with gcc and clang), gawk, NLTK, -- Libraries and development packages for : boost , Qt5 and Qwt. +- Libraries and development packages for : boost , Qt6 and Qwt. Optional dependencies: - python3: @@ -28,23 +28,7 @@ Named Entity Recognition and soon parsing too); Under Ubuntu, most of these dependencies are installed with the following packages: ``` - -sudo apt-get clean && sudo apt-get update && sudo apt-get install -y -qq 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 qtbase5-dev-tools \ -libqt5xmlpatterns5-dev libqt5qml5 qtdeclarative5-dev qml-module-qtquick-extras \ -qml-module-qtquick-controls qml-module-qtquick-layouts qml-module-qtquick2 \ -libtre-dev libboost-all-dev nodejs npm qml-module-qtquick-controls2 qml-module-qtquick-dialogs \ -qml-module-qtquick-privatewidgets qml-module-qtquick-scene3d qml-module-qtquick-templates2 \ -qml-module-qtquick-virtualkeyboard qml-module-qtquick-window2 qml-module-qtquick-xmllistmodel \ -libicu-dev libeigen3-dev dos2unix python-is-python3 nvidia-cuda-toolkit nvidia-cudnn \ -software-properties-common - -``` - -Install python packages necessary to use the language resources install script: -```bash -pip3 install --user arpy requests tqdm +sudo 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 ``` qhttpserver can be downloaded and installed from @@ -52,33 +36,6 @@ https://github.com/aymara/qhttpserver/releases svmtool++ can be downloaded and installed from https://github.com/aymara/svmtool-cpp/releases -To compile SVMTool models, you also need svm_light: -```bash -mkdir svm_light && cd svm_light -wget http://osmot.cs.cornell.edu/svm_light/current/svm_light.tar.gz -tar xvzf svm_light.tar.gz -dos2unix *.c -cat< svm_light.patch ---- svm_hideo.c.s 2021-12-16 11:34:23.606959575 +0000 -+++ svm_hideo.c 2021-12-16 11:34:33.614829980 +0000 -@@ -31,7 +31,7 @@ - - /* Common Block Declarations */ - --long verbosity; -+extern long verbosity; - - # define PRIMAL_OPTIMAL 1 - - # define DUAL_OPTIMAL 2 - -EOF -patch