Skip to content
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.

Sign up for GitHub

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

BUG: allow to import keras from tensorflow #532

Merged
merged 7 commits into from
Jun 12, 2019
Merged

BUG: allow to import keras from tensorflow #532

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7ce170f
BUG: allow to import keras from tensorflow
glemaitre Jan 19, 2019
bf224c5
Merge remote-tracking branch 'origin/master' into is/526
glemaitre Jan 19, 2019
b3863ee
add duck-typing flag for keras
glemaitre Jan 19, 2019
aafa667
Merge branch 'master' into is/526
glemaitre Jun 12, 2019
4a6a618
iter
glemaitre Jun 12, 2019
5c8b122
iter
glemaitre Jun 12, 2019
cb4008b
iter
glemaitre Jun 12, 2019
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
Prev Previous commit
iter
  • Loading branch information
@glemaitre
glemaitre committed Jun 12, 2019
commit cb4008b8cede5cb9199526961c7062b2edd86d21
2 changes: 1 addition & 1 deletion imblearn/keras/_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def import_from_tensforflow():
if has_keras:
ParentClass = (ParentClassKeras + ParentClassTensorflow)
else:
ParentClass = tuple(object)
ParentClass = (object,)
return ParentClass, has_keras


Expand Down