Skip to content

Make tensorflow optional & fix setup imageio #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/diffgram/core/directory.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from diffgram.file.file import File
from ..regular.regular import refresh_from_dict
import logging
from diffgram.tensorflow_diffgram.diffgram_tensorflow_dataset import DiffgramTensorflowDataset
from diffgram.core.diffgram_dataset_iterator import DiffgramDatasetIterator
from multiprocessing.pool import ThreadPool as Pool

Expand Down Expand Up @@ -166,6 +165,7 @@ def to_pytorch(self, transform = None):
return pytorch_dataset

def to_tensorflow(self):
from diffgram.tensorflow_diffgram.diffgram_tensorflow_dataset import DiffgramTensorflowDataset
file_id_list = self.file_id_list
diffgram_tensorflow_dataset = DiffgramTensorflowDataset(
project = self.client,
Expand Down
2 changes: 1 addition & 1 deletion sdk/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ six>=1.9.0
tensorflow>=1.12.0
pillow
torch
imageio
imageio>=2.9.0
3 changes: 2 additions & 1 deletion sdk/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
'opencv-python>=4.0.0.21',
'scipy>=1.1.0',
'six>=1.9.0',
'pillow>=6.1.0'
'pillow>=6.1.0',
'imageio>=2.9.0'
]
)