8000 Enhancements and adjustments · Embarcadero/llama-cpp-delphi@451c4a9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 451c4a9

Browse files
lmbelolmbelo
committed
Enhancements and adjustments
1 parent d4ec316 commit 451c4a9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+5226
-135
lines changed

‎images/bmp/128x128/llama_cpp.bmp

48.1 KB
Binary file not shown.

‎images/bmp/16x16/llama_cpp.bmp

822 Bytes
Binary file not shown.

‎images/bmp/24x24/llama_cpp.bmp

1.74 KB
Binary file not shown.

‎images/bmp/32x32/llama_cpp.bmp

3.05 KB
Binary file not shown.

‎images/png/128x128/llama_cpp.png

17.3 KB
Loading

‎images/png/16x16/llama_cpp.png

6.12 KB
Loading

‎images/png/24x24/llama_cpp.png

6.58 KB
Loading

‎images/png/32x32/llama_cpp.png

7.31 KB
Loading

‎packages/LlamaCpp.dpk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ package LlamaCpp;
2525
{$IMAGEBASE $400000}
2626
{$DEFINE DEBUG}
2727
{$ENDIF IMPLICITBUILDING}
28+
{$LIBSUFFIX AUTO}
29+
{$RUNONLY}
2830
{$IMPLICITBUILD ON}
2931

3032
requires

‎packages/LlamaCpp.dproj

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
<ProjectVersion>20.2</ProjectVersion>
66
<FrameworkType>None</FrameworkType>
77
<Base>True</Base>
8-
<Config Condition="'$(Config)'==''">Debug</Config>
9-
<Platform Condition="'$(Platform)'==''">OSXARM64</Platform>
10-
<TargetedPlatforms>131075</TargetedPlatforms>
8+
<Config Condition="'$(Config)'==''">Release</Config>
9+
<Platform Condition="'$(Platform)'==''">Win32</Platform>
10+
<TargetedPlatforms>1183875</TargetedPlatforms>
1111
<AppType>Package</AppType>
12+
<ProjectName Condition="'$(ProjectName)'==''">LlamaCpp</ProjectName>
1213
</PropertyGroup>
1314
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1415
<Base>true</Base>
@@ -33,6 +34,11 @@
3334
<CfgParent>Base</CfgParent>
3435
<Base>true</Base>
3536
</PropertyGroup>
37+
<PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Base)'=='true') or '$(Base_OSX64)'!=''">
38+
<Base_OSX64>true</Base_OSX64>
39+
<CfgParent>Base</CfgParent>
40+
<Base>true</Base>
41+
</PropertyGroup>
3642
<PropertyGroup Condition="('$(Platform)'=='OSXARM64' and '$(Base)'=='true') or '$(Base_OSXARM64)'!=''">
3743
<Base_OSXARM64>true</Base_OSXARM64>
3844
<CfgParent>Base</CfgParent>
@@ -48,6 +54,11 @@
4854
<CfgParent>Base</CfgParent>
4955
<Base>true</Base>
5056
</PropertyGroup>
57+
<PropertyGroup Condition="('$(Platform)'=='Win64x' and '$(Base)'=='true') or '$(Base_Win64x)'!=''">
58+
<Base_Win64x>true</Base_Win64x>
59+
<CfgParent>Base</CfgParent>
60+
<Base>true</Base>
61+
</PropertyGroup>
5162
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
5263
<Cfg_1>true</Cfg_1>
5364
<CfgParent>Base</CfgParent>
@@ -59,6 +70,12 @@
5970
<Cfg_1>true</Cfg_1>
6071
<Base>true</Base>
6172
</PropertyGroup>
73+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
74+
<Cfg_1_Win64>true</Cfg_1_Win64>
75+
<CfgParent>Cfg_1</CfgParent>
76+
<Cfg_1>true</Cfg_1>
77+
<Base>true</Base>
78+
</PropertyGroup>
6279
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
6380
<Cfg_2>true</Cfg_2>
6481
<CfgParent>Base</CfgParent>
@@ -79,6 +96,8 @@
7996
<SanitizedProjectName>LlamaCpp</SanitizedProjectName>
8097
<VerInfo_Locale>1033</VerInfo_Locale>
8198
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
99+
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
100+
<DllSuffix>$(Auto)</DllSuffix>
82101
</PropertyGroup>
83102
<PropertyGroup Condition="'$(Base_Android)'!=''">
84103
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
@@ -94,6 +113,10 @@
94113
<PropertyGroup Condition="'$(Base_iOSSimARM64)'!=''">
95114
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
96115
</PropertyGroup>
116+
<PropertyGroup Condition="'$(Base_OSX64)'!=''">
117+
<VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple&apos;s speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface</VerInfo_Keys>
118+
<BT_BuildType>Debug</BT_BuildType>
119+
</PropertyGroup>
97120
<PropertyGroup Condition="'$(Base_OSXARM64)'!=''">
98121
<VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple&apos;s speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface</VerInfo_Keys>
99122
<BT_BuildType>Debug</BT_BuildType>
@@ -110,6 +133,11 @@
110133
<BT_BuildType>Debug</BT_BuildType>
111134
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
112135
</PropertyGroup>
136+
<PropertyGroup Condition="'$(Base_Win64x)'!=''">
137+
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
138+
<BT_BuildType>Debug</BT_BuildType>
139+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
140+
</PropertyGroup>
113141
<PropertyGroup Condition="'$(Cfg_1)'!=''">
114142
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
115143
<DCC_DebugDCUs>true</DCC_DebugDCUs>
@@ -125,6 +153,9 @@
125153
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
126154
<VerInfo_Locale>1033</VerInfo_Locale>
127155
</PropertyGroup>
156+
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
157+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
158+
</PropertyGroup>
128159
<PropertyGroup Condition="'$(Cfg_2)'!=''">
129160
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
130161
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
@@ -1121,12 +1152,12 @@
11211152
<Platform value="Android64">False</Platform>
11221153
<Platform value="iOSDevice64">False</Platform>
11231154
<Platform value="iOSSimARM64">False</Platform>
1124-
<Platform value="Linux64">False</Platform>
1125-
<Platform value="OSX64">False</Platform>
1155+
<Platform value="Linux64">True</Platform>
1156+
<Platform value="OSX64">True</Platform>
11261157
<Platform value="OSXARM64">True</Platform>
11271158
<Platform value="Win32">True</Platform>
11281159
<Platform value="Win64">True</Platform>
1129-
<Platform value="Win64x">False</Platform>
1160+
<Platform value="Win64x">True</Platform>
11301161
</Platforms>
11311162
<UnitTesting>
11321163
<TestProjectName>C:\Dev\Delphi\Projects\llama-cpp-delphi\Test\LlamaCppTests.dproj</TestProjectName>

