Skip to content

Commit

Permalink
Re-black the code
Browse files Browse the repository at this point in the history
  • Loading branch information
lmcinnes committed Sep 6, 2019
1 parent fc0af08 commit bc6106c
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 34 deletions.
1 change: 0 additions & 1 deletion pynndescent/distances.py
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,6 @@ def hellinger(x, y):
return np.sqrt(1 - result / np.sqrt(l1_norm_x * l1_norm_y))



named_distances = {
# general minkowski distances
"euclidean": euclidean,
Expand Down
1 change: 0 additions & 1 deletion pynndescent/pynndescent_.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ def init_rp_tree(data, dist, dist_args, current_graph, leaf_array, tried=None):
tried.add((q, p))



@numba.njit(fastmath=True)
def nn_descent_internal_low_memory(
current_graph,
Expand Down
1 change: 0 additions & 1 deletion pynndescent/sparse.py
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,6 @@ def sparse_hellinger(ind1, data1, ind2, data2):
return np.sqrt(1.0 - (result / sqrt_norm_prod))



sparse_named_distances = {
# general minkowski distances
"euclidean": sparse_euclidean,
Expand Down
60 changes: 29 additions & 31 deletions pynndescent/sparse_nndescent.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,23 +56,22 @@ def sparse_init_rp_tree(
tried.add((q, p))



@numba.njit(fastmath=True)
def sparse_nn_descent_internal_low_memory(
current_graph,
inds,
indptr,
data,
n_vertices,
n_neighbors,
rng_state,
max_candidates=50,
sparse_dist=sparse_euclidean,
dist_args=(),
n_iters=10,
delta=0.001,
rho=0.5,
verbose=False,
current_graph,
inds,
indptr,
data,
n_vertices,
n_neighbors,
rng_state,
max_candidates=50,
sparse_dist=sparse_euclidean,
dist_args=(),
n_iters=10,
delta=0.001,
rho=0.5,
verbose=False,
):
for n in range(n_iters):
if verbose:
Expand Down Expand Up @@ -134,21 +133,21 @@ def sparse_nn_descent_internal_low_memory(

@numba.njit(fastmath=True)
def sparse_nn_descent_internal_high_memory(
current_graph,
inds,
indptr,
data,
n_vertices,
n_neighbors,
rng_state,
max_candidates=50,
sparse_dist=sparse_euclidean,
dist_args=(),
n_iters=10,
delta=0.001,
rho=0.5,
tried=set([(-1, -1)]),
verbose=False,
current_graph,
inds,
indptr,
data,
n_vertices,
n_neighbors,
rng_state,
max_candidates=50,
sparse_dist=sparse_euclidean,
dist_args=(),
n_iters=10,
delta=0.001,
rho=0.5,
tried=set([(-1, -1)]),
verbose=False,
):
for n in range(n_iters):
if verbose:
Expand Down Expand Up @@ -300,7 +299,6 @@ def sparse_nn_descent(
verbose=verbose,
)


return deheap_sort(current_graph)


Expand Down

0 comments on commit bc6106c

Please sign in to comment.