Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/doxygen/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ PROJECT_NAME = "LLM for Unity"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = v3.0.0
PROJECT_NUMBER = v3.0.1

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## v3.0.1
#### 🚀 Features

- add Unity.Nuget.Newtonsoft-Json in the assembly definition (PR: #379)
- Update LlamaLib to v2.0.2 (llama.cpp b7777) (PR: #380)

#### 🐛 Fixes

- fix running in Editor with Android/iOS platform selected (PR: #378)


## v2.5.2
#### 🚀 Features

Expand Down
8 changes: 6 additions & 2 deletions CHANGELOG.release.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
### 🚀 Features

- Support Android x86-64 architecture (Magic Leap 2) (PR: #344)
- Combine ARM and Intel architectures of macOS (PR: #345)
- add Unity.Nuget.Newtonsoft-Json in the assembly definition (PR: #379)
- Update LlamaLib to v2.0.2 (llama.cpp b7777) (PR: #380)

### 🐛 Fixes

- fix running in Editor with Android/iOS platform selected (PR: #378)

5 changes: 3 additions & 2 deletions Editor/undream.llmunity.Editor.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"Editor"
],
"references": [
"undream.llmunity.Runtime"
"undream.llmunity.Runtime",
"Unity.Nuget.Newtonsoft-Json"
]
}
}
6 changes: 3 additions & 3 deletions Runtime/LLMUnitySetup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ public class LLMUnitySetup
{
// DON'T CHANGE! the version is autocompleted with a GitHub action
/// <summary> LLM for Unity version </summary>
public static string Version = "v3.0.0";
public static string Version = "v3.0.1";
/// <summary> LlamaLib version </summary>
public static string LlamaLibVersion = "v2.0.0";
public static string LlamaLibVersion = "v2.0.2";
/// <summary> LlamaLib release url </summary>
public static string LlamaLibReleaseURL = $"https://github.com/undreamai/LlamaLib/releases/download/{LlamaLibVersion}";
/// <summary> LlamaLib name </summary>
Expand Down Expand Up @@ -318,7 +318,7 @@ public static async Task AndroidExtractFile(string assetName, bool overwrite = f
{
if (!androidExtractTasks.TryGetValue(assetName, out extractionTask))
{
#if UNITY_ANDROID
#if !UNITY_EDITOR && UNITY_ANDROID
extractionTask = AndroidExtractFileOnce(assetName, overwrite, log, chunkSize);
#else
extractionTask = Task.CompletedTask;
Expand Down
8 changes: 4 additions & 4 deletions Runtime/LlamaLib/LibraryLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static IntPtr LoadLibrary(string libraryPath)
if (string.IsNullOrEmpty(libraryPath))
throw new ArgumentNullException(nameof(libraryPath));

#if (ANDROID || IOS || VISIONOS) || (UNITY_ANDROID || UNITY_IOS || UNITY_VISIONOS)
#if (ANDROID || IOS || VISIONOS) || (!UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS || UNITY_VISIONOS))
return Mobile.dlopen(libraryPath);
#else
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand All @@ -64,7 +64,7 @@ public static IntPtr GetSymbol(IntPtr library, string symbolName)
if (string.IsNullOrEmpty(symbolName))
throw new ArgumentNullException(nameof(symbolName));

#if (ANDROID || IOS || VISIONOS) || (UNITY_ANDROID || UNITY_IOS || UNITY_VISIONOS)
#if (ANDROID || IOS || VISIONOS) || (!UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS || UNITY_VISIONOS))
return Mobile.dlsym(library, symbolName);
#else
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand All @@ -86,7 +86,7 @@ public static void FreeLibrary(IntPtr library)
if (library == IntPtr.Zero)
return;

#if (ANDROID || IOS || VISIONOS) || (UNITY_ANDROID || UNITY_IOS || UNITY_VISIONOS)
#if (ANDROID || IOS || VISIONOS) || (!UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS || UNITY_VISIONOS))
Mobile.dlclose(library);
#else
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand Down Expand Up @@ -192,7 +192,7 @@ private static class Mobile
{
public static IntPtr dlopen(string path) => dlopen(path, 1);

#if (ANDROID || IOS || VISIONOS) || (UNITY_ANDROID || UNITY_IOS || UNITY_VISIONOS)
#if (ANDROID || IOS || VISIONOS) || (!UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS || UNITY_VISIONOS))
[DllImport("__Internal")]
public static extern IntPtr dlopen(string filename, int flags);

Expand Down
5 changes: 3 additions & 2 deletions Runtime/undream.llmunity.Runtime.asmdef
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "undream.llmunity.Runtime",
"references": [
"Cloud.Unum.USearch"
"Cloud.Unum.USearch",
"Unity.Nuget.Newtonsoft-Json"
]
}
}
3 changes: 2 additions & 1 deletion Tests/Editor/undream.llmunity.Editor.Tests.asmdef
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"name": "undream.llmunity.Editor.Tests",
"references": [
"undream.llmunity.Runtime"
"undream.llmunity.Runtime",
"Unity.Nuget.Newtonsoft-Json"
],
"optionalUnityReferences": [
"TestAssemblies"
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v3.0.0
v3.0.1
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ai.undream.llm",
"version": "3.0.0",
"version": "3.0.1",
"displayName": "LLM for Unity",
"description": "LLM for Unity allows to run and distribute Large Language Models (LLMs) in the Unity engine.",
"unity": "2022.3",
Expand Down
Loading