@epfml/discojs 2.1.1 → 2.1.2-p20240506085037.0

package/dist/default_tasks/index.d.ts

@@ -0,0 +1,8 @@
+export { cifar10 } from './cifar10/index.js';
+export { geotags } from './geotags/index.js';
+export { lusCovid } from './lus_covid.js';
+export { mnist } from './mnist.js';
+export { simpleFace } from './simple_face/index.js';
+export { skinMnist } from './skin_mnist.js';
+export { titanic } from './titanic.js';
+export { wikitext } from './wikitext.js';

package/dist/default_tasks/index.js

@@ -0,0 +1,8 @@
+export { cifar10 } from './cifar10/index.js';
+export { geotags } from './geotags/index.js';
+export { lusCovid } from './lus_covid.js';
+export { mnist } from './mnist.js';
+export { simpleFace } from './simple_face/index.js';
+export { skinMnist } from './skin_mnist.js';
+export { titanic } from './titanic.js';
+export { wikitext } from './wikitext.js';

package/dist/default_tasks/lus_covid.d.ts

@@ -0,0 +1,2 @@
+import type { TaskProvider } from '../index.js';
+export declare const lusCovid: TaskProvider;

package/dist/default_tasks/lus_covid.js

@@ -0,0 +1,89 @@
+import * as tf from '@tensorflow/tfjs';
+import { data, models } from '../index.js';
+export const lusCovid = {
+    getTask() {
+        return {
+            id: 'lus_covid',
+            displayInformation: {
+                taskTitle: 'COVID Lung Ultrasound',
+                summary: {
+                    preview: 'Do you have a data of lung ultrasound images on patients <b>suspected of Lower Respiratory Tract infection (LRTI) during the COVID pandemic</b>? <br> Learn how to discriminate between COVID positive and negative patients by joining this task.',
+                    overview: "Don’t have a dataset of your own? Download a sample of a few cases <a class='underline' href='https://drive.switch.ch/index.php/s/zM5ZrUWK3taaIly' target='_blank'>here</a>."
+                },
+                model: "We use a simplified* version of the <b>DeepChest model</b>: A deep learning model developed in our lab (<a class='underline' href='https://www.epfl.ch/labs/mlo/igh-intelligent-global-health/'>intelligent Global Health</a>.). On a cohort of 400 Swiss patients suspected of LRTI, the model obtained over 90% area under the ROC curve for this task. <br><br>*Simplified to ensure smooth running on your browser, the performance is minimally affected. Details of the adaptations are below <br>- <b>Removed</b>: positional embedding (i.e. we don’t take the anatomic position into consideration). Rather, the model now does mean pooling over the feature vector of the images for each patient <br>- <b>Replaced</b>: ResNet18 by Mobilenet",
+                tradeoffs: 'We are using a simpler version of DeepChest in order to be able to run it on the browser.',
+                dataFormatInformation: 'This model takes as input an image dataset. It consists on a set of lung ultrasound images per patient with its corresponding label of covid positive or negative. Moreover, to identify the images per patient you have to follow the follwing naming pattern: "patientId_*.png"',
+                dataExampleText: 'Below you can find an example of an expected lung image for patient 2 named: 2_QAID_1.masked.reshaped.squared.224.png',
+                dataExampleImage: 'https://storage.googleapis.com/deai-313515.appspot.com/example_training_data/2_QAID_1.masked.reshaped.squared.224.png'
+            },
+            trainingInformation: {
+                modelID: 'lus-covid-model',
+                epochs: 50,
+                roundDuration: 2,
+                validationSplit: 0,
+                batchSize: 5,
+                IMAGE_H: 100,
+                IMAGE_W: 100,
+                preprocessingFunctions: [data.ImagePreprocessing.Resize, data.ImagePreprocessing.Normalize],
+                LABEL_LIST: ['COVID-Positive', 'COVID-Negative'],
+                dataType: 'image',
+                scheme: 'federated',
+                noiseScale: undefined,
+                clippingRadius: 20,
+                decentralizedSecure: true,
+                minimumReadyPeers: 2,
+                maxShareValue: 100
+            }
+        };
+    },
+    // Model architecture from tensorflow.js docs: 
+    // https://codelabs.developers.google.com/codelabs/tfjs-training-classfication/index.html#4
+    async getModel() {
+        const imageHeight = 100;
+        const imageWidth = 100;
+        const imageChannels = 3;
+        const numOutputClasses = 2;
+        const model = tf.sequential();
+        // In the first layer of our convolutional neural network we have
+        // to specify the input shape. Then we specify some parameters for
+        // the convolution operation that takes place in this layer.
+        model.add(tf.layers.conv2d({
+            inputShape: [imageHeight, imageWidth, imageChannels],
+            kernelSize: 5,
+            filters: 8,
+            strides: 1,
+            activation: 'relu',
+            kernelInitializer: 'varianceScaling'
+        }));
+        // The MaxPooling layer acts as a sort of downsampling using max values
+        // in a region instead of averaging.
+        model.add(tf.layers.maxPooling2d({ poolSize: [2, 2], strides: [2, 2] }));
+        // Repeat the conv2d + maxPooling block.
+        // Note that we have more filters in the convolution.
+        model.add(tf.layers.conv2d({
+            kernelSize: 5,
+            filters: 16,
+            strides: 1,
+            activation: 'relu',
+            kernelInitializer: 'varianceScaling'
+        }));
+        model.add(tf.layers.maxPooling2d({ poolSize: [2, 2], strides: [2, 2] }));
+        // Now we flatten the output from the 2D filters into a 1D vector to prepare
+        // it for input into our last layer. This is common practice when feeding
+        // higher dimensional data to a final classification output layer.
+        model.add(tf.layers.flatten());
+        // Our last layer is a dense layer which has 2 output units, one for each
+        // output class.
+        model.add(tf.layers.dense({
+            units: numOutputClasses,
+            kernelInitializer: 'varianceScaling',
+            activation: 'softmax'
+        }));
+        model.compile({
+            optimizer: 'sgd',
+            loss: 'binaryCrossentropy',
+            metrics: ['accuracy']
+        });
+        return Promise.resolve(new models.TFJS(model));
+    }
+};

