Skip to content

Commit ff753f0

Browse files
bmehta001Copilot
andcommitted
Merge main and address cancellation review feedback
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2 parents b604a2e + 58bba93 commit ff753f0

104 files changed

Lines changed: 6618 additions & 604 deletions

File tree

Some content is hidden

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

.pipelines/foundry-local-packaging.yml

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -761,34 +761,31 @@ extends:
761761
flcNugetDir: '$(Pipeline.Workspace)/flc-nuget'
762762
depsVersionsDir: '$(Pipeline.Workspace)/deps-versions-standard'
763763

764-
# The Linux JS test job is currently disabled due to intermittent SSL errors when running get_model_list. This issue is under investigation.
765-
# Error: Command 'get_model_list' failed: Error: System.Net.Http.HttpRequestException: An error occurred while sending the request.
766-
# ---> System.IO.IOException: The decryption operation failed, see inner exception.
767-
# ---> Interop+OpenSsl+SslException: Decrypt failed with OpenSSL error - SSL_ERROR_SSL.
768-
# ---> System.Security.Cryptography.CryptographicException: Error occurred during a cryptographic operation.
769-
# - job: test_js_linux_x64
770-
# displayName: 'linux-x64'
771-
# pool:
772-
# name: onnxruntime-Ubuntu2404-AMD-CPU
773-
# os: linux
774-
# templateContext:
775-
# inputs:
776-
# - input: pipelineArtifact
777-
# artifactName: 'flc-nuget'
778-
# targetPath: '$(Pipeline.Workspace)/flc-nuget'
779-
# - input: pipelineArtifact
780-
# artifactName: 'deps-versions-standard'
781-
# targetPath: '$(Pipeline.Workspace)/deps-versions-standard'
782-
# steps:
783-
# - checkout: self
784-
# clean: true
785-
# - checkout: test-data-shared
786-
# lfs: true
787-
# - template: .pipelines/templates/test-js-steps.yml@self
788-
# parameters:
789-
# isWinML: false
790-
# flcNugetDir: '$(Pipeline.Workspace)/flc-nuget'
791-
# depsVersionsDir: '$(Pipeline.Workspace)/deps-versions-standard'
764+
- job: test_js_linux_x64
765+
displayName: 'linux-x64'
766+
pool:
767+
name: onnxruntime-Ubuntu2404-AMD-CPU
768+
os: linux
769+
templateContext:
770+
inputs:
771+
- input: pipelineArtifact
772+
artifactName: 'flc-nuget'
773+
targetPath: '$(Pipeline.Workspace)/flc-nuget'
774+
- input: pipelineArtifact
775+
artifactName: 'deps-versions-standard'
776+
targetPath: '$(Pipeline.Workspace)/deps-versions-standard'
777+
steps:
778+
- checkout: self
779+
clean: true
780+
- template: .pipelines/templates/checkout-steps.yml@self
781+
parameters:
782+
repoName: test-data-shared
783+
basePath: '$(Agent.BuildDirectory)'
784+
- template: .pipelines/templates/test-js-steps.yml@self
785+
parameters:
786+
isWinML: false
787+
flcNugetDir: '$(Pipeline.Workspace)/flc-nuget'
788+
depsVersionsDir: '$(Pipeline.Workspace)/deps-versions-standard'
792789

793790
- job: test_js_osx_arm64
794791
displayName: 'osx-arm64'

.pipelines/templates/build-cs-steps.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,13 @@ steps:
4141
Write-Host "##vso[task.setvariable variable=repoRoot]$repoRoot"
4242
Write-Host "##vso[task.setvariable variable=testDataDir]$testDataDir"
4343
44+
# Using the latest SDK does not prevent us from targeting other platforms.
45+
# It ensures that we've got the latest tooling, fixes, and performance enhancements.
4446
- task: UseDotNet@2
45-
displayName: 'Use .NET 9 SDK'
47+
displayName: 'Use .NET 10 SDK'
4648
inputs:
4749
packageType: sdk
48-
version: '9.0.x'
50+
version: '10.0.x'
4951

5052
# Read version from the version-info artifact produced by compute_version stage.
5153
- task: PowerShell@2
@@ -132,7 +134,7 @@ steps:
132134
targetType: inline
133135
script: |
134136
$base = "$(repoRoot)/sdk/cs/src/bin/Release"
135-
# The SDK targets net9.0 (standard) or net9.0-windows10.0.26100.0 (WinML).
137+
# The SDK targets netstandard2.0 and any compatible runtime.
136138
# Find whichever TFM directory was produced by the build.
137139
$tfmDir = Get-ChildItem $base -Directory | Select-Object -First 1
138140
if (-not $tfmDir) { throw "No target framework directory found under $base" }

