Move Grendel Makefile into grendel/

Author: ssoelvsten

grendel/README.md

@@ -6,23 +6,38 @@ one needs to use the newly acquired _q48_ nodes with 3.0 GHz CPUs, 384 GB of
 memory, and 3.5 TB of SSD disk available for temporary files in a _scratch/_
 directory.
 
-With `grendel_build.sh` we provide a script to compile all the benchmarks on the
-CPU in question. This way, we are sure to compile it for the right instruction
-set.
+## Generating the .sh scripts
+
+All shell scripts used on the cluster are generated by the Python 3 script in
+`grendel_gen.py`
 
 ```bash
-sbatch -p q48 grendel/grendel_build.sh
+module load python
+python3 grendel_gen.py
 ```
 
-The shell scripts running each instance of a benchmark can be generated by
-running the Python 3 script `grendel_gen.py`
+Alternatively, you can use the Makefile, which both includes a _build_ and a
+_clean_ target.
 
 ```bash
-cd grendel && python3 grendel_gen.py
+ml load python && make
 ```
 
-Then one can schedule all the generated shell files from the root directory of
-this repository with
+## Running the .sh scripts
+
+To compile all the benchmarks for the desired CPU (i.e. with the correct
+instruction set), we provide the `grendel_build.sh` script that can be run on
+one of the desired nodes in question. This can be run from the root directory as
+follows:
+
+```bash
+sbatch -p q48 grendel/build.sh
+```
+
+You can follow the build process with `tail -f slurm-<jobid>.out` .
+
+When the build is complete, then you can schedule all the generated shell files
+from the root directory of this repository with
 
 ```bash
 for f in grendel/*_*_*.sh; do sbatch -p q48 $f; done

grendel/grendel_gen.py

@@ -242,7 +242,7 @@ def script_str_build():
 # RUN BUILD SCRIPTS
 # =========================================================================== #
 
-with open("grendel_build.sh", "w") as file:
+with open("build.sh", "w") as file:
     file.write(script_str_build())
 
 for variant in VARIANTS:

grendel/makefile

@@ -0,0 +1,8 @@
+.PHONY: all build clean
+
+build: | clean
+	@python3 grendel_gen.py
+	@chmod a+x *.sh
+
+clean:
+	@rm -f *.sh

makefile

@@ -76,11 +76,3 @@ sat-solver/pigeonhole_principle:
 sat-solver/queens: N := 6
 sat-solver/queens:
 	@$(subst VARIANT,$(V),./build/src/VARIANT_sat_queens) -N $(N) -M $(M)
-
-# ============================================================================ #
-#  GRENDEL
-# ============================================================================ #
-grendel:
-	@rm -f grendel/*_*_*.sh
-	@cd grendel && python3 grendel_gen.py
-	@chmod a+x grendel/*.sh