From 7a1350a53f4f5c7efe7918f31e2bd73fc86ab434 Mon Sep 17 00:00:00 2001
From: aejjeh <aejjeh@illinois.edu>
Date: Fri, 24 Jan 2020 17:44:28 -0600
Subject: [PATCH] Update hpvm/test/benchmarks/hpvm-cava/README.md,
hpvm/test/benchmarks/hpvm-cava/scripts/Makefile files
---
hpvm/test/benchmarks/hpvm-cava/README.md | 2 ++
hpvm/test/benchmarks/hpvm-cava/scripts/Makefile | 7 ++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/hpvm/test/benchmarks/hpvm-cava/README.md b/hpvm/test/benchmarks/hpvm-cava/README.md
index 4b8611fba7..0af7983dec 100644
--- a/hpvm/test/benchmarks/hpvm-cava/README.md
+++ b/hpvm/test/benchmarks/hpvm-cava/README.md
@@ -15,4 +15,6 @@ After building HPVM, the following steps are required to build and run the camer
* This processes the raw image `example-tulip-small/raw_tulip-small.bin`. Note that raw images are different from bitmaps, so you might need to obtain them using special software.
* This generates: `tulip-small.bin` and `tulip-small-<stage>.bin` where `<stage>` represents the stage of the pipeline, in the directory `example-tulip-small`.
3. Convert the binary outputs to a PNG with `./convert.sh example-tulip-small`.
+ * The convert script uses some scripts in the `script` directory. These need to be compiled first using `cd ./scripts; make`.
+ * **In order to compile the convert scripts, the path to numpy should be set correctly in the makefile.**
4. View the resulting PNG at `example-tulip-small/tulip-small.png`. (As well as all the intermediary images for each stage `tulip-small-<stage>.png`).
diff --git a/hpvm/test/benchmarks/hpvm-cava/scripts/Makefile b/hpvm/test/benchmarks/hpvm-cava/scripts/Makefile
index f00acd3b62..3b9bef9667 100644
--- a/hpvm/test/benchmarks/hpvm-cava/scripts/Makefile
+++ b/hpvm/test/benchmarks/hpvm-cava/scripts/Makefile
@@ -5,15 +5,16 @@ IMAGE_NAME = $(basename $(IMAGE))
CXX = g++
CFLAGS = -c -fPIC -O2
-LFLAGS = -I/usr/include/python2.7/ -I/home/kotsifa2/.local/lib/python2.7/site-packages/numpy/core/include
-#LFLAGS = -I/group/brooks/environments/gem5-aladdin-ubuntu/include/python2.7/ -I/group/brooks/environments/gem5-aladdin-ubuntu/lib/python2.7/site-packages/numpy/core/include
+
+# set local paths below
+IFLAGS = -I/usr/include/python2.7/ -I/path/to/local/numpy/include
all: ${PROGRAM}
${PROGRAM}: ${PROGRAM}.cc
swig -python -o ${PROGRAM}_wrap.cc ${PROGRAM}.i
$(CXX) ${CFLAGS} ${PROGRAM}.cc -o ${PROGRAM}.o
- $(CXX) ${CFLAGS} ${PROGRAM}_wrap.cc -o ${PROGRAM}_wrap.o ${LFLAGS}
+ $(CXX) ${CFLAGS} ${PROGRAM}_wrap.cc -o ${PROGRAM}_wrap.o ${IFLAGS}
$(CXX) -shared -o _${LIBRARY}.so *.o
run:
--
GitLab