Skip to content

Conversation

jbentvelsen
Copy link
Collaborator

This PR will integrate the custom datastore into the DeepInterpolation repo. @tkuenzmw developed a first version of this datastore including an example. I have made some modifications such that the hard coded parameters are replaced by parameters. Also, I have extended the live script with some additional information about the this custom datastore.

@jbentvelsen jbentvelsen linked an issue Oct 16, 2023 that may be closed by this pull request
Copy link
Collaborator

@theavuik theavuik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this commit reintroduces exactly the same function, wouldn't it be better to adjust the earlier commit in which this function was removed to keep the same git history wrt this file (since it was written by Thomas and not you)?

@tkuenzmw
Copy link
Collaborator

@theavuik I think the branch I pushed is in no good state to be merged. Is that what you are referring to? I think what @jbentvelsen is doing is ok (at least for me)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After denoising one frame, I obtain a figure with two subfigs (raw and denoised). After denoising all frames I do not see any figures, is that OK?
Is it possible to add the 'raw' and 'denoised' also to the bottom figures related to the for-loop?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@theavuik that was intended in the way the deepIntInference example function was written, it will denoise and then save the stack to disc when not given a frame number. However, this functions is not exactly connected to the custom datastore and should be removed, it does not even use the custom datastore. The "deepIntTraining" function I submitted showed training using the custom datastore. Should we/I better create a revised workflow demo?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@thkupy You are right, the current inference we see in the new customdatastore_example.mlx is not related to the datastore.

Maybe, the solution is that we simply remove the inference steps from the customdatastore_example? Such that the example ends after showing how to train a network with the custom datastore (these steps were based on your deepIntTraining function). I believe the other live scripts show how to do inference anyway, and the datastore is not relevant for inference.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree

@stevevanhooser
Copy link
Collaborator

stevevanhooser commented Oct 19, 2023 via email

@theavuik
Copy link
Collaborator

Hi - Just to confirm, you all are still discussing this PR and I shouldn’t test yet, true? Thanks Steve

I expect Joris will take a look at our comments first, but he is on holiday now. Thanks!

@jbentvelsen jbentvelsen force-pushed the integrate-custom-datastore branch from 63a048b to 0418ca8 Compare October 23, 2023 08:09
@jbentvelsen
Copy link
Collaborator Author

If this commit reintroduces exactly the same function, wouldn't it be better to adjust the earlier commit in which this function was removed to keep the same git history wrt this file (since it was written by Thomas and not you)?

As the folder structure is different, the git history will be lost anyway. Furthermore, we probably remove this function in a next version. So for now, I will leave this as it is.

@jbentvelsen
Copy link
Collaborator Author

I have processed the feedback (renamed a variable and removed the inference part). @stevevanhooser (maybe also @tkuenzmw) can you review this PR?

@theavuik theavuik linked an issue Oct 24, 2023 that may be closed by this pull request
@tkuenzmw
Copy link
Collaborator

I have processed the feedback (renamed a variable and removed the inference part). @stevevanhooser (maybe also @tkuenzmw) can you review this PR?

I will not formally review the PR but I'll comment here: I think this is now really good! In the future a workflow example for just the datastore workflow could maybe be even more reduced/simpler. For example the construction of the exampleOpts (ll. 2-13) is maybe a bit confusing here -- why are the parameters put into a struct at all, this is not clear to the "viewer". However, this is a minor point. I think you greatly improved the custom datastore and the demo related to it. Good stuff!

@jbentvelsen jbentvelsen force-pushed the integrate-custom-datastore branch from d8396f2 to 4ec9031 Compare October 25, 2023 09:28
@jbentvelsen
Copy link
Collaborator Author

I have added a section showing inference using the custom datastore (based on the code of @tkuenzmw).

Copy link
Collaborator

@stevevanhooser stevevanhooser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, I ran the demos here.

@stevevanhooser stevevanhooser merged commit dd27212 into main Oct 25, 2023
@stevevanhooser stevevanhooser deleted the integrate-custom-datastore branch October 25, 2023 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use datastore objects and remote data access custom datastore workflow for DeepInterpolation-MATLAB
4 participants