From 66547e004e7e5c9461d50710bde8b159f500e528 Mon Sep 17 00:00:00 2001 From: kkshmz <kyeshimizu@gmail.com> Date: Mon, 23 Jul 2018 23:18:29 +0900 Subject: [PATCH 1/3] Add pip requirements for server.py --- demo/requirements.txt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 demo/requirements.txt diff --git a/demo/requirements.txt b/demo/requirements.txt new file mode 100644 index 0000000..254ccb5 --- /dev/null +++ b/demo/requirements.txt @@ -0,0 +1,6 @@ +opencv-python==3.4.2. +imutils==0.4.6 +tqdm==4.23.4 +dlib==19.15.0 +flask==1.0.2 +flask-cors==3.0.6 \ No newline at end of file From c47aae00f7939dac4a724a72489ad7d2d391c891 Mon Sep 17 00:00:00 2001 From: kkshmz <kyeshimizu@gmail.com> Date: Mon, 23 Jul 2018 23:21:10 +0900 Subject: [PATCH 2/3] [update] update readme for requirements.txt --- demo/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/demo/README.md b/demo/README.md index fb35c23..6c46db0 100644 --- a/demo/README.md +++ b/demo/README.md @@ -26,8 +26,13 @@ curl https://storage.googleapis.com/glow-demo/celeba-hq/z.npy > z.npy Then, run `get_manipulators.py` # Run server and client for demo +Install pip requirements through requirements.txt + +dAlso libjpeg.so.9 is needed, which can be installed through `conda install -c conda-forge jpeg`. + To run server for demo, run `python server.py`. + To run client, run `python -m http.server` (starts a local http server at port 8000) and open `0.0.0.0:8000/web` in your browser. To test client, upload `test/img.png`. You should see aligned image and be able to move sliders. From 101ee7ad74dbce12bde0ecf8c8eeabc24fc1e68b Mon Sep 17 00:00:00 2001 From: kkshmz <kyeshimizu@gmail.com> Date: Thu, 26 Jul 2018 14:45:59 +0900 Subject: [PATCH 3/3] changes with pip to $(whichpip) --- demo/README.md | 4 ---- demo/requirements.txt | 6 ------ demo/script.sh | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 demo/requirements.txt diff --git a/demo/README.md b/demo/README.md index 6c46db0..7c31e26 100644 --- a/demo/README.md +++ b/demo/README.md @@ -26,10 +26,6 @@ curl https://storage.googleapis.com/glow-demo/celeba-hq/z.npy > z.npy Then, run `get_manipulators.py` # Run server and client for demo -Install pip requirements through requirements.txt - -dAlso libjpeg.so.9 is needed, which can be installed through `conda install -c conda-forge jpeg`. - To run server for demo, run `python server.py`. diff --git a/demo/requirements.txt b/demo/requirements.txt deleted file mode 100644 index 254ccb5..0000000 --- a/demo/requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -opencv-python==3.4.2. -imutils==0.4.6 -tqdm==4.23.4 -dlib==19.15.0 -flask==1.0.2 -flask-cors==3.0.6 \ No newline at end of file diff --git a/demo/script.sh b/demo/script.sh index 2f54a92..8e83c57 100644 --- a/demo/script.sh +++ b/demo/script.sh @@ -5,7 +5,7 @@ locale-gen en_US.UTF-8 export LC_ALL=en_US.UTF-8 # Pip packages for running server and face-aligned (dlib takes a while to install) -pip install flask flask_cors tqdm opencv-python imutils dlib imageio +$(which pip) install flask flask_cors tqdm opencv-python imutils dlib imageio # Get model weights curl https://storage.googleapis.com/glow-demo/large3/graph_optimized.pb > graph_optimized.pb