Skip to content

Commit 83a7e5a

Browse files
shoumikhinfacebook-github-bot
authored andcommitted
Misc fixes for the demo app.
Summary: . Differential Revision: D64119638
1 parent 566902b commit 83a7e5a

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

examples/demo-apps/apple_ios/LLaMA/LLaMA/Application/ContentView.swift

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,9 @@ class RunnerHolder: ObservableObject {
1818

1919
extension UIImage {
2020
func resized(to newSize: CGSize) -> UIImage {
21-
let format = UIGraphicsImageRendererFormat.default()
22-
let renderer = UIGraphicsImageRenderer(size: newSize, format: format)
23-
let image = renderer.image { _ in
21+
UIGraphicsImageRenderer(size: newSize).image { _ in
2422
draw(in: CGRect(origin: .zero, size: newSize))
2523
}
26-
return image
2724
}
2825

2926
func toRGBArray() -> [UInt8]? {
@@ -71,10 +68,10 @@ extension UIImage {
7168
let g = UInt8(pixelData[pixelIndex + 1])
7269
let b = UInt8(pixelData[pixelIndex + 2])
7370

74-
let rgbIndex = (y * width + x)
71+
let rgbIndex = (y * width + x) * 3
7572
rgbArray[rgbIndex] = r
76-
rgbArray[rgbIndex + height * width] = g
77-
rgbArray[rgbIndex + 2 * height * width] = b
73+
rgbArray[rgbIndex + 1] = g
74+
rgbArray[rgbIndex + 2] = b
7875
}
7976
}
8077

@@ -288,6 +285,7 @@ struct ContentView: View {
288285
defer {
289286
DispatchQueue.main.async {
290287
isGenerating = false
288+
selectedImage = nil
291289
}
292290
}
293291

@@ -302,7 +300,7 @@ struct ContentView: View {
302300
messages.append(Message(text: text))
303301
messages.append(Message(type: .llamagenerated))
304302

305-
if let runner = runnerHolder.runner, !runner.isloaded() {
303+
if let runner = runnerHolder.runner, !runner.isLoaded() {
306304
var error: Error?
307305
let startLoadTime = Date()
308306
do {
@@ -335,7 +333,7 @@ struct ContentView: View {
335333
messages.append(Message(text: text))
336334
messages.append(Message(type: .llavagenerated))
337335

338-
if let runner = runnerHolder.llavaRunner, !runner.isloaded() {
336+
if let runner = runnerHolder.llavaRunner, !runner.isLoaded() {
339337
var error: Error?
340338
let startLoadTime = Date()
341339
do {
@@ -394,7 +392,7 @@ struct ContentView: View {
394392
if token != llava_prompt {
395393
if token == "</s>" {
396394
shouldStopGenerating = true
397-
runnerHolder.runner?.stop()
395+
runnerHolder.llavaRunner?.stop()
398396
} else {
399397
tokens.append(token)
400398
if tokens.count > 2 {
@@ -410,7 +408,7 @@ struct ContentView: View {
410408
}
411409
}
412410
if shouldStopGenerating {
413-
runnerHolder.runner?.stop()
411+
runnerHolder.llavaRunner?.stop()
414412
}
415413
}
416414
}
@@ -485,6 +483,7 @@ struct ContentView: View {
485483
}
486484
runnerQueue.async {
487485
runnerHolder.runner = nil
486+
runnerHolder.llavaRunner = nil
488487
}
489488
switch pickerType {
490489
case .model:

examples/demo-apps/apple_ios/LLaMA/LLaMARunner/LLaMARunner/Exported/LLaMARunner.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ NS_SWIFT_NAME(Runner)
1818

1919
- (instancetype)initWithModelPath:(NSString*)filePath
2020
tokenizerPath:(NSString*)tokenizerPath;
21-
- (BOOL)isloaded;
21+
- (BOOL)isLoaded;
2222
- (BOOL)loadWithError:(NSError**)error;
2323
- (BOOL)generate:(NSString*)prompt
2424
sequenceLength:(NSInteger)seq_len
@@ -36,7 +36,7 @@ NS_SWIFT_NAME(LLaVARunner)
3636

3737
- (instancetype)initWithModelPath:(NSString*)filePath
3838
tokenizerPath:(NSString*)tokenizerPath;
39-
- (BOOL)isloaded;
39+
- (BOOL)isLoaded;
4040
- (BOOL)loadWithError:(NSError**)error;
4141
- (BOOL)generate:(void*)imageBuffer
4242
width:(CGFloat)width

examples/demo-apps/apple_ios/LLaMA/LLaMARunner/LLaMARunner/Exported/LLaMARunner.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ - (void)dealloc {
4040
[ExecuTorchLog.sharedLog removeSink:self];
4141
}
4242

43-
- (BOOL)isloaded {
43+
- (BOOL)isLoaded {
4444
return _runner->is_loaded();
4545
}
4646

@@ -128,7 +128,7 @@ - (void)dealloc {
128128
[ExecuTorchLog.sharedLog removeSink:self];
129129
}
130130

131-
- (BOOL)isloaded {
131+
- (BOOL)isLoaded {
132132
return _runner->is_loaded();
133133
}
134134

0 commit comments

Comments
 (0)