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

Fix loadModelLayersFromConfiguration recursively calling itself #319

Merged
merged 1 commit into from
Dec 28, 2021
Merged

Fix loadModelLayersFromConfiguration recursively calling itself #319

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions api/src/main/kotlin/org/jetbrains/kotlinx/dl/api/core/Functional.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020 JetBrains s.r.o. and Kotlin Deep Learning project contributors. All Rights Reserved.
* Copyright 2020-2021 JetBrains s.r.o. and Kotlin Deep Learning project contributors. All Rights Reserved.
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file.
*/

Expand Down Expand Up @@ -173,7 +173,8 @@ public class Functional(vararg layers: Layer) : GraphTrainableModel(*layers) {
): MutableList<Layer> {
require(configuration.isFile) { "${configuration.absolutePath} is not a file. Should be a .json file with configuration." }

return loadModelLayersFromConfiguration(configuration, inputShape)
val functionalConfig = loadSerializedModel(configuration)
return loadFunctionalModelLayers(functionalConfig, inputShape)
}

/**
Expand Down