Merge pull request #19 from elephant-track/v0.4.x

ELEPHANT server v0.4.2-> v0.4.3

Dockerfile-test

@@ -1,4 +1,4 @@
-FROM elephant-server:0.4.2
+FROM elephant-server:0.4.3
 
 LABEL maintainer="Ko Sugawara <[email protected]>"
 

Makefile

@@ -5,7 +5,7 @@ help:
 
 ELEPHANT_GPU?=all
 ELEPHANT_WORKSPACE?=${PWD}/workspace
-ELEPHANT_IMAGE_NAME?=elephant-server:0.4.2
+ELEPHANT_IMAGE_NAME?=elephant-server:0.4.3
 ELEPHANT_NVIDIA_GID?=$$(ls -n /dev/nvidia0 2>/dev/null | awk '{print $$4}')
 ELEPHANT_DOCKER?=docker
 
@@ -26,20 +26,29 @@ stop:
 	fi
 
 warmup:
-	$(ELEPHANT_DOCKER) run -it --rm --gpus all $(ELEPHANT_IMAGE_NAME) echo "warming up..."
+	$(eval GPU_ARG:=$(shell \
+	if [ -n "$(ELEPHANT_NVIDIA_GID)" ] && [ -n "$(ELEPHANT_GPU)" ]; then \
+		VAR=$$(echo --gpus '"device=$(ELEPHANT_GPU)"'); \
+	fi;\
+	echo $$VAR))
+	@if [ -n "$(GPU_ARG)" ]; then \
+		$(ELEPHANT_DOCKER) run -it --rm $(GPU_ARG) $(ELEPHANT_IMAGE_NAME) echo "warming up GPU..."; \
+	else \
+		echo "CPU mode..."; \
+	fi
 
 launch: warmup
-	$(ELEPHANT_DOCKER) run -it --rm --gpus '"device=$(ELEPHANT_GPU)"' --shm-size=8g -v $(ELEPHANT_WORKSPACE):/workspace -p 8080:80 -p 5672:5672 \
+	$(ELEPHANT_DOCKER) run -it --rm $(GPU_ARG) --shm-size=8g -v $(ELEPHANT_WORKSPACE):/workspace -p 8080:80 -p 5672:5672 \
 	-e LOCAL_UID=$(shell id -u) -e LOCAL_GID=$(shell id -g) -e NVIDIA_GID=$(ELEPHANT_NVIDIA_GID) \
 	$(ELEPHANT_IMAGE_NAME)
 
 bash: warmup
-	$(ELEPHANT_DOCKER) run -it --rm --gpus '"device=$(ELEPHANT_GPU)"' --shm-size=8g -v $(ELEPHANT_WORKSPACE):/workspace \
+	$(ELEPHANT_DOCKER) run -it --rm $(GPU_ARG) --shm-size=8g -v $(ELEPHANT_WORKSPACE):/workspace \
 	-e LOCAL_UID=$(shell id -u) -e LOCAL_GID=$(shell id -g) -e AS_LOCAL_USER=1 -e NVIDIA_GID=$(ELEPHANT_NVIDIA_GID) \
 	$(ELEPHANT_IMAGE_NAME) /bin/bash
 
-bashroot:
-	$(ELEPHANT_DOCKER) run -it --rm --gpus '"device=$(ELEPHANT_GPU)"' --shm-size=8g -v $(ELEPHANT_WORKSPACE):/workspace \
+bashroot: warmup
+	$(ELEPHANT_DOCKER) run -it --rm $(GPU_ARG) --shm-size=8g -v $(ELEPHANT_WORKSPACE):/workspace \
 	$(ELEPHANT_IMAGE_NAME) /bin/bash
 
 test:

elephant-core/elephant/version.py

@@ -24,4 +24,4 @@
 # ==============================================================================
 """Version definition."""
 
-__version__ = '0.4.2'
+__version__ = '0.4.3'

elephant_server.ipynb

@@ -51,7 +51,7 @@
         "id": "CpJPKG_ATv39"
       },
       "source": [
-        "%env ELEPHANT_SERVER_VERSION = v0.4.2"
+        "%env ELEPHANT_SERVER_VERSION = v0.4.3"
       ],
       "execution_count": null,
       "outputs": []