Skip to content

Commit

Permalink
Merge pull request #7903 from leofang/revert_timeout
Browse files Browse the repository at this point in the history
Revert CI timeout changes
  • Loading branch information
kmaehashi committed Jan 24, 2024
2 parents 4c5bbf3 + 142ea0c commit 3ab6976
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 37 deletions.
70 changes: 35 additions & 35 deletions .pfnci/config.pbtxt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ configs {
gpu: 1
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "1" }
command: ".pfnci/linux/main-flexci.sh cuda112"
Expand All @@ -31,7 +31,7 @@ configs {
gpu: 2
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "2" }
command: ".pfnci/linux/main-flexci.sh cuda112.multi"
Expand All @@ -49,7 +49,7 @@ configs {
gpu: 1
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "1" }
command: ".pfnci/linux/main-flexci.sh cuda113"
Expand All @@ -67,7 +67,7 @@ configs {
gpu: 2
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "2" }
command: ".pfnci/linux/main-flexci.sh cuda113.multi"
Expand All @@ -85,7 +85,7 @@ configs {
gpu: 1
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "1" }
command: ".pfnci/linux/main-flexci.sh cuda114"
Expand All @@ -103,7 +103,7 @@ configs {
gpu: 2
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "2" }
command: ".pfnci/linux/main-flexci.sh cuda114.multi"
Expand All @@ -121,7 +121,7 @@ configs {
gpu: 1
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "1" }
command: ".pfnci/linux/main-flexci.sh cuda115"
Expand All @@ -139,7 +139,7 @@ configs {
gpu: 2
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "2" }
command: ".pfnci/linux/main-flexci.sh cuda115.multi"
Expand All @@ -157,7 +157,7 @@ configs {
gpu: 1
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "1" }
command: ".pfnci/linux/main-flexci.sh cuda116"
Expand All @@ -175,7 +175,7 @@ configs {
gpu: 2
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "2" }
command: ".pfnci/linux/main-flexci.sh cuda116.multi"
Expand All @@ -193,7 +193,7 @@ configs {
gpu: 1
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "1" }
command: ".pfnci/linux/main-flexci.sh cuda117"
Expand All @@ -211,7 +211,7 @@ configs {
gpu: 2
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "2" }
command: ".pfnci/linux/main-flexci.sh cuda117.multi"
Expand All @@ -229,7 +229,7 @@ configs {
gpu: 1
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "1" }
command: ".pfnci/linux/main-flexci.sh cuda118"
Expand All @@ -247,7 +247,7 @@ configs {
gpu: 2
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "2" }
command: ".pfnci/linux/main-flexci.sh cuda118.multi"
Expand All @@ -265,7 +265,7 @@ configs {
gpu: 1
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "1" }
command: ".pfnci/linux/main-flexci.sh cuda120"
Expand All @@ -283,7 +283,7 @@ configs {
gpu: 2
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "2" }
command: ".pfnci/linux/main-flexci.sh cuda120.multi"
Expand All @@ -301,7 +301,7 @@ configs {
gpu: 1
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "1" }
command: ".pfnci/linux/main-flexci.sh cuda121"
Expand All @@ -319,7 +319,7 @@ configs {
gpu: 2
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "2" }
command: ".pfnci/linux/main-flexci.sh cuda121.multi"
Expand All @@ -337,7 +337,7 @@ configs {
gpu: 1
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "1" }
command: ".pfnci/linux/main-flexci.sh cuda122"
Expand All @@ -355,7 +355,7 @@ configs {
gpu: 2
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "2" }
command: ".pfnci/linux/main-flexci.sh cuda122.multi"
Expand All @@ -373,7 +373,7 @@ configs {
gpu: 1
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "1" }
command: ".pfnci/linux/main-flexci.sh cuda11x-cuda-python"
Expand Down Expand Up @@ -463,7 +463,7 @@ configs {
gpu: 2
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "2" }
command: ".pfnci/linux/main-flexci.sh cuda-head"
Expand All @@ -481,7 +481,7 @@ configs {
gpu: 2
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "2" }
command: ".pfnci/linux/main-flexci-stable.sh cuda-head"
Expand All @@ -499,7 +499,7 @@ configs {
gpu: 1
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "1" }
command: ".pfnci/linux/main-flexci.sh benchmark"
Expand All @@ -516,7 +516,7 @@ configs {
gpu: 1
}
time_limit: {
seconds: 43200
seconds: 21600
}
environment_variables { key: "GPU" value: "1" }
command: ".pfnci/linux/main-flexci.sh benchmark"
Expand Down Expand Up @@ -556,7 +556,7 @@ configs {
image: "windows"
}
time_limit {
seconds: 72000
seconds: 36000
}
checkout_strategy {
include_dot_git: true
Expand All @@ -577,7 +577,7 @@ configs {
image: "windows"
}
time_limit {
seconds: 72000
seconds: 36000
}
checkout_strategy {
include_dot_git: true
Expand All @@ -598,7 +598,7 @@ configs {
image: "windows"
}
time_limit {
seconds: 72000
seconds: 36000
}
checkout_strategy {
include_dot_git: true
Expand All @@ -619,7 +619,7 @@ configs {
image: "windows"
}
time_limit {
seconds: 72000
seconds: 36000
}
checkout_strategy {
include_dot_git: true
Expand All @@ -640,7 +640,7 @@ configs {
image: "windows"
}
time_limit {
seconds: 72000
seconds: 36000
}
checkout_strategy {
include_dot_git: true
Expand All @@ -661,7 +661,7 @@ configs {
image: "windows"
}
time_limit {
seconds: 72000
seconds: 36000
}
checkout_strategy {
include_dot_git: true
Expand All @@ -682,7 +682,7 @@ configs {
image: "windows"
}
time_limit {
seconds: 72000
seconds: 36000
}
checkout_strategy {
include_dot_git: true
Expand All @@ -703,7 +703,7 @@ configs {
image: "windows"
}
time_limit {
seconds: 72000
seconds: 36000
}
checkout_strategy {
include_dot_git: true
Expand All @@ -724,7 +724,7 @@ configs {
image: "windows"
}
time_limit {
seconds: 72000
seconds: 36000
}
checkout_strategy {
include_dot_git: true
Expand All @@ -745,7 +745,7 @@ configs {
image: "windows"
}
time_limit {
seconds: 72000
seconds: 36000
}
checkout_strategy {
include_dot_git: true
Expand Down
2 changes: 1 addition & 1 deletion .pfnci/linux/tests/actions/unittest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ python3 -m pip install --user pytest-timeout pytest-xdist
pushd tests
timeout --signal INT --kill-after 10 60 python3 -c 'import cupy; cupy.show_config(_full=True)'
test_retval=0
timeout --signal INT --kill-after 60 36000 python3 -m pytest "${pytest_opts[@]}" "${PYTEST_FILES[@]}" || test_retval=$?
timeout --signal INT --kill-after 60 18000 python3 -m pytest "${pytest_opts[@]}" "${PYTEST_FILES[@]}" || test_retval=$?
popd

case ${test_retval} in
Expand Down
2 changes: 1 addition & 1 deletion .pfnci/windows/test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ function Main {
echo "CuPy Configuration:"
RunOrDie python -c "import cupy; print(cupy); cupy.show_config()"
echo "Running test..."
$test_retval = RunWithTimeout -timeout 32766 -output ../cupy_test_log.txt -- python -m pytest -rfEX @pytest_opts .
$test_retval = RunWithTimeout -timeout 18000 -output ../cupy_test_log.txt -- python -m pytest -rfEX @pytest_opts .
popd

if (-Not $is_pull_request) {
Expand Down

0 comments on commit 3ab6976

Please sign in to comment.