digits Slurm

.gitignore

@@ -16,3 +16,47 @@ TAGS
 /build/
 /dist/
 *.egg-info/
+
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/
+.idea/workspace.xml
+.idea/tasks.xml
+
+# Sensitive or high-churn files:
+.idea/dataSources/
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/dataSources.local.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+
+# Gradle:
+.idea/gradle.xml
+.idea/libraries
+
+# Mongo Explorer plugin:
+.idea/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties

.nfs000000000f7c03bc0003551c

@@ -0,0 +1,6 @@
+#!/bin/bash
+# Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+
+set -e
+
+python2 -m digits $@

.travis.yml

@@ -121,7 +121,8 @@ before_install:
     - deactivate
     - virtualenv --system-site-packages ~/venv
     - source ~/venv/bin/activate
-
+    - "sudo apt-get install libboost-filesystem1.55-dev 
+libboost-python1.55-dev libboost-system1.55-dev libboost-thread1.55-dev"
 install:
     - mkdir -p ~/.config/matplotlib
     - echo "backend:agg" > ~/.config/matplotlib/matplotlibrc

digits/config/__init__.py

@@ -5,13 +5,15 @@
 option_list = {}
 
 from . import (  # noqa
+    system_type,
     caffe,
     gpu_list,
     jobs_dir,
     log_file,
     torch,
     server_name,
     store_option,
+
 )
 
 

digits/config/system_type.py

@@ -0,0 +1,10 @@
+from __future__ import absolute_import
+from . import option_list
+from digits.extensions.cluster_management.cluster_factory import cluster_factory
+if cluster_factory.use_cluster:
+    system_type = cluster_factory.selected_system
+
+else:
+    system_type = 'interactive'
+
+option_list['system_type'] = system_type

digits/dataset/forms.py

@@ -3,6 +3,7 @@
 
 from flask.ext.wtf import Form
 from wtforms.validators import DataRequired
+from wtforms import validators
 
 from digits import utils
 
@@ -20,3 +21,13 @@ class DatasetForm(Form):
     group_name = utils.forms.StringField('Group Name',
                                          tooltip="An optional group name for organization on the main page."
                                          )
+
+    # slurm options
+    slurm_selector = utils.forms.BooleanField('Use slurm?')
+    slurm_time_limit = utils.forms.IntegerField('Task time limit', tooltip='in minutes', default=0, )
+    slurm_cpu_count = utils.forms.IntegerField('Use this many cores', validators=[
+        validators.NumberRange(min=1, max=128)
+    ], default=8, )
+    slurm_mem = utils.forms.IntegerField('Use this much memory (GB)', validators=[
+        validators.NumberRange(min=1, max=128)
+    ], default=10, )

digits/dataset/generic/job.py

@@ -35,6 +35,15 @@ def __init__(self,
         self.extension_id = extension_id
         self.extension_userdata = extension_userdata
 
+        try:
+            self.time_limit = kwargs.pop('time_limit', None)
+            self.s_cpu_count = kwargs.pop('s_cpu_count', None)
+            self.s_mem = kwargs.pop('s_mem', None)
+        except:
+            self.time_limit
+            self.s_cpu_count
+            self.s_mem
+
         super(GenericDatasetJob, self).__init__(**kwargs)
         self.pickver_job_dataset_extension = PICKLE_VERSION
 
@@ -45,6 +54,9 @@ def __init__(self,
                 job=self,
                 backend=self.backend,
                 stage=stage,
+                time_limit=self.time_limit,
+                s_cpu_count=self.s_cpu_count,
+                s_mem=self.s_mem,
             )
             )
 

digits/dataset/generic/views.py

@@ -3,6 +3,8 @@
 
 import os
 # Find the best implementation available
+from digits.config import config_value
+
 try:
     from cStringIO import StringIO
 except ImportError:
@@ -54,7 +56,8 @@ def new(extension_id):
         extension_title=extension.get_title(),
         extension_id=extension_id,
         extension_html=rendered_extension,
-        form=form
+        form=form,
+        system_type=config_value('system_type')
     )
 
 
