-
Notifications
You must be signed in to change notification settings - Fork 68
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.
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
bundle moved to model #26
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
import CoreML | ||
|
||
@available(macOS 10.13, iOS 11.0, tvOS 11.0, watchOS 4.0, *) | ||
//model name : "FindFour.mlmodelc" | ||
struct BundleURL{ | ||
static func bundleUrl(forResource: String, withExtension: String, modelName: String) -> URL?{ | ||
guard let documentDirectory = | ||
try? FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor:nil, create:false) else { | ||
print("Directory could not be found") | ||
return nil | ||
} | ||
|
||
let modelcFile = documentDirectory.appendingPathComponent(modelName) | ||
|
||
if !FileManager.default.fileExists(atPath: modelcFile.path) { | ||
guard let bundleUrl = Bundle(for: FindFour.self).url(forResource: "CardScan", withExtension: "bundle") else { | ||
print("bundleURL could not be found") | ||
return nil | ||
} | ||
|
||
guard let bundle = Bundle(url: bundleUrl) else { | ||
print("bundle with bundleURL could not be found") | ||
return nil | ||
} | ||
|
||
guard let modelUrl = bundle.url(forResource: forResource, withExtension: withExtension) else { | ||
print("Could not find bundle named \" FindFour.bin\" ") | ||
return nil | ||
} | ||
|
||
guard let compiledUrl = try? MLModel.compileModel(at: modelUrl) else { | ||
print("Model could not compile") | ||
return nil | ||
} | ||
|
||
guard let _ = try? FileManager.default.moveItem(at: compiledUrl, to: modelcFile) else { | ||
print("Could not move to modelcFile") | ||
return nil | ||
} | ||
} | ||
|
||
return modelcFile | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -70,22 +70,7 @@ class FindFourOutput : MLFeatureProvider { | |
@available(macOS 10.13, iOS 11.0, tvOS 11.0, watchOS 4.0, *) | ||
class FindFour { | ||
var model: MLModel | ||
|
||
/// URL of model assuming it was installed in the same bundle as this class | ||
class var urlOfModelInThisBundle : URL { | ||
let bundleUrl = Bundle(for: FindFour.self).url(forResource: "CardScan", withExtension: "bundle")! | ||
let bundle = Bundle(url: bundleUrl)! | ||
|
||
let documentDirectory = try! FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor:nil, create:false) | ||
let modelcFile = documentDirectory.appendingPathComponent("FindFour.mlmodelc") | ||
if !FileManager.default.fileExists(atPath: modelcFile.path) { | ||
let modelUrl = bundle.url(forResource: "FindFour", withExtension: "bin")! | ||
let compiledUrl = try? MLModel.compileModel(at: modelUrl) | ||
try! FileManager.default.moveItem(at: compiledUrl!, to: modelcFile) | ||
} | ||
|
||
return modelcFile | ||
} | ||
|
||
|
||
/** | ||
Construct a model with explicit path to mlmodelc file | ||
|
@@ -99,7 +84,7 @@ class FindFour { | |
|
||
/// Construct a model that automatically loads the model from the app's bundle | ||
convenience init() { | ||
try! self.init(contentsOf: type(of:self).urlOfModelInThisBundle) | ||
try! self.init(contentsOf: BundleURL) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we need this still? We can just instantiate the class directly using the url we get from your static method |
||
} | ||
|
||
/** | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor comment, but I'd make
forResource
andwithExtension
the public variable names with something likeresource
andextension
internally