Refactor build-and-run workflow for TornadoVM

Updated TornadoVM build process and environment variables.

Author: mikepapadim

.github/workflows/build-and-run.yml

@@ -10,64 +10,63 @@ jobs:
     env:
       # TornadoVM paths
       TORNADO_ROOT: ${{ github.workspace }}/GPULlama3.java/external/tornadovm
-      # This static path is only used for the initial 'make' call if the makefile needs it.
-      TORNADO_SDK: ${{ github.workspace }}/GPULlama3.java/external/tornadovm/bin/sdk
+      TORNADO_SDK: ${{ github.workspace }}/GPULlama3.java/external/tornadovm/bin/sdk  # Keep this for make
       # Java
       JAVA_HOME: /opt/jenkins/jdks/graal-23.1.0/jdk-21.0.3
     steps:
       - name: Checkout GPULlama3
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      
       - name: Clone TornadoVM explicitly
         run: |
-          # Use a stable tag like v1.0 or v1.0.1 for better GraalVM 23.1.0 compatibility
-          # I will revert this to 'master' as you started, but note this is a potential future failure point.
           git clone --branch master https://github.com/beehive-lab/TornadoVM.git GPULlama3.java/external/tornadovm
           cd GPULlama3.java/external/tornadovm
           git pull origin master
-      
-      # (Verify Java and Python steps remain the same)
-      ...
-      
-      - name: Build TornadoVM 🚀 (Compilation and SDK Path Fix)
+      - name: Verify Java
+        run: |
+          java -version
+          echo "JAVA_HOME=$JAVA_HOME"
+      - name: Set up Python 3
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+      - name: Create Python venv
         run: |
           cd GPULlama3.java/external/tornadovm
+          python3 -m venv venv
           source venv/bin/activate
+      - name: Build TornadoVM
+        run: |
+          cd GPULlama3.java/external/tornadovm
+          source venv/bin/activate
+          make  # Uses the initial TORNADO_SDK from env
           
-          # 1. FIX: Use 'make graal-jdk-21' to ensure Graal dependencies are resolved
-          make graal-jdk-21
-          
-          # 2. FIX: Look for the specific OpenCL SDK directory created by the graal-jdk-21 target.
-          # We use the pattern observed in your logs: dist/tornadovm-*-opencl-linux-amd64
-          TORNADO_SDK_DIR=$(ls -d dist/tornadovm-*-opencl-linux-amd64 | head -1)
-          
-          # The SDK path might be one level deeper for the binaries, let's use the full path.
-          # If the above fails, you may need to use: TORNADO_SDK_DIR=$(ls -d dist/tornadovm-*-opencl-linux-amd64/tornadovm-*-opencl | head -1)
-          
+          # After build, find and update TORNADO_SDK to the actual SDK location
+          TORNADO_SDK_DIR=$(ls -d dist/tornado-sdk/tornado-sdk-* | head -1)
           FULL_TORNADO_SDK="${PWD}/${TORNADO_SDK_DIR}"
-          # Persist the correct, dynamic path for subsequent steps
           echo "TORNADO_SDK=${FULL_TORNADO_SDK}" >> $GITHUB_ENV
           echo "Updated TORNADO_SDK to: ${FULL_TORNADO_SDK}"
           
           # Verify TornadoVM with the updated path
           export TORNADO_SDK="${FULL_TORNADO_SDK}"
           export PATH="${TORNADO_SDK}/bin:$JAVA_HOME/bin:$PATH"
           tornado --devices
-
       - name: Build GPULlama3
         run: |
-          # Ensure PATH is set with the correct SDK for this step too
           export PATH="${TORNADO_SDK}/bin:$JAVA_HOME/bin:$PATH"
           echo "Using TORNADO_SDK: $TORNADO_SDK"
           pwd
-          ls -l
+          ls -l 
           make
-          
-      - name: Run llama-tornado test prompt 💻 (Original Env Fix)
+      - name: Run llama-tornado test prompt
         run: |
-          # 3. ORIGINAL FIX: Explicitly export PATH using the GITHUB_ENV updated TORNADO_SDK
+          # The TORNADO_SDK variable is available because it was updated via GITHUB_ENV
           export PATH="${TORNADO_SDK}/bin:$JAVA_HOME/bin:$PATH"
           echo "Using TORNADO_SDK: $TORNADO_SDK"
           ./llama-tornado --gpu --opencl --model /home/michalis/models/Llama-3.2-1B-Instruct-F16.gguf --prompt "Say hello"
+      # - name: Run llama-tornado test prompt
+      #   run: |
+      #     # export PATH="${TORNADO_SDK}/bin:$JAVA_HOME/bin:$PATH"
+      #     echo "Using TORNADO_SDK: $TORNADO_SDK"
+      #     ./llama-tornado --gpu --opencl --model /home/michalis/models/Llama-3.2-1B-Instruct-F16.gguf --prompt "Say hello"