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.

Sign up for GitHub

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

Jump to bottom

Update libraries #256

Merged
merged 54 commits into from
Mar 28, 2022
Merged

Update libraries #256

merged 54 commits into from
Mar 28, 2022

Conversation

martukas
Copy link
Collaborator

@martukas martukas commented Oct 14, 2021 •
edited
Loading

  • Build container versions updated
  • conan packages updated, though had to roll some back because CI nodes have an outdated version of conan. Left comments in conan file about deferred bumps
  • daqlite is now part of the everything target, so that it builds on CI
  • code updated to work with updated libraries
  • code updated to work with newer compilers (more explicit includes, std::filesystem)
  • PR template simplified
  • readme has badge with link to Jenkins build
  • there are some weird @mortenjc commits that are now part of this branch - not sure if he actually contributed or if these appeared as a result of rebasing to master that I just did. To prevent funky stuff like this in the future, I just configured the repo to require linear history. If rebasing is something new to you, you can read up on it here
  • Did not update daq profiles because I do not know what setups you are using it with these days.
  • Manual test with with full on daquiri and MockProducer worked until it started dropping data and stalled. Could be just a performance issue on my VM. I'll come back to testing things more thoroughly in a future PR.

PROBLEM: macOS build is failing, but quite unpredictably, due to something going wrong with the HDF5 package. It was successful yesterday and then started failing with seemingly no changes to relevant parts of code. I have started playing around with the HDF5 package and it seems to be doing ok on Jenkins. The new h5cpp package also seems to be sound... I do not have a Mac, so one of you may be a in better position to figure out what's wrong?

Checklist for submitter

  • Update docker container versions (if possible)
  • Update conan package versions (if possible)
  • Unit tests pass
  • utils/acquire.sh runs
  • utils/daquiri.sh runs
  • MockProducer profile runs and produces plots (manual test)
  • profiles in /data directory have been updated (if applicable)

@martukas martukas marked this pull request as draft December 5, 2021 07:28
@martukas martukas changed the title **WIP** update libs Update libraries Dec 5, 2021
mortenjc and others added 21 commits December 6, 2021 13:14
@mortenjc
trying to ignore warnings while building (hack)
8c18479
@mortenjc
morten trying to hack his way into compiling on Mac
9c13112
@mortenjc
debugging build
26e9d12
@mortenjc
undo debug
1262abd
@mortenjc
trying isysroot
71d6a49
@mortenjc
trying isysroot II
cc7a836
@martukas
"updated conan packages and some code to boot; updates #255"
8072b26
@martukas
"should build, daqlite added to everything target; updates #255"
d6f59da
@martukas
"updated CLI11; updates #255"
375e4ae
@martukas
"changed node to ubuntu20.04; updates #255"
5bffff1
@martukas
"std filsystem linking for older compilers; updates #255"
021627f
@martukas
"consistent target link signatures in cmake; updates #255"
5a78432
@mortenjc @martukas
trying to ignore warnings while building (hack)
24fd6d7
@mortenjc @martukas
morten trying to hack his way into compiling on Mac
98275ab
@mortenjc @martukas
debugging build
4693c8e
@mortenjc @martukas
undo debug
6803c60
@mortenjc @martukas
trying isysroot
75575fc
@mortenjc @martukas
trying isysroot II
23d7389
@martukas
"updated thread includes; updates #255"
de095fc
@martukas
"updated conan dependencies, Jenkins badge in readme; updates #255"
e600923
@martukas
"updated dependencies; updates #255"
d58d0f9
@martukas martukas marked this pull request as ready for review March 18, 2022 19:40
martukas and others added 18 commits March 18, 2022 12:54
@martukas
"downgrade spdlog and removed some hacks; updates #255"
5f0725b
@martukas
"downgrade fmt; updates #255"
ed49bce
@mortenjc
merge conflicts (maybe from master)
6ce0a4c
@mortenjc
making librdkafka linking static (revert)
0846b1d
@mortenjc
adding include path as H5CC build fails because it cant find stdio.h
68ff106
@mortenjc
Revert "adding include path as H5CC build fails because it cant find …
1d06385 
…stdio.h"

This reverts commit 68ff106.
@mortenjc
try -I to fix mac build
4459201
@mortenjc
debug
67678e1
@mortenjc
debug
0dab71f
@mortenjc
debug: trying new sdk for isysroot
4d67331
@mortenjc
debug: checking out if /usr and /usr/include are available
dd924c7
@mortenjc
debug: check /usr/local
d2289b3
@mortenjc
debug: trying isysroot with conan command
8307647
@mortenjc
debug: check /usr/local - missing string quote
9f76d4a
@mortenjc
debug: testing [env] section of conan
bdac5ea
@mortenjc
debug: checking conan version
b3eaf16
@mortenjc
debug: removed all hacks, clean slate
5522f60
@mortenjc
removing isysroot
e78b8c5
mortenjc
mortenjc approved these changes Mar 25, 2022
View reviewed changes
Copy link
Contributor

@mortenjc mortenjc 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 to me. I've applied a solution to the failing Max node builds on Jenkins where we needed to put the clang specific -isysroot functionality into the conan profile's [env] section.

conanfile.txt Outdated
Comment on lines 31 to 36
., *.dylib* -> ./lib @ keep_path=False
., *.so* -> ./lib @ keep_path=False
., LICENSE* -> ./licenses @ folder=True, ignore_case=True
., *.dll -> ./bin @ keep_path=False
., *.a* -> ./lib @ keep_path=False
., *.lib -> -> ./bin @ keep_path=False
Copy link
Contributor

Choose a reason for hiding this comment

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

I really have no idea what is going on here so I just assume this is correct, but
how about the double arrow at the end?

Copy link
Collaborator Author

@martukas martukas Mar 27, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Actually, I am not sure what is going on here either :D
I think I copied this section from kafka-to-nexus just to keep in step with what your latest practice was. I have never understood this section too well. Perhaps @amues has some insight on what the correct thing to do here is?

Copy link
Contributor

Choose a reason for hiding this comment

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

Fair enough. I'll check this out with the kafka-to-nexus people. I think the double arrow is an error. If there is nothing else coming out of this I will go ahead and squash, merge and delete the branch sometime today or tomorrow.

@mortenjc mortenjc merged commit 8902fb4 into master Mar 28, 2022
@mortenjc mortenjc deleted the issue_255_update_libs branch March 28, 2022 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mortenjc mortenjc mortenjc approved these changes

@JennyLouise JennyLouise Awaiting requested review from JennyLouise

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@martukas @mortenjc