From c06229b561cc5731329c254d0d5dde758b23b555 Mon Sep 17 00:00:00 2001 From: kttian <19katherinet@students.harker.org> Date: Mon, 11 Jun 2018 15:10:06 -0700 Subject: [PATCH] modifying theano_backend to not crash on cpu --- .gitignore | 3 ++- modisco.egg-info/PKG-INFO | 3 +-- modisco/backend/theano_backend.py | 3 ++- setup.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 80cc350..69dcb11 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,6 @@ **/*.h5 **/*.ipynb_checkpoints **/*.bin -**/*.tree +**/*.tree_* **/*.weights +**/*DS_Store diff --git a/modisco.egg-info/PKG-INFO b/modisco.egg-info/PKG-INFO index d683702..a54622b 100644 --- a/modisco.egg-info/PKG-INFO +++ b/modisco.egg-info/PKG-INFO @@ -1,12 +1,11 @@ Metadata-Version: 1.1 Name: modisco -Version: 0.2 +Version: 0.2.1 Summary: TF MOtif Discovery from Importance SCOres Home-page: NA Author: UNKNOWN Author-email: UNKNOWN License: UNKNOWN Download-URL: NA -Description-Content-Type: UNKNOWN Description: UNKNOWN Platform: UNKNOWN diff --git a/modisco/backend/theano_backend.py b/modisco/backend/theano_backend.py index 966d022..5c1d77a 100644 --- a/modisco/backend/theano_backend.py +++ b/modisco/backend/theano_backend.py @@ -1,7 +1,8 @@ from __future__ import division, print_function import theano from theano import tensor as T -#import theano.tensor.signal.pool #autoimported if on GPU +from theano.tensor import signal +from theano.tensor.signal import pool import numpy as np import sys diff --git a/setup.py b/setup.py index ab4b696..4bc6391 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ description='TF MOtif Discovery from Importance SCOres', url='NA', download_url='NA', - version='0.2', + version='0.2.1', packages=['modisco', 'modisco.cluster','modisco.backend', 'modisco.visualization', 'modisco.affinitymat', 'modisco.tfmodisco_workflow'],