Removing model file. Making setup path agnostic

Former-commit-id: 85897dba0ca300ba52dd3b5ad43fbd3ed785d77b

Makefile

@@ -1,8 +1,13 @@
+CURRENT_DIR = $(shell pwd)
+
 model-server: style
-	docker run --gpus all -p 8500:8500 --mount type=bind,source=/home/albert/github/neural-style/style,target=/models/style -e MODEL_NAME=style -t tensorflow/serving:latest-gpu
+	docker run --gpus all -p 8500:8500 --mount type=bind,source=${CURRENT_DIR}/style,target=/models/style -e MODEL_NAME=style -t tensorflow/serving:latest-gpu
 
 model-server-cpu: style
-	docker run -p 8500:8500 --mount type=bind,source=/home/albert/github/neural-style/style,target=/models/style -e MODEL_NAME=style -t tensorflow/serving
+	docker run -p 8500:8500 --mount type=bind,source=${CURRENT_DIR}/style,target=/models/style -e MODEL_NAME=style -t tensorflow/serving
 
 app:
 	exec streamlit run streamlit_app.py
+
+webcam:
+	exec streamlit run webcam_stream.py

README.md

@@ -1,14 +1,16 @@
-## Webcam Demo
+## Setup for both
 - Run `firstTimeSetup.sh`
 - Activate virtualenv `source venv/bin/activate`
-- Run streamlit webcam application `streamlit run webcam_stream.py`
+- Download style transfer model `python download_model.py`
+
+## Webcam Demo
+- Run streamlit webcam application inside virtualenv `make webcam`
 
 
 ## Image Demo
-- Run `firstTimeSetup.sh`
-- Activate virtualenv `source venv/bin/activate`
-- Pull tensorflow serving docker image and start tensorflow model server `make model-server`
-- In separate terminal call `make app`
+- Pull tensorflow serving docker image and start tensorflow model server `make model-server-cpu`
+- If you want to use GPU instead and have `nvidia-docker` then call `make model-server`
+- In separate terminal call in virtualenv `make app`
 
 
 ## Dependencies
@@ -17,8 +19,4 @@
 - Docker
 - Nvidia-docker
 - tensorflow/serving:latest-gpu image
-- Go
-- gocv
-- tensorflow and tensorflow/serving repositories (for golang protobufs)
-- golang protobuf library
-- protobuf compiler
+- tensorflow and tensorflow/serving repositories (for golang protobufs)

style/1/variables/variables.data-00000-of-00001.REMOVED.git-id

@@ -1 +0,0 @@
-32c1044a28bd76fc7aec2d67c9bfb365b351422e

webcam_stream.py

@@ -80,7 +80,7 @@ def main():
     frame_rate = st.text(f'Frames per second: 0')
 
     if webcam_flag:
-        video_capture = WebcamVideoStream('http://192.168.0.10:4747/video')
+        video_capture = WebcamVideoStream(0)
         start = time.time()
         total_frames = 0
         try: