From e12500c87a903afaf4b86dffbcbde3d5374f57c4 Mon Sep 17 00:00:00 2001
From: Emilio Castillo <ecastill@preferred.jp>
Date: Wed, 1 Apr 2020 02:03:40 +0000
Subject: [PATCH 1/5] test

---
 .pfnci/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pfnci/run.sh b/.pfnci/run.sh
index ab5c1bc9e83d..9473373bc8b3 100644
--- 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:=$(2)}"
 
 # Use multi-process service to prevent GPU flakiness caused by running many
 # processes on a GPU.  Specifically, it seems running more than 16 processes

From a35e0707f4c3a3e9d686ff8fcf79db3a4b5cf5a2 Mon Sep 17 00:00:00 2001
From: Emilio Castillo <ecastill@preferred.jp>
Date: Wed, 1 Apr 2020 02:05:10 +0000
Subject: [PATCH 2/5] fix

---
 .pfnci/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pfnci/run.sh b/.pfnci/run.sh
index 9473373bc8b3..c7caeddf951d 100644
--- 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:=$(2)}"
+: "${XPYTEST_NUM_THREADS:=2}"
 
 # Use multi-process service to prevent GPU flakiness caused by running many
 # processes on a GPU.  Specifically, it seems running more than 16 processes

From b86e9c027fcc2c5ea4e6f0b27869441996b57e5e Mon Sep 17 00:00:00 2001
From: Emilio Castillo <ecastill@preferred.jp>
Date: Wed, 1 Apr 2020 02:29:19 +0000
Subject: [PATCH 3/5] fix

---
 .pfnci/run.sh    | 4 ++--
 .pfnci/script.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pfnci/run.sh b/.pfnci/run.sh
index c7caeddf951d..65e40345bd08 100644
--- a/.pfnci/run.sh
+++ b/.pfnci/run.sh
@@ -94,7 +94,7 @@ test_py37() {
   fi
   xpytest_args=(
       --python=python3.7 -m "${marker}"
-      --bucket="${bucket}" --thread="$(( XPYTEST_NUM_THREADS / bucket ))"
+      --bucket="${bucket}" --thread="2"
       --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="2"
       --hint="/chainer/.pfnci/hint.pbtxt"
       --retry=1
   )
diff --git a/.pfnci/script.sh b/.pfnci/script.sh
index 9b9187dd9a04..67ae43a35414 100644
--- 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=2")
       if [ "${SPREADSHEET_ID:-}" != '' ]; then
         docker_args+=(--env="SPREADSHEET_ID=${SPREADSHEET_ID}")
       fi

From 3df1b99543d5039ba6c3c6c4ffedf6bf04d737d6 Mon Sep 17 00:00:00 2001
From: Emilio Castillo <ecastill@preferred.jp>
Date: Wed, 1 Apr 2020 03:21:04 +0000
Subject: [PATCH 4/5] wip

---
 .pfnci/script.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pfnci/script.sh b/.pfnci/script.sh
index 67ae43a35414..440bfd17813f 100644
--- 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=2")
+          --env="XPYTEST_NUM_THREADS=4")
       if [ "${SPREADSHEET_ID:-}" != '' ]; then
         docker_args+=(--env="SPREADSHEET_ID=${SPREADSHEET_ID}")
       fi

From 386bc79faa00a2267781929aa407d42b4260a79a Mon Sep 17 00:00:00 2001
From: Emilio Castillo <ecastill@preferred.jp>
Date: Wed, 1 Apr 2020 04:14:46 +0000
Subject: [PATCH 5/5] fix

---
 .pfnci/run.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pfnci/run.sh b/.pfnci/run.sh
index 65e40345bd08..d82de0cd3340 100644
--- 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:=2}"
+: "${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="2"
+      --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="2"
+      --bucket="${bucket}" --thread="4"
       --hint="/chainer/.pfnci/hint.pbtxt"
       --retry=1
   )