Skip to content

Removed deprecated dependencies #79

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Removed deprecated dependencies #79

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60573c4
Updated the import for keras applications.
IronOnet Nov 12, 2021
b77d87f
updated import statement for the get_source_inputs method
IronOnet Nov 12, 2021
2231e14
updated old imports from a deprecated keras package
IronOnet Nov 12, 2021
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 keras_vggface/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
from keras.layers import Flatten, Dense, Input, GlobalAveragePooling2D, \
GlobalMaxPooling2D, Activation, Conv2D, MaxPooling2D, BatchNormalization, \
AveragePooling2D, Reshape, Permute, multiply
from keras_applications.imagenet_utils import _obtain_input_shape
from keras.applications.imagenet_utils import obtain_input_shape
from keras.utils import layer_utils
from keras.utils.data_utils import get_file
from keras import backend as K
from keras_vggface import utils
from keras.engine.topology import get_source_inputs
from keras.utils.layer_utils import get_source_inputs
import warnings
from keras.models import Model
from keras import layers
Expand All @@ -27,7 +27,7 @@ def VGG16(include_top=True, weights='vggface',
input_tensor=None, input_shape=None,
pooling=None,
classes=2622):
input_shape = _obtain_input_shape(input_shape,
input_shape = obtain_input_shape(input_shape,
default_size=224,
min_size=48,
data_format=K.image_data_format(),
Expand Down Expand Up @@ -208,7 +208,7 @@ def RESNET50(include_top=True, weights='vggface',
input_tensor=None, input_shape=None,
pooling=None,
classes=8631):
input_shape = _obtain_input_shape(input_shape,
input_shape = obtain_input_shape(input_shape,
default_size=224,
min_size=32,
data_format=K.image_data_format(),
Expand Down Expand Up @@ -413,7 +413,7 @@ def SENET50(include_top=True, weights='vggface',
input_tensor=None, input_shape=None,
pooling=None,
classes=8631):
input_shape = _obtain_input_shape(input_shape,
input_shape = obtain_input_shape(input_shape,
default_size=224,
min_size=197,
data_format=K.image_data_format(),
Expand Down