Merge 386bc79 into d00b3cb

chainer · Apr 1, 2020 · d57e18a · d57e18a
2 parents d00b3cb + 386bc79
commit d57e18a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.pfnci/run.sh b/.pfnci/run.sh
@@ -27,7 +27,7 @@ find /chainer -name "*.pyc" -exec rm -f {} \;
 
 TARGET="$1"
 : "${GPU:=0}"
-: "${XPYTEST_NUM_THREADS:=$(nproc)}"
+: "${XPYTEST_NUM_THREADS:=4}"
 
 # Use multi-process service to prevent GPU flakiness caused by running many
 # processes on a GPU.  Specifically, it seems running more than 16 processes
@@ -94,7 +94,7 @@ test_py37() {
   fi
   xpytest_args=(
       --python=python3.7 -m "${marker}"
-      --bucket="${bucket}" --thread="$(( XPYTEST_NUM_THREADS / bucket ))"
+      --bucket="${bucket}" --thread="4"
       --hint="/chainer/.pfnci/hint.pbtxt"
       --retry=1
   )
@@ -154,7 +154,7 @@ test_py27and35() {
   fi
   xpytest_args=(
       --python=python3.5 -m "${marker}"
-      --bucket="${bucket}" --thread="$(( XPYTEST_NUM_THREADS / bucket ))"
+      --bucket="${bucket}" --thread="4"
       --hint="/chainer/.pfnci/hint.pbtxt"
       --retry=1
   )

diff --git a/.pfnci/script.sh b/.pfnci/script.sh
@@ -53,7 +53,7 @@ main() {
         docker_args+=(--volume="${XPYTEST}:/usr/local/bin/xpytest:ro")
       fi
       docker_args+=(
-          --env="XPYTEST_NUM_THREADS=${XPYTEST_NUM_THREADS:-$(nproc)}")
+          --env="XPYTEST_NUM_THREADS=4")
       if [ "${SPREADSHEET_ID:-}" != '' ]; then
         docker_args+=(--env="SPREADSHEET_ID=${SPREADSHEET_ID}")
       fi