Skip to content
This repository has been archived by the owner on Jul 2, 2021. It is now read-only.

[DO NOT MERGE] pfnCI -> flexCI #919

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[DO NOT MERGE] pfnCI -> flexCI #919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a8dc8c
.pfnci -> .flexci
Hakuyume Jul 31, 2019
8bda736
pfnci_skip -> flexci_skip
Hakuyume Jul 31, 2019
502d698
Merge branch 'master' into flexci
Hakuyume Jul 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pfnci/cache.sh → .flexci/cache.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ do
docker build \
--cache-from ${DOCKER_IMAGE} \
--tag ${DOCKER_IMAGE} \
.pfnci/docker/${DOCKER_TAG}/
.flexci/docker/${DOCKER_TAG}/
docker push ${DOCKER_IMAGE}
done
2 changes: 1 addition & 1 deletion .pfnci/common.sh → .flexci/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ docker pull ${DOCKER_IMAGE} || true
docker build \
--cache-from ${DOCKER_IMAGE} \
--tag ${DOCKER_IMAGE} \
chainercv/.pfnci/docker/${DOCKER_TAG}/
chainercv/.flexci/docker/${DOCKER_TAG}/
62 changes: 31 additions & 31 deletions .pfnci/config.pbtxt → .flexci/config.pbtxt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ configs {
time_limit {
seconds: 1800
}
command: "sh .pfnci/cache.sh"
command: "sh .flexci/cache.sh"
}
}
configs {
Expand All @@ -25,7 +25,7 @@ configs {
time_limit {
seconds: 3600
}
command: "sh .pfnci/tests.sh"
command: "sh .flexci/tests.sh"
environment_variables {
key: "PYTHON"
value: "2"
Expand All @@ -49,7 +49,7 @@ configs {
disk: 10
gpu: 1
}
command: "sh .pfnci/tests_gpu.sh"
command: "sh .flexci/tests_gpu.sh"
environment_variables {
key: "PYTHON"
value: "2"
Expand All @@ -75,7 +75,7 @@ configs {
time_limit {
seconds: 3600
}
command: "sh .pfnci/tests.sh"
command: "sh .flexci/tests.sh"
environment_variables {
key: "PYTHON"
value: "2"
Expand All @@ -99,7 +99,7 @@ configs {
disk: 10
gpu: 1
}
command: "sh .pfnci/tests_gpu.sh"
command: "sh .flexci/tests_gpu.sh"
environment_variables {
key: "PYTHON"
value: "2"
Expand All @@ -126,7 +126,7 @@ configs {
time_limit {
seconds: 1800
}
command: "sh .pfnci/examples_tests.sh"
command: "sh .flexci/examples_tests.sh"
environment_variables {
key: "PYTHON"
value: "2"
Expand All @@ -152,7 +152,7 @@ configs {
time_limit {
seconds: 3600
}
command: "sh .pfnci/tests.sh"
command: "sh .flexci/tests.sh"
environment_variables {
key: "PYTHON"
value: "2"
Expand All @@ -176,7 +176,7 @@ configs {
disk: 10
gpu: 1
}
command: "sh .pfnci/tests_gpu.sh"
command: "sh .flexci/tests_gpu.sh"
environment_variables {
key: "PYTHON"
value: "2"
Expand All @@ -202,7 +202,7 @@ configs {
time_limit {
seconds: 3600
}
command: "sh .pfnci/tests.sh"
command: "sh .flexci/tests.sh"
environment_variables {
key: "PYTHON"
value: "2"
Expand All @@ -226,7 +226,7 @@ configs {
disk: 10
gpu: 1
}
command: "sh .pfnci/tests_gpu.sh"
command: "sh .flexci/tests_gpu.sh"
environment_variables {
key: "PYTHON"
value: "2"
Expand All @@ -253,7 +253,7 @@ configs {
time_limit {
seconds: 1800
}
command: "sh .pfnci/examples_tests.sh"
command: "sh .flexci/examples_tests.sh"
environment_variables {
key: "PYTHON"
value: "2"
Expand All @@ -279,7 +279,7 @@ configs {
time_limit {
seconds: 3600
}
command: "sh .pfnci/tests.sh"
command: "sh .flexci/tests.sh"
environment_variables {
key: "PYTHON"
value: "2"
Expand All @@ -303,7 +303,7 @@ configs {
disk: 10
gpu: 1
}
command: "sh .pfnci/tests_gpu.sh"
command: "sh .flexci/tests_gpu.sh"
environment_variables {
key: "PYTHON"
value: "2"
Expand All @@ -329,7 +329,7 @@ configs {
time_limit {
seconds: 3600
}
command: "sh .pfnci/tests.sh"
command: "sh .flexci/tests.sh"
environment_variables {
key: "PYTHON"
value: "2"
Expand All @@ -353,7 +353,7 @@ configs {
disk: 10
gpu: 1
}
command: "sh .pfnci/tests_gpu.sh"
command: "sh .flexci/tests_gpu.sh"
environment_variables {
key: "PYTHON"
value: "2"
Expand All @@ -380,7 +380,7 @@ configs {
time_limit {
seconds: 1800
}
command: "sh .pfnci/examples_tests.sh"
command: "sh .flexci/examples_tests.sh"
environment_variables {
key: "PYTHON"
value: "2"
Expand All @@ -406,7 +406,7 @@ configs {
time_limit {
seconds: 3600
}
command: "sh .pfnci/tests.sh"
command: "sh .flexci/tests.sh"
environment_variables {
key: "PYTHON"
value: "3"
Expand All @@ -430,7 +430,7 @@ configs {
disk: 10
gpu: 1
}
command: "sh .pfnci/tests_gpu.sh"
command: "sh .flexci/tests_gpu.sh"
environment_variables {
key: "PYTHON"
value: "3"
Expand All @@ -456,7 +456,7 @@ configs {
time_limit {
seconds: 3600
}
command: "sh .pfnci/tests.sh"
command: "sh .flexci/tests.sh"
environment_variables {
key: "PYTHON"
value: "3"
Expand All @@ -480,7 +480,7 @@ configs {
disk: 10
gpu: 1
}
command: "sh .pfnci/tests_gpu.sh"
command: "sh .flexci/tests_gpu.sh"
environment_variables {
key: "PYTHON"
value: "3"
Expand All @@ -507,7 +507,7 @@ configs {
time_limit {
seconds: 1800
}
command: "sh .pfnci/examples_tests.sh"
command: "sh .flexci/examples_tests.sh"
environment_variables {
key: "PYTHON"
value: "3"
Expand All @@ -533,7 +533,7 @@ configs {
time_limit {
seconds: 3600
}
command: "sh .pfnci/tests.sh"
command: "sh .flexci/tests.sh"
environment_variables {
key: "PYTHON"
value: "3"
Expand All @@ -557,7 +557,7 @@ configs {
disk: 10
gpu: 1
}
command: "sh .pfnci/tests_gpu.sh"
command: "sh .flexci/tests_gpu.sh"
environment_variables {
key: "PYTHON"
value: "3"
Expand All @@ -583,7 +583,7 @@ configs {
time_limit {
seconds: 3600
}
command: "sh .pfnci/tests.sh"
command: "sh .flexci/tests.sh"
environment_variables {
key: "PYTHON"
value: "3"
Expand All @@ -607,7 +607,7 @@ configs {
disk: 10
gpu: 1
}
command: "sh .pfnci/tests_gpu.sh"
command: "sh .flexci/tests_gpu.sh"
environment_variables {
key: "PYTHON"
value: "3"
Expand All @@ -634,7 +634,7 @@ configs {
time_limit {
seconds: 1800
}
command: "sh .pfnci/examples_tests.sh"
command: "sh .flexci/examples_tests.sh"
environment_variables {
key: "PYTHON"
value: "3"
Expand All @@ -660,7 +660,7 @@ configs {
time_limit {
seconds: 3600
}
command: "sh .pfnci/tests.sh"
command: "sh .flexci/tests.sh"
environment_variables {
key: "PYTHON"
value: "3"
Expand All @@ -684,7 +684,7 @@ configs {
disk: 10
gpu: 1
}
command: "sh .pfnci/tests_gpu.sh"
command: "sh .flexci/tests_gpu.sh"
environment_variables {
key: "PYTHON"
value: "3"
Expand All @@ -710,7 +710,7 @@ configs {
time_limit {
seconds: 3600
}
command: "sh .pfnci/tests.sh"
command: "sh .flexci/tests.sh"
environment_variables {
key: "PYTHON"
value: "3"
Expand All @@ -734,7 +734,7 @@ configs {
disk: 10
gpu: 1
}
command: "sh .pfnci/tests_gpu.sh"
command: "sh .flexci/tests_gpu.sh"
environment_variables {
key: "PYTHON"
value: "3"
Expand All @@ -761,7 +761,7 @@ configs {
time_limit {
seconds: 1800
}
command: "sh .pfnci/examples_tests.sh"
command: "sh .flexci/examples_tests.sh"
environment_variables {
key: "PYTHON"
value: "3"
Expand Down
0 .pfnci/docker/devel-minimal/Dockerfile → .flexci/docker/devel-minimal/Dockerfile
View file
Open in desktop
File renamed without changes.
0 .pfnci/docker/devel/Dockerfile → .flexci/docker/devel/Dockerfile
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .pfnci/examples_tests.sh → .flexci/examples_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ docker run --runtime=nvidia --interactive --rm \
--env MPIEXEC='mpiexec -n 2 --allow-run-as-root' \
--env MPLBACKEND=agg \
--env CHAINERCV_DOWNLOAD_REPORT=OFF \
--env PFNCI_SKIP='echo SKIP:' \
--env FLEXCI_SKIP='echo SKIP:' \
${DOCKER_IMAGE} \
sh -ex << EOD
. ./install.sh
Expand Down
8 changes: 4 additions & 4 deletions .pfnci/gen_config.py → .flexci/gen_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,18 @@ def test_config(python, chainer, optional, target):
value['requirement']['cpu'] = 6
value['requirement']['memory'] = 36
value['time_limit'] = {'seconds': 3600}
value['command'] = 'sh .pfnci/tests.sh'
value['command'] = 'sh .flexci/tests.sh'
elif target == 'gpu':
key += '.gpu'
value['requirement']['gpu'] = 1
value['command'] = 'sh .pfnci/tests_gpu.sh'
value['command'] = 'sh .flexci/tests_gpu.sh'
elif target == 'examples':
key += '.examples'
value['requirement']['cpu'] = 6
value['requirement']['memory'] = 36
value['requirement']['gpu'] = 2
value['time_limit'] = {'seconds': 1800}
value['command'] = 'sh .pfnci/examples_tests.sh'
value['command'] = 'sh .flexci/examples_tests.sh'

return key, value

Expand All @@ -62,7 +62,7 @@ def main():
('time_limit', OrderedDict((
('seconds', 1800),
))),
('command', 'sh .pfnci/cache.sh'),
('command', 'sh .flexci/cache.sh'),
))
))

Expand Down
4 changes: 2 additions & 2 deletions .pfnci/tests.sh → .flexci/tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ docker run --interactive --rm \
pip${PYTHON} install --user pytest-xdist
cd chainercv/
python${PYTHON} -m pytest --color=no -n $(nproc) \
-m 'not pfnci_skip and not gpu and not mpi' tests/
-m 'not flexci_skip and not gpu and not mpi' tests/
if which mpiexec; then
mpiexec -n 2 --allow-run-as-root \
python${PYTHON} -m pytest --color=no \
-m 'not pfnci_skip and not gpu and mpi' tests/
-m 'not flexci_skip and not gpu and mpi' tests/
fi
EOD
4 changes: 2 additions & 2 deletions .pfnci/tests_gpu.sh → .flexci/tests_gpu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ docker run --runtime=nvidia --interactive --rm \
. ./install.sh
cd chainercv/
python${PYTHON} -m pytest --color=no \
-m 'not pfnci_skip and gpu and not mpi' tests/
-m 'not flexci_skip and gpu and not mpi' tests/
if which mpiexec; then
mpiexec -n 2 --allow-run-as-root \
python${PYTHON} -m pytest --color=no \
-m 'not pfnci_skip and gpu and mpi' tests/
-m 'not flexci_skip and gpu and mpi' tests/
fi
EOD
4 changes: 2 additions & 2 deletions chainercv/utils/testing/attr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

try:
import pytest
pfnci_skip = pytest.mark.pfnci_skip
flexci_skip = pytest.mark.flexci_skip

except ImportError:
from chainer.testing.attr import _dummy_callable
pfnci_skip = _dummy_callable
flexci_skip = _dummy_callable


def mpi(f):
Expand Down
2 changes: 1 addition & 1 deletion examples_tests/detection_tests/test_visualize_models.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
cd examples/detection

$PFNCI_SKIP $PYTHON visualize_models.py
$FLEXCI_SKIP $PYTHON visualize_models.py
4 changes: 2 additions & 2 deletions examples_tests/fcis_tests/test_demo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cd examples/fcis

$PFNCI_SKIP $PYTHON demo.py --dataset sbd $SAMPLE_IMAGE
$FLEXCI_SKIP $PYTHON demo.py --dataset sbd $SAMPLE_IMAGE
$PYTHON demo.py --dataset sbd --gpu 0 $SAMPLE_IMAGE
$PFNCI_SKIP $PYTHON demo.py --dataset coco $SAMPLE_IMAGE
$FLEXCI_SKIP $PYTHON demo.py --dataset coco $SAMPLE_IMAGE
$PYTHON demo.py --dataset coco --gpu 0 $SAMPLE_IMAGE
Loading