Merge pull request #509 from niboshi/use-pip

Use pip for installing Chainer/CuPy
chainer · Jun 10, 2019 · 9e5a25a · 9e5a25a
2 parents 8420a58 + 0cc0ece
commit 9e5a25a
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 27 deletions.
diff --git a/test.sh b/test.sh
@@ -2,13 +2,9 @@
 
 # Chainer setup script installs specific version of CuPy.
 # We need to install Chainer first for test.
-cd chainer
-python setup.py install --user
-cd ..
+pip install --user chainer/
 
-cd cupy
-python setup.py build -j 4 develop install --user || python setup.py develop install --user
-cd ..
+pip install --user -e cupy/
 
 cd chainer
 

diff --git a/test_cpu.sh b/test_cpu.sh
@@ -1,8 +1,9 @@
 #!/bin/bash -e
 
 
+pip install --user -e chainer/
+
 cd chainer
-python setup.py develop install --user
 
 export CUPY_DUMP_CUDA_SOURCE_ON_ERROR=1
 

diff --git a/test_cupy.sh b/test_cupy.sh
@@ -1,7 +1,8 @@
 #!/bin/bash -ex
 
+pip install --user -e cupy/
+
 cd cupy
-python setup.py build -j 4 develop install --user || python setup.py develop install --user
 
 export CUPY_DUMP_CUDA_SOURCE_ON_ERROR=1
 

diff --git a/test_cupy_doc.sh b/test_cupy_doc.sh
@@ -1,9 +1,9 @@
 #!/bin/sh -ex
 
-cd cupy
-python setup.py -q build -j 4 develop install --user || python setup.py -q develop install --user
+pip install --user -e cupy/
+
+cd cupy/docs
 
-cd docs
 export SPHINXOPTS=-W
 
 # Generate HTML and preserve it for preview.

diff --git a/test_cupy_slow.sh b/test_cupy_slow.sh
@@ -1,7 +1,8 @@
 #!/bin/bash -ex
 
+pip install --user -e cupy/
+
 cd cupy
-python setup.py build -j 4 develop install --user || python setup.py develop install --user
 
 export CUPY_DUMP_CUDA_SOURCE_ON_ERROR=1
 

diff --git a/test_doc.sh b/test_doc.sh
@@ -1,8 +1,6 @@
 #!/bin/sh -ex
 
-cd cupy
-python setup.py -q build -j 4 develop install --user || python setup.py -q develop install --user
-cd ..
+pip install --user -e cupy/
 
 cd chainer
 pip install --user -e .[docs]

diff --git a/test_example.sh b/test_example.sh
@@ -2,9 +2,7 @@
 
 pip install -U pip --user
 
-cd cupy
-python setup.py build -j 4 develop install --user || python setup.py develop install --user
-cd ..
+pip install --user -e cupy/
 
 cd chainer
 rm -rf dist

diff --git a/test_prev_example.sh b/test_prev_example.sh
@@ -5,9 +5,7 @@ CHAINER_DIR=chainer-${PREV_VER}
 
 pip install -U pip --user
 
-cd cupy
-python setup.py build -j 4 develop install --user || python setup.py develop install --user
-cd ..
+pip install --user -e cupy/
 
 cd chainer
 rm -rf dist

diff --git a/test_slow.sh b/test_slow.sh
@@ -2,13 +2,9 @@
 
 # Chainer setup script installs specific version of CuPy.
 # We need to install Chainer first for test.
-cd chainer
-python setup.py install --user
-cd ..
+pip install --user chainer/
 
-cd cupy
-python setup.py build -j 4 develop install --user || python setup.py develop install --user
-cd ..
+pip install --user -e cupy/
 
 cd chainer