From 1b20ae9fec7eee5ac7d7eb94f5affbde7e6a2a6e Mon Sep 17 00:00:00 2001 From: eddieh-xlnx Date: Fri, 5 Jan 2024 14:26:41 -0800 Subject: [PATCH 1/2] Makefile fixes --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a955874..f304d43 100644 --- a/Makefile +++ b/Makefile @@ -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 $< $@) > $@.log $(call log_and_or_display,$@.log) +# %_exampleroute.phys: %_unrouted.phys +# (/usr/bin/time $< $@) $(call log_and_or_display,$@.log) #### END ROUTER RECIPES @@ -168,12 +168,12 @@ endif # Use the _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 _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) From a24c255117fdfafedc208960239ef0bfc33cac68 Mon Sep 17 00:00:00 2001 From: eddieh-xlnx Date: Fri, 5 Jan 2024 16:01:59 -0800 Subject: [PATCH 2/2] Update alpha_submission.md --- docs/alpha_submission.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/alpha_submission.md b/docs/alpha_submission.md index 9427c30..418aa9b 100644 --- a/docs/alpha_submission.md +++ b/docs/alpha_submission.md @@ -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.