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

setup: Allow fallback to /lib, even on x64 systems #79

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

setup: Allow fallback to /lib, even on x64 systems #79

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f0fcf1
setup: Allow fallback to /lib, even on x64 systems
tomsmeding Jan 17, 2025
2b39c30
setup: Actually check the right paths
tomsmeding Jan 17, 2025
0532c4f
setup: Use the existing disambiguation logic
tomsmeding Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions Setup.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ libraryBuildInfo
-> IO HookedBuildInfo
libraryBuildInfo verbosity profile installPath platform@(Platform arch os) ghcVersion extraLibs extraIncludes = do
let
libraryPaths = cudaLibraryPath platform installPath : extraLibs
libraryPaths = cudaLibraryPaths platform installPath ++ extraLibs
includePaths = cudaIncludePath platform installPath : extraIncludes

takeFirstExisting paths = do
Expand Down Expand Up @@ -215,18 +215,18 @@ cudaIncludePath :: Platform -> FilePath -> FilePath
cudaIncludePath _ installPath = installPath </> "include"


-- Return the location of the libraries relative to the base CUDA installation.
-- Return the potential locations of the libraries relative to the base CUDA installation.
--
cudaLibraryPath :: Platform -> FilePath -> FilePath
cudaLibraryPath (Platform arch os) installPath = installPath </> libpath
cudaLibraryPaths :: Platform -> FilePath -> [FilePath]
cudaLibraryPaths (Platform arch os) installPath = [ installPath </> path | path <- libpaths ]
where
libpath =
libpaths =
case (os, arch) of
(Windows, I386) -> "lib/Win32"
(Windows, X86_64) -> "lib/x64"
(OSX, _) -> "lib" -- MacOS does not distinguish 32- vs. 64-bit paths
(_, X86_64) -> "lib64" -- treat all others similarly
_ -> "lib"
(Windows, I386) -> ["lib/Win32"]
(Windows, X86_64) -> ["lib/x64"]
(OSX, _) -> ["lib"] -- MacOS does not distinguish 32- vs. 64-bit paths
(_, X86_64) -> ["lib64", "lib"] -- prefer lib64 for 64-bit systems
_ -> ["lib"]


-- On Windows and OSX we use different libraries depending on whether we are
Expand Down Expand Up @@ -264,7 +264,9 @@ cudaGhciLibrariesWindows
-> [FilePath]
-> IO [FilePath]
cudaGhciLibrariesWindows platform installPath libraries = do
candidates <- mapM (importLibraryToDLLFileName platform) [ cudaLibraryPath platform installPath </> lib <.> "lib" | lib <- libraries ]
candidates <- mapM (importLibraryToDLLFileName platform)
[ libPath </> lib <.> "lib" | libPath <- cudaLibraryPaths platform installPath
, lib <- libraries ]
return [ dropExtension dll | Just dll <- candidates ]


Expand Down
Loading