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

feat: some cleanup #17

Merged
merged 36 commits into from
Feb 13, 2024
Merged

feat: some cleanup #17

merged 36 commits into from
Feb 13, 2024

Conversation

n0w0f
Copy link
Contributor

@n0w0f n0w0f commented Feb 1, 2024

@RezaAliakbari I have done some cleanup. maybe you can review the code?

@n0w0f n0w0f requested a review from r3zu February 1, 2024 15:06
@kjappelbaum kjappelbaum self-requested a review February 9, 2024 12:58
@kjappelbaum
Copy link
Contributor

@n0w0f and @RezaAliakbari at least for me the tests failed. Probably due to a different Python version.
For this reason, I now used PDM to also create lock files.

I also linted the package and removed other unneeded parts (I think our cookiecutter should be updated).

@kjappelbaum
Copy link
Contributor

kjappelbaum commented Feb 11, 2024

It would be good to understand the test failures and if we need some additional version pinning or processing of the data to ensure that we don't fool ourselves when we generated millions of text representations (this would especially hurt us, if we collaborate with different python environments)

@n0w0f
Copy link
Contributor Author

n0w0f commented Feb 11, 2024

It would be good to understand the test failures and if we need some additional version pinning or processing of the data to ensure that we don't fool ourselves when we generated millions of text representations (this would especially hurt us, if we collaborate with different python environments)

Thank you for reviewing the code, there were some bugs which i have fixed now. Will add more test cases as well.

pyproject.toml Outdated
@@ -39,4 +39,5 @@ dev = [
"pytest>=8.0.0",
"black>=24.1.1",
"ruff>=0.2.1",
"absl-py==2.1.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

yeah, I wonder why this wasn't added by pdm. I say that this failure is caused by this and it is also in the lockfiles. It should automatically be obtained as a tensorflow dependency and not manually by us

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah this came with slices. Was not sure why it was not installed by pdm

Copy link
Contributor

Choose a reason for hiding this comment

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

this thus doesn't feel like the right fix ...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

did pdm install absl-py for you in your local ? I had conda env with slices & m3gnet, which might have added absl-py. before i started using pdm

Copy link
Contributor

Choose a reason for hiding this comment

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

you are right, there might be a confounding. Let me clean that

Copy link
Contributor Author

Choose a reason for hiding this comment

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

pdm is not adding absl-py ?

Copy link
Contributor

Choose a reason for hiding this comment

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

no, because there should be no need. It is an indirect dependency.

Copy link
Contributor

Choose a reason for hiding this comment

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

I do not have time now to look deeper into it, I'll add it back, but it is somehow strange and should not be needed and there must be a bug somewhere

Copy link
Contributor

Choose a reason for hiding this comment

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

ok, has been some venv issue on github actions, wtf

Copy link
Contributor

Choose a reason for hiding this comment

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

this PR now really must be squashed :D

@kjappelbaum
Copy link
Contributor

@n0w0f the robocrys thing is still failing. Do we need to have a harder pin on the version? Or can we make the test a bit less strict?

r3zu and others added 3 commits February 12, 2024 23:47
@n0w0f
Copy link
Contributor Author

n0w0f commented Feb 12, 2024

@n0w0f the robocrys thing is still failing. Do we need to have a harder pin on the version? Or can we make the test a bit less strict?

Not sure about the origin of this issue. Test passed for N2, locally (will cross check dependency local and remote ), and how representation changes with versions. pymatgen version in CI and local is same.
for now testing on inorganic system.

Copy link
Contributor

@kjappelbaum kjappelbaum left a comment

Choose a reason for hiding this comment

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

lgtm!

@n0w0f
Copy link
Contributor Author

n0w0f commented Feb 13, 2024

incorporate #14 #7

@n0w0f n0w0f merged commit 1640cab into main Feb 13, 2024
1 check passed
@n0w0f n0w0f deleted the refactor branch February 13, 2024 09:10
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.

3 participants