Merge pull request #882 from Hakuyume/cache-models

Enable model cache in pfnCI
chainer · May 29, 2019 · a709539 · a709539
2 parents 76e7201 + 2c8a43f
commit a709539
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 18 deletions.
diff --git a/.pfnci/config.pbtxt b/.pfnci/config.pbtxt
@@ -118,8 +118,8 @@ configs {
   key: "chainercv.py2.stable.examples"
   value {
     requirement {
-      cpu: 4
-      memory: 24
+      cpu: 6
+      memory: 36
       disk: 10
       gpu: 2
     }
@@ -245,8 +245,8 @@ configs {
   key: "chainercv.py2.latest.examples"
   value {
     requirement {
-      cpu: 4
-      memory: 24
+      cpu: 6
+      memory: 36
       disk: 10
       gpu: 2
     }
@@ -372,8 +372,8 @@ configs {
   key: "chainercv.py2.master.examples"
   value {
     requirement {
-      cpu: 4
-      memory: 24
+      cpu: 6
+      memory: 36
       disk: 10
       gpu: 2
     }
@@ -499,8 +499,8 @@ configs {
   key: "chainercv.py3.stable.examples"
   value {
     requirement {
-      cpu: 4
-      memory: 24
+      cpu: 6
+      memory: 36
       disk: 10
       gpu: 2
     }
@@ -626,8 +626,8 @@ configs {
   key: "chainercv.py3.latest.examples"
   value {
     requirement {
-      cpu: 4
-      memory: 24
+      cpu: 6
+      memory: 36
       disk: 10
       gpu: 2
     }
@@ -753,8 +753,8 @@ configs {
   key: "chainercv.py3.master.examples"
   value {
     requirement {
-      cpu: 4
-      memory: 24
+      cpu: 6
+      memory: 36
       disk: 10
       gpu: 2
     }

diff --git a/.pfnci/examples_tests.sh b/.pfnci/examples_tests.sh
@@ -4,9 +4,12 @@ set -eux
 . $(dirname $0)/common.sh
 
 apt-get install -y --no-install-recommends unzip
-gsutil -q cp gs://chainercv-pfn-public-ci/datasets-tiny.zip .
-unzip -q datasets-tiny.zip
-rm datasets-tiny.zip
+for ZIP in datasets-tiny.zip models.zip
+do
+    gsutil -q cp gs://chainercv-pfn-public-ci/${ZIP} .
+    unzip -q ${ZIP}
+    rm ${ZIP}
+done
 
 curl -L https://cloud.githubusercontent.com/assets/2062128/26187667/9cb236da-3bd5-11e7-8bcf-7dbd4302e2dc.jpg \
      -o sample.jpg

diff --git a/.pfnci/gen_config.py b/.pfnci/gen_config.py
@@ -4,6 +4,7 @@
     $ python gen_config.py > config.pbtxt
 """
 
+from __future__ import print_function
 from collections import OrderedDict
 import itertools
 
@@ -39,6 +40,8 @@ def test_config(python, chainer, optional, target):
         value['command'] = 'sh .pfnci/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'

diff --git a/.pfnci/tests.sh b/.pfnci/tests.sh
@@ -4,9 +4,12 @@ set -eux
 . $(dirname $0)/common.sh
 
 apt-get install -y --no-install-recommends unzip
-gsutil -q cp gs://chainercv-pfn-public-ci/datasets-tiny.zip .
-unzip -q datasets-tiny.zip
-rm datasets-tiny.zip
+for ZIP in datasets-tiny.zip models.zip
+do
+    gsutil -q cp gs://chainercv-pfn-public-ci/${ZIP} .
+    unzip -q ${ZIP}
+    rm ${ZIP}
+done
 
 docker run --interactive --rm \
        --volume $(pwd):/root/ --workdir /root/ \