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

prepend to $PYTHONPATH or $EBPYTHONPREFIXES in generated module files by automatically scanning for python site package directories #4539

Merged
merged 27 commits into from
Oct 2, 2024

Conversation

Micket
Copy link
Contributor

@Micket Micket commented May 22, 2024

Alternative approach, don't attempt to rewrite paths, instead generate them directly.

Will of course require some easyblocks (primarily pythonpackage and pythonbundle) to adapt by using these new options, though they should be trivial.

Note: very much a draft right now. Completely untested and probably forgot something important.

easyblock PR: easybuilders/easybuild-easyblocks#3343
easyconfig PR: easybuilders/easybuild-easyconfigs#20960

@Micket Micket force-pushed the ebpythonprefixes2 branch 4 times, most recently from a75d981 to f5bf63d Compare May 23, 2024 13:05
@Micket Micket added EasyBuild-5.0 EasyBuild 5.0 feature labels May 23, 2024
@Micket Micket added this to the 5.0 milestone May 23, 2024
@Micket Micket force-pushed the ebpythonprefixes2 branch from f5bf63d to 0150194 Compare May 23, 2024 13:06
@boegel boegel added the EasyBuild-5.0-blocker Blocker for EasyBuild 5.0 label Jun 5, 2024
@boegel boegel changed the title Add PYTHONPATH or EBPYTHONPREFIXES by automatically scanning for python site package directories Add $PYTHONPATH or $EBPYTHONPREFIXES by automatically scanning for python site package directories Jun 5, 2024
@Micket Micket force-pushed the ebpythonprefixes2 branch 2 times, most recently from 0ce388e to 8662f67 Compare July 3, 2024 21:31
@Micket Micket force-pushed the ebpythonprefixes2 branch 3 times, most recently from 943ccd9 to 19a3b8d Compare July 7, 2024 15:43
@Micket Micket marked this pull request as ready for review July 7, 2024 16:21
@Micket Micket force-pushed the ebpythonprefixes2 branch 2 times, most recently from dd17e4e to cd4d977 Compare August 15, 2024 18:36
Comment on lines 1440 to 1442
if len(python_paths) > 1 and not use_ebpythonprefixes:
raise EasyBuildError('Multiple python paths requires EBPYTHONPREFIXES: ' + ', '.join(python_paths))
elif python_paths:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
if len(python_paths) > 1 and not use_ebpythonprefixes:
raise EasyBuildError('Multiple python paths requires EBPYTHONPREFIXES: ' + ', '.join(python_paths))
elif python_paths:
if python_paths:

This is (as far as I have found, having tested just about every type of easyconfig i could find), which has an actual issue with the code right now

EasyBuild itself generates both:

/apps/Test2/software/EasyBuild/4.9.2/lib/python3.6/site-packages/
/apps/Test2/software/EasyBuild/4.9.2/lib64/python3.6/site-packages/

while the latter is empty, my glob'ing still picks it up, and having multiple PYTHONPATH's doesn't make any sense, this errors out.
There is technically nothing wrong here, those paths are both compatible with python3.6, so they would be fine to use.

I can just remove that extra check. Simplifies the code and you simply get what you ask for. If you have multiple paths for some reason, they are both added, no problem. This is just an extra check we added that were never cared about before, and it's in no way a requirement for this PR.

On the other hand, it's literally only EasyBuild that does this, and I think it shouldn't duplicate the installation directories. Perhaps it should be creating a lib <-> lib64 symlink like just about everything else?

I could also make the code more robust, checking if it's really the same python version etc...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I removed this check for now, to keep this as simple as possible. This check could be introduced later if we want it (but we never checked for this in the past, so this change really has nothing to do with EBPYTHONPREFIXES, especially considering it actually only is problem when EBPYTHONPREFIXES isn't used)

@Micket Micket force-pushed the ebpythonprefixes2 branch 3 times, most recently from 740102c to 47cd62b Compare August 16, 2024 11:19
@Micket
Copy link
Contributor Author

Micket commented Aug 16, 2024

I've made some simplifications:

  1. I just drop that extra check for python paths. We have never checked this before, it's not a requirement for this PR, and in practice it never has any real errors in anything we currently have (and it would be very strange if a real issue ever appeared).

  2. Secondly, i dropped lib64 variant from the globbed paths, since this was never considered by our multi python dep code (sitecustomize.py) to begin with, so I will not consider it here either for consistency.

  3. I changed the global prefer-ebpythonprefixes default to false. While I think everyone really ought to use this due to the problems caused by using PYTHONPATH, there is a problem enabling this by default for existing installations: if your dependencies use PYTHONPATH, you can't shadow any libraries as PYTHONPATH will take precedence. Fixing this requires you rebuild the old easyconfigs (module-only) with --prefer-ebpyhonprefixes, while this is easy, i suspect many would have issues with this.
    We shadow libraries like this regularly, example https://github.com/easybuilders/easybuild-easyconfigs/blob/187ba72edb9f3c71203b1bf02a2243cfd8d203af/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.9.1-foss-2022a.eb#L130
    so if you had build scipy bundle before, and not try to build that tensorflow, you would pick up the wrong version of gast (and fail the sanity check)

