Commit Graph

13 Commits

Author SHA1 Message Date
Jonathan Ringer
47bd04c9d8
colmap: use pkgs.autoAddDriverRunpath 2024-04-01 09:53:08 -07:00
Yann Hamdaoui
63746cac08
cudaPackages: generalize and refactor setup hook
This PR refactor CUDA setup hooks, and in particular
autoAddOpenGLRunpath and autoAddCudaCompatRunpathHook, that were using a
lot of code in common (in fact, I introduced the latter by copy pasting
most of the bash script of the former). This is not satisfying for
maintenance, as a recent patch showed, because we need to duplicate
changes to both hooks.

This commit abstract the common part in a single shell script that
applies a generic patch action to every elf file in the output. For
autoAddOpenGLRunpath the action is just addOpenGLRunpath (now
addDriverRunpath), and is few line function for
autoAddCudaCompatRunpathHook.

Doing so, we also takes the occasion to use the newer addDriverRunpath
instead of the previous addOpenGLRunpath, and rename the CUDA hook to
reflect that as well.

Co-Authored-By: Connor Baker <connor.baker@tweag.io>
2024-03-15 15:54:21 +01:00
Someone Serge
471dbe9bcf
treewide: consume config.cudaSupport as required
Eliminate uses of `config.cudaSupport or false` and alike, since the
option is now declared in config.nix with a default value

fd .nix -t f -x sed 's/config\.cudaSupport or false, cudaPackages [?] [{][}]/config.cudaSupport, cudaPackages ? { }/' '{}' -i
fd .nix -t f -x sed 's/config\.cudaSupport or false/config.cudaSupport/' '{}' -i
fd .nix -t f -x sed 's/cudaSupport = pkgs.config.cudaSupport/inherit (pkgs.config) cudaSupport/' '{}' -i
fd .nix -t f -x sed 's/cudaSupport = config.cudaSupport/inherit (config) cudaSupport/' '{}' -i
2023-07-20 18:08:19 +03:00
Someone Serge
bf9e6fe9b8
tree-wide: rm cudaSupport ? false formal parameters
'cudaSupport ? false' -> 'cudaSupport ? config.cudaSupport or false' to respect global defaults

Packages expressions that take `cudaSupport ? false` are likely to
ignore `config.cudaSupport`. Instead, we want them to make `cudaSupport`
a required argument, or to explicitly refer to `config`
2023-07-20 17:27:07 +03:00
Tobias Mayer
315d100113 boost17x, boost18x: remove aliases 2023-07-13 17:48:33 +03:00
Serge K
1248ea16e1
colmap: fix for cuda11.6/gcc11 (#169623)
* colmap: force nvcc std=c++14 after gcc11 bump

* colmap: optional -> optionals

* colmap: sha256 -> hash

* colmapWithCuda: force CUDA_ENABLED=ON safeguard

* colmapWithCuda: add opengl runpath
2022-04-27 16:09:30 -07:00
R. RyanTM
ac1c96ecec
colmap: 3.6 -> 3.7
* colmap: 3.6 -> 3.7 (#159198)

* colmap: license is BSD-3-Clause

Co-authored-by: Renaud <c0bw3b@users.noreply.github.com>
2022-02-18 00:29:14 +01:00
Florian Pester
b740afa546 colmap: 3.5 -> 3.6 2020-12-31 09:56:07 +01:00
Florian Pester
75eef96f08 colmapWithCuda: fix build 2020-12-31 09:56:07 +01:00
Matt Huszagh
e8215cd634 colmap: update boost to 1.72 to fix build 2020-05-15 09:42:36 -07:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Franz Pletz
dffcb87383
colmap: fix build with gcc9 2019-11-03 14:43:33 +01:00
Alexander
35ac3344e7 colmap: init at 3.5 (#67759)
* colmap: init at 3.5
2019-08-31 08:06:46 -04:00