Skip to content

Commit 6ca1055

Browse files
committed
Figure out the weights dir automatically from the location of build_lib.sh
1 parent 5fbdae8 commit 6ca1055

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

hls4ml/templates/vivado/build_lib.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ LDFLAGS=
1111
INCFLAGS="-Ifirmware/ap_types/"
1212
PROJECT=myproject
1313
LIB_STAMP=mystamp
14-
WEIGHTS_DIR="\"weights\""
14+
BASEDIR="$(cd "$(dirname "$0")" && pwd)"
15+
WEIGHTS_DIR="\"${BASEDIR}/firmware/weights\""
1516

1617
${CC} ${CFLAGS} ${INCFLAGS} -D WEIGHTS_DIR=${WEIGHTS_DIR} -c firmware/${PROJECT}.cpp -o ${PROJECT}.o
1718
${CC} ${CFLAGS} ${INCFLAGS} -D WEIGHTS_DIR=${WEIGHTS_DIR} -c ${PROJECT}_bridge.cpp -o ${PROJECT}_bridge.o

hls4ml/writer/vivado_writer.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -725,13 +725,10 @@ def write_build_script(self, model):
725725
# build_lib.sh
726726
build_lib_src = (filedir / '../templates/vivado/build_lib.sh').resolve()
727727
build_lib_dst = Path(f'{model.config.get_output_dir()}/build_lib.sh').resolve()
728-
weights_dir = (build_lib_dst.parent / 'firmware/weights').resolve()
729728
with open(build_lib_src) as src, open(build_lib_dst, 'w') as dst:
730729
for line in src.readlines():
731730
line = line.replace('myproject', model.config.get_project_name())
732731
line = line.replace('mystamp', model.config.get_config_value('Stamp'))
733-
if line.startswith('WEIGHTS_DIR='):
734-
line = f'WEIGHTS_DIR=\\""{weights_dir}\\""\n'
735732

736733
dst.write(line)
737734
build_lib_dst.chmod(build_lib_dst.stat().st_mode | stat.S_IEXEC)

0 commit comments

Comments
 (0)