Skip to content

Commit 94be14d

Browse files
tharviktharvik
committed
TMP eslint 2022
1 parent d6406da commit 94be14d

32 files changed

+386
-140
lines changed

‎.eslintrc.js

-14
This file was deleted.

‎cli/.eslintrc.json

-5
This file was deleted.

‎cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"watch": "nodemon --ext ts --ignore dist --watch ../discojs/discojs-node/dist --watch ../server/dist --watch . --exec npm run",
88
"start": "npm run build && node dist/cli.js",
99
"build": "tsc",
10-
"lint": "npx eslint --ext ts --max-warnings 0 .",
10+
"lint": "npx eslint .",
1111
"test": ": nothing"
1212
},
1313
"author": "",

‎discojs/discojs-core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"scripts": {
88
"watch": "nodemon --ext ts --ignore dist --exec npm run",
99
"build": "tsc",
10-
"lint": "npx eslint --ext ts --max-warnings 0 .",
10+
"lint": "npx eslint .",
1111
"test": "mocha",
1212
"docs": "typedoc ./src/index.ts --theme oxide"
1313
},

‎discojs/discojs-core/src/models/gpt/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,13 @@ export class GPT extends Model {
123123
}
124124
}
125125

126-
override async predict (input: Sample): Promise<Prediction> {
126+
override predict (input: Sample): Promise<Prediction> {
127127
const ret = this.model.predict(input)
128128
if (Array.isArray(ret)) {
129129
throw new Error('prediction yield many Tensors but should have only returned one')
130130
}
131131

132-
return ret
132+
return Promise.resolve(ret)
133133
}
134134

135135
static deserialize (weights: WeightsContainer): Model {

‎discojs/discojs-core/src/models/gpt/train.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function getCustomAdam (model: tf.LayersModel, c: Required<GPTConfig>): tf.Optim
1818
const excludeFromWeightDecay: string[] = []
1919

2020
// TODO unsafe cast
21-
const namedWeights = (model as unknown as any).getNamedWeights() as Array<{ name: string, tensor: tf.Tensor }>
21+
const namedWeights = (model as unknown as Record<'getNamedWeights', () => Array<{ name: string, tensor: tf.Tensor }>>).getNamedWeights()
2222

2323
namedWeights.forEach((v) => {
2424
if (

‎discojs/discojs-core/src/models/tfjs.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@ export class TFJS extends Model {
5151
}
5252
}
5353

54-
override async predict (input: Sample): Promise<Prediction> {
54+
override predict (input: Sample): Promise<Prediction> {
5555
const ret = this.model.predict(input)
5656
if (Array.isArray(ret)) {
5757
throw new Error('prediction yield many Tensors but should have only returned one')
5858
}
5959

60-
return ret
60+
return Promise.resolve(ret)
6161
}
6262

6363
static async deserialize (raw: tf.io.ModelArtifacts): Promise<Model> {
6464
return new this(await tf.loadLayersModel({
65-
load: async () => raw
65+
load: () => Promise.resolve(raw)
6666
}))
6767
}
6868

@@ -71,14 +71,14 @@ export class TFJS extends Model {
7171
const ret = new Promise<tf.io.ModelArtifacts>((resolve) => { resolveArtifacts = resolve })
7272

7373
await this.model.save({
74-
save: async (artifacts) => {
74+
save: (artifacts) => {
7575
resolveArtifacts(artifacts)
76-
return {
76+
return Promise.resolve({
7777
modelArtifactsInfo: {
7878
dateSaved: new Date(),
7979
modelTopologyType: 'JSON'
8080
}
81-
}
81+
})
8282
}
8383
}, {
8484
includeOptimizer: true // keep model compiled

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

+7-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ import type tf from '@tensorflow/tfjs'
44
import type { Model } from '../index.js'
55
import { models, serialization } from '../index.js'
66

7-
const enum Type { TFJS, GPT }
7+
const Type = {
8+
TFJS: 0,
9+
GPT: 1
10+
} as const
811

912
export type Encoded = Uint8Array
1013

@@ -37,7 +40,7 @@ export async function decode (encoded: unknown): Promise<Model> {
3740
}
3841
const [type, rawModel] = raw as [unknown, unknown]
3942

40-
if (typeof type !== 'number' || (type !== Type.TFJS && type !== Type.GPT)) {
43+
if (typeof type !== 'number') {
4144
throw new Error('invalid encoding')
4245
}
4346
switch (type) {
@@ -57,5 +60,7 @@ export async function decode (encoded: unknown): Promise<Model> {
5760
const serialized = serialization.weights.decode(nums)
5861
return models.GPT.deserialize(serialized)
5962
}
63+
default:
64+
throw new Error('invalid encoding')
6065
}
6166
}

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ function isSerialized (raw: unknown): raw is Serialized {
2424
return false
2525
}
2626

27-
// eslint-disable-next-line
2827
const _: Serialized = {shape, data}
2928

3029
return true
@@ -48,7 +47,7 @@ export async function encode (weights: WeightsContainer): Promise<Encoded> {
4847
}
4948

5049
export function decode (encoded: Encoded): WeightsContainer {
51-
const raw = msgpack.decode(encoded)
50+
const raw: unknown = msgpack.decode(encoded)
5251

5352
if (!(Array.isArray(raw) && raw.every(isSerialized))) {
5453
throw new Error('expected to decode an array of serialized weights')

‎discojs/discojs-core/src/task/digest.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export function isDigest (raw: unknown): raw is Digest {
88
return false
99
}
1010

11-
const { algorithm, value }: Partial<Record<string, unknown>> = raw
11+
const { algorithm, value }: Partial<Record<keyof Digest, unknown>> = raw
1212

1313
if (!(
1414
typeof algorithm === 'string' &&

‎discojs/discojs-core/src/task/training_information.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { type AggregatorChoice } from '../aggregator/get.js'
2-
import { type Preprocessing } from '../dataset/data/preprocessing/index.js'
1+
import type { AggregatorChoice } from '../aggregator/get.js'
2+
import type { Preprocessing } from '../dataset/data/preprocessing/index.js'
33

44
export interface TrainingInformation {
55
// modelID: unique ID for the model

‎discojs/discojs-core/src/training/trainer/distributed_trainer.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ export class DistributedTrainer extends Trainer {
3131
await this.client.onTrainBeginCommunication(this.model.weights, this.trainingInformant)
3232
}
3333

34-
async onRoundBegin (accuracy: number): Promise<void> {
34+
async onRoundBegin (): Promise<void> {
3535
await this.client.onRoundBeginCommunication(this.model.weights, this.roundTracker.round, this.trainingInformant)
3636
}
3737

3838
/**
3939
* Callback called every time a round is over
4040
*/
41-
async onRoundEnd (accuracy: number): Promise<void> {
41+
async onRoundEnd (): Promise<void> {
4242
await this.client.onRoundEndCommunication(this.model.weights, this.roundTracker.round, this.trainingInformant)
4343
if (this.aggregator.model !== undefined) {
4444
// The aggregator's own aggregation is async. The trainer updates its model to match the aggregator's

‎discojs/discojs-core/src/training/trainer/local_trainer.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ import { Trainer } from './trainer.js'
66
* without any collaborators.
77
*/
88
export class LocalTrainer extends Trainer {
9-
async onRoundBegin (accuracy: number): Promise<void> {}
9+
async onRoundBegin (): Promise<void> {
10+
return await Promise.resolve()
11+
}
1012

11-
async onRoundEnd (accuracy: number): Promise<void> {
13+
async onRoundEnd (): Promise<void> {
1214
console.log('on round end')
1315
await this.memory.updateWorkingModel(
1416
{ taskID: this.task.id, name: this.task.trainingInformation.modelID },

‎discojs/discojs-core/src/training/trainer/trainer.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ export abstract class Trainer {
6969
}
7070
}
7171

72-
protected onEpochBegin (epoch: number, logs?: tf.Logs): void {}
72+
// TODO never used
73+
protected onEpochBegin (_epoch: number, _logs?: tf.Logs): void {}
7374

7475
/**
7576
* We update the training graph, this needs to be done on epoch end as there is no validation accuracy onBatchEnd.
@@ -88,15 +89,17 @@ export abstract class Trainer {
8889
}
8990
}
9091

91-
protected async onTrainBegin (logs?: tf.Logs): Promise<void> {
92+
protected async onTrainBegin (_logs?: tf.Logs): Promise<void> {
9293
this.trainingInformant.addMessage('Training started.')
94+
return await Promise.resolve()
9395
}
9496

9597
/**
9698
* When the training ends this function will be call
9799
*/
98-
protected async onTrainEnd (logs?: tf.Logs): Promise<void> {
100+
protected async onTrainEnd (_logs?: tf.Logs): Promise<void> {
99101
this.trainingInformant.addMessage('Training finished.')
102+
return await Promise.resolve()
100103
}
101104

102105
/**

‎discojs/discojs-core/src/validation/validator.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ export class Validator {
8181
[],
8282
0
8383
).arraySync()
84-
} catch (e: any) {
85-
console.error(e instanceof Error ? e.message : e.toString())
84+
} catch (e) {
85+
console.error(e instanceof Error ? e.message : e)
8686
throw new Error('Failed to compute the confusion matrix')
8787
}
8888
}

‎discojs/discojs-core/src/weights/aggregation.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { assert } from 'chai'
33
import { WeightsContainer, aggregation } from './index.js'
44

55
describe('weights aggregation', () => {
6-
it('avg of weights with two operands', async () => {
6+
it('avg of weights with two operands', () => {
77
const actual = aggregation.avg([
88
WeightsContainer.of([1, 2, 3, -1], [-5, 6]),
99
WeightsContainer.of([2, 3, 7, 1], [-10, 5]),
@@ -14,7 +14,7 @@ describe('weights aggregation', () => {
1414
assert.isTrue(actual.equals(expected))
1515
})
1616

17-
it('sum of weights with two operands', async () => {
17+
it('sum of weights with two operands', () => {
1818
const actual = aggregation.sum([
1919
[[3, -4], [9]],
2020
[[2, 13], [0]]
@@ -24,7 +24,7 @@ describe('weights aggregation', () => {
2424
assert.isTrue(actual.equals(expected))
2525
})
2626

27-
it('diff of weights with two operands', async () => {
27+
it('diff of weights with two operands', () => {
2828
const actual = aggregation.diff([
2929
[[3, -4, 5], [9, 1]],
3030
[[2, 13, 4], [0, 1]]

‎discojs/discojs-node/.eslintrc.json

-5
This file was deleted.

‎discojs/discojs-node/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"scripts": {
88
"watch": "nodemon --ext ts --ignore dist --watch ../discojs-core/dist --watch . --exec npm run",
99
"build": "tsc",
10-
"lint": "npx eslint --ext ts --max-warnings 0 .",
10+
"lint": "npx eslint .",
1111
"test": "mocha",
1212
"docs": "typedoc ./src/imports.ts --theme oxide"
1313
},

‎discojs/discojs-web/.eslintrc.json

-5
This file was deleted.

‎discojs/discojs-web/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"scripts": {
88
"watch": "nodemon --ext ts --ignore dist --watch ../discojs-core/dist --watch . --exec npm run",
99
"build": "tsc",
10-
"lint": "npx eslint --ext ts --max-warnings 0 .",
10+
"lint": "npx eslint .",
1111
"test": ": nothing",
1212
"docs": "typedoc ./src/index.ts --theme oxide"
1313
},

‎docs/examples/.eslintrc.js

-18
This file was deleted.

‎docs/examples/custom_task.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const customTask: TaskProvider = {
3232
}
3333
},
3434

35-
async getModel () {
35+
getModel () {
3636
const model = tf.sequential()
3737

3838
model.add(
@@ -52,7 +52,7 @@ const customTask: TaskProvider = {
5252
metrics: ['accuracy']
5353
})
5454

55-
return new models.TFJS(model)
55+
return Promise.resolve(new models.TFJS(model))
5656
}
5757
}
5858

‎eslint.config.js ‎docs/examples/eslint.config.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ export default tseslint.config(
77
eslint.configs.recommended,
88
...tseslint.configs.recommendedTypeChecked,
99
{
10+
files: ['*.ts'],
1011
languageOptions: {
1112
parserOptions: {
12-
project: './tsconfig.eslint.json',
13+
project: true,
1314
tsconfigRootDir: import.meta.dirname
1415
}
1516
}
1617
},
17-
{ ignores: ['**/dist/*'] }
18+
{ ignores: ['eslint.config.js', 'dist/*'] }
1819
)

‎docs/examples/package.json

+3-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"train": "npm run build && node dist/training.js",
88
"custom_task": "npm run build && node dist/custom_task.js",
99
"build": "tsc",
10-
"lint": "npx eslint --ext ts --max-warnings 0 .",
10+
"lint": "npx eslint .",
1111
"test": "npm run train"
1212
},
1313
"license": "ISC",
@@ -17,12 +17,8 @@
1717
"@epfml/discojs-node": "*"
1818
},
1919
"devDependencies": {
20-
"@typescript-eslint/eslint-plugin": "6",
2120
"eslint": "8",
22-
"eslint-config-standard-with-typescript": "43",
23-
"eslint-plugin-import": "2",
24-
"eslint-plugin-n": "15",
25-
"eslint-plugin-promise": "6",
26-
"typescript": "4"
21+
"typescript": "4",
22+
"typescript-eslint": "7"
2723
}
2824
}

‎docs/examples/training.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ async function loadSimpleFaceData (task: Task): Promise<data.DataSplit> {
7878

7979
const filesPerFolder = [youngFiles, oldFiles]
8080

81-
const labels = filesPerFolder.flatMap((files, index) => Array(files.length).fill(index))
81+
const labels = filesPerFolder.flatMap((files, index) => Array<string>(files.length).fill(`${index}`))
8282
const files = filesPerFolder.flat()
8383

8484
return await new NodeImageLoader(task).loadAll(files, { labels })

‎docs/examples/tsconfig.eslint.json

-4
This file was deleted.

0 commit comments

Comments
 (0)