Add torch to lit cfg for programming_examples (#1370)

Co-authored-by: singagan <53442471+singagan@users.noreply.github.com> Co-authored-by: Gagandeep Singh <gagan.posted@gmail.com>
Xilinx · Apr 23, 2024 · 8da4f3b · 8da4f3b
1 parent 0e90fd8
commit 8da4f3b
Show file tree

Hide file tree

Showing 20 changed files with 1,686 additions and 1,305 deletions.
diff --git a/.github/workflows/buildAndTestRyzenAI.yml b/.github/workflows/buildAndTestRyzenAI.yml
@@ -127,6 +127,7 @@ jobs:
           python -m venv aie-venv
           source aie-venv/bin/activate
           pip install -r python/requirements.txt
+          pip install -r python/requirements_ml.txt
           pip install jupyter
           sed -i.bak 's/OUTPUT_TIMEOUT = 10/OUTPUT_TIMEOUT = 100/g' \
             $(python -c 'import site; print(site.getsitepackages()[0])')/jupyter_client/runapp.py

diff --git a/programming_examples/lit.cfg.py b/programming_examples/lit.cfg.py
@@ -165,6 +165,14 @@
     opencv_flags = ""
 config.substitutions.append(("%opencv_flags", opencv_flags))
 
+try:
+    import torch
+
+    config.available_features.add("torch")
+except ImportError:
+    print("torch not found", file=sys.stderr)
+    pass
+
 VitisSysrootFlag = ""
 if "x86_64" in config.aieHostTarget:
     config.substitutions.append(("%aieHostTargetTriplet%", "x86_64-unknown-linux-gnu"))

diff --git a/programming_examples/ml/bottleneck/Makefile b/programming_examples/ml/bottleneck/Makefile
@@ -37,4 +37,4 @@ clean:
 		*.log aie_partition.json *.bin BOOT.BIN _x test.exe
 
 run_py: 
-	${powershell} python3 test.py
+	${powershell} python3 test.py -x build/final.xclbin -i build/insts.txt -k MLIR_AIE
diff --git a/programming_examples/ml/bottleneck/README.md b/programming_examples/ml/bottleneck/README.md
@@ -115,11 +115,4 @@ make
 To run the design:
 ```
 make run_py
-```
-
-### Prerequisites
-To install the dependencies, run the following command:
-```
-pip install -r requirements.txt
-
 ```
diff --git a/programming_examples/ml/bottleneck/run.lit b/programming_examples/ml/bottleneck/run.lit
@@ -8,5 +8,5 @@
 // RUN: xchesscc_wrapper aie2 -I %aietools/include -DBIT_WIDTH=8 -DINT8_ACT -c %S/../../../aie_kernels/aie2/conv2dk1_skip.cc -o conv2dk1_skip.o
 // RUN: %python %S/aie2.py | aie-opt -cse -canonicalize -o ./aie.mlir
 // RUN: %python aiecc.py --xbridge --aie-generate-cdo --aie-generate-ipu --no-compile-host --xclbin-name=aie.xclbin --ipu-insts-name=insts.txt ./aie.mlir
-// RUN: %run_on_ipu %python %S/test.py | FileCheck %s
+// RUN: %run_on_ipu %python %S/test.py -x aie.xclbin -i insts.txt -k MLIR_AIE | FileCheck %s
 // CHECK: PASS!