@@ -35,7 +35,7 @@ DFCLF_NUM_THREADS = $(SVM_NUM_THREADS)
35
35
DFREG_NUM_THREADS = $(SVM_NUM_THREADS )
36
36
MULTIPLIER = 100
37
37
DATA_DIR = data/
38
- DATA_kmeans = data/kmeans_$(KMEANS_SIZE ) .npy
38
+ DATA_kmeans = data/clustering/ kmeans_$(KMEANS_SIZE ) .npy
39
39
40
40
COMMON_ARGS = --batch '$(BATCH ) ' --arch '$(HOST ) ' \
41
41
--num-threads '$(NUM_THREADS ) ' --header
@@ -76,8 +76,8 @@ ARGS_NATIVE_pca_full = --num-threads "$(NUM_THREADS)" --header \
76
76
--size "$(REGRESSION_SIZE ) " --svd-solver full
77
77
ARGS_NATIVE_kmeans = --num-threads "$(NUM_THREADS ) " --header \
78
78
--data-multiplier "$(MULTIPLIER ) " \
79
- --filex data/kmeans_$(KMEANS_SIZE ) .npy \
80
- --filei data/kmeans_$(KMEANS_SIZE ) .init.npy
79
+ --filex data/clustering/ kmeans_$(KMEANS_SIZE ) .npy \
80
+ --filei data/clustering/ kmeans_$(KMEANS_SIZE ) .init.npy
81
81
ARGS_NATIVE_svm2 = --fileX data/two/X-$(SVM_SIZE ) .npy \
82
82
--fileY data/two/y-$(SVM_SIZE ) .npy \
83
83
--num-threads $(SVM_NUM_THREADS ) --header
@@ -120,8 +120,8 @@ ARGS_SKLEARN_linear = --size "$(REGRESSION_SIZE)"
120
120
ARGS_SKLEARN_pca_daal = --size "$(REGRESSION_SIZE ) " --svd-solver daal
121
121
ARGS_SKLEARN_pca_full = --size "$(REGRESSION_SIZE ) " --svd-solver full
122
122
ARGS_SKLEARN_kmeans = --data-multiplier "$(MULTIPLIER ) " \
123
- --filex data/kmeans_$(KMEANS_SIZE ) .npy \
124
- --filei data/kmeans_$(KMEANS_SIZE ) .init.npy
123
+ --filex data/clustering/ kmeans_$(KMEANS_SIZE ) .npy \
124
+ --filei data/clustering/ kmeans_$(KMEANS_SIZE ) .init.npy
125
125
ARGS_SKLEARN_svm2 = --fileX data/two/X-$(SVM_SIZE ) .npy \
126
126
--fileY data/two/y-$(SVM_SIZE ) .npy
127
127
ARGS_SKLEARN_svm5 = --fileX data/multi/X-$(SVM_SIZE ) .npy \
@@ -157,8 +157,8 @@ ARGS_DAAL4PY_linear = --size "$(REGRESSION_SIZE)"
157
157
ARGS_DAAL4PY_pca_daal = --size "$(REGRESSION_SIZE ) " --svd-solver daal
158
158
ARGS_DAAL4PY_pca_full = --size "$(REGRESSION_SIZE ) " --svd-solver full
159
159
ARGS_DAAL4PY_kmeans = --data-multiplier "$(MULTIPLIER ) " \
160
- --filex data/kmeans_$(KMEANS_SIZE ) .npy \
161
- --filei data/kmeans_$(KMEANS_SIZE ) .init.npy
160
+ --filex data/clustering/ kmeans_$(KMEANS_SIZE ) .npy \
161
+ --filei data/clustering/ kmeans_$(KMEANS_SIZE ) .init.npy
162
162
ARGS_DAAL4PY_svm2 = --fileX data/two/X-$(SVM_SIZE ) .npy \
163
163
--fileY data/two/y-$(SVM_SIZE ) .npy
164
164
ARGS_DAAL4PY_svm5 = --fileX data/multi/X-$(SVM_SIZE ) .npy \
@@ -212,7 +212,7 @@ daal4py: $(addsuffix .out,$(addprefix output/daal4py/,$(DAAL4PY_BENCHMARKS))) da
212
212
213
213
data : $(KMEANS_DATA ) svm_data logreg_data df_clf_data
214
214
215
- DATA_kmeans : data/kmeans_$(KMEANS_SIZE ) .npy
215
+ DATA_kmeans : data/clustering/ kmeans_$(KMEANS_SIZE ) .npy
216
216
DATA_svm2 : data/two/X-$(SVM_SIZE ) .npy
217
217
DATA_svm5 : data/multi/X-$(SVM_SIZE ) .npy
218
218
DATA_logreg2 : data/two/X-$(LOGREG_SIZE ) .npy
@@ -223,7 +223,7 @@ DATA_dfreg: data/reg/X-$(DFREG_SIZE).npy
223
223
DATA_% : ;
224
224
225
225
226
- data/kmeans_$(KMEANS_SAMPLES ) x$(KMEANS_FEATURES ) .npy : | data/
226
+ data/clustering/ kmeans_$(KMEANS_SAMPLES ) x$(KMEANS_FEATURES ) .npy : | data/clustering /
227
227
python make_datasets.py -f $(KMEANS_FEATURES ) -s $(KMEANS_SAMPLES ) \
228
228
kmeans -c 10 -x $(basename $@ ) -i $(basename $@ ) .init \
229
229
-t $(basename $@ ) .tol
0 commit comments