Merge 15f66fc into d00b3cb

chainer · Apr 1, 2020 · 9b586c9 · 9b586c9
2 parents d00b3cb + 15f66fc
commit 9b586c9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.pfnci/config.pbtxt b/.pfnci/config.pbtxt
@@ -38,15 +38,15 @@ configs {
       gpu: 2
     }
     time_limit: {
-      seconds: 1200
+      seconds: 3600
     }
     checkout_strategy {
       include_dot_git: true
     }
     environment_variables { key: "GPU" value: "2" }
     # NOTE: If # of threads / # of GPUs exceeds 10, GPU tests may cause
     # cudaErrorLaunchFailure because of insufficient memory on GPU.
-    environment_variables { key: "XPYTEST_NUM_THREADS" value: "30" }
+    environment_variables { key: "XPYTEST_NUM_THREADS" value: "4" }
     environment_variables {
       key: "SPREADSHEET_ID"
       value: "1u5OYiPOL3XRppn73XBSgR-XyDuHKb_4Ilmx1kgJfa-k"
@@ -89,15 +89,15 @@ configs {
       gpu: 2
     }
     time_limit: {
-      seconds: 1200
+      seconds: 2400
     }
     checkout_strategy {
       include_dot_git: true
     }
     environment_variables { key: "GPU" value: "2" }
     # NOTE: If # of threads / # of GPUs exceeds 10, GPU tests may cause
     # cudaErrorLaunchFailure because of insufficient memory on GPU.
-    environment_variables { key: "XPYTEST_NUM_THREADS" value: "30" }
+    environment_variables { key: "XPYTEST_NUM_THREADS" value: "4" }
     environment_variables {
       key: "SPREADSHEET_ID"
       value: "1u5OYiPOL3XRppn73XBSgR-XyDuHKb_4Ilmx1kgJfa-k"

diff --git a/.pfnci/hint.pbtxt b/.pfnci/hint.pbtxt
@@ -35,6 +35,7 @@ rules { name: "chainer_tests/functions_tests/math_tests/test_average.py" xdist:
 rules { name: "chainer_tests/functions_tests/math_tests/test_basic_math.py" xdist: 2 }
 rules { name: "chainer_tests/functions_tests/math_tests/test_maximum.py" xdist: 2 }
 rules { name: "chainer_tests/functions_tests/math_tests/test_prod.py" xdist: 2 }
+rules { name: "chainer_tests/functions_tests/normalization_tests/test_l2_normalization.py" xdist: 2 }
 rules { name: "chainer_tests/functions_tests/math_tests/test_trigonometric.py" xdist: 2 }
 rules { name: "chainer_tests/functions_tests/pooling_tests/test_average_pooling_nd.py" xdist: 2 }
 rules { name: "chainer_tests/links_tests/normalization_tests/test_batch_normalization.py" xdist: 2 }

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:=8}"
 
 # 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="6"
       --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="6"
       --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=8")
       if [ "${SPREADSHEET_ID:-}" != '' ]; then
         docker_args+=(--env="SPREADSHEET_ID=${SPREADSHEET_ID}")
       fi