Commit 6a348e7b authored by Cabaret Laurent's avatar Cabaret Laurent

auto -> manual

tuned for MINST
parent 00238625
......@@ -53,7 +53,7 @@ T_real square_of_distance_between_instance_i_and_centroid_k_auto_vect(int i, int
}
/*-----------------------------------------------------------------------------------------*/
/* Autovectorisation candidate */
/* manualvectorisation candidate */
/*-----------------------------------------------------------------------------------------*/
T_real square_of_distance_between_instance_i_and_centroid_k_manual_vect(int i, int k, T_real dist_sq)
{
......@@ -155,8 +155,8 @@ void cpuKmeans(void)
dist_sq = 0.0;
// Calculate the square of distance between instance i and centroid k
//dist_sq = square_of_distance_between_instance_i_and_centroid_k_no_vect(i, k, dist_sq);
//dist_sq = square_of_distance_between_instance_i_and_centroid_k_auto_vect(i, k, dist_sq);
dist_sq = square_of_distance_between_instance_i_and_centroid_k_manual_vect(i, k, dist_sq);
dist_sq = square_of_distance_between_instance_i_and_centroid_k_auto_vect(i, k, dist_sq);
//dist_sq = square_of_distance_between_instance_i_and_centroid_k_manual_vect(i, k, dist_sq);
// Find and record the nearest centroid to instance i
bool a = (dist_sq < minDist_sq);
......
......@@ -2,9 +2,9 @@
/* Define constants */
/*-----------------------------------------------------------------------------------------*/
// Benchmark dataset
#define NbPoints 50000000 // Number of data instances (50000000)
#define NbDims 4 // Number of dimensions
#define NbClusters 4 // Number of clusters
#define NbPoints 60000 // Number of data instances (50000000)
#define NbDims 784 // Number of dimensions
#define NbClusters 10 // Number of clusters
#define NbPackages 100 // Number of packages used for UpdateCentroids
#define INPUT_DATA "./datasets/SyntheticDataset.txt"
#define INPUT_INITIAL_CENTROIDS "" // Optional
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment