learning_model 1.0.41 → 1.0.43
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.bundle.js +1 -1
- package/dist/learning/mobilenet.js +13 -7
- package/lib/learning/mobilenet.ts +14 -7
- package/package.json +1 -1
|
@@ -218,15 +218,15 @@ class LearningMobilenet {
|
|
|
218
218
|
const validationData = datasets.validationDataset.batch(this.batchSize);
|
|
219
219
|
const optimizer = tf.train.adam(this.learningRate);
|
|
220
220
|
const trainModel = yield this._createModel(optimizer);
|
|
221
|
+
const jointModel = tf.sequential();
|
|
222
|
+
jointModel.add(this.mobilenetModule);
|
|
223
|
+
jointModel.add(trainModel);
|
|
224
|
+
this.model = jointModel;
|
|
221
225
|
const history = yield trainModel.fitDataset(trainData, {
|
|
222
226
|
epochs: this.epochs,
|
|
223
227
|
validationData: validationData,
|
|
224
228
|
callbacks: customCallback
|
|
225
229
|
});
|
|
226
|
-
const jointModel = tf.sequential();
|
|
227
|
-
jointModel.add(this.mobilenetModule);
|
|
228
|
-
jointModel.add(trainModel);
|
|
229
|
-
this.model = jointModel;
|
|
230
230
|
optimizer.dispose();
|
|
231
231
|
return history;
|
|
232
232
|
}
|
|
@@ -277,10 +277,16 @@ class LearningMobilenet {
|
|
|
277
277
|
saveModel(handlerOrURL, config) {
|
|
278
278
|
var _a;
|
|
279
279
|
return __awaiter(this, void 0, void 0, function* () {
|
|
280
|
-
|
|
281
|
-
|
|
280
|
+
try {
|
|
281
|
+
console.log('saveModel try', this.isTrainedDone);
|
|
282
|
+
if (!this.isTrainedDone) {
|
|
283
|
+
return Promise.reject(new Error('Train is not done status'));
|
|
284
|
+
}
|
|
285
|
+
yield ((_a = this.model) === null || _a === void 0 ? void 0 : _a.save(handlerOrURL, config));
|
|
286
|
+
}
|
|
287
|
+
catch (e) {
|
|
288
|
+
console.log('saveModel Error', e);
|
|
282
289
|
}
|
|
283
|
-
yield ((_a = this.model) === null || _a === void 0 ? void 0 : _a.save(handlerOrURL, config));
|
|
284
290
|
});
|
|
285
291
|
}
|
|
286
292
|
// 진행중 여부
|
|
@@ -228,15 +228,17 @@ class LearningMobilenet implements LearningInterface {
|
|
|
228
228
|
const validationData = datasets.validationDataset.batch(this.batchSize);
|
|
229
229
|
const optimizer = tf.train.adam(this.learningRate);
|
|
230
230
|
const trainModel = await this._createModel(optimizer);
|
|
231
|
+
const jointModel = tf.sequential();
|
|
232
|
+
jointModel.add(this.mobilenetModule!);
|
|
233
|
+
jointModel.add(trainModel);
|
|
234
|
+
this.model = jointModel;
|
|
235
|
+
|
|
231
236
|
const history = await trainModel.fitDataset(trainData, {
|
|
232
237
|
epochs: this.epochs,
|
|
233
238
|
validationData: validationData,
|
|
234
239
|
callbacks: customCallback
|
|
235
240
|
});
|
|
236
|
-
|
|
237
|
-
jointModel.add(this.mobilenetModule!);
|
|
238
|
-
jointModel.add(trainModel);
|
|
239
|
-
this.model = jointModel;
|
|
241
|
+
|
|
240
242
|
optimizer.dispose();
|
|
241
243
|
return history;
|
|
242
244
|
} catch (error) {
|
|
@@ -284,10 +286,15 @@ class LearningMobilenet implements LearningInterface {
|
|
|
284
286
|
|
|
285
287
|
// 모델 저장
|
|
286
288
|
public async saveModel(handlerOrURL: io.IOHandler | string, config?: io.SaveConfig): Promise<void> {
|
|
287
|
-
|
|
288
|
-
|
|
289
|
+
try {
|
|
290
|
+
console.log('saveModel try', this.isTrainedDone);
|
|
291
|
+
if (!this.isTrainedDone) {
|
|
292
|
+
return Promise.reject(new Error('Train is not done status'));
|
|
293
|
+
}
|
|
294
|
+
await this.model?.save(handlerOrURL, config);
|
|
295
|
+
} catch(e) {
|
|
296
|
+
console.log('saveModel Error', e);
|
|
289
297
|
}
|
|
290
|
-
await this.model?.save(handlerOrURL, config);
|
|
291
298
|
}
|
|
292
299
|
|
|
293
300
|
// 진행중 여부
|