fix for constants in faster_destroy and fix for jenkins

Theano · May 1, 2017 · 6c724d4 · 6c724d4
1 parent 1dd3738
commit 6c724d4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.jenkins/jenkins_buildbot_python2_32bit.sh b/.jenkins/jenkins_buildbot_python2_32bit.sh
@@ -13,5 +13,4 @@ echo
 
 FILE=${BUILDBOT_DIR}/theano_python32bit_tests.xml
 set -x
-<<<<<<< HEAD
 PYTHONPATH=$HOME/anaconda2_32bit/lib/python2.7/site-packages THEANO_FLAGS=device=cpu,cycle_detection='fast',force_device=true,lib.amdlibm=False,compiledir=$HOME/.theano/buildbot_theano_python2_32bit $HOME/anaconda2_32bit/bin/python bin/theano-nose ${THEANO_PARAM} ${XUNIT}${FILE}
diff --git a/theano/gof/destroyhandler.py b/theano/gof/destroyhandler.py
@@ -800,7 +800,7 @@ def fast_destroy(self, app, reason):
         inputs = set(itertools.chain.from_iterable(dm.values()))   # list of app's destroyed inputs
         for inp_idx in inputs:
             inp = app.inputs[inp_idx]
-            if getattr(inp.tag, 'indestructible', False):
+            if getattr(inp.tag, 'indestructible', False) or isinstance(inp, graph.Constant):
                 self.fail_validate[app] = InconsistencyError(
                     "Attempting to destroy indestructible variables: %s" %
                     inp)