@boegel boegel changed the title Add $PYTHONPATH or $EBPYTHONPREFIXES by automatically scanning for python site package directories prepend to $PYTHONPATH or $EBPYTHONPREFIXES in generated module files by automatically scanning for python site package directories Aug 27, 2024
@Flamefire
Copy link
Contributor

Compared to #4496 it looks like this doesn't handle the case where easyblocks (and also easyconfigs?) add $PYTHONPATH directly, does it?

@Micket
Copy link
Contributor Author

Micket commented Aug 28, 2024

Correct, I don't override those if people have their own custom easyblocks or easyconfigs where they keep using PYTHONPATH (my accompanying PRs remove it from easybuild-easyblocks and easybuild-easyconfigs)

@Micket Micket force-pushed the ebpythonprefixes2 branch 2 times, most recently from 8bb432f to ba28b96 Compare September 26, 2024 23:57
Not only simplifies the code but is also the obviously correct way
which i should have used from the start.
Instead, using absolute paths and then make them relative.
if path not in self.module_generator.added_paths_per_key[EBPYTHONPREFIXES]:
lines.append(self.module_generator.prepend_paths(EBPYTHONPREFIXES, path))
else:
for python_path in python_paths:
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm wondering: There can/should never be more than one here, can there? It would mean we'd have e.g. lib/python3.8 and lib/python2.6 and will add both to $PYTHONPATH which can't be right

Copy link
Contributor Author

Choose a reason for hiding this comment

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

A bit of history, went through a few iterations here, at some points i had lib/ and lib64/, which if not symlinked, could be both considered without being an error (and there was a few cases like that which falsely triggered an error), so I just got tired of dealing with that as well so I opted skip that error checking for now.

Since then, I've changed to only consider lib/ since that's the only thing EBPYTHONPREFIXES could handle anyway, so, yes, it's changed slightly. So yes, if someone makes a non PythonPackage/PythonBundle, which also does multi_deps for python, and they set force_python = True for some reason, there would be multiple pythonpaths which maybe (possible likely) would break things (though breaking things isn't guaranteed if the actual python modules installed happens to work with both).

Copy link
Member

Choose a reason for hiding this comment

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

So when using $EBPYTHONPREFIX, it's fine if there are multiple ones (there would be when using multi_deps), but not when using $PYTHONPATH, so we should make the latter an error.

I'll look into that, I'm working on this right now (implementing tests)

@@ -1105,15 +1105,19 @@ def filter_deps(self, deps):

return retained_deps

def dependencies(self, build_only=False):
def dependencies(self, build_only=False, runtime_only=False):
Copy link
Contributor

Choose a reason for hiding this comment

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

Can't we have either an "enum" dep_type=BUILD|RUNTIME|BOTH or at least use include_build=True, include_runtime=True because now we have a potentially "invalid" call: When both are True

Maybe we should at least rename to exclude_runtime, exclude_build which would be mostly backwards compatible and setting both to True seems more reasonable to return nothing

Copy link
Member

Choose a reason for hiding this comment

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

Let's follow up on that in a separate PR, I want to get this PR merged ASAP.

Maybe open an issue for it, so we can tag it with 5.0 milestone.

boegel and others added 3 commits September 30, 2024 11:09
add test to verify that `$PYTHONPATH` or `$EBPYTHONPREFIXES` are set correctly by generated module file
easybuild/framework/easyblock.py Outdated Show resolved Hide resolved
boegel and others added 2 commits September 30, 2024 16:03
take into account `multi_deps` when determining whether to use `$PYTHONPATH` or `$EBPYTHONPREFIXES` + remove `force_pythonpath` easyconfig parameter
Copy link
Member

@boegel boegel left a comment

Choose a reason for hiding this comment

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

lgtm

@lexming
Copy link
Contributor

lexming commented Oct 2, 2024

Merging, thanks @Micket !

@lexming lexming merged commit 9eb0e4a into easybuilders:5.0.x Oct 2, 2024
36 checks passed
@Micket Micket deleted the ebpythonprefixes2 branch October 18, 2024 15:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
EasyBuild-5.0-blocker Blocker for EasyBuild 5.0 EasyBuild-5.0 EasyBuild 5.0 feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants