Skip to content

Commit

Permalink
Change TypedRacket's Makefile to a symlink
Browse files Browse the repository at this point in the history
Since, to the best of my knowledge, the Makefiles for Racket and TypedRacket should actually be identical (the differences between the two flavours being confined to the source code files), I have swapped out the old TypedRacket Makefile for a soft symlink to Racket's Makefile.  This should ensure that the two always stay in sync with each other automatically, since, after all, one is just a reference to the real file.

Also, this commit corrects a problem with the current benchmarking for linalg and whispers, in that the file names for the output files weren't being adjusted based on the style in use, which had the effect of causing the last style used to overwrite the earlier styles.  This wasn't currently an issue for Whispers, since it only 'ring' enabled right now, but it meant that only results for 'mixed' were recorded for linalg.
  • Loading branch information
jcoo092 committed Jun 21, 2020
1 parent a57cf05 commit bc03c6b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 258 deletions.
4 changes: 4 additions & 0 deletions Racket/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,15 @@ bench_linalg:
make bench_linalg1
make bench_linalg2

bench_linalg1 : benches_record_name = $(benches_dir)/$@\_$$j\_$$i
bench_linalg1 : iter_command = $(hypw3) --parameter-list vecs_size "$(call spaces-to-commas,$(VECTORS))" "$< $$j $$i {vecs_size}"
bench_linalg1 : VECTORS = 2 3 4 8 16 32
bench_linalg1: $(exes_dir)/linalg | $(benches_dir)
for j in $(LINALG_OPTS); do\
$(for_iters);\
done

bench_linalg2 : benches_record_name = $(benches_dir)/$@\_$$j\_$$i
bench_linalg2 : iter_command = $(hypw3) --parameter-list vecs_size "$(call spaces-to-commas,$(VECTORS))" "$< $$j $$i {vecs_size}"
bench_linalg2 : VECTORS = 128
bench_linalg2 : ITERATIONS = 1 64
Expand Down Expand Up @@ -210,13 +212,15 @@ bench_whispers: $(exes_dir)/whispers | $(benches_dir)
make bench_whispers1
make bench_whispers2

bench_whispers1 : benches_record_name = $(benches_dir)/$@\_$$j\_$$i
bench_whispers1 : THREADS = 2 16 128 1024
bench_whispers1 : iter_command = $(hypw3) --parameter-list num_threads "$(call spaces-to-commas,$(THREADS))" "$< $$j $$i {num_threads}"
bench_whispers1: $(exes_dir)/whispers | $(benches_dir)
for j in $(WHISPERS_OPTS); do\
$(for_iters); \
done

bench_whispers2 : benches_record_name = $(benches_dir)/$@\_$$j\_$$i
bench_whispers2 : THREADS = 8192
bench_whispers2 : ITERATIONS = 1 64
bench_whispers2 : iter_command = $(hypw3) --parameter-list num_threads "$(call spaces-to-commas,$(THREADS))" "$< $$j $$i {num_threads}"
Expand Down
258 changes: 0 additions & 258 deletions TypedRacket/Makefile

This file was deleted.

1 change: 1 addition & 0 deletions TypedRacket/Makefile

0 comments on commit bc03c6b

Please sign in to comment.