@epfml/discojs 2.1.2-p20240717102015.0 → 2.1.2-p20240718132634.0

package/dist/dataset/data/data.d.ts

@@ -1,4 +1,4 @@
-import type tf from '@tensorflow/tfjs';
+import * as tf from '@tensorflow/tfjs';
 import type { List } from 'immutable';
 import type { Task } from '../../index.js';
 import type { Dataset } from '../index.js';

package/dist/dataset/data/data.js

@@ -1,3 +1,4 @@
+import * as tf from '@tensorflow/tfjs';
 /**
  * Abstract class representing an immutable Disco dataset, including a TF.js dataset,
  * Disco task and set of preprocessing functions.
@@ -59,8 +60,18 @@ export class Data {
         if (applyPreprocessing.size === 0) {
             return x => Promise.resolve(x);
         }
-        const preprocessingChain = applyPreprocessing.reduce((acc, fn) => x => fn(acc(x), this.task), (x) => x);
-        return x => preprocessingChain(Promise.resolve(x));
+        const preprocessingChain = async (input) => {
+            let currentContainer = await input; // Start with the initial tensor container
+            for (const fn of applyPreprocessing) {
+                const newContainer = await fn(Promise.resolve(currentContainer), this.task);
+                if (currentContainer !== newContainer) {
+                    tf.dispose(currentContainer); // Dispose of the old container
+                }
+                currentContainer = newContainer;
+            }
+            return currentContainer; // Return the final tensor container
+        };
+        return async (entry) => await preprocessingChain(Promise.resolve(entry));
     }
     /**
      * The TF.js dataset preprocessing according to the set of preprocessing functions and the task's

package/dist/dataset/data/preprocessing/image_preprocessing.js

@@ -25,10 +25,12 @@ const normalize = {
     type: ImagePreprocessing.Normalize,
     apply: async (entry) => {
         const { xs, ys } = await entry;
-        return {
-            xs: xs.div(tf.scalar(255)),
-            ys
-        };
+        return tf.tidy(() => {
+            return {
+                xs: xs.div(tf.scalar(255)),
+                ys
+            };
+        });
     }
 };
 /**

package/package.json

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