Skip to content

Commit f98d216

Browse files
committed
updated tf version & remove keras requirement & fix little tensorboard bug
1 parent 9538048 commit f98d216

File tree

2 files changed

+7
-21
lines changed

2 files changed

+7
-21
lines changed

deep_emotion_recognition.py

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,13 @@
33
import sys
44
stderr = sys.stderr
55
sys.stderr = open(os.devnull, 'w')
6-
import keras
7-
sys.stderr = stderr
8-
# to use CPU uncomment below code
9-
os.environ["CUDA_DEVICE_ORDER"] = "PCI_BUS_ID" # see issue #152
10-
os.environ["CUDA_VISIBLE_DEVICES"] = "-1"
11-
# disable tensorflow logs
12-
os.environ['TF_CPP_MIN_LOG_LEVEL'] = '3'
136
import tensorflow as tf
147

15-
config = tf.ConfigProto(intra_op_parallelism_threads=5,
16-
inter_op_parallelism_threads=5,
17-
allow_soft_placement=True,
18-
device_count = {'CPU' : 1,
19-
'GPU' : 0}
20-
)
21-
from keras.layers import LSTM, GRU, Dense, Activation, LeakyReLU, Dropout
22-
from keras.layers import Conv1D, MaxPool1D, GlobalAveragePooling1D
23-
from keras.models import Sequential
24-
from keras.callbacks import ModelCheckpoint, TensorBoard
25-
from keras.utils import to_categorical
8+
from tensorflow.keras.layers import LSTM, GRU, Dense, Activation, LeakyReLU, Dropout
9+
from tensorflow.keras.layers import Conv1D, MaxPool1D, GlobalAveragePooling1D
10+
from tensorflow.keras.models import Sequential
11+
from tensorflow.keras.callbacks import ModelCheckpoint, TensorBoard
12+
from tensorflow.keras.utils import to_categorical
2613

2714
from sklearn.metrics import accuracy_score, mean_absolute_error, confusion_matrix
2815

@@ -264,7 +251,7 @@ def train(self, override=False):
264251
model_filename = self._get_model_filename()
265252

266253
self.checkpointer = ModelCheckpoint(model_filename, save_best_only=True, verbose=1)
267-
self.tensorboard = TensorBoard(log_dir=f"logs/{self.model_name}")
254+
self.tensorboard = TensorBoard(log_dir=os.path.join("logs", self.model_name))
268255

269256
self.history = self.model.fit(self.X_train, self.y_train,
270257
batch_size=self.batch_size,

requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ sklearn
77
tqdm==4.28.1
88
matplotlib==2.2.3
99
pyaudio==0.2.11
10-
keras==2.2.4
11-
tensorflow==1.15.2
10+
tensorflow==2.0.2

0 commit comments

Comments
 (0)