Fix executable directory and added safe-guard if LLAMA_ROOT is loaded to avoid loading environments

Author: stratika

llama-tornado

@@ -268,6 +268,9 @@ class LlamaRunner:
 
 
 def load_env_from_script():
+    if "LLAMA_ROOT" in os.environ and os.environ["LLAMA_ROOT"]:
+        return
+
     system = platform.system()
 
     if system == "Windows":

set_paths

@@ -12,7 +12,7 @@ export TORNADO_ROOT="${LLAMA_ROOT}/external/tornadovm"
 export TORNADO_SDK="${TORNADO_ROOT}/bin/sdk"
 
 # Add TornadoVM and LLaMA bin directories to PATH
-export PATH="${PATH}:${TORNADO_SDK}:${LLAMA_ROOT}/bin"
+export PATH="${PATH}:${TORNADO_SDK}:${LLAMA_ROOT}"
 
 # Optional: Set JAVA_HOME if required
 # export JAVA_HOME=/path/to/graalvm

set_paths.cmd

@@ -12,7 +12,7 @@ set "TORNADO_ROOT=%LLAMA_ROOT%\external\tornadovm"
 set "TORNADO_SDK=%TORNADO_ROOT%\bin\sdk"
 
 REM Add TornadoVM SDK and LLaMA3 bin to PATH
-set "PATH=%TORNADO_SDK%;%LLAMA_ROOT%\bin;%PATH%"
+set "PATH=%TORNADO_SDK%;%LLAMA_ROOT%;%PATH%"
 
 REM Optional: Set JAVA_HOME if needed
 REM set "JAVA_HOME=C:\Path\To\GraalVM"