@@ -96,14 +99,17 @@ def create(extension_id):
                 extension_id=extension_id,
                 extension_html=rendered_extension,
                 form=form,
-                errors=errors), 400
+                errors=errors,
+                system_type=config_value('system_type')
+            ), 400
 
     # create instance of extension class
     extension = extension_class(**extension_form.data)
 
     job = None
     try:
         # create job
+
         job = GenericDatasetJob(
             username=utils.auth.get_username(),
             name=form.dataset_name.data,
@@ -116,6 +122,9 @@ def create(extension_id):
             force_same_shape=form.dsopts_force_same_shape.data,
             extension_id=extension_id,
             extension_userdata=extension.get_user_data(),
+            time_limit=form.slurm_time_limit.data,
+            s_cpu_count=form.slurm_cpu_count.data,
+            s_mem=form.slurm_mem.data,
         )
 
         # Save form data with the job so we can easily clone it later.
@@ -199,7 +208,7 @@ def explore():
     return flask.render_template(
         'datasets/images/explore.html',
         page=page, size=size, job=job, imgs=imgs, labels=None,
-        pages=pages, label=None, total_entries=total_entries, db=db)
+        pages=pages, label=None, total_entries=total_entries, db=db, system_type=config_value('system_type'))
 
 
 def show(job, related_jobs=None):

digits/dataset/images/classification/views.py

@@ -5,6 +5,8 @@
 import shutil
 
 # Find the best implementation available
+from digits.config import config_value
+
 try:
     from cStringIO import StringIO
 except ImportError:
@@ -23,7 +25,6 @@
 from digits.utils.routing import request_wants_json, job_from_request
 from digits.webapp import scheduler
 
-
 blueprint = flask.Blueprint(__name__, __name__)
 
 
@@ -115,6 +116,9 @@ def from_folders(job, form):
             compression=compression,
             mean_file=utils.constants.MEAN_FILE_CAFFE,
             labels_file=job.labels_file,
+            time_limit=form.slurm_time_limit.data,
+            s_cpu_count=form.slurm_cpu_count.data,
+            s_mem=form.slurm_mem.data,
         )
     )
 
@@ -131,6 +135,9 @@ def from_folders(job, form):
                 encoding=encoding,
                 compression=compression,
                 labels_file=job.labels_file,
+                time_limit=form.slurm_time_limit.data,
+                s_cpu_count=form.slurm_cpu_count.data,
+                s_mem=form.slurm_mem.data,
             )
         )
 
@@ -147,6 +154,9 @@ def from_folders(job, form):
                 encoding=encoding,
                 compression=compression,
                 labels_file=job.labels_file,
+                time_limit=form.slurm_time_limit.data,
+                s_cpu_count=form.slurm_cpu_count.data,
+                s_mem=form.slurm_mem.data,
             )
         )
 
@@ -198,6 +208,10 @@ def from_files(job, form):
             mean_file=utils.constants.MEAN_FILE_CAFFE,
             labels_file=job.labels_file,
             shuffle=shuffle,
+            time_limit=form.slurm_time_limit.data,
+            s_cpu_count=form.slurm_cpu_count.data,
+            s_mem=form.slurm_mem.data,
+
         )
     )
 
@@ -229,6 +243,9 @@ def from_files(job, form):
                 compression=compression,
                 labels_file=job.labels_file,
                 shuffle=shuffle,
+                time_limit=form.slurm_time_limit.data,
+                s_cpu_count=form.slurm_cpu_count.data,
+                s_mem=form.slurm_mem.data,
             )
         )
 
@@ -260,6 +277,9 @@ def from_files(job, form):
                 compression=compression,
                 labels_file=job.labels_file,
                 shuffle=shuffle,
+                time_limit=form.slurm_time_limit.data,
+                s_cpu_count=form.slurm_cpu_count.data,
+                s_mem=form.slurm_mem.data,
             )
         )
 
@@ -275,7 +295,8 @@ def new():
     # Is there a request to clone a job with ?clone=<job_id>
     fill_form_if_cloned(form)
 