.pipelines/templates/test-cs-steps.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ steps:
3434
packageType: sdk
3535
version: '9.0.x'
3636

37+
- task: UseDotNet@2
38+
displayName: 'Install .NET 8 runtime'
39+
inputs:
40+
packageType: runtime
41+
version: '8.0.x'
42+
3743
# Load dependency versions from deps_versions.json
3844
- template: update-deps-versions-steps.yml
3945
parameters:
@@ -54,7 +60,7 @@ steps:
5460
<clear />
5561
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
5662
<add key="LocalFLC" value="${{ parameters.flcNugetDir }}" />
57-
<add key="ORT-Nightly" value="https://pkgs.dev.azure.com/aiinfra/PublicPackages/_packaging/ORT-Nightly/nuget/v3/index.json" />
63+
<add key="AIFoundryLocal_PublicPackages" value="https://pkgs.dev.azure.com/aiinfra/AIFoundryLocal/_packaging/AIFoundryLocal_PublicPackages/nuget/v3/index.json" />
5864
</packageSources>
5965
</configuration>
6066
"@

LICENSE

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,34 @@
1-
MICROSOFT SOFTWARE LICENSE TERMS
2-
3-
FOUNDRY LOCAL
4-
1+
FOUNDRY LOCAL LICENSE TERMS
2+
===========================
3+
4+
FOUNDRY LOCAL SDK
5+
-----------------
6+
7+
MIT License
8+
9+
Copyright (c) Microsoft Corporation
10+
11+
Permission is hereby granted, free of charge, to any person obtaining a copy
12+
of this software and associated documentation files (the "Software"), to deal
13+
in the Software without restriction, including without limitation the rights
14+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
15+
copies of the Software, and to permit persons to whom the Software is
16+
furnished to do so, subject to the following conditions:
17+
18+
The above copyright notice and this permission notice shall be included in all
19+
copies or substantial portions of the Software.
20+
21+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
22+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
23+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
24+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
25+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
26+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
27+
SOFTWARE.
28+
29+
FOUNDRY LOCAL CLI
30+
-----------------
31+
532
These license terms are an agreement between you and Microsoft Corporation (or based on where you live, one of its affiliates). They apply to the software named above. The terms also apply to any Microsoft services or updates for the software, except to the extent those have additional terms.
633

734
IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE RIGHTS BELOW.

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,4 +233,7 @@ Foundry Local supports Windows, macOS (Apple silicon), and Linux.
233233
234234
## ⚖️ License
235235
236-
Foundry Local is licensed under the Microsoft Software License Terms. For more details, read the [LICENSE](LICENSE) file.
236+
Foundry Local SDK is licensed under the MIT license. For more details, see the [LICENSE](LICENSE) file.
237+
Foundry Local CLI is licensed under the Microsoft Software License Terms. For more details, read the [LICENSE](LICENSE) file.
238+
239+
Individual models made available for use with Foundry Local are subject to the each model's license terms, notices, and use restrictions. Refer to the model's documentation or download/listing page for the applicable terms before using or redistributing a model.

licenses/deepseek.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

licenses/mistral.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

licenses/phi.md

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Live Audio Transcription Example (C++)
2+
3+
Demonstrates real-time microphone-to-text using the Foundry Local C++ SDK.
4+
5+
Uses [PortAudio](http://www.portaudio.com/) for cross-platform microphone capture
6+
(the C/C++ equivalent of `naudiodon2` used by the JS sample). If PortAudio is not
7+
available, falls back to synthetic PCM audio.
8+
9+
10+
## Build
11+
12+
```bash
13+
# With PortAudio (live microphone)
14+
g++ -std=c++20 -DHAS_PORTAUDIO main.cpp -lfoundry_local -lportaudio -o live-audio-transcription-example
15+
16+
# Without PortAudio (synthetic audio only)
17+
g++ -std=c++20 main.cpp -lfoundry_local -o live-audio-transcription-example
18+
```
19+
20+
## Run
21+
22+
```bash
23+
# Live microphone (requires PortAudio)
24+
./live-audio-transcription-example
25+
26+
# Synthetic 440Hz sine wave (no microphone needed)
27+
./live-audio-transcription-example --synth
28+
```

0 commit comments

Comments
 (0)