diff --git a/include/minicore/clustering/solve.h b/include/minicore/clustering/solve.h index 118dda4..168eeda 100644 --- a/include/minicore/clustering/solve.h +++ b/include/minicore/clustering/solve.h @@ -181,7 +181,7 @@ perform_hard_clustering(const MT &mat, * Returns True if a center was restarted; for this case, we don't force termination of * the clustering algorithm */ -template, typename SumT> +template bool set_centroids_hard(const Mat &mat, const dist::DissimilarityMeasure measure, const PriorT &prior, @@ -231,7 +231,7 @@ bool set_centroids_hard(const Mat &mat, return ctrs_restarted; } -template +template void assign_points_hard(const Mat &mat, const dist::DissimilarityMeasure measure, const PriorT &prior, diff --git a/include/minicore/optim/graph_thorup.h b/include/minicore/optim/graph_thorup.h index 5b35afe..ea83be2 100644 --- a/include/minicore/optim/graph_thorup.h +++ b/include/minicore/optim/graph_thorup.h @@ -211,7 +211,7 @@ thorup_d(Graph &x, RNG &rng, size_t nperround, size_t maxnumrounds, return std::make_pair(std::move(F), cost); } -template::vertex_descriptor>> +template std::vector::vertex_descriptor> &sample_from_graph(Graph &x, size_t samples_per_round, size_t iterations, std::vector::vertex_descriptor> &container, uint64_t seed, diff --git a/libsimdsampling b/libsimdsampling index 1546a3e..f34e2f2 160000 --- a/libsimdsampling +++ b/libsimdsampling @@ -1 +1 @@ -Subproject commit 1546a3ee194a65fe1ee7c584223f30fb91d3cd9a +Subproject commit f34e2f2bd58915cd51fc9a97162e0da9043d8414 diff --git a/setup.py b/setup.py index 1e3950f..d3688bf 100644 --- a/setup.py +++ b/setup.py @@ -10,9 +10,11 @@ sleefdir = environ.get("SLEEF_DIR", "sleef/build") def main(): + ''' if "CONDA_PREFIX" in environ: from dynsetup import dyn_main return dyn_main() + ''' if not path.isfile(SLEEFLIB): print("Making sleef")