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

Some updates for key4hep and Marlin packages #175

Merged
merged 7 commits into from
Dec 21, 2023
Merged

Conversation

gaede
Copy link
Contributor

@gaede gaede commented Dec 15, 2023

BEGINRELEASENOTES

  • some fixes to keep up w/ changes in key4hep packages
    - allow HEAD branch to be called main
    - patch lcgeo install to work w/ latest k4geo
  • Allow Marlin packages to be installed into lib64 or lib and make sure that MARLIN_DLL is populated properly.
  • update versions of externals in example macbookfg

ENDRELEASENOTES

@gaede gaede changed the title Some updates for key4hep packages WIP: Some updates for key4hep packages Dec 15, 2023
@@ -67,3 +67,5 @@ def postCheckDeps(self):
if os.path.exists(libname):
self.parent.module('Marlin').envpath["MARLIN_DLL"].append(libname)
break
else:
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we know now, why this sometimes seems to only work on the second try?

Copy link
Contributor

Choose a reason for hiding this comment

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

This else should be de-dented one level

for ...:
    if ..:
        break
else:
    print("error: only when no 'break'")

Copy link
Contributor

Choose a reason for hiding this comment

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

I think this function postCheckDeps is called before the compilation happened, so the libraries will not exist at this point. The setting for MARLIN_DLL would need to move to checkInstall instead?

Copy link
Contributor

Choose a reason for hiding this comment

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

Except that init_ilcsoft.sh is written before the compilation is done...

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, that would explain what we saw almost perfectly...

Copy link
Contributor

Choose a reason for hiding this comment

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

Copying the code that writes the init_ilcsoft.sh file and adding f.close() does the trick for me.

master...andresailer:iLCInstall:python3

(used for building the nighlty clicdp.cern.ch ilcsoft stacks)

Copy link
Contributor

Choose a reason for hiding this comment

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

Nice. Can the necessary commits simply be cherry picked to here? Or do we need to do it manually?

Copy link
Contributor

Choose a reason for hiding this comment

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

I think one would need to manually cherry-pick

@tmadlener
Copy link
Contributor

Cherry picked (hopefully) all of the relevant changes from your branch.

@gaede
Copy link
Contributor Author

gaede commented Dec 20, 2023

Thanks for the fix.

@tmadlener tmadlener changed the title WIP: Some updates for key4hep packages Some updates for key4hep and Marlin packages Dec 21, 2023
@tmadlener tmadlener merged commit de8db57 into iLCSoft:master Dec 21, 2023
2 checks passed
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.

None yet

3 participants