Skip to content

Commit e2c909f

Browse files
committed
Fixed incorrect keras imports in P2B1
1 parent 079891c commit e2c909f

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

Pilot2/P2B1/helper.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import numpy as np
22
import glob
3-
from keras.losses import mean_squared_error as mse
4-
from keras.losses import mean_absolute_error as mae
3+
from tensorflow.keras.losses import mean_squared_error as mse
4+
from tensorflow.keras.losses import mean_absolute_error as mae
55

66

77
def combined_loss(y_true, y_pred):

Pilot2/P2B1/p2b1.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# from tqdm import *
1313

1414
import numpy as np
15-
import keras.backend as K
15+
import tensorflow.keras.backend as K
1616
import threading
1717
import os
1818
import sys

Pilot2/P2B1/p2b1_AE_models.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
from __future__ import absolute_import
22
from __future__ import print_function
33

4-
from keras.layers import Input
5-
from keras.models import Sequential, Model
6-
from keras.layers.core import Flatten, Dense, Dropout
7-
from keras.layers.convolutional import Convolution2D, Conv2DTranspose
8-
from keras.layers.normalization import BatchNormalization
9-
from keras.regularizers import l2
4+
from tensorflow.keras.layers import Input
5+
from tensorflow.keras.models import Sequential, Model
6+
from tensorflow.keras.layers import Flatten, Dense, Dropout
7+
from tensorflow.keras.layers import Convolution2D, Conv2DTranspose
8+
from tensorflow.keras.layers import BatchNormalization
9+
from tensorflow.keras.regularizers import l2
1010

1111
import os
1212
import sys

Pilot2/P2B1/p2b1_baseline_keras2.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
lib_path2 = os.path.abspath(os.path.join(file_path, '..', '..', 'common'))
1818
sys.path.append(lib_path2)
1919

20-
from keras import backend as K
20+
from tensorflow.keras import backend as K
2121

2222
import p2b1
2323
import candle
@@ -108,7 +108,7 @@ def run(GP):
108108
# maps = hf.autoencoder_preprocess()
109109

110110
# from keras.callbacks import LearningRateScheduler
111-
from keras import callbacks
111+
from tensorflow.keras import callbacks
112112

113113
# GP=hf.ReadConfig(opts.config_file)
114114
batch_size = GP['batch_size']

0 commit comments

Comments
 (0)