package/dist/default_tasks/mnist.d.ts

@@ -0,0 +1,2 @@
+import type { TaskProvider } from '../index.js';
+export declare const mnist: TaskProvider;

package/dist/{core/default_tasks → default_tasks}/mnist.js

@@ -1,12 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mnist = void 0;
-var tslib_1 = require("tslib");
-var __1 = require("..");
-exports.mnist = {
-    getTask: function () {
+import * as tf from '@tensorflow/tfjs';
+import { models } from '../index.js';
+export const mnist = {
+    getTask() {
         return {
-            taskID: 'mnist',
+            id: 'mnist',
             displayInformation: {
                 taskTitle: 'MNIST',
                 summary: {
@@ -25,17 +22,12 @@ exports.mnist = {
                 roundDuration: 10,
                 validationSplit: 0.2,
                 batchSize: 30,
-                modelCompileData: {
-                    optimizer: 'rmsprop',
-                    loss: 'categoricalCrossentropy',
-                    metrics: ['accuracy']
-                },
                 dataType: 'image',
                 IMAGE_H: 28,
                 IMAGE_W: 28,
                 preprocessingFunctions: [],
                 LABEL_LIST: ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'],
-                scheme: 'Decentralized',
+                scheme: 'decentralized',
                 noiseScale: undefined,
                 clippingRadius: 20,
                 decentralizedSecure: true,
@@ -44,26 +36,26 @@ exports.mnist = {
             }
         };
     },
-    getModel: function () {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var model;
-            return (0, tslib_1.__generator)(this, function (_a) {
-                model = __1.tf.sequential();
-                model.add(__1.tf.layers.conv2d({
-                    inputShape: [28, 28, 3],
-                    kernelSize: 3,
-                    filters: 16,
-                    activation: 'relu'
-                }));
-                model.add(__1.tf.layers.maxPooling2d({ poolSize: 2, strides: 2 }));
-                model.add(__1.tf.layers.conv2d({ kernelSize: 3, filters: 32, activation: 'relu' }));
-                model.add(__1.tf.layers.maxPooling2d({ poolSize: 2, strides: 2 }));
-                model.add(__1.tf.layers.conv2d({ kernelSize: 3, filters: 32, activation: 'relu' }));
-                model.add(__1.tf.layers.flatten({}));
-                model.add(__1.tf.layers.dense({ units: 64, activation: 'relu' }));
-                model.add(__1.tf.layers.dense({ units: 10, activation: 'softmax' }));
-                return [2 /*return*/, model];
-            });
+    getModel() {
+        const model = tf.sequential();
+        model.add(tf.layers.conv2d({
+            inputShape: [28, 28, 3],
+            kernelSize: 3,
+            filters: 16,
+            activation: 'relu'
+        }));
+        model.add(tf.layers.maxPooling2d({ poolSize: 2, strides: 2 }));
+        model.add(tf.layers.conv2d({ kernelSize: 3, filters: 32, activation: 'relu' }));
+        model.add(tf.layers.maxPooling2d({ poolSize: 2, strides: 2 }));
+        model.add(tf.layers.conv2d({ kernelSize: 3, filters: 32, activation: 'relu' }));
+        model.add(tf.layers.flatten({}));
+        model.add(tf.layers.dense({ units: 64, activation: 'relu' }));
+        model.add(tf.layers.dense({ units: 10, activation: 'softmax' }));
+        model.compile({
+            optimizer: 'rmsprop',
+            loss: 'categoricalCrossentropy',
+            metrics: ['accuracy']
         });
+        return Promise.resolve(new models.TFJS(model));
     }
 };

package/dist/default_tasks/simple_face/index.d.ts

@@ -0,0 +1,2 @@
+import type { TaskProvider } from '../../index.js';
+export declare const simpleFace: TaskProvider;

package/dist/{core/default_tasks/simple_face.js → default_tasks/simple_face/index.js}

@@ -1,12 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.simpleFace = void 0;
-var tslib_1 = require("tslib");
-var __1 = require("..");
-exports.simpleFace = {
-    getTask: function () {
+import * as tf from '@tensorflow/tfjs';
+import { data, models } from '../../index.js';
+import baseModel from './model.js';
+export const simpleFace = {
+    getTask() {
         return {
-            taskID: 'simple_face',
+            id: 'simple_face',
             displayInformation: {
                 taskTitle: 'Simple Face',
                 summary: {
@@ -22,32 +20,29 @@ exports.simpleFace = {
             trainingInformation: {
                 modelID: 'simple_face-model',
                 epochs: 50,
-                modelURL: 'https://storage.googleapis.com/deai-313515.appspot.com/models/mobileNetV2_35_alpha_2_classes/model.json',
                 roundDuration: 1,
                 validationSplit: 0.2,
                 batchSize: 10,
-                preprocessingFunctions: [__1.data.ImagePreprocessing.Normalize],
-                learningRate: 0.001,
-                modelCompileData: {
-                    optimizer: 'sgd',
-                    loss: 'categoricalCrossentropy',
-                    metrics: ['accuracy']
-                },
+                preprocessingFunctions: [data.ImagePreprocessing.Normalize],
                 dataType: 'image',
                 IMAGE_H: 200,
                 IMAGE_W: 200,
                 LABEL_LIST: ['child', 'adult'],
-                scheme: 'Federated',
+                scheme: 'federated', // secure aggregation not yet implemented for federated
                 noiseScale: undefined,
                 clippingRadius: undefined
             }
         };
     },
-    getModel: function () {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            return (0, tslib_1.__generator)(this, function (_a) {
-                throw new Error('Not implemented');
-            });
+    async getModel() {
+        const model = await tf.loadLayersModel({
+            load: async () => Promise.resolve(baseModel),
+        });
+        model.compile({
+            optimizer: tf.train.sgd(0.001),
+            loss: 'categoricalCrossentropy',
+            metrics: ['accuracy']
         });
+        return new models.TFJS(model);
     }
 };