Skip to content

Commit

Permalink
mlpack fix
Browse files Browse the repository at this point in the history
  • Loading branch information
gagolews committed Jun 17, 2024
1 parent 44cd449 commit 2bd3086
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 13 deletions.
8 changes: 5 additions & 3 deletions .devel/pytest/test_approx.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@

try:
import mlpack
except ImportError:
except:
mlpack = None

try:
import nmslib
except ImportError:
except:
nmslib = None


Expand All @@ -52,7 +52,7 @@

def __test_genie_approx(metric='euclidean'):
if nmslib is None: return

if mlpack is None: return

for dataset in ["t4_8k", "h2mg_64_50"]:#, "bigger"]:#[, "bigger""s1", "Aggregation", "unbalance", "h2mg_64_50"]:#, "h2mg_1024_50", "t4_8k", "bigger"]:
if dataset == "bigger":
Expand Down Expand Up @@ -133,6 +133,7 @@ def __test_genie_approx(metric='euclidean'):

def __test_sparse(affinity='euclidean_sparse'):
if nmslib is None: return
if mlpack is None: return

np.random.seed(123)
X = np.random.choice(np.arange(-2.0, 3.0), 1000).reshape(100,-1)
Expand All @@ -148,6 +149,7 @@ def __test_sparse(affinity='euclidean_sparse'):

def __test_string(affinity='leven'):
if nmslib is None: return
if mlpack is None: return

np.random.seed(123)
X = []
Expand Down
11 changes: 8 additions & 3 deletions .devel/sphinx/_static/css/custom.css
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
/* --------------------------------------------------------------------------
Copyleft (C) 2021-2023, Marek Gagolewski <https://www.gagolewski.com/>
Copyleft (C) 2021-2024, Marek Gagolewski <https://www.gagolewski.com/>
-------------------------------------------------------------------------- */

@import url("fonts/Alegreya-fontspec.css");
@import url("fonts/ubuntu-fontspec.css");

.katex {
font-size: inherit;
}

h1, h2, h3, h4, h5, h6 {
font-weight: 700;
font-family: Alegreya Sans,Roboto Slab,ff-tisa-web-pro,Georgia,Arial,sans-serif;
}

body {
font-family: Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;
font-family: Alegreya Sans,Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;
font-weight: 400;
}

Expand Down Expand Up @@ -128,7 +132,8 @@ p code.notranslate, p code.literal, p tt.literal {

strong.command, strong.program, .rst-content code, .rst-content div[class^="highlight"] pre, .rst-content tt, .rst-content pre, pre, samp, kbd, code {
font-family: Ubuntu Mono,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,Courier,monospace;
/* font-size: 90%; */
letter-spacing: -0.15pt;
font-size: 95%;
/* font-style: normal; */
}

Expand Down
2 changes: 1 addition & 1 deletion .devel/sphinx/alphamarek.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def get_book_template(self, e):
self.format_btitle(e, 'title'),
self.format_volume_and_series(e),
sentence [
field('publisher'),
optional_field('publisher'),
optional_field('address'),
self.format_edition(e)
],
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: genieclust
Type: Package
Title: Fast and Robust Hierarchical Clustering with Noise Points Detection
Version: 1.1.5-2
Date: 2023-11-02
Version: 1.1.5-9001
Date: 2024-06-17
Authors@R: c(
person("Marek", "Gagolewski",
role = c("aut", "cre", "cph"),
Expand Down
4 changes: 2 additions & 2 deletions genieclust/genie.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@

try:
import nmslib
except ImportError:
except:
nmslib = None


try:
import mlpack
except ImportError:
except:
mlpack = None


Expand Down
4 changes: 2 additions & 2 deletions man/gclust.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2bd3086

Please sign in to comment.