@@ -396,12 +396,12 @@ public static List<Integer> generateTokensGPULlama(Model model, State state, int
396396 long tornadoCompileNanos = 0 ;
397397 long tornadoWarmupNanos = 0 ;
398398 // If statement to prevent inadvertent crashes from future features
399- if (tornadoVMMasterPlan != null ) {
400- tornadoCompileNanos = tornadoVMMasterPlan .getCompileDurationNanos ();
401- tornadoWarmupNanos = tornadoVMMasterPlan .getWarmupDurationNanos ();
399+ if (tornadoVMPlan != null ) {
400+ tornadoCompileNanos = tornadoVMPlan .getCompileDurationNanos ();
401+ tornadoWarmupNanos = tornadoVMPlan .getWarmupDurationNanos ();
402402 // Reset values so they are only output if they are changed in tornadoVMMasterPlan.java
403- tornadoVMMasterPlan .setCompileDurationNanos (0 );
404- tornadoVMMasterPlan .setWarmupDurationNanos (0 );
403+ tornadoVMPlan .setCompileDurationNanos (0 );
404+ tornadoVMPlan .setWarmupDurationNanos (0 );
405405 }
406406 LastRunMetrics .setMetrics (totalTokens , totalNanos , promptEvalCount , promptNanos , inferenceEvalCount , inferenceNanos , tornadoCompileNanos , tornadoWarmupNanos );
407407
@@ -490,7 +490,7 @@ public static List<Integer> generateTokensGPUQwen3(Model model, State state, int
490490 state .latestToken = currentToken = nextToken ;
491491 }
492492
493- // Calculate and print performance metrics
493+ // Calculate and Print Performance Metrics
494494 long endNanos = System .nanoTime ();
495495 if (inferenceStartNanos == 0 ) {
496496 inferenceStartNanos = endNanos ; // Prevents negative time if no tokens were generated
@@ -504,12 +504,12 @@ public static List<Integer> generateTokensGPUQwen3(Model model, State state, int
504504 long tornadoCompileNanos = 0 ;
505505 long tornadoWarmupNanos = 0 ;
506506 // If statement to prevent inadvertent crashes from future features
507- if (tornadoVMMasterPlan != null ) {
508- tornadoCompileNanos = tornadoVMMasterPlan .getCompileDurationNanos ();
509- tornadoWarmupNanos = tornadoVMMasterPlan .getWarmupDurationNanos ();
507+ if (tornadoVMPlan != null ) {
508+ tornadoCompileNanos = tornadoVMPlan .getCompileDurationNanos ();
509+ tornadoWarmupNanos = tornadoVMPlan .getWarmupDurationNanos ();
510510 // Reset values so they are only output if they are changed in tornadoVMMasterPlan.java
511- tornadoVMMasterPlan .setCompileDurationNanos (0 );
512- tornadoVMMasterPlan .setWarmupDurationNanos (0 );
511+ tornadoVMPlan .setCompileDurationNanos (0 );
512+ tornadoVMPlan .setWarmupDurationNanos (0 );
513513 }
514514 LastRunMetrics .setMetrics (totalTokens , totalNanos , promptEvalCount , promptNanos , inferenceEvalCount , inferenceNanos , tornadoCompileNanos , tornadoWarmupNanos );
515515
@@ -581,7 +581,7 @@ public static List<Integer> generateTokensGPUPhi3(Model model, State state, int
581581 pos ++;
582582 }
583583
584- // Calculate and print performance metrics
584+ // Calculate and Print Performance Metrics
585585 long endNanos = System .nanoTime ();
586586 if (inferenceStartNanos == 0 ) {
587587 inferenceStartNanos = endNanos ; // Prevents negative time if no tokens were generated
@@ -595,12 +595,12 @@ public static List<Integer> generateTokensGPUPhi3(Model model, State state, int
595595 long tornadoCompileNanos = 0 ;
596596 long tornadoWarmupNanos = 0 ;
597597 // If statement to prevent inadvertent crashes from future features
598- if (tornadoVMMasterPlan != null ) {
599- tornadoCompileNanos = tornadoVMMasterPlan .getCompileDurationNanos ();
600- tornadoWarmupNanos = tornadoVMMasterPlan .getWarmupDurationNanos ();
598+ if (tornadoVMPlan != null ) {
599+ tornadoCompileNanos = tornadoVMPlan .getCompileDurationNanos ();
600+ tornadoWarmupNanos = tornadoVMPlan .getWarmupDurationNanos ();
601601 // Reset values so they are only output if they are changed in tornadoVMMasterPlan.java
602- tornadoVMMasterPlan .setCompileDurationNanos (0 );
603- tornadoVMMasterPlan .setWarmupDurationNanos (0 );
602+ tornadoVMPlan .setCompileDurationNanos (0 );
603+ tornadoVMPlan .setWarmupDurationNanos (0 );
604604 }
605605 LastRunMetrics .setMetrics (totalTokens , totalNanos , promptEvalCount , promptNanos , inferenceEvalCount , inferenceNanos , tornadoCompileNanos , tornadoWarmupNanos );
606606
@@ -689,7 +689,7 @@ public static List<Integer> generateTokensGranite(Model model, State state, int
689689 */
690690 public static List <Integer > generateTokensGPUGranite (Model model , State state , int startPosition ,
691691 List <Integer > promptTokens , Set <Integer > stopTokens , int maxTokens , Sampler sampler , boolean echo ,
692- IntConsumer onTokenGenerated , TornadoVMMasterPlan tornadoVMMasterPlan ) {
692+ IntConsumer onTokenGenerated , TornadoVMMasterPlan tornadoVMPlan ) {
693693 long startNanos = System .nanoTime ();
694694 long inferenceStartNanos = 0 ;
695695
@@ -707,7 +707,7 @@ public static List<Integer> generateTokensGPUGranite(Model model, State state, i
707707
708708 while (pos < maxTokens ) {
709709 // Call TornadoVM forward pass (same as Llama for now)
710- logits = InferenceCore .forwardTornadoVM (model , state , currentToken , pos , tornadoVMMasterPlan );
710+ logits = InferenceCore .forwardTornadoVM (model , state , currentToken , pos , tornadoVMPlan );
711711
712712 if (promptIndex < promptTokens .size ()) {
713713 nextToken = promptTokens .get (promptIndex ++);
@@ -755,12 +755,12 @@ public static List<Integer> generateTokensGPUGranite(Model model, State state, i
755755 long tornadoCompileNanos = 0 ;
756756 long tornadoWarmupNanos = 0 ;
757757 // If statement to prevent inadvertent crashes from future features
758- if (tornadoVMMasterPlan != null ) {
759- tornadoCompileNanos = tornadoVMMasterPlan .getCompileDurationNanos ();
760- tornadoWarmupNanos = tornadoVMMasterPlan .getWarmupDurationNanos ();
758+ if (tornadoVMPlan != null ) {
759+ tornadoCompileNanos = tornadoVMPlan .getCompileDurationNanos ();
760+ tornadoWarmupNanos = tornadoVMPlan .getWarmupDurationNanos ();
761761 // Reset values so they are only output if they are changed in tornadoVMMasterPlan.java
762- tornadoVMMasterPlan .setCompileDurationNanos (0 );
763- tornadoVMMasterPlan .setWarmupDurationNanos (0 );
762+ tornadoVMPlan .setCompileDurationNanos (0 );
763+ tornadoVMPlan .setWarmupDurationNanos (0 );
764764 }
765765 LastRunMetrics .setMetrics (totalTokens , totalNanos , promptEvalCount , promptNanos , inferenceEvalCount , inferenceNanos , tornadoCompileNanos , tornadoWarmupNanos );
766766
0 commit comments