Skip to content

Commit

Permalink
Merge 9d2c2d4 into d00b3cb
Browse files Browse the repository at this point in the history
  • Loading branch information
emcastillo committed Apr 1, 2020
2 parents d00b3cb + 9d2c2d4 commit da128eb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .pfnci/config.pbtxt
Expand Up @@ -38,15 +38,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"
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions .pfnci/run.sh
Expand Up @@ -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
Expand Down Expand Up @@ -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
)
Expand Down Expand Up @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion .pfnci/script.sh
Expand Up @@ -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
Expand Down

0 comments on commit da128eb

Please sign in to comment.