Update commands and settings to work with docker

actions.mk

@@ -68,7 +68,7 @@ show_reconstruction:
 		--n_components 6
 
 show_ibug:
-	python src/main.py \
+	$(BASE_DOCKER_CMD) python main.py \
 		--reconstruct \
 		--files data/imm_face_db/*.jpg\
 		--model_texture_file data/pca_ibug_texture_model.npy \
@@ -76,7 +76,7 @@ show_ibug:
 		--shape_type ibug
 
 profile_reconstruction:
-	python -m cProfile src/main.py \
+	$(BASE_DOCKER_CMD) python -m cProfile main.py \
 		--reconstruct \
 		--files data/imm_face_db/*.asf \
 		--model_texture_file data/pca_imm_texture_model.npy \
@@ -85,7 +85,7 @@ profile_reconstruction:
 		--n_components 6
 
 graph_reconstruction:
-	python ./src/main.py \
+	$(BASE_DOCKER_CMD) python main.py \
 		--generate_call_graph \
 		--files data/imm_face_db/*.asf \
 		--model_texture_file data/pca_imm_texture_model.npy \
@@ -95,7 +95,7 @@ graph_reconstruction:
 
 
 test_landmarks:
-	./src/main.py \
+	$(BASE_DOCKER_CMD) python main.py \
 		--test_landmarks \
 		--image data/test_data/lenna.jpg
 
@@ -105,7 +105,7 @@ test:
 
 .PHONY:= server
 server:
-	#(cd src/; python -m tornado.autoreload server.py)
+	$(BASE_DOCKER_CMD) python -m tornado.autoreload server.py
 
 .PHONY:= ember
 ember:

makefile

-#VIRTUALENV := venv
-#PYTHON := python2.7
-#PYTHON_BIN_PATH := /usr/local/bin/$(PYTHON)
-#SITE_PACKAGES := $(VIRTUALENV)/lib/$(PYTHON)/site-packages
-#OPENCV := $(SITE_PACKAGES)/cv.py $(SITE_PACKAGES)/cv2.so
-#TARGETS := $(OPENCV) $(VIRTUALENV) data reconstruction
-
+DEBUG:=1
 VERSION:=v0.1
 IMAGE_TAG:= icyrizard/face-reconstruction.git:$(VERSION)
-DEBUG:=1
 BASE_DOCKER_CMD:= docker run \
 	--rm \
 	--volume /Users/richard/Documents/sighthub/face-reconstruction/data:/data \
 	--volume /Users/richard/Documents/sighthub/face-reconstruction/src:/src \
 	-e "DEBUG=$(DEBUG)" \
+	-p 8888:8888 \
 	$(IMAGE_TAG)
 
 include actions.mk
@@ -28,10 +22,6 @@ OS := $(shell uname)
 build: requirements.txt
 	docker build -t $(IMAGE_TAG) .
 
-#@(source $(VIRTUALENV)/bin/activate; \
-#	pip install -r requirements.txt; \
-#);
-
 run-bash:
 	$(BASE_DOCKER_CMD) --interactive --tty $(IMAGE_TAG) /bin/bash
 

src/server.py

@@ -15,8 +15,7 @@ from reconstruction import reconstruction
 from settings import logger
 from utility import import_dataset_module
 
-BASE = '../viewer/app'
-FILES_DIR = '../data/'
+FILES_DIR = '/data/'
 FACE_DB_NAME = 'imm_face_db'
 FACE_DB = '{}{}'.format(FILES_DIR, FACE_DB_NAME)