Skip to content

febio: 3.6 -> 4.7; febio-studio: 1.6.1 -> 2.7#331864

Merged
philiptaron merged 7 commits intoNixOS:masterfrom
emilazy:push-posunwslrptx
Aug 6, 2024
Merged

febio: 3.6 -> 4.7; febio-studio: 1.6.1 -> 2.7#331864
philiptaron merged 7 commits intoNixOS:masterfrom
emilazy:push-posunwslrptx

Conversation

@emilazy
Copy link
Member

@emilazy emilazy commented Aug 2, 2024

Description of changes

Phew, this was a lot of work! Another FFmpeg 4 dependency upgraded, and some Darwin support to sweeten the deal.

@Scriptkiddi I hope you still use this! I have absolutely no idea how to operate the program, but I’ve checked that it starts and can call out to FEBio and so on. It would be great if you could test it more thoroughly, especially on Linux.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Aug 2, 2024
@ofborg ofborg bot requested a review from Scriptkiddi August 2, 2024 23:56
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Aug 2, 2024
Copy link
Contributor

@philiptaron philiptaron left a comment

Choose a reason for hiding this comment

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

Gave a thorough build check.


patches = [
# Fix library searching and installation
(substituteAll {
Copy link
Contributor

Choose a reason for hiding this comment

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

Unrelated: #237216, #301350

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for the pointers! #301350 looks interesting. This is just inherited from the previous version of the derivation, though.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, hence "unrelated" -- no expectation for you to take any action.

ninja,
zlib,
darwin,
mklSupport ? true,
Copy link
Contributor

Choose a reason for hiding this comment

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

Tested with mklSupport off on x86_64-linux; builds.

I know it's in the previous version, but this does make febio a mixed free/non-free derivation.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, I get the impression that you’re really just meant to use it:

FEBio requires the Intel Math Kernel Library (MKL) in order to utilize the Pardiso linear solver and some of the iterative linear solvers. This library can be downloaded as part of the Intel oneAPI Base Toolkit from Intel's website: https://software.intel.com/content/www/us/en/develop/tools/oneapi/base-toolkit.html. In the absence of MKL, FEBio will default to using the Skyline linear solver. However, the Pardiso solver is significantly faster and more memory-efficient than the Skyline solver, and it is strongly recommended that the Pardiso solver be used.

zlib,
libGLU,
qt6Packages,
febio,
Copy link
Contributor

Choose a reason for hiding this comment

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

Confirmed that this derivation builds with febio = febio.override { mklSupport = false; }

dicomSupport ? false,
dcmtk,
withModelRepo ? true,
withCadFeatures ? false,
Copy link
Contributor

Choose a reason for hiding this comment

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

confirmed that this builds with withCadFeatures set to true

tetgen,
ffmpegSupport ? true,
ffmpeg_7,
dicomSupport ? false,
Copy link
Contributor

Choose a reason for hiding this comment

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

confirmed that this builds with dicomSupport set to true

libssh,
tetgenSupport ? true,
tetgen,
ffmpegSupport ? true,
Copy link
Contributor

Choose a reason for hiding this comment

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

confirmed that this builds with ffmpegSupport set to false

sshSupport ? true,
openssl,
libssh,
tetgenSupport ? true,
Copy link
Contributor

Choose a reason for hiding this comment

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

confirmed that this builds with tetgenSupport set to false

ffmpeg_7,
dicomSupport ? false,
dcmtk,
withModelRepo ? true,
Copy link
Contributor

Choose a reason for hiding this comment

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

confirmed that this builds with withModelRepo set to false

@philiptaron
Copy link
Contributor

I intend to merge on Monday, in order to give @Scriptkiddi time to look. But this seems 👍🏻

@philiptaron philiptaron merged commit 57b4585 into NixOS:master Aug 6, 2024
@Scriptkiddi
Copy link
Contributor

thanks for taking care of this, im not using febio really active anymore but I know its being used for research by 8 people

@emilazy emilazy mentioned this pull request Aug 21, 2024
13 tasks
@emilazy emilazy deleted the push-posunwslrptx branch August 26, 2024 00:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Comments