Skip to content

Commit 661729e

Browse files
committed
makefile update
1 parent 337554e commit 661729e

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

Makefile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ PREDS_FLAG = $(PRED_DIR)/.checkpoint
1111
SCORES = $(OUTPUT_DIR)/scores.parquet
1212

1313
PLOT_DATA = $(OUTPUT_DIR)/plots/coverage_trajectories.svg
14-
PLOT_PREDS = $(OUTPUT_DIR)/plots/score_by_geo.svg
15-
14+
PLOT_SCORES = $(OUTPUT_DIR)/plots/score_by_geo.svg
1615
FORECAST_DATES = $(shell python scripts/get_forecast_dates.py --config=$(CONFIG))
16+
1717
PREDS = $(foreach date,$(FORECAST_DATES),$(PRED_DIR)/forecast_date=$(date)/part-0.parquet)
1818
FITS = $(foreach date,$(FORECAST_DATES),$(OUTPUT_DIR)/fits/fit_$(date).pkl)
1919

@@ -24,7 +24,7 @@ EQ = =
2424

2525
.PHONY: clean viz dx
2626

27-
all: $(CONFIG_COPY) $(DATA) $(FITS) $(PREDS) $(SCORES) $(PLOT_DATA) $(PLOT_PREDS)
27+
all: $(CONFIG_COPY) $(DATA) $(FITS) $(PREDS) $(SCORES) $(PLOT_DATA)
2828

2929
viz:
3030
streamlit run scripts/viz.py -- \
@@ -33,10 +33,13 @@ viz:
3333
dx: scripts.diagnostics $(FITS) $(CONFIG)
3434
python $< --fit_dir=$(OUTPUT_DIR)/fits --output_dir=$(OUTPUT_DIR)/diagnostics --config=$(CONFIG)
3535

36+
$(PLOT_SCORES): scripts/plot_scores.py $(SCORES) $(CONFIG)
37+
python $< --scores=$(SCORES) --output_dir=$(OUTPUT_DIR)/plots --config=$(CONFIG)
38+
3639
$(SCORES): scripts/eval.py $(PREDS_FLAG) $(DATA) $(CONFIG)
3740
python $< --preds=$(PRED_DIR) --data=$(DATA) --config=$(CONFIG) --output=$@
3841

39-
$(PLOT_PREDS): scripts/plot_preds.py $(CONFIG) $(DATA) $(PREDS_FLAG) $(SCORES)
42+
plot_preds: scripts/plot_preds.py $(CONFIG) $(DATA) $(PREDS_FLAG) $(SCORES)
4043
python $< --config=$(CONFIG) --data=$(DATA) --preds=$(PRED_DIR) --scores=$(SCORES) --output_dir=$(OUTPUT_DIR)/plots
4144

4245
$(PLOT_DATA): scripts/plot_data.py $(DATA) $(CONFIG)

0 commit comments

Comments
 (0)