don't reexport tfjs/discojs-core

cli/src/args.ts

@@ -1,6 +1,7 @@
 import { parse } from 'ts-command-line-args'
 import { Map } from 'immutable'
-import { defaultTasks, type Task } from '@epfml/discojs-node'
+import type { Task } from '@epfml/discojs-core'
+import { defaultTasks } from '@epfml/discojs-core'
 
 interface BenchmarkArguments {
   task: Task

cli/src/cli.ts

@@ -1,6 +1,7 @@
 import { Range } from 'immutable'
 
-import { Disco, TrainingSchemes, type TrainerLog, type data, type Task } from '@epfml/discojs-node'
+import type { TrainerLog, data, Task } from '@epfml/discojs-core'
+import { Disco, TrainingSchemes } from '@epfml/discojs-core'
 
 import { startServer, saveLog } from './utils'
 import { getTaskData } from './data'

cli/src/data.ts

@@ -3,7 +3,8 @@ import fs from 'node:fs'
 import fs_promises from 'fs/promises'
 import path from 'node:path'
 
-import { node, type data, type Task } from '@epfml/discojs-node'
+import type { Task, data } from '@epfml/discojs-core'
+import { NodeImageLoader, NodeTabularLoader } from '@epfml/discojs-node'
 
 function filesFromFolder (dir: string, folder: string, fractionToKeep: number): string[] {
   const f = fs.readdirSync(dir + folder)
@@ -34,21 +35,21 @@ async function simplefaceData (task: Task): Promise<data.DataSplit> {
   const labels = filesPerFolder.flatMap((files, index) => Array(files.length).fill(index))
   const files = filesPerFolder.flat()
 
-  return await new node.data.NodeImageLoader(task).loadAll(files, { labels })
+  return await new NodeImageLoader(task).loadAll(files, { labels })
 }
 
 async function cifar10Data (cifar10: Task): Promise<data.DataSplit> {
   const dir = '../example_training_data/CIFAR10/'
   const files = (await fs_promises.readdir(dir)).map((file) => path.join(dir, file))
   const labels = Range(0, 24).map((label) => (label % 10).toString()).toArray()
 
-  return await new node.data.NodeImageLoader(cifar10).loadAll(files, { labels })
+  return await new NodeImageLoader(cifar10).loadAll(files, { labels })
 }
 
 async function titanicData (titanic: Task): Promise<data.DataSplit> {
   const dir = '../example_training_data/titanic_train.csv'
 
-  const data = await (new node.data.NodeTabularLoader(titanic, ',').loadAll(
+  const data = await (new NodeTabularLoader(titanic, ',').loadAll(
     ['file://'.concat(dir)],
     {
       features: titanic.trainingInformation?.inputColumns,

cli/src/utils.ts

@@ -1,7 +1,7 @@
 import type http from 'node:http'
 import fs from 'node:fs'
 
-import { type TrainerLog } from '@epfml/discojs-node'
+import type { TrainerLog } from '@epfml/discojs-core'
 import { Disco } from '@epfml/disco-server'
 
 export async function startServer (): Promise<[http.Server, URL]> {

discojs/discojs-core/src/aggregator/base.ts

@@ -1,6 +1,7 @@
-import { type client, type Task, type tf, type AsyncInformant } from '..'
-
 import { List, Map, Set } from 'immutable'
+import type tf from '@tensorflow/tfjs'
+
+import type { client, Task, AsyncInformant } from '..'
 
 export enum AggregationStep {
   ADD,

discojs/discojs-core/src/aggregator/mean.spec.ts

@@ -1,7 +1,9 @@
 import { assert, expect } from 'chai'
-import { type Map } from 'immutable'
+import type { Map } from 'immutable'
+import type tf from '@tensorflow/tfjs'
 
-import { aggregator, defaultTasks, type client, type Task, type tf } from '..'
+import type { client, Task } from '..'
+import { aggregator, defaultTasks } from '..'
 import { AggregationStep } from './base'
 
 const task = defaultTasks.titanic.getTask()

discojs/discojs-core/src/aggregator/mean.ts

@@ -1,7 +1,9 @@
-import { type Map } from 'immutable'
+import type { Map } from 'immutable'
+import type tf from '@tensorflow/tfjs'
 
 import { AggregationStep, Base as Aggregator } from './base'
-import { type Task, type WeightsContainer, aggregation, type tf, type client } from '..'
+import type { Task, WeightsContainer, client } from '..'
+import { aggregation } from '..'
 
 /**
  * Mean aggregator whose aggregation step consists in computing the mean of the received weights.

discojs/discojs-core/src/aggregator/secure.spec.ts

@@ -1,7 +1,7 @@
 import { List, Set, Range } from 'immutable'
 import { assert } from 'chai'
 
-import { aggregator as aggregators, aggregation, WeightsContainer, defaultTasks } from '@epfml/discojs-node'
+import { aggregator as aggregators, aggregation, WeightsContainer, defaultTasks } from '@epfml/discojs-core'
 
 describe('secret shares test', function () {
   const epsilon = 1e-4

discojs/discojs-core/src/aggregator/secure.ts

@@ -1,9 +1,10 @@
-import { AggregationStep, Base as Aggregator } from './base'
-import { tf, aggregation, type Task, type WeightsContainer, type client } from '..'
-
 import * as crypto from 'crypto'
-
 import { Map, List, Range } from 'immutable'
+import tf from '@tensorflow/tfjs'
+
+import { AggregationStep, Base as Aggregator } from './base'
+import type { Task, WeightsContainer, client } from '..'
+import { aggregation } from '..'
 
 /**
  * Aggregator implementing secure multi-party computation for decentralized learning.

discojs/discojs-core/src/client/base.ts

@@ -1,10 +1,12 @@
 import axios from 'axios'
-import { type Set } from 'immutable'
+import type { Set } from 'immutable'
+import type tf from '@tensorflow/tfjs'
 
-import { type tf, type Task, type TrainingInformant, serialization, type WeightsContainer } from '..'
-import { type NodeID } from './types'
-import { type EventConnection } from './event_connection'
-import { type Aggregator } from '../aggregator'
+import type { Task, TrainingInformant, WeightsContainer } from '..'
+import { serialization } from '..'
+import type { NodeID } from './types'
+import type { EventConnection } from './event_connection'
+import type { Aggregator } from '../aggregator'
 
 /**
  * Main, abstract, class representing a Disco client in a network, which handles

discojs/discojs-core/src/dataset/data/data.ts

@@ -1,8 +1,9 @@
-import { type tf, type Task } from '../..'
-import { type Dataset } from '../dataset'
-import { type PreprocessingFunction } from './preprocessing/base'
+import type tf from '@tensorflow/tfjs'
+import type { List } from 'immutable'
 
-import { type List } from 'immutable'
+import type { Task } from '../..'
+import type { Dataset } from '../dataset'
+import type { PreprocessingFunction } from './preprocessing/base'
 
 /**
  * Abstract class representing an immutable Disco dataset, including a TF.js dataset,

discojs/discojs-core/src/dataset/data/image_data.spec.ts

@@ -1,7 +1,8 @@
 import { assert, expect } from 'chai'
+import tf from '@tensorflow/tfjs'
 
 import { ImageData } from './image_data'
-import { tf, type Task } from '../..'
+import type { Task } from '../..'
 
 describe('image data checks', () => {
   const simplefaceMock: Task = {

discojs/discojs-core/src/dataset/data/image_data.ts

@@ -1,5 +1,7 @@
-import { type tf, type Task } from '../..'
-import { type Dataset } from '../dataset'
+import type tf from '@tensorflow/tfjs'
+
+import type { Task } from '../..'
+import type { Dataset } from '../dataset'
 import { Data } from './data'
 import { ImagePreprocessing, IMAGE_PREPROCESSING } from './preprocessing'
 

discojs/discojs-core/src/dataset/data/preprocessing/base.ts

@@ -1,7 +1,9 @@
-import { type tf, type Task } from '../../..'
-import { type ImagePreprocessing } from './image_preprocessing'
-import { type TabularPreprocessing } from './tabular_preprocessing'
-import { type TextPreprocessing } from './text_preprocessing'
+import type tf from '@tensorflow/tfjs'
+
+import type { Task } from '../../..'
+import type { ImagePreprocessing } from './image_preprocessing'
+import type { TabularPreprocessing } from './tabular_preprocessing'
+import type { TextPreprocessing } from './text_preprocessing'
 
 /**
  * All available preprocessing type enums.

discojs/discojs-core/src/dataset/data/preprocessing/image_preprocessing.ts

@@ -1,7 +1,8 @@
-import { type Task, tf } from '../../..'
-import { type PreprocessingFunction } from './base'
-
 import { List } from 'immutable'
+import tf from '@tensorflow/tfjs'
+
+import type { Task } from '../../..'
+import type { PreprocessingFunction } from './base'
 
 /**
  * Available image preprocessing types.

discojs/discojs-core/src/dataset/data/preprocessing/tabular_preprocessing.ts

@@ -1,6 +1,8 @@
-import { type Task, type tf } from '../../..'
+import type tf from '@tensorflow/tfjs'
 import { List } from 'immutable'
-import { type PreprocessingFunction } from './base'
+
+import type { Task } from '../../..'
+import type { PreprocessingFunction } from './base'
 
 /**
  * Available tabular preprocessing types.

discojs/discojs-core/src/dataset/data/preprocessing/text_preprocessing.ts

@@ -1,7 +1,8 @@
-import { type Task, tf } from '../../..'
-import { type PreprocessingFunction } from './base'
-
 import { List } from 'immutable'
+import tf from '@tensorflow/tfjs'
+
+import type { Task } from '../../..'
+import type { PreprocessingFunction } from './base'
 
 /**
  * Available text preprocessing types.

discojs/discojs-core/src/dataset/data/tabular_data.spec.ts

@@ -1,8 +1,9 @@
 import { assert, expect } from 'chai'
 import { Map, Set } from 'immutable'
+import tf from '@tensorflow/tfjs'
 
 import { TabularData } from './tabular_data'
-import { tf, type Task } from '../..'
+import type { Task } from '../..'
 
 describe('tabular data checks', () => {
   const titanicMock: Task = {

discojs/discojs-core/src/dataset/data_loader/image_loader.ts

@@ -1,9 +1,11 @@
 import { Range } from 'immutable'
+import tf from '@tensorflow/tfjs'
 
-import { tf } from '../..'
-import { type Dataset } from '../dataset'
-import { type Data, ImageData, type DataSplit } from '../data'
-import { DataLoader, type DataConfig } from '../data_loader'
+import type { Dataset } from '../dataset'
+import type { Data, DataSplit } from '../data'
+import { ImageData } from '../data'
+import type { DataConfig } from '../data_loader'
+import { DataLoader } from '../data_loader'
 
 /**
  * Image data loader whose instantiable implementation is delegated by the platform-dependent Disco subprojects, namely,

discojs/discojs-core/src/dataset/dataset.ts

@@ -1,4 +1,4 @@
-import { type tf } from '..'
+import type tf from '@tensorflow/tfjs'
 
 /**
  * Convenient type for the common dataset type used in TF.js.

discojs/discojs-core/src/default_tasks/cifar10.ts

@@ -1,4 +1,7 @@
-import { tf, type Task, data, type TaskProvider } from '..'
+import tf from '@tensorflow/tfjs'
+
+import type { Task, TaskProvider } from '..'
+import { data } from '..'
 
 export const cifar10: TaskProvider = {
   getTask (): Task {

discojs/discojs-core/src/default_tasks/geotags.ts

@@ -1,5 +1,8 @@
-import { tf, type Task, data, type TaskProvider } from '..'
 import { Range } from 'immutable'
+import tf from '@tensorflow/tfjs'
+
+import type { Task, TaskProvider } from '..'
+import { data } from '..'
 import { LabelTypeEnum } from '../task/label_type'
 
 export const geotags: TaskProvider = {

discojs/discojs-core/src/default_tasks/lus_covid.ts

@@ -1,4 +1,7 @@
-import { tf, type Task, data, type TaskProvider } from '..'
+import tf from '@tensorflow/tfjs'
+
+import type { Task, TaskProvider } from '..'
+import { data } from '..'
 
 export const lusCovid: TaskProvider = {
   getTask (): Task {

discojs/discojs-core/src/default_tasks/mnist.ts

@@ -1,4 +1,6 @@
-import { tf, type Task, type TaskProvider } from '..'
+import tf from '@tensorflow/tfjs'
+
+import type { Task, TaskProvider } from '..'
 
 export const mnist: TaskProvider = {
   getTask (): Task {

discojs/discojs-core/src/default_tasks/simple_face.ts

@@ -1,4 +1,7 @@
-import { type tf, type Task, data, type TaskProvider } from '..'
+import type tf from '@tensorflow/tfjs'
+
+import type { Task, TaskProvider } from '..'
+import { data } from '..'
 
 export const simpleFace: TaskProvider = {
   getTask (): Task {

discojs/discojs-core/src/default_tasks/skin_mnist.ts

@@ -1,5 +1,7 @@
+import tf from '@tensorflow/tfjs'
+
 import type { Task, TaskProvider } from '..'
-import { tf, data } from '..'
+import { data } from '..'
 
 export const skinMnist: TaskProvider = {
   getTask (): Task {

discojs/discojs-core/src/default_tasks/titanic.ts

@@ -1,4 +1,7 @@
-import { tf, type Task, type TaskProvider, data } from '..'
+import tf from '@tensorflow/tfjs'
+
+import type { Task, TaskProvider } from '..'
+import { data } from '..'
 
 export const titanic: TaskProvider = {
   getTask (): Task {

discojs/discojs-core/src/index.ts

@@ -1,5 +1,3 @@
-export * as tf from '@tensorflow/tfjs'
-
 export * as data from './dataset'
 export * as serialization from './serialization'
 export * as training from './training'

discojs/discojs-core/src/logging/trainer_logger.ts

@@ -1,6 +1,6 @@
 import { List } from 'immutable'
+import tf from '@tensorflow/tfjs'
 
-import { tf } from '..'
 import { ConsoleLogger } from '.'
 
 export class TrainerLog {

discojs/discojs-core/src/memory/base.ts

@@ -1,9 +1,9 @@
 // only used browser-side
 // TODO: replace IO type
-import type * as tf from '@tensorflow/tfjs'
+import type tf from '@tensorflow/tfjs'
 
-import { type TaskID } from '..'
-import { type ModelType } from './model_type'
+import type { TaskID } from '..'
+import type { ModelType } from './model_type'
 
 /**
  * Model path which uniquely identifies a model in memory.

discojs/discojs-core/src/memory/empty.ts

@@ -1,6 +1,7 @@
-import { type tf } from '..'
+import type tf from '@tensorflow/tfjs'
 
-import { Memory, type ModelInfo, type Path } from './base'
+import type { ModelInfo, Path } from './base'
+import { Memory } from './base'
 
 /**
  * Represents an empty model memory.

discojs/discojs-core/src/privacy.ts

@@ -1,4 +1,6 @@
-import { tf, type Task, type WeightsContainer } from '.'
+import tf from '@tensorflow/tfjs'
+
+import type { Task, WeightsContainer } from '.'
 
 /**
  * Add task-parametrized Gaussian noise to and clip the weights update between the previous and current rounds.

discojs/discojs-core/src/serialization/model.spec.ts

@@ -1,6 +1,7 @@
 import { assert } from 'chai'
+import tf from '@tensorflow/tfjs'
 
-import { tf, serialization } from '..'
+import { serialization } from '..'
 
 async function getRawWeights (model: tf.LayersModel): Promise<Array<[number, Float32Array]>> {
   return Array.from(

discojs/discojs-core/src/serialization/model.ts

@@ -1,4 +1,4 @@
-import { tf } from '..'
+import tf from '@tensorflow/tfjs'
 import msgpack from 'msgpack-lite'
 
 export type Encoded = number[]

discojs/discojs-core/src/serialization/weights.ts

@@ -1,6 +1,7 @@
 import * as msgpack from 'msgpack-lite'
+import tf from '@tensorflow/tfjs'
 
-import { tf, WeightsContainer } from '..'
+import { WeightsContainer } from '..'
 
 interface Serialized {
   shape: number[]

discojs/discojs-core/src/task/task_handler.ts

@@ -1,8 +1,10 @@
 import axios from 'axios'
 import { Map } from 'immutable'
+import type tf from '@tensorflow/tfjs'
 
-import { serialization, type tf, WeightsContainer } from '..'
-import { isTask, type Task, type TaskID } from './task'
+import { serialization, WeightsContainer } from '..'
+import type { Task, TaskID } from './task'
+import { isTask } from './task'
 
 const TASK_ENDPOINT = 'tasks'