discojs*: rm *Loader & DatasetBuilder

epfml · Aug 22, 2024 · a85cb4d · a85cb4d
1 parent 9b2c676
commit a85cb4d
Show file tree

Hide file tree

Showing 23 changed files with 15 additions and 731 deletions.
diff --git a/cli/README.md b/cli/README.md
@@ -31,7 +31,7 @@ npm -w cli start -- --help # or -h
 The CLI can be used on several pre-defined tasks: titanic, simple-face and CIFAR10. In order
 to understand how to add a new task have a look at [TASK.md](../docs/TASK.md).
 
-Once a new task has been defined in `discojs`, it can be loaded in [data.ts](./src/data.ts) as it is already implemented for current tasks. There are currently [multiple classes](../discojs-node/src/dataset/data_loader) you can use to load data using Node.js and preprocess data: ImageLoader, TabularLoader and TextLoader.
+Once a new task has been defined in `discojs`, it can be loaded in [data.ts](./src/data.ts) as it is already implemented for current tasks. There are currently [multiple classes](../discojs-node/src/loaders) you can use to load data using Node.js and preprocess data: loadImagesInDir, loadCSV and loadText.
 Once a function to load data has been added, make sure to extend `getTaskData` in `data.ts`, which matches each task with it respective with data loading function.
 
 The last thing to add is to add the task as a CLI argument in [args.ts](./src/args.ts) to the `supportedTasks` Map.

diff --git a/discojs-node/src/data/image_loader.spec.ts b/discojs-node/src/data/image_loader.spec.ts
diff --git a/discojs-node/src/data/image_loader.ts b/discojs-node/src/data/image_loader.ts
diff --git a/discojs-node/src/data/index.ts b/discojs-node/src/data/index.ts
diff --git a/discojs-node/src/data/tabular_loader.spec.ts b/discojs-node/src/data/tabular_loader.spec.ts
diff --git a/discojs-node/src/data/tabular_loader.ts b/discojs-node/src/data/tabular_loader.ts
diff --git a/discojs-node/src/data/text_loader.ts b/discojs-node/src/data/text_loader.ts
diff --git a/discojs-node/src/index.ts b/discojs-node/src/index.ts
@@ -1,3 +1,2 @@
-export * from './data/index.js'
 export * from './loaders/index.js'
 export { saveModelToDisk, loadModelFromDisk } from './model_loader.js'
diff --git a/discojs-web/src/data/image_loader.ts b/discojs-web/src/data/image_loader.ts
diff --git a/discojs-web/src/data/index.ts b/discojs-web/src/data/index.ts
diff --git a/discojs-web/src/data/tabular_loader.ts b/discojs-web/src/data/tabular_loader.ts
diff --git a/discojs-web/src/data/text_loader.ts b/discojs-web/src/data/text_loader.ts
diff --git a/discojs-web/src/index.ts b/discojs-web/src/index.ts
@@ -1,3 +1,2 @@
-export * from './data/index.js'
 export * from "./loaders/index.js";
 export * from "./memory/index.js";
diff --git a/discojs/src/dataset/data/helpers.ts b/discojs/src/dataset/data/helpers.ts
@@ -12,7 +12,8 @@ import type {
 } from "../../index.js";
 import { convertors } from "../../index.js";
 
-import { Data, DataSplit, ImageData, TabularData, TextData } from "./index.js";
+import { Data, ImageData, TabularData, TextData } from "./index.js";
+import { DataSplit } from "./data_split.js";
 
 // Array.fromAsync not yet widely used (2024)
 async function arrayFromAsync<T>(iter: AsyncIterable<T>): Promise<T[]> {

diff --git a/discojs/src/dataset/data/index.ts b/discojs/src/dataset/data/index.ts
@@ -1,4 +1,3 @@
-export type { DataSplit } from './data_split.js'
 export { Data } from './data.js'
 export { ImageData } from './image_data.js'
 export { TabularData } from './tabular_data.js'

diff --git a/discojs/src/dataset/data_loader/data_loader.ts b/discojs/src/dataset/data_loader/data_loader.ts