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

Jump to bottom

Bump tensorflow from 2.0.1 to 2.3.1 #20

Merged
merged 2 commits into from
Dec 5, 2020
Merged

Bump tensorflow from 2.0.1 to 2.3.1 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da43976
Bump tensorflow from 2.0.1 to 2.3.1
dependabot[bot] Nov 13, 2020
e22f591
Resolve dependency conflicts
amnesia15 Dec 5, 2020
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
10 changes: 5 additions & 5 deletions diffraction_image_rcg/nn_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from keras.models import Sequential
from keras.layers.core import Dense
from keras.optimizers import Adam
from keras.initializers import glorot_normal
from keras.layers import Dropout
from tensorflow.keras.models import Sequential
from tensorflow.keras.layers import Dense
from tensorflow.keras.optimizers import Adam
from tensorflow.keras.initializers import glorot_normal
from tensorflow.keras.layers import Dropout
import numpy as np


Expand Down
9 changes: 4 additions & 5 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cachetools==3.1.1
certifi==2019.11.28
chardet==3.0.4
cycler==0.10.0
gast==0.2.2
gast==0.3.3
google-auth==1.7.1
google-auth-oauthlib==0.4.1
google-pasta==0.1.8
Expand All @@ -14,7 +14,6 @@ idna==2.8
joblib==0.14.0
Keras==2.3.1
Keras-Applications==1.0.8
Keras-Preprocessing==1.1.0
kiwisolver==1.1.0
Markdown==3.1.1
matplotlib==3.1.2
Expand All @@ -36,9 +35,9 @@ rsa==4.0
scikit-learn==0.21.3
scipy==1.3.3
six==1.13.0
tensorboard==2.0.2
tensorflow==2.0.1
tensorflow-estimator==2.0.1
tensorboard>=2.3.2
tensorflow==2.3.1
tensorflow-estimator>=2.3.0
termcolor==1.1.0
urllib3==1.25.7
Werkzeug==0.16.0
Expand Down
4 changes: 2 additions & 2 deletions tests/test_nn_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import context
import numpy as np
from keras.models import Sequential
from tensorflow.keras.models import Sequential

from diffraction_image_rcg.nn_model import NNModel

Expand Down Expand Up @@ -82,7 +82,7 @@ def test_nn_model_build_dropout():
input_dimension = 16
learning_rate = 0.005
activation_fun = "relu"
dropout_rate = np.asarray([10, 10])
dropout_rate = np.asarray([0.5, 0.5])

# Act
model = NNModel.build_dropout(
Expand Down