Benchmark: Update Makefile

benchmark/Makefile

@@ -3,8 +3,6 @@
 #  Released under the modified BSD license. See COPYING.md for more details.
 #  Written by Alinson S. Xavier <axavier@anl.gov>
 
-DATAFILE := miplearn-train-data.tar.gz
-
 CHALLENGES := \
     stab/ChallengeA \
     knapsack/ChallengeA \
@@ -12,12 +10,12 @@ CHALLENGES := \
 
 test: $(addsuffix /performance.png, $(CHALLENGES))
 
-train: $(addsuffix /train_instances.bin, $(CHALLENGES))
+train: $(addsuffix /train/done, $(CHALLENGES))
 
-%/train_instances.bin:
+%/train/done:
 	python benchmark.py train $*
 
-%/benchmark_baseline.csv: %/train_instances.bin
+%/benchmark_baseline.csv: %/train/done
 	python benchmark.py test-baseline $*
 
 %/benchmark_ml.csv: %/benchmark_baseline.csv
@@ -29,21 +27,5 @@ train: $(addsuffix /train_instances.bin, $(CHALLENGES))
 clean:
 	rm -rvf $(CHALLENGES)
 
-clean-ml:
+.PHONY: clean
-	rm -rvf */*/benchmark_ml.csv
-
-clean-charts:
-	rm -rfv */*/performance.png
-
-training-data-push:
-	tar -cvvzf $(DATAFILE) */*/*.bin
-	rsync -avP $(DATAFILE) andromeda:/www/axavier.org/projects/miplearn/$(DATAFILE)
-	rm -fv $(DATAFILE)
-
-training-data-pull:
-	wget https://axavier.org/projects/miplearn/$(DATAFILE)
-	tar -xvvzf $(DATAFILE)
-	rm -f $(DATAFILE)
-
-.PHONY: clean clean-ml clean-charts
 .SECONDARY: