@epfml/discojs 0.0.1 → 0.1.0

package/dist/dataset/dataset_builder.js

@@ -11,7 +11,6 @@ var DatasetBuilder = /** @class */ (function () {
         this.built = false;
     }
     DatasetBuilder.prototype.addFiles = function (sources, label) {
-        var _this = this;
         if (this.built) {
             throw new Error('builder already consumed');
         }
@@ -19,7 +18,13 @@ var DatasetBuilder = /** @class */ (function () {
             this.sources = this.sources.concat(sources);
         }
         else {
-            sources.forEach(function (source) { return _this.labelledSources.set(label, source); });
+            var currentSources = this.labelledSources.get(label);
+            if (currentSources === undefined) {
+                this.labelledSources.set(label, sources);
+            }
+            else {
+                this.labelledSources.set(label, currentSources.concat(sources));
+            }
         }
     };
     DatasetBuilder.prototype.clearFiles = function (label) {
@@ -33,10 +38,21 @@ var DatasetBuilder = /** @class */ (function () {
             this.labelledSources.delete(label);
         }
     };
-    DatasetBuilder.prototype.build = function () {
+    DatasetBuilder.prototype.getLabels = function () {
+        // We need to duplicate the labels as we need one for each soure.
+        // Say for label A we have sources [img1, img2, img3], then we
+        // need labels [A, A, A].
+        var labels = [];
+        Array.from(this.labelledSources.values()).forEach(function (sources, index) {
+            var sourcesLabels = Array.from({ length: sources.length }, function (_) { return index.toString(); });
+            labels = labels.concat(sourcesLabels);
+        });
+        return labels.flat();
+    };
+    DatasetBuilder.prototype.build = function (config) {
         var _a, _b;
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var data, config, config;
+            var dataTuple, defaultConfig, defaultConfig, sources;
             return (0, tslib_1.__generator)(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -45,26 +61,22 @@ var DatasetBuilder = /** @class */ (function () {
                             throw new Error('invalid sources');
                         }
                         if (!(this.sources.length > 0)) return [3 /*break*/, 2];
-                        config = {
-                            features: (_a = this.task.trainingInformation) === null || _a === void 0 ? void 0 : _a.inputColumns,
-                            labels: (_b = this.task.trainingInformation) === null || _b === void 0 ? void 0 : _b.outputColumns
-                        };
-                        return [4 /*yield*/, this.dataLoader.loadAll(this.sources, config)];
+                        defaultConfig = (0, tslib_1.__assign)({ features: (_a = this.task.trainingInformation) === null || _a === void 0 ? void 0 : _a.inputColumns, labels: (_b = this.task.trainingInformation) === null || _b === void 0 ? void 0 : _b.outputColumns }, config);
+                        return [4 /*yield*/, this.dataLoader.loadAll(this.sources, defaultConfig)];
                     case 1:
-                        data = _c.sent();
+                        dataTuple = _c.sent();
                         return [3 /*break*/, 4];
                     case 2:
-                        config = {
-                            labels: Array.from(this.labelledSources.keys())
-                        };
-                        return [4 /*yield*/, this.dataLoader.loadAll(Array.from(this.labelledSources.values()), config)];
+                        defaultConfig = (0, tslib_1.__assign)({ labels: this.getLabels() }, config);
+                        sources = Array.from(this.labelledSources.values()).flat();
+                        return [4 /*yield*/, this.dataLoader.loadAll(sources, defaultConfig)];
                     case 3:
-                        data = _c.sent();
+                        dataTuple = _c.sent();
                         _c.label = 4;
                     case 4:
-                        // TODO @s314cy: Support .csv labels for image datasets
+                        // TODO @s314cy: Support .csv labels for image datasets (supervised training or testing)
                         this.built = true;
-                        return [2 /*return*/, data];
+                        return [2 /*return*/, dataTuple];
                 }
             });
         });

package/dist/index.d.ts

@@ -4,14 +4,16 @@ export * as serialization from './serialization';
 export * as tasks from './tasks';
 export * as training from './training';
 export * as privacy from './privacy';
+export { GraphInformant, TrainingInformant, informant } from './informant';
 export { Base as Client } from './client';
 export * as client from './client';
 export { AsyncBuffer } from './async_buffer';
 export { AsyncInformant } from './async_informant';
-export { Logger, ConsoleLogger } from './logging';
-export { Memory, ModelType, Empty as EmptyMemory } from './memory';
+export { Logger, ConsoleLogger, TrainerLog } from './logging';
+export { Memory, ModelType, ModelInfo, Path, ModelSource, Empty as EmptyMemory } from './memory';
 export { ModelActor } from './model_actor';
+export { Disco, TrainingSchemes } from './training';
+export { Validator } from './validation';
 export { TrainingInformation, DisplayInformation, isTask, Task, isTaskID, TaskID } from './task';
-export { TrainingInformant } from './training_informant';
-export { TrainingSchemes } from './training/training_schemes';
 export * from './types';
+export { tf } from './tfjs';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TrainingSchemes = exports.TrainingInformant = exports.isTaskID = exports.isTask = exports.ModelActor = exports.EmptyMemory = exports.ModelType = exports.Memory = exports.ConsoleLogger = exports.Logger = exports.AsyncInformant = exports.AsyncBuffer = exports.client = exports.Client = exports.privacy = exports.training = exports.tasks = exports.serialization = exports.dataset = exports.aggregation = void 0;
+exports.tf = exports.isTaskID = exports.isTask = exports.Validator = exports.TrainingSchemes = exports.Disco = exports.ModelActor = exports.EmptyMemory = exports.ModelType = exports.Memory = exports.TrainerLog = exports.ConsoleLogger = exports.Logger = exports.AsyncInformant = exports.AsyncBuffer = exports.client = exports.Client = exports.informant = exports.TrainingInformant = exports.GraphInformant = exports.privacy = exports.training = exports.tasks = exports.serialization = exports.dataset = exports.aggregation = void 0;
 var tslib_1 = require("tslib");
 exports.aggregation = (0, tslib_1.__importStar)(require("./aggregation"));
 exports.dataset = (0, tslib_1.__importStar)(require("./dataset"));
@@ -8,6 +8,10 @@ exports.serialization = (0, tslib_1.__importStar)(require("./serialization"));
 exports.tasks = (0, tslib_1.__importStar)(require("./tasks"));
 exports.training = (0, tslib_1.__importStar)(require("./training"));
 exports.privacy = (0, tslib_1.__importStar)(require("./privacy"));
+var informant_1 = require("./informant");
+Object.defineProperty(exports, "GraphInformant", { enumerable: true, get: function () { return informant_1.GraphInformant; } });
+Object.defineProperty(exports, "TrainingInformant", { enumerable: true, get: function () { return informant_1.TrainingInformant; } });
+Object.defineProperty(exports, "informant", { enumerable: true, get: function () { return informant_1.informant; } });
 var client_1 = require("./client");
 Object.defineProperty(exports, "Client", { enumerable: true, get: function () { return client_1.Base; } });
 exports.client = (0, tslib_1.__importStar)(require("./client"));
@@ -18,17 +22,21 @@ Object.defineProperty(exports, "AsyncInformant", { enumerable: true, get: functi
 var logging_1 = require("./logging");
 Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return logging_1.Logger; } });
 Object.defineProperty(exports, "ConsoleLogger", { enumerable: true, get: function () { return logging_1.ConsoleLogger; } });
+Object.defineProperty(exports, "TrainerLog", { enumerable: true, get: function () { return logging_1.TrainerLog; } });
 var memory_1 = require("./memory");
 Object.defineProperty(exports, "Memory", { enumerable: true, get: function () { return memory_1.Memory; } });
 Object.defineProperty(exports, "ModelType", { enumerable: true, get: function () { return memory_1.ModelType; } });
 Object.defineProperty(exports, "EmptyMemory", { enumerable: true, get: function () { return memory_1.Empty; } });
 var model_actor_1 = require("./model_actor");
 Object.defineProperty(exports, "ModelActor", { enumerable: true, get: function () { return model_actor_1.ModelActor; } });
+var training_1 = require("./training");
+Object.defineProperty(exports, "Disco", { enumerable: true, get: function () { return training_1.Disco; } });
+Object.defineProperty(exports, "TrainingSchemes", { enumerable: true, get: function () { return training_1.TrainingSchemes; } });
+var validation_1 = require("./validation");
+Object.defineProperty(exports, "Validator", { enumerable: true, get: function () { return validation_1.Validator; } });
 var task_1 = require("./task");
 Object.defineProperty(exports, "isTask", { enumerable: true, get: function () { return task_1.isTask; } });
 Object.defineProperty(exports, "isTaskID", { enumerable: true, get: function () { return task_1.isTaskID; } });
-var training_informant_1 = require("./training_informant");
-Object.defineProperty(exports, "TrainingInformant", { enumerable: true, get: function () { return training_informant_1.TrainingInformant; } });
-var training_schemes_1 = require("./training/training_schemes");
-Object.defineProperty(exports, "TrainingSchemes", { enumerable: true, get: function () { return training_schemes_1.TrainingSchemes; } });
 (0, tslib_1.__exportStar)(require("./types"), exports);
+var tfjs_1 = require("./tfjs");
+Object.defineProperty(exports, "tf", { enumerable: true, get: function () { return tfjs_1.tf; } });

package/dist/informant/graph_informant.d.ts

@@ -0,0 +1,10 @@
+import { List } from 'immutable';
+export declare class GraphInformant {
+    static readonly NB_EPOCHS_ON_GRAPH = 10;
+    private currentAccuracy;
+    private accuracyDataSeries;
+    constructor();
+    updateAccuracy(accuracy: number): void;
+    data(): List<number>;
+    accuracy(): number;
+}

package/dist/informant/graph_informant.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GraphInformant = void 0;
+var immutable_1 = require("immutable");
+var GraphInformant = /** @class */ (function () {
+    function GraphInformant() {
+        this.currentAccuracy = 0;
+        this.accuracyDataSeries = (0, immutable_1.Repeat)(0, GraphInformant.NB_EPOCHS_ON_GRAPH).toList();
+    }
+    GraphInformant.prototype.updateAccuracy = function (accuracy) {
+        this.accuracyDataSeries = this.accuracyDataSeries.shift().push(accuracy);
+        this.currentAccuracy = accuracy;
+    };
+    GraphInformant.prototype.data = function () {
+        return this.accuracyDataSeries;
+    };
+    GraphInformant.prototype.accuracy = function () {
+        return this.currentAccuracy;
+    };
+    GraphInformant.NB_EPOCHS_ON_GRAPH = 10;
+    return GraphInformant;
+}());
+exports.GraphInformant = GraphInformant;

package/dist/informant/index.d.ts

@@ -0,0 +1,3 @@
+export { GraphInformant } from './graph_informant';
+export { Base as TrainingInformant } from './training_informant';
+export * as informant from './training_informant';

package/dist/informant/index.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.informant = exports.TrainingInformant = exports.GraphInformant = void 0;
+var tslib_1 = require("tslib");
+var graph_informant_1 = require("./graph_informant");
+Object.defineProperty(exports, "GraphInformant", { enumerable: true, get: function () { return graph_informant_1.GraphInformant; } });
+var training_informant_1 = require("./training_informant");
+Object.defineProperty(exports, "TrainingInformant", { enumerable: true, get: function () { return training_informant_1.Base; } });
+exports.informant = (0, tslib_1.__importStar)(require("./training_informant"));

package/dist/informant/training_informant/base.d.ts

@@ -0,0 +1,31 @@
+import { List } from 'immutable';
+import { TaskID } from '@/task';
+import { GraphInformant } from '../graph_informant';
+export declare abstract class Base {
+    readonly taskID: TaskID;
+    private readonly nbrMessagesToShow;
+    private messages;
+    protected readonly trainingGraphInformant: GraphInformant;
+    protected readonly validationGraphInformant: GraphInformant;
+    protected currentRound: number;
+    protected currentNumberOfParticipants: number;
+    protected totalNumberOfParticipants: number;
+    protected averageNumberOfParticipants: number;
+    constructor(taskID: TaskID, nbrMessagesToShow: number);
+    abstract update(statistics: Record<string, number>): void;
+    addMessage(msg: string): void;
+    getMessages(): string[];
+    round(): number;
+    participants(): number;
+    totalParticipants(): number;
+    averageParticipants(): number;
+    updateTrainingGraph(accuracy: number): void;
+    updateValidationGraph(accuracy: number): void;
+    trainingAccuracy(): number;
+    validationAccuracy(): number;
+    trainingAccuracyData(): List<number>;
+    validationAccuracyData(): List<number>;
+    isDecentralized(): boolean;
+    isFederated(): boolean;
+    static isTrainingInformant(raw: unknown): raw is Base;
+}

package/dist/informant/training_informant/base.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Base = void 0;
+var immutable_1 = require("immutable");
+var graph_informant_1 = require("../graph_informant");
+var Base = /** @class */ (function () {
+    function Base(taskID, nbrMessagesToShow) {
+        this.taskID = taskID;
+        this.nbrMessagesToShow = nbrMessagesToShow;
+        // written feedback
+        this.messages = (0, immutable_1.List)();
+        // graph feedback
+        this.trainingGraphInformant = new graph_informant_1.GraphInformant();
+        this.validationGraphInformant = new graph_informant_1.GraphInformant();
+        // statistics
+        this.currentRound = 0;
+        this.currentNumberOfParticipants = 0;
+        this.totalNumberOfParticipants = 0;
+        this.averageNumberOfParticipants = 0;
+    }
+    Base.prototype.addMessage = function (msg) {
+        if (this.messages.size >= this.nbrMessagesToShow) {
+            this.messages = this.messages.shift();
+        }
+        this.messages = this.messages.push(msg);
+    };
+    Base.prototype.getMessages = function () {
+        return this.messages.toArray();
+    };
+    Base.prototype.round = function () {
+        return this.currentRound;
+    };
+    Base.prototype.participants = function () {
+        return this.currentNumberOfParticipants;
+    };
+    Base.prototype.totalParticipants = function () {
+        return this.totalNumberOfParticipants;
+    };
+    Base.prototype.averageParticipants = function () {
+        return this.averageNumberOfParticipants;
+    };
+    Base.prototype.updateTrainingGraph = function (accuracy) {
+        this.trainingGraphInformant.updateAccuracy(accuracy);
+    };
+    Base.prototype.updateValidationGraph = function (accuracy) {
+        this.validationGraphInformant.updateAccuracy(accuracy);
+    };
+    Base.prototype.trainingAccuracy = function () {
+        return this.trainingGraphInformant.accuracy();
+    };
+    Base.prototype.validationAccuracy = function () {
+        return this.validationGraphInformant.accuracy();
+    };
+    Base.prototype.trainingAccuracyData = function () {
+        return this.trainingGraphInformant.data();
+    };
+    Base.prototype.validationAccuracyData = function () {
+        return this.validationGraphInformant.data();
+    };
+    Base.prototype.isDecentralized = function () {
+        return false;
+    };
+    Base.prototype.isFederated = function () {
+        return false;
+    };
+    Base.isTrainingInformant = function (raw) {
+        if (typeof raw !== 'object') {
+            return false;
+        }
+        if (raw === null) {
+            return false;
+        }
+        // TODO
+        var requiredFields = (0, immutable_1.Set)();
+        if (!(requiredFields.every(function (field) { return field in raw; }))) {
+            return false;
+        }
+        return true;
+    };
+    return Base;
+}());
+exports.Base = Base;

package/dist/informant/training_informant/decentralized.d.ts

@@ -0,0 +1,5 @@
+import { Base } from '.';
+export declare class DecentralizedInformant extends Base {
+    update(statistics: Record<string, number>): void;
+    isDecentralized(): boolean;
+}

package/dist/informant/training_informant/decentralized.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DecentralizedInformant = void 0;
+var tslib_1 = require("tslib");
+var _1 = require(".");
+var DecentralizedInformant = /** @class */ (function (_super) {
+    (0, tslib_1.__extends)(DecentralizedInformant, _super);
+    function DecentralizedInformant() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    DecentralizedInformant.prototype.update = function (statistics) {
+        this.currentRound += 1;
+        this.currentNumberOfParticipants = statistics.currentNumberOfParticipants;
+        this.totalNumberOfParticipants += this.currentNumberOfParticipants;
+        this.averageNumberOfParticipants = this.totalNumberOfParticipants / this.currentRound;
+    };
+    DecentralizedInformant.prototype.isDecentralized = function () {
+        return true;
+    };
+    return DecentralizedInformant;
+}(_1.Base));
+exports.DecentralizedInformant = DecentralizedInformant;

package/dist/informant/training_informant/federated.d.ts

@@ -0,0 +1,14 @@
+import { Base } from '.';
+/**
+ * Class that collects information about the status of the training-loop of the model.
+ */
+export declare class FederatedInformant extends Base {
+    displayHeatmap: boolean;
+    /**
+     * Update the server statistics with the JSON received from the server
+     * For now it's just the JSON, but we might want to keep it as a dictionary
+     * @param receivedStatistics statistics received from the server.
+     */
+    update(receivedStatistics: Record<string, number>): void;
+    isFederated(): boolean;
+}

package/dist/informant/training_informant/federated.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FederatedInformant = void 0;
+var tslib_1 = require("tslib");
+var _1 = require(".");
+/**
+ * Class that collects information about the status of the training-loop of the model.
+ */
+var FederatedInformant = /** @class */ (function (_super) {
+    (0, tslib_1.__extends)(FederatedInformant, _super);
+    function FederatedInformant() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.displayHeatmap = false;
+        return _this;
+    }
+    /**
+     * Update the server statistics with the JSON received from the server
+     * For now it's just the JSON, but we might want to keep it as a dictionary
+     * @param receivedStatistics statistics received from the server.
+     */
+    FederatedInformant.prototype.update = function (receivedStatistics) {
+        this.currentRound = receivedStatistics.round;
+        this.currentNumberOfParticipants = receivedStatistics.currentNumberOfParticipants;
+        this.totalNumberOfParticipants = receivedStatistics.totalNumberOfParticipants;
+        this.averageNumberOfParticipants = receivedStatistics.averageNumberOfParticipants;
+    };
+    FederatedInformant.prototype.isFederated = function () {
+        return true;
+    };
+    return FederatedInformant;
+}(_1.Base));
+exports.FederatedInformant = FederatedInformant;

package/dist/informant/training_informant/index.d.ts

@@ -0,0 +1,4 @@
+export { Base } from './base';
+export { FederatedInformant } from './federated';
+export { DecentralizedInformant } from './decentralized';
+export { LocalInformant } from './local';

package/dist/informant/training_informant/index.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LocalInformant = exports.DecentralizedInformant = exports.FederatedInformant = exports.Base = void 0;
+var base_1 = require("./base");
+Object.defineProperty(exports, "Base", { enumerable: true, get: function () { return base_1.Base; } });
+var federated_1 = require("./federated");
+Object.defineProperty(exports, "FederatedInformant", { enumerable: true, get: function () { return federated_1.FederatedInformant; } });
+var decentralized_1 = require("./decentralized");
+Object.defineProperty(exports, "DecentralizedInformant", { enumerable: true, get: function () { return decentralized_1.DecentralizedInformant; } });
+var local_1 = require("./local");
+Object.defineProperty(exports, "LocalInformant", { enumerable: true, get: function () { return local_1.LocalInformant; } });

package/dist/informant/training_informant/local.d.ts

@@ -0,0 +1,6 @@
+import { TaskID } from '@/task';
+import { Base } from '.';
+export declare class LocalInformant extends Base {
+    constructor(taskID: TaskID, nbrMessagesToShow: number);
+    update(statistics: Record<string, number>): void;
+}

package/dist/informant/training_informant/local.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LocalInformant = void 0;
+var tslib_1 = require("tslib");
+var _1 = require(".");
+var LocalInformant = /** @class */ (function (_super) {
+    (0, tslib_1.__extends)(LocalInformant, _super);
+    function LocalInformant(taskID, nbrMessagesToShow) {
+        var _this = _super.call(this, taskID, nbrMessagesToShow) || this;
+        _this.currentNumberOfParticipants = 1;
+        _this.averageNumberOfParticipants = 1;
+        _this.totalNumberOfParticipants = 1;
+        return _this;
+    }
+    LocalInformant.prototype.update = function (statistics) {
+        this.currentRound = statistics.currentRound;
+    };
+    return LocalInformant;
+}(_1.Base));
+exports.LocalInformant = LocalInformant;

package/dist/logging/index.d.ts

@@ -1,2 +1,3 @@
 export { Logger } from './logger';
 export { ConsoleLogger } from './console_logger';
+export { TrainerLog } from './trainer_logger';

package/dist/logging/index.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConsoleLogger = exports.Logger = void 0;
+exports.TrainerLog = exports.ConsoleLogger = exports.Logger = void 0;
 var logger_1 = require("./logger");
 Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return logger_1.Logger; } });
 var console_logger_1 = require("./console_logger");
 Object.defineProperty(exports, "ConsoleLogger", { enumerable: true, get: function () { return console_logger_1.ConsoleLogger; } });
+var trainer_logger_1 = require("./trainer_logger");
+Object.defineProperty(exports, "TrainerLog", { enumerable: true, get: function () { return trainer_logger_1.TrainerLog; } });

package/dist/logging/trainer_logger.d.ts

@@ -1,5 +1,5 @@
-import * as tf from '@tensorflow/tfjs';
 import { List } from 'immutable';
+import { tf } from '..';
 import { ConsoleLogger } from '.';
 export declare class TrainerLog {
     epochs: List<number>;

package/dist/logging/trainer_logger.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrainerLogger = exports.TrainerLog = void 0;
 var tslib_1 = require("tslib");
-var tf = (0, tslib_1.__importStar)(require("@tensorflow/tfjs"));
 var immutable_1 = require("immutable");
+var __1 = require("..");
 var _1 = require(".");
 var TrainerLog = /** @class */ (function () {
     function TrainerLog() {
@@ -44,15 +44,15 @@ var TrainerLogger = /** @class */ (function (_super) {
             this.log.add(epoch, logs);
         }
         // console output
-        var msg = "Train: " + ((_a = logs === null || logs === void 0 ? void 0 : logs.acc) !== null && _a !== void 0 ? _a : 'undefined') + "\nValidation:" + ((_b = logs === null || logs === void 0 ? void 0 : logs.val_acc) !== null && _b !== void 0 ? _b : 'undefined') + "\nLoss:" + ((_c = logs === null || logs === void 0 ? void 0 : logs.loss) !== null && _c !== void 0 ? _c : 'undefined');
-        this.success("On epoch end:\n" + msg);
+        var msg = "Epoch: " + epoch + "\nTrain: " + ((_a = logs === null || logs === void 0 ? void 0 : logs.acc) !== null && _a !== void 0 ? _a : 'undefined') + "\nValidation:" + ((_b = logs === null || logs === void 0 ? void 0 : logs.val_acc) !== null && _b !== void 0 ? _b : 'undefined') + "\nLoss:" + ((_c = logs === null || logs === void 0 ? void 0 : logs.loss) !== null && _c !== void 0 ? _c : 'undefined');
+        this.success("On epoch end:\n" + msg + "\n");
     };
     /**
      *  Display ram usage
      */
     TrainerLogger.prototype.ramUsage = function () {
-        this.success("Training RAM usage is  = " + tf.memory().numBytes * 0.000001 + " MB");
-        this.success("Number of allocated tensors  = " + tf.memory().numTensors);
+        this.success("Training RAM usage is  = " + __1.tf.memory().numBytes * 0.000001 + " MB");
+        this.success("Number of allocated tensors  = " + __1.tf.memory().numTensors);
     };
     return TrainerLogger;
 }(_1.ConsoleLogger));

package/dist/memory/base.d.ts

@@ -1,53 +1,22 @@
 import * as tf from '@tensorflow/tfjs';
 import { TaskID } from '..';
 import { ModelType } from './model_type';
+export declare type Path = string;
+export interface ModelInfo {
+    type?: ModelType;
+    taskID: TaskID;
+    name?: string;
+}
+export declare type ModelSource = ModelInfo | Path;
 export declare abstract class Memory {
-    /**
-     * Fetches metadata of the model.
-     * @param taskID the working model's corresponding task
-     * @param modelName the working model's file name
-     */
-    abstract getModelMetadata(type: ModelType, taskID: TaskID, modelName: string): Promise<tf.io.ModelArtifactsInfo | undefined>;
-    /**
-     * Loads the current working model and returns it as a fresh TFJS object.
-     * @param taskID the working model's corresponding task
-     * @param modelName the working model's file name
-     */
-    abstract getModel(type: ModelType, taskID: TaskID, modelName: string): Promise<tf.LayersModel>;
-    /**
-     * Loads a model from the model library into the current working model.
-     * @param taskID the saved model's corresponding task
-     * @param modelName the saved model's file name
-     */
-    abstract loadSavedModel(taskID: TaskID, modelName: string): Promise<void>;
-    /**
-     * Loads a fresh TFJS model object into the current working model.
-     * @param taskID the working model's corresponding task
-     * @param modelName the working model's file name
-     * @param model the fresh model
-     */
-    abstract updateWorkingModel(taskID: TaskID, modelName: string, model: tf.LayersModel): Promise<void>;
-    /**
-     * Adds the current working model to the model library.
-     * @param taskID the working model's corresponding task
-     * @param modelName the working model's file name
-     */
-    abstract saveWorkingModel(taskID: TaskID, modelName: string): Promise<void>;
-    /**
-     * Removes the model from the library.
-     * @param taskID the model's corresponding task
-     * @param modelName the model's file name
-     */
-    abstract deleteModel(type: ModelType, taskID: TaskID, modelName: string): Promise<void>;
-    /**
-     * Downloads a previously saved model.
-     * @param {taskID} taskID the saved model's corresponding task
-     * @param {string} modelName the saved model's file name
-     */
-    abstract downloadSavedModel(taskID: TaskID, modelName: string): Promise<void>;
-    /**
-     * @param {taskID} taskID
-     * @param {string} modelName
-     */
-    abstract contains(modelType: ModelType, taskID: TaskID, modelName: string): Promise<boolean>;
+    abstract getModel(source: ModelSource): Promise<tf.LayersModel>;
+    abstract deleteModel(source: ModelSource): Promise<void>;
+    abstract loadModel(source: ModelSource): Promise<void>;
+    abstract getModelMetadata(source: ModelSource): Promise<tf.io.ModelArtifactsInfo | undefined>;
+    abstract updateWorkingModel(source: ModelSource, model: tf.LayersModel): Promise<void>;
+    abstract saveWorkingModel(source: ModelSource): Promise<void>;
+    abstract downloadModel(source: ModelSource): Promise<void>;
+    abstract contains(source: ModelSource): Promise<boolean>;
+    abstract pathFor(source: ModelSource): Path | undefined;
+    abstract infoFor(source: ModelSource): ModelInfo | undefined;
 }

package/dist/memory/empty.d.ts

@@ -1,12 +1,14 @@
-import * as tf from '@tensorflow/tfjs';
-import { Memory } from './base';
+import { tf } from '..';
+import { Memory, ModelInfo, Path } from './base';
 export declare class Empty extends Memory {
     getModelMetadata(): Promise<undefined>;
     contains(): Promise<boolean>;
     getModel(): Promise<tf.LayersModel>;
-    loadSavedModel(): Promise<void>;
+    loadModel(): Promise<void>;
     updateWorkingModel(): Promise<void>;
     saveWorkingModel(): Promise<void>;
     deleteModel(): Promise<void>;
-    downloadSavedModel(): Promise<void>;
+    downloadModel(): Promise<void>;
+    pathFor(): Path;
+    infoFor(): ModelInfo;
 }

package/dist/memory/empty.js

@@ -29,7 +29,7 @@ var Empty = /** @class */ (function (_super) {
             });
         });
     };
-    Empty.prototype.loadSavedModel = function () {
+    Empty.prototype.loadModel = function () {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             return (0, tslib_1.__generator)(this, function (_a) {
                 throw new Error('empty');
@@ -57,13 +57,19 @@ var Empty = /** @class */ (function (_super) {
             });
         });
     };
-    Empty.prototype.downloadSavedModel = function () {
+    Empty.prototype.downloadModel = function () {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             return (0, tslib_1.__generator)(this, function (_a) {
                 throw new Error('empty');
             });
         });
     };
+    Empty.prototype.pathFor = function () {
+        throw new Error('empty');
+    };
+    Empty.prototype.infoFor = function () {
+        throw new Error('empty');
+    };
     return Empty;
 }(base_1.Memory));
 exports.Empty = Empty;

package/dist/memory/index.d.ts

@@ -1,3 +1,3 @@
 export { Empty } from './empty';
-export { Memory } from './base';
+export { Memory, ModelInfo, Path, ModelSource } from './base';
 export { ModelType } from './model_type';