Merge pull request #90 from sony/fix/20180906-multi-gpu-ci-integration

Fix `-u` option.
sony · Sep 6, 2018 · b15b7c8 · b15b7c8
2 parents ac22e2e + 9a46e1b
commit b15b7c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build-tools/make/build-with-docker.mk b/build-tools/make/build-with-docker.mk
@@ -105,7 +105,7 @@ bwd-nnabla-ext-cuda-test: docker_image_build_cuda
 .PHONY: bwd-nnabla-ext-cuda-multi-gpu-test
 bwd-nnabla-ext-cuda-multi-gpu-test: docker_image_build_cuda_multi_gpu
 	cd $(NNABLA_EXT_CUDA_DIRECTORY) \
-	&& nvidia-docker run $(DOCKER_RUN_OPTS) -u 0 $(DOCKER_IMAGE_BUILD_NNABLA_EXT_CUDA_MULTI_GPU) make -f build-tools/make/build.mk nnabla-ext-cuda-multi-gpu-test-local
+	&& nvidia-docker run $(DOCKER_RUN_OPTS) $(DOCKER_IMAGE_BUILD_NNABLA_EXT_CUDA_MULTI_GPU) make -f build-tools/make/build.mk nnabla-ext-cuda-multi-gpu-test-local
 
 .PHONY: bwd-nnabla-ext-cuda-shell
 bwd-nnabla-ext-cuda-shell: docker_image_build_cuda

diff --git a/build-tools/make/build.mk b/build-tools/make/build.mk
@@ -164,5 +164,5 @@ nnabla-ext-cuda-test-local: nnabla-install nnabla-ext-cuda-install
 nnabla-ext-cuda-multi-gpu-test-local: nnabla-ext-cuda-multi-gpu-install
 	cd $(BUILD_EXT_CUDA_DIRECTORY_WHEEL_MULTI_GPU) \
 	&& PYTHONPATH=$(NNABLA_EXT_CUDA_DIRECTORY)/python/test:$(NNABLA_DIRECTORY)/python/test \
-			mpirun -n 2 --allow-run-as-root python -m pytest --test-communicator --communicator-gpus=0,1 $(NNABLA_DIRECTORY)/python/test/communicator/ \
+			mpiexec -q -n 2 python -m pytest --test-communicator --communicator-gpus=0,1 $(NNABLA_DIRECTORY)/python/test/communicator/ \
 	&& python -m pytest $(NNABLA_DIRECTORY)/python/test/