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

eigen3_3: fix EIGEN3_INCLUDE_DIR location #50628

Merged
merged 1 commit into from Nov 18, 2018
Merged

eigen3_3: fix EIGEN3_INCLUDE_DIR location #50628

merged 1 commit into from Nov 18, 2018

Conversation

orivej
Copy link
Contributor

@orivej orivej commented Nov 18, 2018

Motivation for this change

Eigen assumes that CMAKE_INSTALL_INCLUDEDIR is a path relative to CMAKE_INSTALL_PREFIX (typically include), but CMake supports it being an absolute path, which is the case in Nixpkgs. This resulted in EIGEN3_INCLUDE_DIR being set to /nix/store/…eigen…//nix/store/…eigen…/include/eigen3.

GNUInstallDirs_get_absolute_install_dir requires CMake 3.7.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@orivej
eigen3_3: fix EIGEN3_INCLUDE_DIR location
5598918 
Eigen assumes that CMAKE_INSTALL_INCLUDEDIR is a path relative to
CMAKE_INSTALL_PREFIX (typically "include"), but CMake supports it being an
absolute path, which is the case in Nixpkgs. This resulted in EIGEN3_INCLUDE_DIR
being set to "/nix/store/…eigen…//nix/store/…eigen…/include/eigen3".

GNUInstallDirs_get_absolute_install_dir requires CMake 3.7.
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: eigen3_3

Partial log (click to expand)

-- Installing: /nix/store/506bv3sjc8khgyslcf80bkszan4pf54r-eigen-3.3.5/include/eigen3/unsupported/Eigen/CXX11/src/Tensor/TensorBroadcasting.h
-- Installing: /nix/store/506bv3sjc8khgyslcf80bkszan4pf54r-eigen-3.3.5/include/eigen3/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h
-- Installing: /nix/store/506bv3sjc8khgyslcf80bkszan4pf54r-eigen-3.3.5/include/eigen3/unsupported/Eigen/CXX11/src/Tensor/TensorAssign.h
-- Installing: /nix/store/506bv3sjc8khgyslcf80bkszan4pf54r-eigen-3.3.5/include/eigen3/unsupported/Eigen/CXX11/src/Tensor/TensorArgMax.h
-- Installing: /nix/store/506bv3sjc8khgyslcf80bkszan4pf54r-eigen-3.3.5/include/eigen3/unsupported/Eigen/CXX11/src/Tensor/Tensor.h
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/506bv3sjc8khgyslcf80bkszan4pf54r-eigen-3.3.5
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/506bv3sjc8khgyslcf80bkszan4pf54r-eigen-3.3.5
checking for references to /build in /nix/store/506bv3sjc8khgyslcf80bkszan4pf54r-eigen-3.3.5...

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: eigen3_3

Partial log (click to expand)

-- Installing: /nix/store/bqlfvh78c1l835fglka6l9m9d8cs3j08-eigen-3.3.5/include/eigen3/unsupported/Eigen/CXX11/src/ThreadPool/ThreadYield.h
-- Installing: /nix/store/bqlfvh78c1l835fglka6l9m9d8cs3j08-eigen-3.3.5/include/eigen3/unsupported/Eigen/CXX11/src/util
-- Installing: /nix/store/bqlfvh78c1l835fglka6l9m9d8cs3j08-eigen-3.3.5/include/eigen3/unsupported/Eigen/CXX11/src/util/CXX11Meta.h
-- Installing: /nix/store/bqlfvh78c1l835fglka6l9m9d8cs3j08-eigen-3.3.5/include/eigen3/unsupported/Eigen/CXX11/src/util/CXX11Workarounds.h
-- Installing: /nix/store/bqlfvh78c1l835fglka6l9m9d8cs3j08-eigen-3.3.5/include/eigen3/unsupported/Eigen/CXX11/src/util/EmulateArray.h
-- Installing: /nix/store/bqlfvh78c1l835fglka6l9m9d8cs3j08-eigen-3.3.5/include/eigen3/unsupported/Eigen/CXX11/src/util/EmulateCXX11Meta.h
-- Installing: /nix/store/bqlfvh78c1l835fglka6l9m9d8cs3j08-eigen-3.3.5/include/eigen3/unsupported/Eigen/CXX11/src/util/MaxSizeVector.h
post-installation fixup
strip is /nix/store/g5r4apl0za012ffs6ladinwa5w0m1l3k-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/bqlfvh78c1l835fglka6l9m9d8cs3j08-eigen-3.3.5

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: eigen3_3

Partial log (click to expand)

-- Installing: /nix/store/iv6sglpzciv7sv4lvy3jcvf1y25lniga-eigen-3.3.5/include/eigen3/unsupported/Eigen/CXX11/src/ThreadPool/RunQueue.h
-- Installing: /nix/store/iv6sglpzciv7sv4lvy3jcvf1y25lniga-eigen-3.3.5/include/eigen3/unsupported/Eigen/CXX11/src/ThreadPool/ThreadYield.h
-- Installing: /nix/store/iv6sglpzciv7sv4lvy3jcvf1y25lniga-eigen-3.3.5/include/eigen3/unsupported/Eigen/CXX11/src/ThreadPool/ThreadPoolInterface.h
-- Installing: /nix/store/iv6sglpzciv7sv4lvy3jcvf1y25lniga-eigen-3.3.5/include/eigen3/unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h
-- Installing: /nix/store/iv6sglpzciv7sv4lvy3jcvf1y25lniga-eigen-3.3.5/include/eigen3/unsupported/Eigen/CXX11/src/ThreadPool/ThreadLocal.h
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/iv6sglpzciv7sv4lvy3jcvf1y25lniga-eigen-3.3.5
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/iv6sglpzciv7sv4lvy3jcvf1y25lniga-eigen-3.3.5
checking for references to /build in /nix/store/iv6sglpzciv7sv4lvy3jcvf1y25lniga-eigen-3.3.5...

@orivej-nixos orivej-nixos merged commit 023e544 into NixOS:master Nov 18, 2018
@orivej orivej deleted the eigen3 branch March 29, 2023 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@orivej @GrahamcOfBorg @orivej-nixos