Skip to content

Fix ONNX converter #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gsvgit merged 2 commits into from
Apr 14, 2025
Merged

Fix ONNX converter #96

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3220cd5
Fix indices in ONNX converter.
Anya497 Apr 8, 2025
3789669
Remove obsolete comment.
Anya497 Apr 12, 2025
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
31 changes: 17 additions & 14 deletions VSharp.Explorer/AISearcher.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ type internal AISearcher(oracle: Oracle, aiAgentTrainingMode: Option<AIAgentTrai
| Some(SendEachStep _) -> TrainingSendEachStep
| Some(SendModel _) -> TrainingSendModel
| None -> Runner

let pick selector =
if useDefaultSearcher then
defaultSearcherSteps <- defaultSearcherSteps + 1u<step>
Expand Down Expand Up @@ -122,7 +123,7 @@ type internal AISearcher(oracle: Oracle, aiAgentTrainingMode: Option<AIAgentTrai

Application.applicationGraphDelta.Clear()

if stepsToPlay = stepsPlayed then
if aiMode <> Runner && stepsToPlay = stepsPlayed then
None
else
let toPredict =
Expand All @@ -136,6 +137,7 @@ type internal AISearcher(oracle: Oracle, aiAgentTrainingMode: Option<AIAgentTrai
| Runner -> gameState.Value

let stateId = oracle.Predict toPredict

afterFirstAIPeek <- true
let state = availableStates |> Seq.tryFind (fun s -> s.internalId = stateId)
lastCollectedStatistics <- statistics
Expand All @@ -147,6 +149,7 @@ type internal AISearcher(oracle: Oracle, aiAgentTrainingMode: Option<AIAgentTrai
incorrectPredictedStateId <- true
oracle.Feedback(Feedback.IncorrectPredictedStateId stateId)
None

static member updateGameState (delta: GameState) (gameState: Option<GameState>) =
match gameState with
| None -> Some delta
Expand Down Expand Up @@ -199,11 +202,11 @@ type internal AISearcher(oracle: Oracle, aiAgentTrainingMode: Option<AIAgentTrai
Some
<| GameState(vertices.ToArray(), states, pathConditionVertices.ToArray(), edges.ToArray())

static member convertOutputToJson (output: IDisposableReadOnlyCollection<OrtValue>) =
static member convertOutputToJson(output: IDisposableReadOnlyCollection<OrtValue>) =
seq { 0 .. output.Count - 1 }
|> Seq.map (fun i -> output[i].GetTensorDataAsSpan<float32>().ToArray())



new
(
Expand Down Expand Up @@ -309,11 +312,11 @@ type internal AISearcher(oracle: Oracle, aiAgentTrainingMode: Option<AIAgentTrai
stateIds.Add(v.Id, i)
let j = i * numOfStateAttributes
attributes.[j] <- float32 v.Position
attributes.[j + 2] <- float32 v.VisitedAgainVertices
attributes.[j + 3] <- float32 v.VisitedNotCoveredVerticesInZone
attributes.[j + 4] <- float32 v.VisitedNotCoveredVerticesOutOfZone
attributes.[j + 5] <- float32 v.StepWhenMovedLastTime
attributes.[j + 6] <- float32 v.InstructionsVisitedInCurrentBlock
attributes.[j + 1] <- float32 v.VisitedAgainVertices
attributes.[j + 2] <- float32 v.VisitedNotCoveredVerticesInZone
attributes.[j + 3] <- float32 v.VisitedNotCoveredVerticesOutOfZone
attributes.[j + 4] <- float32 v.StepWhenMovedLastTime
attributes.[j + 5] <- float32 v.InstructionsVisitedInCurrentBlock

OrtValue.CreateTensorValueFromMemory(attributes, shape), numOfParentOfEdges, numOfHistoryEdges

Expand All @@ -325,17 +328,17 @@ type internal AISearcher(oracle: Oracle, aiAgentTrainingMode: Option<AIAgentTrai
for v in gameState.PathConditionVertices do
for child in v.Children do
// from vertex to child
index.[firstFreePositionOfIndex] <- pathConditionVerticesIds.[v.Id]
index.[firstFreePositionOfIndex] <- int64 pathConditionVerticesIds.[v.Id]

index.[firstFreePositionOfIndex + 2 * numOfPcToPcEdges] <-
pathConditionVerticesIds.[child]
index.[firstFreePositionOfIndex + numOfPcToPcEdges] <-
int64 pathConditionVerticesIds.[child]

firstFreePositionOfIndex <- firstFreePositionOfIndex + 1
// from child to vertex
index.[firstFreePositionOfIndex] <- pathConditionVerticesIds.[child]
index.[firstFreePositionOfIndex] <- int64 pathConditionVerticesIds.[child]

index.[firstFreePositionOfIndex + 2 * numOfPcToPcEdges] <-
pathConditionVerticesIds.[v.Id]
index.[firstFreePositionOfIndex + numOfPcToPcEdges] <-
int64 pathConditionVerticesIds.[v.Id]

firstFreePositionOfIndex <- firstFreePositionOfIndex + 1

Expand Down
Loading