[tutorial] final touches on tutorial images and a learn client for yunqi

Author: jhauswald

Dockerfile

@@ -113,6 +113,7 @@ RUN cd /usr/src \
 RUN apt-get install -y supervisor
 RUN apt-get install -y flac
 RUN apt-get install -y gawk
+RUN apt-get install -y imagemagick
 
 ## install lucida
 # fixes some weird OE compiliation issue

Makefile

@@ -1,4 +1,6 @@
-SUBDIRS=tonic-suite lucida lucida-suite
+SUBDIRS=tonic-suite lucida-suite lucida 
+TESTSUBDIRS=tonic-suite lucida-suite
+
 DOCKER_CONTAINER=claritylab/lucida
 VERSION=tutorial
 

Makefile.common

@@ -12,7 +12,7 @@ all-sub:
 	$(foreach var,$(SUBDIRS),$(MAKE) -C $(var) all || exit 1;)
 
 test-sub:
-	$(foreach var,$(SUBDIRS),$(MAKE) -C $(var) test || exit 1;)
+	$(foreach var,$(TESTSUBDIRS),$(MAKE) -C $(var) test || exit 1;)
 
 clean-sub:
 	$(foreach var,$(SUBDIRS),$(MAKE) -C $(var) clean || exit 1;)

lucida-suite/crf/pthread/Makefile

@@ -26,7 +26,6 @@ $(EXEC): $(OBJECTS) Makefile
 test: CXX_FLAGS += -DTESTING
 test: all
 	@./$(EXEC) $(THREADS) $(MODEL) $(INPUT)
-	-@diff -q ../input/$(EXEC).baseline ../input/$(EXEC).pthread
 
 # To remove generated files
 clean:

lucida-suite/gmm/pthread/Makefile

@@ -25,7 +25,6 @@ $(EXEC): $(OBJECTS) Makefile
 test: CXX_FLAGS += -DTESTING
 test: all
 	@./$(EXEC) $(THREADS) $(SCORES) $(INPUT)
-	-@diff -q ../input/$(EXEC).baseline ../input/$(EXEC).pthread
 
 # To remove generated files
 clean:

lucida-suite/regex/input/regex_data.tar.gz

@@ -27,7 +27,6 @@ $(EXEC): $(OBJECTS) Makefile
 test: CXX_FLAGS += -DTESTING
 test: all
 	@./$(EXEC) $(THREADS) $(NUM_PATTERNS) $(PATTERNS) $(NUM_QUESTIONS) $(QUESTIONS)
-	-@diff -q ../input/$(EXEC).baseline ../input/$(EXEC).pthread
 
 # To remove generated files
 clean: