Merge branch 'release/v0.4.3'

marcellejs · Oct 12, 2021 · 900eefd · 900eefd
2 parents 5f19da3 + 3725193
commit 900eefd
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 60 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Marcelle changelog
 
+## 0.4.3
+
+- Fixed svelte component compilation (reverted to svelte v3.39)
+- Fixed KNN Classifier
+
 ## 0.4.2
 
 - New `trainingHistory` component to track and monitor training runs.

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
@@ -22,7 +22,7 @@ module.exports = {
       },
       {
         text: 'Examples',
-        link: '/examples/',
+        link: 'https://demos.marcelle.dev/',
       },
       {
         text: 'Credits',

diff --git a/docs/.vuepress/styles/index.styl b/docs/.vuepress/styles/index.styl
@@ -83,8 +83,6 @@ tr
   .row
     position: relative
     display: flex
-    text-align: justify
-    text-justify: inter-character
     margin: 3rem auto
     width: 100%
     @media (max-width: 900px)

diff --git a/docs/credits/README.md b/docs/credits/README.md
@@ -14,16 +14,17 @@ This research was supported by the [ELEMENT project](https://element-project.irc
 - [Baptiste Caramiaux](https://baptistecaramiaux.com/) (CNRS researcher at [ISIR](https://hci.isir.upmc.fr/)).
 - [Téo Sanchez](https://teo-sanchez.github.io/) (PhD Student at [LISN](https://www.lisn.upsaclay.fr/))
 
+## Citing this work
+
+Please cite the following publication when refering to Marcelle in academic publications:
+
+> Jules Françoise, Baptiste Caramiaux, Téo Sanchez. **Marcelle: Composing Interactive Machine Learning Workflows and Interfaces.** Annual ACM Symposium on User Interface Software and Technology (UIST ’21), Oct 2021, Virtual. DOI: [10.1145/3472749.3474734](https://doi.org/10.1145/3472749.3474734).<br> > [PDF](https://hal.archives-ouvertes.fr/hal-03335115/document)
+
 ## Supporting institutions
 
 - [CNRS](https://www.cnrs.fr)
 - [Université Paris Saclay](https://www.universite-paris-saclay.fr/)
 - [Sorbonne Université](https://www.sorbonne-universite.fr/)
 - [Inria](https://www.inria.fr/)
 
-## Citing this work
-
-Please cite the following publication when refering to Marcelle in academic publications:
-
-> Jules Françoise, Baptiste Caramiaux, Téo Sanchez. **Marcelle: Composing Interactive Machine Learning Workflows and Interfaces.** Annual ACM Symposium on User Interface Software and Technology (UIST ’21), Oct 2021, Virtual. DOI: [10.1145/3472749.3474734](https://doi.org/10.1145/3472749.3474734).<br>
-> [PDF](https://hal.archives-ouvertes.fr/hal-03335115/document)
+![Logos of supported institutions and projects](./logos.png)
diff --git a/docs/credits/logos.png b/docs/credits/logos.png
diff --git a/docs/examples/README.md b/docs/examples/README.md
diff --git a/docs/examples/images/marcelle-dashboard.png b/docs/examples/images/marcelle-dashboard.png
diff --git a/docs/examples/images/marcelle-mlp-vs-knn.png b/docs/examples/images/marcelle-mlp-vs-knn.png
diff --git a/docs/examples/images/marcelle-sketch.png b/docs/examples/images/marcelle-sketch.png
diff --git a/docs/examples/images/marcelle-wizard.png b/docs/examples/images/marcelle-wizard.png
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@marcellejs/core",
   "description": "Marcelle Core API",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/marcellejs/marcelle"
@@ -88,7 +88,7 @@
     "rollup-plugin-sizes": "^1.0.4",
     "rollup-plugin-svelte": "^7.1.0",
     "rollup-plugin-terser": "^7.0.2",
-    "svelte": "^3.38.2",
+    "svelte": "3.39.0",
     "svelte-loader": "^3.1.1",
     "svelte-preprocess": "^4.7.3",
     "svelte-range-slider-pips": "^1.7.0",

diff --git a/src/components/knn-classifier/knn-classifier.component.ts b/src/components/knn-classifier/knn-classifier.component.ts
@@ -1,4 +1,10 @@
 import { tensor, tensor2d, Tensor2D, TensorLike } from '@tensorflow/tfjs-core';
+import '@tensorflow/tfjs-core/dist/public/chained_ops/flatten';
+import '@tensorflow/tfjs-core/dist/public/chained_ops/norm';
+import '@tensorflow/tfjs-core/dist/public/chained_ops/mat_mul';
+import '@tensorflow/tfjs-core/dist/public/chained_ops/as1d';
+import '@tensorflow/tfjs-core/dist/public/chained_ops/as2d';
+import '@tensorflow/tfjs-core/dist/public/chained_ops/as_type';
 import { KNNClassifier as TfjsKNNClassifier } from '@tensorflow-models/knn-classifier';
 import {
   Stream,

diff --git a/yarn.lock b/yarn.lock
@@ -14436,10 +14436,10 @@ svelte-range-slider-pips@^1.7.0:
   resolved "https://registry.yarnpkg.com/svelte-range-slider-pips/-/svelte-range-slider-pips-1.8.0.tgz#cea0f95979e73918a21a4376b1d1a0cbcea2740e"
   integrity sha512-7tlTd5bXrGUbJBqL+6YJ8taN1opB2CcUSlBBh7mbpla/T6WH/CxblqnNcQX5Gwghhkol4/u4QjKLe65crLsbDg==
 
-svelte@^3.38.2:
-  version "3.43.1"
-  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.43.1.tgz#8370c08a970bcc1c118baaa86a38fae82e0a8396"
-  integrity sha512-nvPIaKx4HLzYlSdquISZpgG1Kqr2VAWQjZOt3Iwm3UhbqmA0LnSx4k1YpRMEhjQYW3ZCqQoK8Egto9tv4YewMA==
+svelte@3.39.0:
+  version "3.39.0"
+  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.39.0.tgz#35d1f18ea9be9109ff7cb54c29a913eddd151453"
+  integrity sha512-dcJCongL0cRkZWe9q+fde0T4HX8PksBywz2+EGDVIrdYdJaxTzrJu0RVeuDtL8Mx2hs4yn3W8zKPScuzG63hTg==
 
 sveltedoc-parser@^4.1.0:
   version "4.1.0"