[CI] Test

Author: mikepapadim

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

@@ -10,59 +10,57 @@ jobs:
   build-and-run:
     runs-on: ubuntu-latest
     env:
-      # Set TornadoVM paths
       TORNADO_ROOT: ${{ github.workspace }}/GPULlama3.java/external/tornadovm
       TORNADO_SDK: ${{ github.workspace }}/GPULlama3.java/external/tornadovm/bin/sdk
-      JAVA_HOME: /opt/jenkins/jdks/graal-23.1.0/jdk-21.0.3
-      PATH: /opt/jenkins/jdks/graal-23.1.0/jdk-21.0.3/bin:${PATH}
+      JDK_21_JAVA_HOME: /opt/jenkins/jdks/graal-23.1.0/jdk-21.0.3
 
     steps:
-      - name: Checkout repository
+      - name: Checkout GPULlama3
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          submodules: recursive
-          
+          submodules: false
+
+      - name: Clone TornadoVM explicitly
+        run: |
+          git clone --branch master https://github.com/beehive-lab/TornadoVM.git GPULlama3.java/external/tornadovm
+          cd GPULlama3.java/external/tornadovm
+          git pull origin master
+
+      - name: Set JAVA_HOME
+        run: |
+          echo "Using Java at $JDK_21_JAVA_HOME"
+          export JAVA_HOME=$JDK_21_JAVA_HOME
+          export PATH=$JAVA_HOME/bin:$PATH
+          java -version
+
       - name: Set up Python 3
         uses: actions/setup-python@v4
         with:
           python-version: '3.11'
 
       - name: Create Python venv
         run: |
-          cd ${{ github.workspace }}/GPULlama3.java/external/tornadovm
+          cd GPULlama3.java/external/tornadovm
           python3 -m venv venv
           source venv/bin/activate
 
-      - name: Install and build TornadoVM
+      - name: Build TornadoVM
         run: |
-          cd ${{ github.workspace }}/GPULlama3.java/external/tornadovm
+          cd GPULlama3.java/external/tornadovm
           source venv/bin/activate
-          python3 ./bin/tornadovm-installer --jdk jdk21 --backend opencl --auto-deps
-          source setvars.sh
           make
-
-      - name: Verify TornadoVM devices
-        run: |
-          cd ${{ github.workspace }}/GPULlama3.java/external/tornadovm
-          source venv/bin/activate
           source setvars.sh
           tornado --devices
 
       - name: Build GPULlama3
         run: |
-          cd ${{ github.workspace }}/GPULlama3.java
+          cd GPULlama3.java
           source external/tornadovm/setvars.sh
           make
 
       - name: Run llama-tornado test prompt
         run: |
-          cd ${{ github.workspace }}/GPULlama3.java
+          cd GPULlama3.java
           source external/tornadovm/setvars.sh
           ./llama-tornado --gpu --opencl --model ../Llama-3.2-1B-Instruct-F16.gguf --prompt "Say hello"
-
-      - name: List environment
-        run: |
-          echo "JAVA_HOME=$JAVA_HOME"
-          echo "PATH=$PATH"
-          echo "TORNADO_SDK=$TORNADO_SDK"