tf 1.15.4

janni/train.py

@@ -263,12 +263,11 @@ def train_pairs(
         model = models.get_model_unet(input_size=patch_size, kernel_size=(3, 3))
     opt = Adam(lr=learning_rate, epsilon=10 ** -8, amsgrad=True)
     model.compile(optimizer=opt, loss=loss)
-
     history = model.fit_generator(
         generator=train_gen,
         epochs=epochs,
         callbacks=callbacks,
         workers=4,
-        use_multiprocessing=True
+        use_multiprocessing=False
     )
     return model

setup.py

@@ -22,28 +22,28 @@ def find_version(*file_paths):
 setup(
     name='janni',
     version=find_version("janni", "__init__.py"),
-    python_requires='>3.4.0',
+    python_requires='>=3.5.0, <3.9',
     packages=['janni'],
     url='https://github.com/MPI-Dortmund/sphire-janni',
     license='MIT',
     author='Thorsten Wagner',
     setup_requires=["Cython"],
     extras_require={
-        'gpu': ['tensorflow-gpu == 1.10.1'],
-        'cpu': ['tensorflow == 1.10.1']
+        'gpu': ['tensorflow-gpu == 1.15.4'],
+        'cpu': ['tensorflow == 1.15.4']
     },
     install_requires=[
-        "mrcfile >=1.0.0,<= 1.1.2",
-        "Keras == 2.2.5",
-        "numpy == 1.14.5",
+        "mrcfile >=1.3.0",
+        "Keras == 2.3.1", # that doesnt seem to work. try tensorflow 1.14.0 in combination with keras 2.2.5
+        "numpy >= 1.16.0, < 1.19.0",
         "h5py >= 2.5.0, < 3.0.0",
         "Pillow >= 6.0.0",
         "Cython",
-        "imagecodecs-lite==2019.2.22",
-        "tifffile==2019.7.2",
-        "GooeyDev >= 1.0.3.2",
-        "wxPython == 4.0.4",
-        "scikit-image == 0.15.0"
+        "tifffile==2020.9.3",
+        "GooeyDev >= 1.0.8b3",
+        "wxPython >= 4.1.0",
+        "scikit-image >= 0.15.0",
+        "protobuf < 4"
     ],
     author_email='[email protected]',
     description='noise 2 noise for cryo em data',