diff --git a/Makefile b/Makefile index a4cc6158..5b3d5a77 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ clean_nlpfr: rm -rf nlpfr/build nlpfr/dist nlpfr/nltk.egg-info clean_alg: - rm -rf alg/build alg/dist alg/alg.egg-info + rm -rf alg/build alg/dist alg/coffeehouse_alg.egg-info clean_his: rm -rf hyper_internal_service/build hyper_internal_service/dist hyper_internal_service/hyper_internal_service.egg-info @@ -28,29 +28,29 @@ clean: # ====================================================================================================================== build_apt: - cd mods/apt; python3 setup.py build; python3 setup.py sdist + cd mods/apt; python3.8 setup.py build; python3.8 setup.py sdist build_stopwords: - cd mods/stopwords; python3 setup.py build; python3 setup.py sdist + cd mods/stopwords; python3.8 setup.py build; python3.8 setup.py sdist build_tokenizer: - cd mods/tokenizer; python3 setup.py build; python3 setup.py sdist + cd mods/tokenizer; python3.8 setup.py build; python3.8 setup.py sdist build_mods: make build_apt build_stopwords build_tokenizer build_nlpfr: make build_mods - cd nlpfr; python3 setup.py build; python3 setup.py sdist + cd nlpfr; python3.8 setup.py build; python3.8 setup.py sdist build_dltc: - cd dltc; python3 setup.py build; python3 setup.py sdist + cd dltc; python3.8 setup.py build; python3.8 setup.py sdist build_alg: - cd alg; python3 setup.py build; python3 setup.py sdist + cd alg; python3.8 setup.py build; python3.8 setup.py sdist build_his: - cd hyper_internal_service; python3 setup.py build; python3 setup.py sdist + cd hyper_internal_service; python3.8 setup.py build; python3.8 setup.py sdist build: make build_nlpfr @@ -61,29 +61,29 @@ build: # ====================================================================================================================== install_apt: - cd mods/apt; python3 setup.py install + cd mods/apt; python3.8 setup.py install install_stopwords: - cd mods/stopwords; python3 setup.py install + cd mods/stopwords; python3.8 setup.py install install_tokenizer: - cd mods/tokenizer; python3 setup.py install + cd mods/tokenizer; python3.8 setup.py install install_mods: make install_apt install_stopwords install_tokenizer install_nlpfr: make install_mods - cd nlpfr; python3 setup.py install + cd nlpfr; python3.8 setup.py install install_dltc: - cd dltc; python3 setup.py install + cd dltc; python3.8 setup.py install install_alg: - cd alg; python3 setup.py install + cd alg; python3.8 setup.py install install_his: - cd hyper_internal_service; make install + cd hyper_internal_service; python3.8 -m pip install -Ur dev_requirements.txt; python3.8 setup.py install install: make install_nlpfr @@ -93,10 +93,13 @@ install: # ====================================================================================================================== +system_prep_python: + apt install python3.8 + system_prep_pip: - apt -y install python3 python3-distutils wget curl + apt -y install python3.8 python3-distutils wget curl wget https://bootstrap.pypa.io/get-pip.py - python3 get-pip.py + python3.8 get-pip.py rm get-pip.py system_prep_gcc: diff --git a/README.md b/README.md index 5ee376a0..f242d2e5 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,24 @@ CoffeeHousePy is the full Python implementation for CoffeeHouse, and it's server components. The [Makefile](Makefile) contains all the setup procedures -used in order to install CoffeeHousePy, and it's components onto the machine. \ No newline at end of file +used in order to install CoffeeHousePy, and it's components onto the machine. + + +## Prepare the system + +The system must have `python3.8` installed, `pip` and `gcc`. To prepare the system run +the following command + +```shell +sudo make system_prep_python system_prep_pip system_prep_gcc +``` + + +## Install CoffeeHousePy + +Depending on the hardware, the installation procedure may take a while. To install +CoffeeHousePy run the following command + +```shell +sudo -H make clean build install +``` \ No newline at end of file diff --git a/alg/README.md b/alg/README.md index a2becacf..6799989a 100644 --- a/alg/README.md +++ b/alg/README.md @@ -7,10 +7,10 @@ CoffeeHouse ALG is a algorithmia API wrapper Predicts the content and appropriate tags for an image ```python -from coffeehouse_alg.utilities import Utilities from coffeehouse_alg.image_tagger import ImageTagger +from coffeehouse_alg.utilities import Utilities -url = "https://cdn4.telesco.pe/file/ETCYVng0VOEczJuIjUbsgzC4a7EOi8wMfwfFBAss_OlKZd822FNiF5Xy5V7MpY0nUvHcBCzDt1MexuBrawuit0WL5HGa0-O5bZXYsBwA5P4QAFKM6VyH0k1G9VbnCn-QiFJ5ipClcP1azPykgcRqDz4d-g_3IHWegBY3wHBD8BHm1T589XhkXbfCl_HN6TJSZ1LIYnoASnN1FF6YDV92UOhMc0-c2FTQkoxx-gGt4A7Vwy821x4-TAd6AlNI_q5NO4NKe047oRlJfm_MCtEsojYGP5tyJKB-xZYm_zRtzriwC0GSJh2zoY_RCv4L-Uudq3GGQ0_8A2OrHCmCNj0AGA.jpg" +url = "https://upload.wikimedia.org/wikipedia/commons/9/9f/Gisele_Bundchen_2018_clear_original_%28cropped%29.jpg" # Process the image image_tagger = ImageTagger()