Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix layer memory crash #876

Merged
merged 3 commits into from
Apr 29, 2022
Merged

Conversation

ghutchis
Copy link
Member

Right now, this reverts #806 but there's still some sort
of memory corruption when assigning one molecule to another

Also, it seems like File -> Import Crystal adds atoms that
don't have layer information

Signed-off-by: Geoff Hutchison geoff.hutchison@gmail.com

Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.

Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or

(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or

(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.

(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.

Right now, this reverts OpenChemistry#806 but there's still some sort
of memory corruption when assigning one molecule to another

Also, it seems like File -> Import Crystal adds atoms that
don't have layer information

Signed-off-by: Geoff Hutchison <geoff.hutchison@gmail.com>
@github-actions
Copy link
Contributor

Here are the build results
Avogadro2.AppImage
macOS.dmg
Ubuntu-2004.tar.gz
Win64.exe
Artifacts will only be retained for 90 days.

added to the active layer.

An ideal thing might be to create a new temporary layer
(e.g., a copy layer) but this is a good step

Signed-off-by: Geoff Hutchison <geoff.hutchison@gmail.com>
@ghutchis ghutchis changed the title WIP to find the memory bug involved in #824 Fix layer memory crash Apr 28, 2022
@github-actions
Copy link
Contributor

Here are the build results
Avogadro2.AppImage
macOS.dmg
Ubuntu-2004.tar.gz
Win64.exe
Artifacts will only be retained for 90 days.

@ghutchis
Copy link
Member Author

@drew-parsons - I think this fixes #824 - could you give it a try?

@drew-parsons
Copy link
Contributor

Seems to work more or less. Doesn't give the memory crash, and I can see the crystal supercell is formed.

There are some other issues with the interface e.g. the ball&stick view gets randomly switched off, but there's no reason to think that's caused by this patch. Might just be the size of the sample I used to test (one protein, so the supercell has 1000s of atoms to track).

I'd say thumbs up for this patch, and can deal with any other problems as they come up if they recur.

@ghutchis
Copy link
Member Author

It's still related. What's happening is that some of the actions -- supercell is the easiest to find -- actually replace the molecule "under the hood."

At the moment, that sometimes replaces the layer information.

The patch is an 80% fix. What you describe is a consequence .. we're losing some of the layer settings .. but if it avoids a crash it's a big step in the right direction.

AFAICT this should be suitable for backporting to 1.95.1 LTS packages.

@ghutchis ghutchis merged commit 333eebf into OpenChemistry:master Apr 29, 2022
@ghutchis ghutchis deleted the find-layer-memory-bug branch April 29, 2022 14:22
@avo-bot
Copy link

avo-bot commented Apr 30, 2022

This pull request has been mentioned on Avogadro Discussion. There might be relevant details there:

https://discuss.avogadro.cc/t/april-2022-development-progress/3786/1

@avo-bot
Copy link

avo-bot commented May 27, 2022

This pull request has been mentioned on Avogadro Discussion. There might be relevant details there:

https://discuss.avogadro.cc/t/may-2022-development-progress/3836/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants