@epfml/discojs 2.1.2-p20240702170238.0 → 2.1.2-p20240715105437.0

package/dist/client/decentralized/base.js

@@ -31,7 +31,7 @@ export class Base extends Client {
         this.server.send(readyMessage);
         // Wait for peers to be connected before sending any update information
         try {
-            const receivedMessage = await waitMessageWithTimeout(this.server, type.PeersForRound);
+            const receivedMessage = await waitMessageWithTimeout(this.server, type.PeersForRound, undefined, "Timeout waiting for the round's peer list");
             if (this.nodes.size > 0) {
                 throw new Error('got new peer list from server but was already received for this round');
             }
@@ -161,7 +161,10 @@ export class Base extends Client {
             }
             // Wait for aggregation before proceeding to the next communication round.
             // The current result will be used as payload for the eventual next communication round.
-            result = await Promise.race([this.aggregationResult, timeout()]);
+            result = await Promise.race([
+                this.aggregationResult,
+                timeout(undefined, "Timeout waiting on the aggregation result promise to resolve")
+            ]);
             // There is at least one communication round remaining
             if (r < this.aggregator.communicationRounds - 1) {
                 // Reuse the aggregation result
@@ -177,14 +180,14 @@ export class Base extends Client {
             let receivedPayloads = 0;
             do {
                 try {
-                    const message = await waitMessageWithTimeout(connection, type.Payload);
+                    const message = await waitMessageWithTimeout(connection, type.Payload, undefined, "Timeout waiting for a contribution from peer " + peerId);
                     const decoded = serialization.weights.decode(message.payload);
                     if (!this.aggregator.add(peerId, decoded, round, message.round)) {
                         console.warn(`[${this.ownId}] Failed to add contribution from peer ${peerId}`);
                     }
                 }
                 catch (e) {
-                    console.warn(e instanceof Error ? e.message : e);
+                    console.error(e instanceof Error ? e.message : e);
                 }
             } while (++receivedPayloads < this.aggregator.communicationRounds);
         });

package/dist/client/event_connection.d.ts

@@ -9,7 +9,7 @@ export interface EventConnection {
     disconnect: () => Promise<void>;
 }
 export declare function waitMessage<T extends type>(connection: EventConnection, type: T): Promise<NarrowMessage<T>>;
-export declare function waitMessageWithTimeout<T extends type>(connection: EventConnection, type: T, timeoutMs?: number): Promise<NarrowMessage<T>>;
+export declare function waitMessageWithTimeout<T extends type>(connection: EventConnection, type: T, timeoutMs?: number, errorMsg?: string): Promise<NarrowMessage<T>>;
 export declare class PeerConnection extends EventEmitter<{
     [K in type]: NarrowMessage<K>;
 }> implements EventConnection {

package/dist/client/event_connection.js

@@ -12,8 +12,8 @@ export async function waitMessage(connection, type) {
         });
     });
 }
-export async function waitMessageWithTimeout(connection, type, timeoutMs) {
-    return await Promise.race([waitMessage(connection, type), timeout(timeoutMs)]);
+export async function waitMessageWithTimeout(connection, type, timeoutMs, errorMsg = 'timeout') {
+    return await Promise.race([waitMessage(connection, type), timeout(timeoutMs, errorMsg)]);
 }
 export class PeerConnection extends EventEmitter {
     _ownId;

package/dist/client/utils.d.ts

@@ -1,2 +1,2 @@
 export declare const MAX_WAIT_PER_ROUND = 15000;
-export declare function timeout(ms?: number): Promise<never>;
+export declare function timeout(ms?: number, errorMsg?: string): Promise<never>;

package/dist/client/utils.js

@@ -1,7 +1,7 @@
 // Time to wait for the others in milliseconds.
 export const MAX_WAIT_PER_ROUND = 15_000;
-export async function timeout(ms = MAX_WAIT_PER_ROUND) {
+export async function timeout(ms = MAX_WAIT_PER_ROUND, errorMsg = 'timeout') {
     return await new Promise((_, reject) => {
-        setTimeout(() => { reject(new Error('timeout')); }, ms);
+        setTimeout(() => { reject(new Error(errorMsg)); }, ms);
     });
 }

package/dist/default_tasks/lus_covid.js

@@ -29,11 +29,6 @@ export const lusCovid = {
                 LABEL_LIST: ['COVID-Positive', 'COVID-Negative'],
                 dataType: 'image',
                 scheme: 'federated',
-                noiseScale: undefined,
-                clippingRadius: 20,
-                decentralizedSecure: true,
-                minimumReadyPeers: 2,
-                maxShareValue: 100,
                 tensorBackend: 'tfjs'
             }
         };

package/dist/default_tasks/mnist.js

@@ -30,7 +30,7 @@ export const mnist = {
                 LABEL_LIST: ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'],
                 scheme: 'decentralized',
                 noiseScale: undefined,
-                clippingRadius: 20,
+                clippingRadius: undefined,
                 decentralizedSecure: true,
                 minimumReadyPeers: 3,
                 maxShareValue: 100,

package/dist/default_tasks/titanic.js

@@ -46,8 +46,8 @@ export const titanic = {
             },
             trainingInformation: {
                 modelID: 'titanic-model',
-                epochs: 40,
-                roundDuration: 10,
+                epochs: 10,
+                roundDuration: 2,
                 validationSplit: 0.2,
                 batchSize: 30,
                 preprocessingFunctions: [data.TabularPreprocessing.Sanitize],

package/dist/models/gpt/config.js

@@ -3,7 +3,7 @@ export const DEFAULT_CONFIG = {
     name: 'transformer',
     lr: 0.001,
     weightDecay: 0,
-    maxIter: 5,
+    maxIter: 10,
     verbose: 0,
     modelType: 'gpt-nano',
     evaluate: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@epfml/discojs",
-  "version": "2.1.2-p20240702170238.0",
+  "version": "2.1.2-p20240715105437.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",