Skip to content

Makefile fixes #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 7, 2024
Merged

Makefile fixes #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b20ae9
Makefile fixes
eddieh-xlnx Jan 5, 2024
a24c255
Update alpha_submission.md
eddieh-xlnx Jan 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ distclean: clean
(/usr/bin/time python3 networkx-proof-of-concept-router/nxroute-poc.py $< $@) $(call log_and_or_display,$@.log)

## EXAMPLEROUTE
# %_exampleroute.phys: %_unrouted.phys | fpga-interchange-schema/interchange/capnp/java.capnp
# (/usr/bin/time <custom router here> $< $@) > $@.log $(call log_and_or_display,$@.log)
# %_exampleroute.phys: %_unrouted.phys
# (/usr/bin/time <custom router here> $< $@) $(call log_and_or_display,$@.log)

#### END ROUTER RECIPES

Expand Down Expand Up @@ -168,12 +168,12 @@ endif
# Use the <ROUTER>_container.sif Apptainer image to run all benchmarks
.PHONY: run-container
run-container: $(ROUTER)_container.sif
apptainer run $(APPTAINER_RUN_ARGS) $< make ROUTER="$(ROUTER)" BENCHMARKS="$(BENCHMARKS)" VERBOSE="$(VERBOSE)"
apptainer exec $(APPTAINER_RUN_ARGS) $< make ROUTER="$(ROUTER)" BENCHMARKS="$(BENCHMARKS)" VERBOSE="$(VERBOSE)"

# Use the <ROUTER>_container.sif Apptainer image to run a single small benchmark for testing
.PHONY: test-container
test-container: $(ROUTER)_container.sif
apptainer run $(APPTAINER_RUN_ARGS) $< make ROUTER="$(ROUTER)" BENCHMARKS="boom_med_pb" VERBOSE="$(VERBOSE)"
apptainer exec $(APPTAINER_RUN_ARGS) $< make ROUTER="$(ROUTER)" BENCHMARKS="boom_med_pb" VERBOSE="$(VERBOSE)"

SUBMISSION_NAME = $(ROUTER)_submission_$(shell date +%Y%m%d%H%M%S)

Expand Down
6 changes: 3 additions & 3 deletions docs/alpha_submission.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ make run-container
This is roughly equivalent to:
```
apptainer build rwroute_container.sif alpha_submission/rwroute_container.def
apptainer run --pid --home `pwd` --rocm --bind /etc/OpenCL --mount src=/tools/,dst=/tools/,ro rwroute_container.sif make
apptainer exec --pid --home `pwd` --rocm --bind /etc/OpenCL --mount src=/tools/,dst=/tools/,ro rwroute_container.sif make
```

The `apptainer build` command creates an image from the `rwroute_container.def`
definition, and the `apptainer run` command runs this image. The Apptainer
command line options do the following:
definition, and the `apptainer exec` command runs the given command inside this image.
The Apptainer command line options do the following:

* `--pid` runs the container in a new process ID namespace to ensure processes
spawned by the container are not orphaned if the container is killed.
Expand Down