Use Python to parse tensorflow v2 keras schemas (Closes #149) #180

umesh-timalsina · 2020-07-30T19:20:28Z

Checklist:

Parse primitive (regularizers, activations, constraints and activations)
Parse Layers
Add tests ? (Not needed)

…nts using inspect

brollb · 2020-07-31T19:57:55Z

The tests for the schemas should actually still work as long as the schema format doesn't change. (It shouldn't need to.)

umesh-timalsina · 2020-08-04T19:47:46Z

@brollb I am requesting your review in this PR. I will commit the JSON files once other issues are resolved in this PR.

1. Remove keras from requirements (use tensorflow.keras) 2. Fix code generation logic and test cases 3. Minor changes in layer names in test fixtures

umesh-timalsina · 2020-08-18T21:47:50Z

With every test passing with increased timeouts, I think this PR is ready to be reviewed/merged. Would any changes to deepforge be necessary @brollb ?

brollb

At a glance, it looks pretty good! I didn't quite have time for a full review but wanted to let you know my thoughts after skimming the code.

Do you know why the test timeout needed to be increased?

I will play with it tomorrow and see if I have any more comments!

brollb · 2020-08-18T21:54:00Z

environment.worker.yml

@@ -2,7 +2,6 @@ name: deepforge-keras
 dependencies:
  - python=3.7
  - pip:
-    - tensorflow==1.14
-    - keras==2.2.5
+    - tensorflow==2.3.0
    - pillow
    - dill


Is dill still needed? This might be able to be split out into its own PR but it is hard to say for sure since we don't want it in a broken state :/

Not sure if this file is being used:
https://github.com/deepforge-dev/deepforge-keras/blob/master/init_code.py

https://github.com/deepforge-dev/deepforge-keras/blob/master/deepforge-extension.json#L6

brollb · 2020-08-18T21:56:48Z

src/plugins/CreateKerasMeta/CreateKerasMeta.js

@@ -263,7 +262,7 @@ define([
                return undefined;
            }
            type = arg.type;
-            layer = this.getLayerSchema(layer.base);
+            layer = layer.name !== layer.base ? this.getLayerSchema(layer.base) : undefined;


Is this still necessary? This was required before because we were parsing the source and had to reconstruct the inheritance chain to determine the type info for a given argument. Since the current version parses the argument type from the runtime, we shouldn't need to reconstruct this (and I don't know that it actually helps us at all).

brollb · 2020-08-19T17:49:57Z

When I try to update the keras project seed, I see the following error:

brollb · 2020-08-19T17:57:20Z

After looking at it a bit more, it looks like this could be an issue with the JSONImporter as an attribute was updated to no longer be an enum. However, I am not sure if this attribute should be changed. Is scale for BatchNorm still a boolean?

umesh-timalsina · 2020-08-25T16:57:22Z

CreateKerasMeta passes when starting with base seed. However it fails during update of the keras seed.

brollb · 2020-08-25T19:23:00Z

