Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ public async Task<string> CreateJobScriptAsync(
+ $" 'trg_lang': '{trgLang}',\n"
+ $" 'shared_file_uri': '{baseUri}',\n"
+ $" 'shared_file_folder': '{folder}',\n"
+ (buildOptions is not null ? $" 'build_options': '''{buildOptions}''',\n" : "")
+ (
buildOptions is not null
? $" 'build_options': '''{Convert.ToBase64String(Encoding.UTF8.GetBytes(buildOptions))}''',\n"
: ""
)
// buildRevision + 1 because the build revision is incremented after the build job
// is finished successfully but the file should be saved with the new revision number
+ (engine.IsModelPersisted ? $" 'save_model': '{engineId}_{engine.BuildRevision + 1}',\n" : $"")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ public async Task<string> CreateJobScriptAsync(
+ $" 'build_id': '{buildId}',\n"
+ $" 'shared_file_uri': '{baseUri}',\n"
+ $" 'shared_file_folder': '{folder}',\n"
+ (buildOptions is not null ? $" 'build_options': '''{buildOptions}''',\n" : "")
+ (
buildOptions is not null
? $" 'build_options': '''{Convert.ToBase64String(Encoding.UTF8.GetBytes(buildOptions))}''',\n"
: ""
)
+ $" 'clearml': True\n"
+ "}\n"
+ "run(args)\n";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ public async Task<string> CreateJobScriptAsync(
+ $" 'build_id': '{buildId}',\n"
+ $" 'shared_file_uri': '{baseUri}',\n"
+ $" 'shared_file_folder': '{folder}',\n"
+ (buildOptions is not null ? $" 'build_options': '''{buildOptions}''',\n" : "")
+ (
buildOptions is not null
? $" 'build_options': '''{Convert.ToBase64String(Encoding.UTF8.GetBytes(buildOptions))}''',\n"
: ""
)
+ $" 'clearml': True\n"
+ "}\n"
+ "run(args)\n";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,30 @@ public class NmtClearMLBuildJobFactoryTests
public async Task CreateJobScriptAsync_BuildOptions()
{
var env = new TestEnvironment();
const string BuildOptions = "{ \"max_steps\": \"10\" }";
string buildOptionsBase64 = Convert.ToBase64String(Encoding.UTF8.GetBytes(BuildOptions));
string script = await env.BuildJobFactory.CreateJobScriptAsync(
"engine1",
"build1",
"test_model",
BuildStage.Train,
buildOptions: "{ \"max_steps\": \"10\" }"
buildOptions: BuildOptions
);
Assert.That(
script,
Is.EqualTo(
@"from machine.jobs.build_nmt_engine import run
args = {
$@"from machine.jobs.build_nmt_engine import run
args = {{
'model_type': 'test_model',
'engine_id': 'engine1',
'build_id': 'build1',
'src_lang': 'spa_Latn',
'trg_lang': 'eng_Latn',
'shared_file_uri': 's3://bucket',
'shared_file_folder': 'folder1/folder2',
'build_options': '''{ ""max_steps"": ""10"" }''',
'build_options': '''{buildOptionsBase64}''',
'clearml': True
}
}}
run(args)
".ReplaceLineEndings("\n")
)
Expand Down
2 changes: 1 addition & 1 deletion src/Machine/test/Serval.Machine.Shared.Tests/Usings.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
global using System.Text;
global using System.Text.Json;
global using System.Text.Json.Nodes;
global using Microsoft.Extensions.DependencyInjection;
Expand All @@ -6,7 +7,6 @@
global using Microsoft.Extensions.Logging;
global using Microsoft.Extensions.Options;
global using NSubstitute;
global using NSubstitute.ReceivedExtensions;
global using NUnit.Framework;
global using NUnit.Framework.Constraints;
global using RichardSzalay.MockHttp;
Expand Down
Loading