react-native-executorch 0.5.2 → 0.5.4

package/lib/utils/llm.js

@@ -6,7 +6,6 @@ import * as zCore from 'zod/v4/core';
 import { Logger } from '../common/Logger';
 export const parseToolCall = (message) => {
     try {
-        const a = 6;
         const unparsedToolCalls = message.match('\\[(.|\\s)*\\]');
         if (!unparsedToolCalls) {
             throw Error('Regex did not match array.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-executorch",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "An easy way to run AI models in React Native with ExecuTorch",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",
@@ -12,7 +12,6 @@
     "lib",
     "android",
     "ios",
-    "!ios/libs",
     "cpp",
     "common",
     "*.podspec",

package/react-native-executorch.podspec

@@ -13,52 +13,56 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/software-mansion/react-native-executorch.git", :tag => "#{s.version}" }
 
-  et_binaries_path = File.expand_path('$(PODS_TARGET_SRCROOT)/ios/libs', __dir__)
+  et_binaries_path = File.expand_path('$(PODS_TARGET_SRCROOT)/ios/libs/executorch', __dir__)
+  tokenizers_binaries_path = File.expand_path('$(PODS_TARGET_SRCROOT)/ios/libs/tokenizers-cpp', __dir__)
+
+  s.frameworks = [
+    'CoreML',
+    'Accelerate',
+    'Metal',
+    'MetalPerformanceShaders',
+    'MetalPerformanceShadersGraph'
+  ]
 
   s.user_target_xcconfig = {
     "HEADER_SEARCH_PATHS" => "$(PODS_TARGET_SRCROOT)/third-party/include",
 
-    # FIXME: The code below links the static libraries built from ExecuTorch against out library.
-    # Please uncomment it once the ExecuTorchLib is no longer required.
-
-    # "OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" => [
-    #  '$(inherited)',
-    #  '-framework "CoreML"',
-    #  '-framework "Accelerate"',
-    #  '-framework "Metal"',
-    #  '-framework "MetalPerformanceShaders"',
-    #  '-framework "MetalPerformanceShadersGraph"',
-    #  "-force_load \"#{et_binaries_path}\"/libbackend_coreml_ios.a",
-    #  "-force_load \"#{et_binaries_path}\"/libbackend_mps_ios.a",
-    #  "-force_load \"#{et_binaries_path}\"/libbackend_xnnpack_ios.a",
-    #  "-force_load \"#{et_binaries_path}\"/libexecutorch_ios.a",
-    #  "-force_load \"#{et_binaries_path}\"/libkernels_custom_ios.a",
-    #  "-force_load \"#{et_binaries_path}\"/libkernels_optimized_ios.a",
-    #  "-force_load \"#{et_binaries_path}\"/libkernels_quantized_ios.a"
-    # ].join(' '),
-
-    # "OTHER_LDFLAGS[sdk=iphonesimulator*][arch=*]" => [
-    #  '$(inherited)',
-    #  '-framework "CoreML"',
-    #  '-framework "Accelerate"',
-    #  '-framework "Metal"',
-    #  '-framework "MetalPerformanceShaders"',
-    #  '-framework "MetalPerformanceShadersGraph"',
-    #  "-force_load \"#{et_binaries_path}\"/libbackend_coreml_simulator.a",
-    #  "-force_load \"#{et_binaries_path}\"/libbackend_mps_simulator.a",
-    #  "-force_load \"#{et_binaries_path}\"/libbackend_xnnpack_simulator.a",
-    #  "-force_load \"#{et_binaries_path}\"/libexecutorch_simulator.a",
-    #  "-force_load \"#{et_binaries_path}\"/libkernels_custom_simulator.a",
-    #  "-force_load \"#{et_binaries_path}\"/libkernels_optimized_simulator.a",
-    #  "-force_load \"#{et_binaries_path}\"/libkernels_quantized_simulator.a"
-    # ].join(' '),
+    "OTHER_LDFLAGS[sdk=iphoneos*]" => [
+      '$(inherited)', 
+      "-force_load \"#{et_binaries_path}\"/libbackend_coreml_ios.a", 
+      "-force_load \"#{et_binaries_path}\"/libbackend_mps_ios.a", 
+      "-force_load \"#{et_binaries_path}\"/libbackend_xnnpack_ios.a", 
+      "-force_load \"#{et_binaries_path}\"/libexecutorch_ios.a", 
+      "-force_load \"#{et_binaries_path}\"/libkernels_custom_ios.a", 
+      "-force_load \"#{et_binaries_path}\"/libkernels_optimized_ios.a", 
+      "-force_load \"#{et_binaries_path}\"/libkernels_quantized_ios.a",
+      "\"#{et_binaries_path}\"/libkernels_portable_ios.a",
+      "\"#{tokenizers_binaries_path}/physical-arm64-release/libtokenizers_cpp.a\"",
+      "\"#{tokenizers_binaries_path}/physical-arm64-release/libsentencepiece.a\"",
+      "\"#{tokenizers_binaries_path}/physical-arm64-release/libtokenizers_c.a\""
+    ].join(' '),
+      
+    "OTHER_LDFLAGS[sdk=iphonesimulator*]" => [
+      '$(inherited)', 
+      "-force_load \"#{et_binaries_path}\"/libbackend_coreml_simulator.a", 
+      "-force_load \"#{et_binaries_path}\"/libbackend_mps_simulator.a", 
+      "-force_load \"#{et_binaries_path}\"/libbackend_xnnpack_simulator.a", 
+      "-force_load \"#{et_binaries_path}\"/libexecutorch_simulator.a", 
+      "-force_load \"#{et_binaries_path}\"/libkernels_custom_simulator.a", 
+      "-force_load \"#{et_binaries_path}\"/libkernels_optimized_simulator.a", 
+      "-force_load \"#{et_binaries_path}\"/libkernels_quantized_simulator.a",
+      "\"#{et_binaries_path}\"/libkernels_portable_simulator.a",
+      "\"#{tokenizers_binaries_path}/simulator-arm64-debug/libtokenizers_cpp.a\"",
+      "\"#{tokenizers_binaries_path}/simulator-arm64-debug/libsentencepiece.a\"",
+      "\"#{tokenizers_binaries_path}/simulator-arm64-debug/libtokenizers_c.a\""
+    ].join(' '),
 
     'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'x86_64',
   }
 
   s.pod_target_xcconfig = {
     "USE_HEADERMAP" => "YES",
-    "HEADER_SEARCH_PATHS" =>
+    "HEADER_SEARCH_PATHS" => 
       '"$(PODS_TARGET_SRCROOT)/ios" '+
       '"$(PODS_TARGET_SRCROOT)/third-party/include" '+
       '"$(PODS_TARGET_SRCROOT)/common" ',
@@ -66,18 +70,19 @@ Pod::Spec.new do |s|
     'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'x86_64',
   }
 
-  s.ios.vendored_frameworks = "ios/ExecutorchLib.xcframework"
   s.source_files = [
     "ios/**/*.{m,mm,h}",
     "common/**/*.{cpp,c,h,hpp}",
   ]
 
+  s.libraries = "z"
+
   # Exclude file with tests to not introduce gtest dependency.
-  # Do not include the headers from common/rnexecutorch/jsi/ as source files.
-  # Xcode/Cocoapods leaks them to other pods that an app also depends on, so if
-  # another pod includes a header with the same name without a path by
-  # #include "Header.h" we get a conflict. Here, headers in jsi/ collide with
-  # react-native-skia. The headers are preserved by preserve_paths and
+  # Do not include the headers from common/rnexecutorch/jsi/ as source files. 
+  # Xcode/Cocoapods leaks them to other pods that an app also depends on, so if 
+  # another pod includes a header with the same name without a path by 
+  # #include "Header.h" we get a conflict. Here, headers in jsi/ collide with 
+  # react-native-skia. The headers are preserved by preserve_paths and 
   # then made available by HEADER_SEARCH_PATHS.
   s.exclude_files = [
     "common/rnexecutorch/tests/*.{cpp}",
@@ -86,9 +91,9 @@ Pod::Spec.new do |s|
   s.header_mappings_dir = "common/rnexecutorch"
   s.header_dir = "rnexecutorch"
   s.preserve_paths = "common/rnexecutorch/jsi/*.{h,hpp}"
-
+  
   s.dependency "opencv-rne", "~> 4.11.0"
   s.dependency "sqlite3"
 
   install_modules_dependencies(s)
-end
+end

package/src/controllers/LLMController.ts

@@ -1,4 +1,3 @@
-import { EventSubscription } from 'react-native';
 import { ResourceSource } from '../types/common';
 import { ResourceFetcher } from '../utils/ResourceFetcher';
 import { ETError, getError } from '../Error';
@@ -12,16 +11,15 @@ import {
   SPECIAL_TOKENS,
   ToolsConfig,
 } from '../types/llm';
-import { LLMNativeModule } from '../native/RnExecutorchModules';
 import { parseToolCall } from '../utils/llm';
 import { Logger } from '../common/Logger';
 
 export class LLMController {
-  private nativeModule: typeof LLMNativeModule;
+  private nativeModule: any;
   private chatConfig: ChatConfig = DEFAULT_CHAT_CONFIG;
   private toolsConfig: ToolsConfig | undefined;
   private tokenizerConfig: any;
-  private onToken: EventSubscription | null = null;
+  private onToken?: (token: string) => void;
   private _response = '';
   private _isReady = false;
   private _isGenerating = false;
@@ -71,7 +69,6 @@ export class LLMController {
       this._isGenerating = isGenerating;
       isGeneratingCallback?.(isGenerating);
     };
-    this.nativeModule = LLMNativeModule;
   }
 
   public get response() {
@@ -132,10 +129,9 @@ export class LLMController {
       this.tokenizerConfig = JSON.parse(
         await readAsStringAsync('file://' + tokenizerConfigPath!)
       );
-
-      await this.nativeModule.loadLLM(modelPath, tokenizerPath);
+      this.nativeModule = global.loadLLM(modelPath, tokenizerPath);
       this.isReadyCallback(true);
-      this.onToken = this.nativeModule.onToken((data: string) => {
+      this.onToken = (data: string) => {
         if (
           !data ||
           (SPECIAL_TOKENS.EOS_TOKEN in this.tokenizerConfig &&
@@ -148,7 +144,7 @@ export class LLMController {
 
         this.tokenCallback(data);
         this.responseCallback(this._response + data);
-      });
+      };
     } catch (e) {
       this.isReadyCallback(false);
       throw new Error(getError(e));
@@ -182,9 +178,8 @@ export class LLMController {
           'You cannot delete the model now. You need to interrupt first.'
       );
     }
-    this.onToken?.remove();
-    this.onToken = null;
-    this.nativeModule.releaseResources();
+    this.onToken = () => {};
+    this.nativeModule.unload();
     this.isReadyCallback(false);
     this.isGeneratingCallback(false);
   }
@@ -199,7 +194,7 @@ export class LLMController {
     try {
       this.responseCallback('');
       this.isGeneratingCallback(true);
-      await this.nativeModule.forward(input);
+      await this.nativeModule.generate(input, this.onToken);
     } catch (e) {
       throw new Error(getError(e));
     } finally {

package/src/hooks/computer_vision/useClassification.ts

@@ -1,5 +1,5 @@
 import { ResourceSource } from '../../types/common';
-import { useNonStaticModule } from '../useNonStaticModule';
+import { useModule } from '../useModule';
 import { ClassificationModule } from '../../modules/computer_vision/ClassificationModule';
 
 interface Props {
@@ -8,7 +8,7 @@ interface Props {
 }
 
 export const useClassification = ({ model, preventLoad = false }: Props) =>
-  useNonStaticModule({
+  useModule({
     module: ClassificationModule,
     model,
     preventLoad: preventLoad,

package/src/hooks/computer_vision/useImageEmbeddings.ts

@@ -1,6 +1,6 @@
 import { ImageEmbeddingsModule } from '../../modules/computer_vision/ImageEmbeddingsModule';
 import { ResourceSource } from '../../types/common';
-import { useNonStaticModule } from '../useNonStaticModule';
+import { useModule } from '../useModule';
 
 interface Props {
   model: { modelSource: ResourceSource };
@@ -8,7 +8,7 @@ interface Props {
 }
 
 export const useImageEmbeddings = ({ model, preventLoad = false }: Props) =>
-  useNonStaticModule({
+  useModule({
     module: ImageEmbeddingsModule,
     model,
     preventLoad,

package/src/hooks/computer_vision/useImageSegmentation.ts

@@ -1,4 +1,4 @@
-import { useNonStaticModule } from '../useNonStaticModule';
+import { useModule } from '../useModule';
 import { ImageSegmentationModule } from '../../modules/computer_vision/ImageSegmentationModule';
 import { ResourceSource } from '../../types/common';
 
@@ -8,7 +8,7 @@ interface Props {
 }
 
 export const useImageSegmentation = ({ model, preventLoad = false }: Props) =>
-  useNonStaticModule({
+  useModule({
     module: ImageSegmentationModule,
     model,
     preventLoad,

package/src/hooks/computer_vision/useObjectDetection.ts

@@ -1,5 +1,5 @@
 import { ResourceSource } from '../../types/common';
-import { useNonStaticModule } from '../useNonStaticModule';
+import { useModule } from '../useModule';
 import { ObjectDetectionModule } from '../../modules/computer_vision/ObjectDetectionModule';
 
 interface Props {
@@ -8,7 +8,7 @@ interface Props {
 }
 
 export const useObjectDetection = ({ model, preventLoad = false }: Props) =>
-  useNonStaticModule({
+  useModule({
     module: ObjectDetectionModule,
     model,
     preventLoad: preventLoad,

package/src/hooks/computer_vision/useStyleTransfer.ts

@@ -1,5 +1,5 @@
 import { ResourceSource } from '../../types/common';
-import { useNonStaticModule } from '../useNonStaticModule';
+import { useModule } from '../useModule';
 import { StyleTransferModule } from '../../modules/computer_vision/StyleTransferModule';
 
 interface Props {
@@ -8,7 +8,7 @@ interface Props {
 }
 
 export const useStyleTransfer = ({ model, preventLoad = false }: Props) =>
-  useNonStaticModule({
+  useModule({
     module: StyleTransferModule,
     model,
     preventLoad: preventLoad,

package/src/hooks/general/useExecutorchModule.ts

@@ -1,6 +1,6 @@
 import { ExecutorchModule } from '../../modules/general/ExecutorchModule';
 import { ResourceSource } from '../../types/common';
-import { useNonStaticModule } from '../useNonStaticModule';
+import { useModule } from '../useModule';
 
 interface Props {
   modelSource: ResourceSource;
@@ -11,7 +11,7 @@ export const useExecutorchModule = ({
   modelSource,
   preventLoad = false,
 }: Props) =>
-  useNonStaticModule({
+  useModule({
     module: ExecutorchModule,
     model: { modelSource },
     preventLoad,

package/src/hooks/natural_language_processing/useTextEmbeddings.ts

@@ -1,6 +1,6 @@
 import { TextEmbeddingsModule } from '../../modules/natural_language_processing/TextEmbeddingsModule';
 import { ResourceSource } from '../../types/common';
-import { useNonStaticModule } from '../useNonStaticModule';
+import { useModule } from '../useModule';
 
 interface Props {
   model: {
@@ -11,7 +11,7 @@ interface Props {
 }
 
 export const useTextEmbeddings = ({ model, preventLoad = false }: Props) =>
-  useNonStaticModule({
+  useModule({
     module: TextEmbeddingsModule,
     model,
     preventLoad,

package/src/hooks/useModule.ts

@@ -3,8 +3,12 @@ import { ETError, getError } from '../Error';
 
 interface Module {
   load: (...args: any[]) => Promise<void>;
-  forward: (...input: any[]) => Promise<any>;
-  onDownloadProgress: (cb: (progress: number) => void) => void;
+  forward: (...args: any[]) => Promise<any>;
+  delete: () => void;
+}
+
+interface ModuleConstructor<M extends Module> {
+  new (): M;
 }
 
 export const useModule = <
@@ -14,41 +18,47 @@ export const useModule = <
   ForwardReturn extends Awaited<ReturnType<M['forward']>>,
 >({
   module,
-  loadArgs,
+  model,
   preventLoad = false,
 }: {
-  module: M;
-  loadArgs: LoadArgs;
+  module: ModuleConstructor<M>;
+  model: LoadArgs[0];
   preventLoad?: boolean;
 }) => {
   const [error, setError] = useState<null | string>(null);
   const [isReady, setIsReady] = useState(false);
   const [isGenerating, setIsGenerating] = useState(false);
   const [downloadProgress, setDownloadProgress] = useState(0);
+  const [moduleInstance] = useState(() => new module());
 
   useEffect(() => {
-    const loadModule = async () => {
+    if (preventLoad) return;
+
+    (async () => {
+      setDownloadProgress(0);
+      setError(null);
       try {
         setIsReady(false);
-        module.onDownloadProgress(setDownloadProgress);
-        await module.load(...loadArgs);
+        await moduleInstance.load(model, setDownloadProgress);
         setIsReady(true);
       } catch (err) {
         setError((err as Error).message);
       }
+    })();
+
+    return () => {
+      moduleInstance.delete();
     };
-    if (!preventLoad) {
-      loadModule();
-    }
+
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [...loadArgs, preventLoad]);
+  }, [moduleInstance, ...Object.values(model), preventLoad]);
 
   const forward = async (...input: ForwardArgs): Promise<ForwardReturn> => {
     if (!isReady) throw new Error(getError(ETError.ModuleNotLoaded));
     if (isGenerating) throw new Error(getError(ETError.ModelGenerating));
     try {
       setIsGenerating(true);
-      return await module.forward(...input);
+      return await moduleInstance.forward(...input);
     } finally {
       setIsGenerating(false);
     }

package/src/index.ts

@@ -10,6 +10,7 @@ declare global {
   var loadTokenizerModule: (source: string) => any;
   var loadImageEmbeddings: (source: string) => any;
   var loadTextEmbeddings: (modelSource: string, tokenizerSource: string) => any;
+  var loadLLM: (modelSource: string, tokenizerSource: string) => any;
   var loadSpeechToText: (
     encoderSource: string,
     decoderSource: string,
@@ -40,10 +41,10 @@ if (
   global.loadTokenizerModule == null ||
   global.loadTextEmbeddings == null ||
   global.loadImageEmbeddings == null ||
+  global.loadLLM == null ||
   global.loadSpeechToText == null ||
   global.loadOCR == null ||
-  global.loadVerticalOCR == null ||
-  global.loadImageEmbeddings == null
+  global.loadVerticalOCR == null
 ) {
   if (!ETInstallerNativeModule) {
     throw new Error(

package/src/modules/BaseModule.ts

@@ -1,37 +1,26 @@
-import { ResourceFetcher } from '../utils/ResourceFetcher';
-import { getError } from '../Error';
 import { ResourceSource } from '../types/common';
+import { TensorPtr } from '../types/common';
 
-export class BaseModule {
-  protected static nativeModule: any;
-  static onDownloadProgressCallback: (downloadProgress: number) => void =
-    () => {};
+export abstract class BaseModule {
+  nativeModule: any = null;
 
-  static async load(
-    sources: ResourceSource[],
-    ...loadArgs: any[] // this can be used in derived classes to pass extra args to load method
-  ): Promise<void> {
-    try {
-      const paths = await ResourceFetcher.fetch(
-        this.onDownloadProgressCallback,
-        ...sources
-      );
-      if (paths === null || paths.length < sources.length) {
-        throw new Error('Download interrupted.');
-      }
-      await this.nativeModule.loadModule(...paths, ...loadArgs);
-    } catch (error) {
-      throw new Error(getError(error));
-    }
+  abstract load(
+    modelSource: ResourceSource,
+    onDownloadProgressCallback: (_: number) => void,
+    ...args: any[]
+  ): Promise<void>;
+
+  protected async forwardET(inputTensor: TensorPtr[]): Promise<TensorPtr[]> {
+    return await this.nativeModule.forward(inputTensor);
   }
 
-  protected static async forward(..._args: any[]): Promise<any> {
-    throw new Error(
-      'forward method is not implemented in the BaseModule class. Please implement it in the derived class.'
-    );
+  async getInputShape(methodName: string, index: number): Promise<number[]> {
+    return this.nativeModule.getInputShape(methodName, index);
   }
 
-  static onDownloadProgress(callback: (downloadProgress: number) => void) {
-    this.onDownloadProgressCallback = callback;
+  delete() {
+    if (this.nativeModule !== null) {
+      this.nativeModule.unload();
+    }
   }
 }

package/src/modules/computer_vision/ClassificationModule.ts

@@ -1,9 +1,9 @@
 import { ResourceFetcher } from '../../utils/ResourceFetcher';
 import { ResourceSource } from '../../types/common';
 import { ETError, getError } from '../../Error';
-import { BaseNonStaticModule } from '../BaseNonStaticModule';
+import { BaseModule } from '../BaseModule';
 
-export class ClassificationModule extends BaseNonStaticModule {
+export class ClassificationModule extends BaseModule {
   async load(
     model: { modelSource: ResourceSource },
     onDownloadProgressCallback: (progress: number) => void = () => {}

package/src/modules/computer_vision/ImageEmbeddingsModule.ts

@@ -1,9 +1,9 @@
 import { ResourceFetcher } from '../../utils/ResourceFetcher';
 import { ResourceSource } from '../../types/common';
 import { ETError, getError } from '../../Error';
-import { BaseNonStaticModule } from '../BaseNonStaticModule';
+import { BaseModule } from '../BaseModule';
 
-export class ImageEmbeddingsModule extends BaseNonStaticModule {
+export class ImageEmbeddingsModule extends BaseModule {
   async load(
     model: { modelSource: ResourceSource },
     onDownloadProgressCallback: (progress: number) => void = () => {}

package/src/modules/computer_vision/ImageSegmentationModule.ts

@@ -2,9 +2,9 @@ import { ResourceFetcher } from '../../utils/ResourceFetcher';
 import { ResourceSource } from '../../types/common';
 import { DeeplabLabel } from '../../types/imageSegmentation';
 import { ETError, getError } from '../../Error';
-import { BaseNonStaticModule } from '../BaseNonStaticModule';
+import { BaseModule } from '../BaseModule';
 
-export class ImageSegmentationModule extends BaseNonStaticModule {
+export class ImageSegmentationModule extends BaseModule {
   async load(
     model: { modelSource: ResourceSource },
     onDownloadProgressCallback: (progress: number) => void = () => {}

package/src/modules/computer_vision/ObjectDetectionModule.ts

@@ -2,9 +2,9 @@ import { ResourceFetcher } from '../../utils/ResourceFetcher';
 import { ResourceSource } from '../../types/common';
 import { Detection } from '../../types/objectDetection';
 import { ETError, getError } from '../../Error';
-import { BaseNonStaticModule } from '../BaseNonStaticModule';
+import { BaseModule } from '../BaseModule';
 
-export class ObjectDetectionModule extends BaseNonStaticModule {
+export class ObjectDetectionModule extends BaseModule {
   async load(
     model: { modelSource: ResourceSource },
     onDownloadProgressCallback: (progress: number) => void = () => {}

package/src/modules/computer_vision/StyleTransferModule.ts

@@ -1,9 +1,9 @@
 import { ResourceFetcher } from '../../utils/ResourceFetcher';
 import { ResourceSource } from '../../types/common';
 import { ETError, getError } from '../../Error';
-import { BaseNonStaticModule } from '../BaseNonStaticModule';
+import { BaseModule } from '../BaseModule';
 
-export class StyleTransferModule extends BaseNonStaticModule {
+export class StyleTransferModule extends BaseModule {
   async load(
     model: { modelSource: ResourceSource },
     onDownloadProgressCallback: (progress: number) => void = () => {}

package/src/modules/general/ExecutorchModule.ts

@@ -1,9 +1,9 @@
 import { TensorPtr } from '../../types/common';
-import { BaseNonStaticModule } from '../BaseNonStaticModule';
+import { BaseModule } from '../BaseModule';
 import { ResourceSource } from '../../types/common';
 import { ResourceFetcher } from '../../utils/ResourceFetcher';
 
-export class ExecutorchModule extends BaseNonStaticModule {
+export class ExecutorchModule extends BaseModule {
   async load(
     modelSource: ResourceSource,
     onDownloadProgressCallback: (progress: number) => void = () => {}