From 2fc9c32e29ca3c15634b43b996831a988d693852 Mon Sep 17 00:00:00 2001 From: formica <42073607+rjdbcm@users.noreply.github.com> Date: Fri, 7 Jun 2019 21:47:15 -0500 Subject: [PATCH] Readme Updates --- README.md | 33 +++++++++++++++++---------------- build-tools/build-for-macos.sh | 2 -- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index c7977d7..5d710c4 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,15 @@ formatted ```.txt``` files. ## Installation -### Requirements -#### Linux +### Binary Build Requirements +#### Ubuntu Linux * libomp-dev +* pyqt5-dev-tools + +* python3-pip + * Python 3.6 or above * The following PyPi packages from ```requirements/requirements-linux.txt```: @@ -26,6 +30,11 @@ opencv-contrib-python==4.0.0.21 tensorflow==1.13.1 numpy==1.16.2 ``` +##### Build Binary: +```bash +cd build_tools +./build_ubuntu_binary.sh +``` #### MacOS * [Homebrew](https://brew.sh) @@ -45,7 +54,11 @@ opencv-contrib-python-headless==4.0.0.21 tensorflow==1.13.1 numpy==1.16.2 ``` - +##### Build Binary: (NOT WORKING) +```bash +cd build_tools +./build_for_macos.sh +``` ### Download prebuilt binaries @@ -65,6 +78,7 @@ numpy==1.16.2 * Run as a source distribution: ```bash +sudo apt-get install python3-pip sudo apt-get install pyqt5-dev-tools sudo apt-get install libomp-dev sudo pip3 install -r requirements/requirements-linux-python3.txt @@ -73,13 +87,6 @@ python3 slgrSuite.py python3 slgrSuite.py [IMAGE_PATH] [PRE-DEFINED CLASS FILE] ``` -* Build Binary - -```bash -cd build_tools -./build_for_macos.sh -``` - #### macOS @@ -94,12 +101,6 @@ python3 slgrSuite.py python3 slgrSuite.py [IMAGE_PATH] [PRE-DEFINED CLASS FILE] ``` -* Build Binary -```bash -cd build_tools -./build_for_macos.sh -``` - ## Usage ### Create pre-defined classes diff --git a/build-tools/build-for-macos.sh b/build-tools/build-for-macos.sh index e1d66d3..9ac4b78 100755 --- a/build-tools/build-for-macos.sh +++ b/build-tools/build-for-macos.sh @@ -1,7 +1,5 @@ #!/bin/sh # To be run from the build-tools/ directory -# TODO: Install into a virtualenv so the binary isn't massive -# Run this script as the super user after running: which -s brew if [[ $? != 0 ]] ; then