-    return flask.render_template('datasets/images/classification/new.html', form=form)
+    return flask.render_template('datasets/images/classification/new.html', form=form,
+                                 system_type=config_value('system_type'))
 
 
 @blueprint.route('.json', methods=['POST'])
@@ -296,7 +317,8 @@ def create():
         if request_wants_json():
             return flask.jsonify({'errors': form.errors}), 400
         else:
-            return flask.render_template('datasets/images/classification/new.html', form=form), 400
+            return flask.render_template('datasets/images/classification/new.html', form=form,
+                                         system_type=config_value('system_type')), 400
 
     job = None
     try:
@@ -309,7 +331,10 @@ def create():
                 int(form.resize_width.data),
                 int(form.resize_channels.data),
             ),
-            resize_mode=form.resize_mode.data
+            resize_mode=form.resize_mode.data,
+            time_limit=form.slurm_time_limit.data,
+            s_cpu_count=form.slurm_cpu_count.data,
+            s_mem=form.slurm_mem.data,
         )
 
         if form.method.data == 'folder':

digits/dataset/images/generic/test_lmdb_creator.py

@@ -209,3 +209,4 @@ def _save_mean(mean, filename):
                  )
 
     print 'Done after %s seconds' % (time.time() - start_time,)
+

digits/dataset/images/generic/views.py

@@ -10,6 +10,7 @@
 from digits.webapp import scheduler
 from digits.utils.forms import fill_form_if_cloned, save_form_to_job
 from digits.utils.routing import request_wants_json
+from digits.config import config_value
 
 blueprint = flask.Blueprint(__name__, __name__)
 
@@ -24,8 +25,7 @@ def new():
 
     # Is there a request to clone a job with ?clone=<job_id>
     fill_form_if_cloned(form)
-
-    return flask.render_template('datasets/images/generic/new.html', form=form)
+    return flask.render_template('datasets/images/generic/new.html', form=form, system_type=config_value('system_type'))
 
 
 @blueprint.route('.json', methods=['POST'])
@@ -46,7 +46,8 @@ def create():
         if request_wants_json():
             return flask.jsonify({'errors': form.errors}), 400
         else:
-            return flask.render_template('datasets/images/generic/new.html', form=form), 400
+            return flask.render_template('datasets/images/generic/new.html', form=form,
+                                         system_type=config_value('system_type')), 400
 
     job = None
     try:
@@ -55,6 +56,7 @@ def create():
             name=form.dataset_name.data,
             group=form.group_name.data,
             mean_file=form.prebuilt_mean_file.data.strip(),
+
         )
 
         if form.method.data == 'prebuilt':
@@ -70,6 +72,9 @@ def create():
                 database=form.prebuilt_train_images.data,
                 purpose=form.prebuilt_train_images.label.text,
                 force_same_shape=force_same_shape,
+                time_limit=form.slurm_time_limit.data,
+                s_cpu_count=form.slurm_cpu_count.data,
+                s_mem=form.slurm_mem.data,
             )
         )
 
@@ -80,6 +85,9 @@ def create():
                     database=form.prebuilt_train_labels.data,
                     purpose=form.prebuilt_train_labels.label.text,
                     force_same_shape=force_same_shape,
+                    time_limit=form.slurm_time_limit.data,
+                    s_cpu_count=form.slurm_cpu_count.data,
+                    s_mem=form.slurm_mem.data,
                 )
             )
 
@@ -90,6 +98,9 @@ def create():
                     database=form.prebuilt_val_images.data,
                     purpose=form.prebuilt_val_images.label.text,
                     force_same_shape=force_same_shape,
+                    time_limit=form.slurm_time_limit.data,
+                    s_cpu_count=form.slurm_cpu_count.data,
+                    s_mem=form.slurm_mem.data,
                 )
             )
             if form.prebuilt_val_labels.data:
@@ -99,6 +110,9 @@ def create():
                         database=form.prebuilt_val_labels.data,
                         purpose=form.prebuilt_val_labels.label.text,
                         force_same_shape=force_same_shape,
+                        time_limit=form.slurm_time_limit.data,
+                        s_cpu_count=form.slurm_cpu_count.data,
+                        s_mem=form.slurm_mem.data,
                     )
                 )