I have a couple fixes that should help with some of those errors (#189 #187)

brollb · 2020-08-27T19:48:09Z

I almost forgot that we will need to update initCode.py: https://www.tensorflow.org/guide/keras/save_and_serialize

umesh-timalsina · 2020-08-28T14:36:17Z

I almost forgot that we will need to update initCode.py: https://www.tensorflow.org/guide/keras/save_and_serialize

Do we want to save the model in pb format now?

umesh-timalsina · 2020-08-28T18:44:11Z

It appears that TimeDistrubuted layer doesn't add a pointer to a layer for its layer attribute. However, BiDirectional correctly points to the layer using this branch.

… Input

umesh-timalsina · 2020-09-08T16:43:15Z

Blocked by deepforge-dev/deepforge#1894

brollb · 2020-09-22T19:31:31Z

init_code.py

-    # Make a tmp dir
-    import os
-    from os import path
-    import time
    tmp_dir = infile.name + '-tmp-' + str(time.time())


Why hasn't this been removed, too?

This will make sure there are no conflicts in the SavedModel directory. i.e. deserializing two models in the same directory can cause problems.

brollb

I left a couple minor comments about the serialization but other than that, it looks good! Nice work.

init_code.py

umesh-timalsina · 2020-09-23T17:52:10Z

While converting the test project seed to use this branch for Sequence 2 Sequence Model (specifically when combining 2 states to one between 2 LSTMS as shown in the figure below:

I got the following error:

Connection.js:76 Uncaught (in promise) TypeError: dims.map is not a function
    at Connection.setDimensionality (Connection.js:76)
    at KerasArchEditorWidget.js:402
    at Array.forEach (<anonymous>)
    at KerasArchEditorWidget.showAnalysisResults (KerasArchEditorWidget.js:395)
    at KerasArchEditorControl.getLatestAnalysis (KerasArchEditorControl.js:963)

brollb · 2020-09-23T18:27:05Z

Can you share the JSON representation of dimensionality/error info?

umesh-timalsina · 2020-09-23T18:35:58Z

The variable dims seems to be a single integer in this case.

WIP- #149; parse regularizers, initializers, activations and constrai…

ad2340d

…nts using inspect

This was referenced Jul 30, 2020

Update to tensorflow v2 (use tf.keras) #149

Closed

Few notes on parsing to tensorflow.keras sources (v2.3.0) #181

Open

WIP- Consolidate layer parsing to a single file; Parse layers

d934dd8

umesh-timalsina marked this pull request as ready for review August 4, 2020 19:46

umesh-timalsina requested a review from brollb August 4, 2020 19:47

umesh-timalsina added 7 commits August 6, 2020 10:34

WIP- Fix baseName in CreateKerasMeta, don't parse base types

ebf7462

Add new JSON files, fix aliases names, fix code generation

2070fb1

1. Remove keras from requirements (use tensorflow.keras) 2. Fix code generation logic and test cases 3. Minor changes in layer names in test fixtures

Remove keras from requirements.spec.js

81e4073

Merge remote-tracking branch 'origin/master' into 149-tfv2-py

105586f

WIP- Increase test timeouts (required for new keras version)

b64ca95

WIP- increase test timeout in JSONImporter.spec.js

ce2fa8f

WIP- Remove ToDo for parse-layers

034f1b5

WIP- Minor fixes to docstring, abstract class determining logic

b810fdf

brollb requested changes Aug 18, 2020

View reviewed changes

WIP- fix errors in Wrapper layer

11f2c32

umesh-timalsina added this to the v2.0.0 milestone Aug 19, 2020

Fix default argument detection

7e75c56

This was referenced Aug 25, 2020

Array removals should be sorted in reverse order in JSONImporter #186

Closed

Ensure changes are sorted so set definition happens before set editing #188

Closed

brollb added 3 commits August 26, 2020 08:37

Merge branch 'master' into 149-tfv2-py

6fac53f

Add debug log for node deletion

a352efb

Add more debug logs

13763e8

brollb added 2 commits August 27, 2020 14:11

Convert lists to tuple strings

ea3a150

Clean up out-of-date comments

0c36a96

WIP- Use standard layer names

0c7d3fa

WIP-Add Input Layer to schema

e47c2ff

umesh-timalsina and others added 8 commits August 28, 2020 15:31

Add serialization in init_code.py

52e5787

Add TimeDistributed layer attribute type

1518e9b

WIP- remove dill from requirements; add Wrapper to be abstract

dd3a198

Merge branch master into 149-tfv2-py

c873514

WIP- Remove InputLayer and InputSpec from schema, Fix Inheritance for…

76eda32

… Input

WIP- remove console.log from the plugin

28b77fb

fix minor linting issue

ba05af6

WIP- Fix output_shape parsing in ValidateKeras

8285267

umesh-timalsina mentioned this pull request Sep 4, 2020

Change serialization to use isinstance instead of __class__. deepforge-dev/deepforge#1894

Open

WIP- Add Suboptimal workaround for serialization

fbba427

brollb reviewed Sep 22, 2020

View reviewed changes

brollb requested changes Sep 22, 2020

View reviewed changes

init_code.py Show resolved Hide resolved

init_code.py Show resolved Hide resolved

brollb approved these changes Sep 22, 2020

View reviewed changes

This was referenced Sep 23, 2020

Use deepforge-keras v1.0.0 from npm deepforge-dev/deepforge#1920

Closed

Update example projects to use tensorflow 2.0 deepforge-dev/examples#25

Open

umesh-timalsina and others added 2 commits October 6, 2020 18:12

WIP- Update seeds; Add Test for layers in ValidateKeras [skip ci]

ffe7ae6

WIP-Fix test seed, layer names in ExportKeras.spec.js

e223747

brollb merged commit 68b432d into master Oct 7, 2020

brollb deleted the 149-tfv2-py branch October 7, 2020 15:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use Python to parse tensorflow v2 keras schemas (Closes #149) #180

Use Python to parse tensorflow v2 keras schemas (Closes #149) #180

umesh-timalsina commented Jul 30, 2020 •

edited

Loading

brollb commented Jul 31, 2020

umesh-timalsina commented Aug 4, 2020

umesh-timalsina commented Aug 18, 2020

brollb left a comment

brollb Aug 18, 2020

umesh-timalsina Aug 19, 2020 •

edited

Loading

brollb Aug 19, 2020

brollb Aug 18, 2020

brollb commented Aug 19, 2020

brollb commented Aug 19, 2020

umesh-timalsina commented Aug 25, 2020

brollb commented Aug 25, 2020

brollb commented Aug 27, 2020

umesh-timalsina commented Aug 28, 2020

umesh-timalsina commented Aug 28, 2020

umesh-timalsina commented Sep 8, 2020

brollb Sep 22, 2020

umesh-timalsina Sep 22, 2020

brollb left a comment

umesh-timalsina commented Sep 23, 2020

brollb commented Sep 23, 2020

umesh-timalsina commented Sep 23, 2020

Use Python to parse tensorflow v2 keras schemas (Closes #149) #180

Use Python to parse tensorflow v2 keras schemas (Closes #149) #180

Conversation

umesh-timalsina commented Jul 30, 2020 • edited Loading

brollb commented Jul 31, 2020

umesh-timalsina commented Aug 4, 2020

umesh-timalsina commented Aug 18, 2020

brollb left a comment

Choose a reason for hiding this comment

brollb Aug 18, 2020

Choose a reason for hiding this comment

umesh-timalsina Aug 19, 2020 • edited Loading

Choose a reason for hiding this comment

brollb Aug 19, 2020

Choose a reason for hiding this comment

brollb Aug 18, 2020

Choose a reason for hiding this comment

brollb commented Aug 19, 2020

brollb commented Aug 19, 2020

umesh-timalsina commented Aug 25, 2020

brollb commented Aug 25, 2020

brollb commented Aug 27, 2020

umesh-timalsina commented Aug 28, 2020

umesh-timalsina commented Aug 28, 2020

umesh-timalsina commented Sep 8, 2020

brollb Sep 22, 2020

Choose a reason for hiding this comment

umesh-timalsina Sep 22, 2020

Choose a reason for hiding this comment

brollb left a comment

Choose a reason for hiding this comment

umesh-timalsina commented Sep 23, 2020

brollb commented Sep 23, 2020

umesh-timalsina commented Sep 23, 2020

umesh-timalsina commented Jul 30, 2020 •

edited

Loading

umesh-timalsina Aug 19, 2020 •

edited

Loading