Skip to content

Commit 61c1b7b

Browse files
author
ChrisMaunder
committed
Updated to 2.1
1 parent 65acf54 commit 61c1b7b

File tree

425 files changed

+17555
-7256
lines changed

Some content is hidden

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

425 files changed

+17555
-7256
lines changed

‎.vscode/launch.json

Lines changed: 482 additions & 91 deletions
Large diffs are not rendered by default.

‎.vscode/tasks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"command": "dotnet",
8686
"args": [
8787
"build",
88-
"${workspaceFolder}/src/AnalysisLayer/ObjectDetectionNet",
88+
"${workspaceFolder}/src/modules/ObjectDetectionNet",
8989
"/property:GenerateFullPaths=true",
9090
"/consoleloggerparameters:NoSummary"
9191
],

‎CodeProject.AI.sln

Lines changed: 370 additions & 158 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ transfer, and is easy to use.
1414

1515
<div style="width:75%;min-width:700px;margin:30px auto">
1616

17-
| <img src="https://www.codeproject.com/ai/docs/img/windows.svg" title="Windows" style="width:64px"> | <img src="https://www.codeproject.com/ai/docs/img/macos.svg" title="macOS" style="width:72px"> | <img src="https://www.codeproject.com/ai/docs/img/apple-silicon.svg" title="Apple Silicon" style="width:64px"> | <img src="https://www.codeproject.com/ai/docs/img/Ubuntu.svg" title="Ubuntu" style="width:64px"> | <img src="https://www.codeproject.com/ai/docs/img/docker.svg" title="Docker" style="width:64px"> | <img src="https://www.codeproject.com/ai/docs/img/VisualStudio.svg" title="Visual Studio" style="width:64px"> | <img src="https://www.codeproject.com/ai/docs/img/VisualStudioCode.svg" title="Visual Studio Code" style="width:64px"> |
18-
| :------: | :---: | :---------: | :-----: | :----: | :--------------------: | :-------------------: |
19-
| Windows | macOS | macOS-arm64 | Ubuntu | Docker | Visual Studio<br>2019+ | Visual Studio<br>Code |
17+
| <img src="https://www.codeproject.com/ai/docs/img/windows.svg" title="Windows" style="width:64px"> | <img src="https://www.codeproject.com/ai/docs/img/macos.svg" title="macOS" style="width:72px"> | <img src="https://www.codeproject.com/ai/docs/img/apple-silicon.svg" title="Apple Silicon" style="width:64px"> | <img src="https://www.codeproject.com/ai/docs/img/Ubuntu.svg" title="Ubuntu" style="width:64px"> | <img src="https://www.codeproject.com/ai/docs/img/RaspberryPi64.svg" title="Raspberry Pi arm64" style="width:64px"> | <img src="https://www.codeproject.com/ai/docs/img/docker.svg" title="Docker" style="width:64px"> | <img src="https://www.codeproject.com/ai/docs/img/VisualStudio.svg" title="Visual Studio" style="width:64px"> | <img src="https://www.codeproject.com/ai/docs/img/VisualStudioCode.svg" title="Visual Studio Code" style="width:64px"> |
18+
| :------: | :---: | :---------: | :-----: | :----: | :----: | :--------------------: | :-------------------: |
19+
| Windows | macOS | macOS arm64 | Ubuntu | Raspberry&nbsp;Pi arm64 | Docker | Visual Studio<br>2019+ | Visual Studio<br>Code |
2020

2121
</div>
2222

‎demos/Python/Face/Face.pyproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<Interpreter Include="$(ProjectDir)\..\..\..\..\src\AnalysisLayer\bin\windows\python39\venv\">
36+
<Interpreter Include="$(ProjectDir)\..\..\..\..\src\runtimes\bin\windows\python39\venv\">
3737
<Id>env</Id>
3838
<Version>3.9</Version>
3939
<Description>env (Python 3.9 (64-bit))</Description>

‎demos/Python/ObjectDetect/ObjectDetect.pyproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<Interpreter Include="$(ProjectDir)\..\..\..\..\src\AnalysisLayer\bin\windows\python39\venv\">
35+
<Interpreter Include="$(ProjectDir)\..\..\..\..\src\runtimes\bin\windows\python39\venv\">
3636
<Id>env</Id>
3737
<Version>3.9</Version>
3838
<Description>env (Python 3.9 (64-bit))</Description>

‎demos/TestData/Faces/scarlett-johanson-1.webp

-194 KB
Binary file not shown.

‎demos/dotNet/CodeProject.AI.Explorer/CodeProject.AI.Explorer.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<!-- Platform, architecture, runtime target defines -->
3+
<!-- Set defines: Windows, Linux, macOS and/or Arm64. This is needed in some files! -->
44
<Import Project="../../../src/SDK/NET/Common.targets" />
55

66
<PropertyGroup>
77
<RootNamespace>CodeProject.AI.Explorer</RootNamespace>
88
<AssemblyName>CodeProject.AI.Explorer</AssemblyName>
99
<OutputType>WinExe</OutputType>
10-
<TargetFramework>net7.0-windows</TargetFramework>
1110
<Nullable>enable</Nullable>
1211
<UseWindowsForms>true</UseWindowsForms>
1312
<ApplicationIcon>favicon.ico</ApplicationIcon>
1413
<SelfContained>false</SelfContained>
1514
<PublishSingleFile>false</PublishSingleFile>
1615
<Platform>AnyCPU</Platform>
16+
<TargetFramework>net7.0-windows</TargetFramework>
1717
</PropertyGroup>
1818

1919
<!-- Common Release properties -->

‎demos/install.bat

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@
22
::
33
:: CodeProject.AI Demos
44
::
5-
:: This script is only called from ../src/setup.bat
5+
:: This script is only called from ..\src\setup.bat
66

77
@if "%1" NEQ "install" (
8-
echo This script is only called from ../src/setup.bat
8+
echo This script is only called from ..\src\setup.bat
99
@pause
1010
@goto:eof
1111
)
1212

13-
call "%sdkScriptsPath%\utils.bat" SetupPython 3.9
14-
call "%sdkScriptsPath%\utils.bat" InstallPythonPackages 3.9 "%modulePath%\Python"
13+
call "%sdkScriptsPath%\utils.bat" SetupPython 3.9 "Shared"
14+
if errorlevel 1 exit /b 1
15+
16+
call "%sdkScriptsPath%\utils.bat" InstallPythonPackages 3.9 "%modulePath%\Python" "Shared"
17+
if errorlevel 1 exit /b 1

‎demos/install.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,8 @@ fi
1616

1717

1818
# Install python and the required dependencies. If we find imutils then asssume it's all there
19-
setupPython 3.8
20-
installPythonPackages 3.8 "${modulePath}/Python"
19+
setupPython 3.8 "Shared"
20+
if [ $? -ne 0 ]; then quit 1; fi
21+
22+
installPythonPackages 3.8 "${modulePath}/Python" "Shared"
23+
if [ $? -ne 0 ]; then quit 1; fi

0 commit comments

Comments
 (0)