Skip to content

Fix kmeans data generation error in Makefile #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 14, 2020
Merged

Fix kmeans data generation error in Makefile #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ DFCLF_NUM_THREADS = $(SVM_NUM_THREADS)
DFREG_NUM_THREADS = $(SVM_NUM_THREADS)
MULTIPLIER = 100
DATA_DIR = data/
DATA_kmeans = data/kmeans_$(KMEANS_SIZE).npy
DATA_kmeans = data/clustering/kmeans_$(KMEANS_SIZE).npy

COMMON_ARGS = --batch '$(BATCH)' --arch '$(HOST)' \
--num-threads '$(NUM_THREADS)' --header
Expand Down Expand Up @@ -76,8 +76,8 @@ ARGS_NATIVE_pca_full = --num-threads "$(NUM_THREADS)" --header \
--size "$(REGRESSION_SIZE)" --svd-solver full
ARGS_NATIVE_kmeans = --num-threads "$(NUM_THREADS)" --header \
--data-multiplier "$(MULTIPLIER)" \
--filex data/kmeans_$(KMEANS_SIZE).npy \
--filei data/kmeans_$(KMEANS_SIZE).init.npy
--filex data/clustering/kmeans_$(KMEANS_SIZE).npy \
--filei data/clustering/kmeans_$(KMEANS_SIZE).init.npy
ARGS_NATIVE_svm2 = --fileX data/two/X-$(SVM_SIZE).npy \
--fileY data/two/y-$(SVM_SIZE).npy \
--num-threads $(SVM_NUM_THREADS) --header
Expand Down Expand Up @@ -120,8 +120,8 @@ ARGS_SKLEARN_linear = --size "$(REGRESSION_SIZE)"
ARGS_SKLEARN_pca_daal = --size "$(REGRESSION_SIZE)" --svd-solver daal
ARGS_SKLEARN_pca_full = --size "$(REGRESSION_SIZE)" --svd-solver full
ARGS_SKLEARN_kmeans = --data-multiplier "$(MULTIPLIER)" \
--filex data/kmeans_$(KMEANS_SIZE).npy \
--filei data/kmeans_$(KMEANS_SIZE).init.npy
--filex data/clustering/kmeans_$(KMEANS_SIZE).npy \
--filei data/clustering/kmeans_$(KMEANS_SIZE).init.npy
ARGS_SKLEARN_svm2 = --fileX data/two/X-$(SVM_SIZE).npy \
--fileY data/two/y-$(SVM_SIZE).npy
ARGS_SKLEARN_svm5 = --fileX data/multi/X-$(SVM_SIZE).npy \
Expand Down Expand Up @@ -157,8 +157,8 @@ ARGS_DAAL4PY_linear = --size "$(REGRESSION_SIZE)"
ARGS_DAAL4PY_pca_daal = --size "$(REGRESSION_SIZE)" --svd-solver daal
ARGS_DAAL4PY_pca_full = --size "$(REGRESSION_SIZE)" --svd-solver full
ARGS_DAAL4PY_kmeans = --data-multiplier "$(MULTIPLIER)" \
--filex data/kmeans_$(KMEANS_SIZE).npy \
--filei data/kmeans_$(KMEANS_SIZE).init.npy
--filex data/clustering/kmeans_$(KMEANS_SIZE).npy \
--filei data/clustering/kmeans_$(KMEANS_SIZE).init.npy
ARGS_DAAL4PY_svm2 = --fileX data/two/X-$(SVM_SIZE).npy \
--fileY data/two/y-$(SVM_SIZE).npy
ARGS_DAAL4PY_svm5 = --fileX data/multi/X-$(SVM_SIZE).npy \
Expand Down Expand Up @@ -212,7 +212,7 @@ daal4py: $(addsuffix .out,$(addprefix output/daal4py/,$(DAAL4PY_BENCHMARKS))) da

data: $(KMEANS_DATA) svm_data logreg_data df_clf_data

DATA_kmeans: data/kmeans_$(KMEANS_SIZE).npy
DATA_kmeans: data/clustering/kmeans_$(KMEANS_SIZE).npy
DATA_svm2: data/two/X-$(SVM_SIZE).npy
DATA_svm5: data/multi/X-$(SVM_SIZE).npy
DATA_logreg2: data/two/X-$(LOGREG_SIZE).npy
Expand All @@ -223,7 +223,7 @@ DATA_dfreg: data/reg/X-$(DFREG_SIZE).npy
DATA_%: ;


data/kmeans_$(KMEANS_SAMPLES)x$(KMEANS_FEATURES).npy: | data/
data/clustering/kmeans_$(KMEANS_SAMPLES)x$(KMEANS_FEATURES).npy: | data/clustering/
python make_datasets.py -f $(KMEANS_FEATURES) -s $(KMEANS_SAMPLES) \
kmeans -c 10 -x $(basename $@) -i $(basename $@).init \
-t $(basename $@).tol
Expand Down