Merge branch 'master' into master

kipoi · Jun 21, 2019 · d0bf7f2 · d0bf7f2
2 parents 182bd12 + 784c0b4
commit d0bf7f2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CpGenie/merged/model.py b/CpGenie/merged/model.py
@@ -27,6 +27,10 @@ def read_txt(file_path):
 class MergedModel(BaseModel):
 
     def __init__(self):
+
+        from keras import backend as K
+        K.clear_session()
+
         self.model_names = read_txt("models.txt")
         # hard-code the path to this models
         # if we'd use `source='dir'`, then the models wouldn't

diff --git a/CpGenie/merged/model.yaml b/CpGenie/merged/model.yaml
@@ -36,7 +36,7 @@ default_dataloader:
     dummy_axis: 1
 dependencies:
   conda:
-    - python=3.5
+    - python=3.6
     - h5py
     - tensorflow>=1.10.0
     - keras==1.2.2

diff --git a/config.yaml b/config.yaml
@@ -5,4 +5,4 @@ test:
 
 dependencies:
   pip:
-    kipoi>=0.6.9
+    kipoi>=0.6.16