‎packages/LlamaCppBindings.groupproj

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
<Projects Include="LlamaCpp.dproj">
77
<Dependencies/>
88
</Projects>
9+
<Projects Include="dclLlamaCpp.dproj">
10+
<Dependencies/>
11+
</Projects>
912
<Projects Include="..\Test\LlamaCppTests.dproj">
1013
<Dependencies/>
1114
</Projects>
@@ -26,6 +29,15 @@
2629
<Target Name="LlamaCpp:Make">
2730
<MSBuild Projects="LlamaCpp.dproj" Targets="Make"/>
2831
</Target>
32+
<Target Name="dclLlamaCpp">
33+
<MSBuild Projects="dclLlamaCpp.dproj"/>
34+
</Target>
35+
<Target Name="dclLlamaCpp:Clean">
36+
<MSBuild Projects="dclLlamaCpp.dproj" Targets="Clean"/>
37+
</Target>
38+
<Target Name="dclLlamaCpp:Make">
39+
<MSBuild Projects="dclLlamaCpp.dproj" Targets="Make"/>
40+
</Target>
2941
<Target Name="LlamaCppTests">
3042
<MSBuild Projects="..\Test\LlamaCppTests.dproj"/>
3143
</Target>
@@ -36,13 +48,13 @@
3648< 1241 /code>
<MSBuild Projects="..\Test\LlamaCppTests.dproj" Targets="Make"/>
3749
</Target>
3850
<Target Name="Build">
39-
<CallTarget Targets="LlamaCpp;LlamaCppTests"/>
51+
<CallTarget Targets="LlamaCpp;dclLlamaCpp;LlamaCppTests"/>
4052
</Target>
4153
<Target Name="Clean">
42-
<CallTarget Targets="LlamaCpp:Clean;LlamaCppTests:Clean"/>
54+
<CallTarget Targets="LlamaCpp:Clean;dclLlamaCpp:Clean;LlamaCppTests:Clean"/>
4355
</Target>
4456
<Target Name="Make">
45-
<CallTarget Targets="LlamaCpp:Make;LlamaCppTests:Make"/>
57+
<CallTarget Targets="LlamaCpp:Make;dclLlamaCpp:Make;LlamaCppTests:Make"/>
4658
</Target>
4759
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
4860
</Project>

‎packages/dclLlamaCpp.dpk

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
package dclLlamaCpp;
2+
3+
{$R *.res}
4+
{$R *.dres}
5+
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
6+
{$ALIGN 8}
7+
{$ASSERTIONS ON}
8+
{$BOOLEVAL OFF}
9+
{$DEBUGINFO OFF}
10+
{$EXTENDEDSYNTAX ON}
11+
{$IMPORTEDDATA ON}
12+
{$IOCHECKS ON}
13+
{$LOCALSYMBOLS ON}
14+
{$LONGSTRINGS ON}
15+
{$OPENSTRINGS ON}
16+
{$OPTIMIZATION OFF}
17+
{$OVERFLOWCHECKS ON}
18+
{$RANGECHECKS ON}
19+
{$REFERENCEINFO ON}
20+
{$SAFEDIVIDE OFF}
21+
{$STACKFRAMES ON}
22+
{$TYPEDADDRESS OFF}
23+
{$VARSTRINGCHECKS ON}
24+
{$WRITEABLECONST OFF}
25+
{$MINENUMSIZE 1}
26+
{$IMAGEBASE $400000}
27+
{$DEFINE DEBUG}
28+
{$ENDIF IMPLICITBUILDING}
29+
{$DESCRIPTION 'Delphi bindings for Llama.cpp'}
30+
{$LIBSUFFIX AUTO}
31+
{$DESIGNONLY}
32+
{$IMPLICITBUILD ON}
33+
34+
requires
35+
rtl,
36+
llamacpp;
37+
38+
contains
39+
LlamaCpp.Registration in '..\src\LlamaCpp.Registration.pas';
40+
41+
end.

0 commit comments

Comments
 (0)
0