Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
base
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FSL
base
Commits
e74dfb52
Commit
e74dfb52
authored
3 years ago
by
Paul McCarthy
Browse files
Options
Downloads
Patches
Plain Diff
MNT: Use default CUDA_HOME of /usr/local/cuda-X.Y, instead of $FSLDIR
parent
1c4672a5
No related branches found
No related tags found
1 merge request
!16
Rf/default cuda home
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
config/buildSettings.mk
+3
-3
3 additions, 3 deletions
config/buildSettings.mk
with
3 additions
and
3 deletions
config/buildSettings.mk
+
3
−
3
View file @
e74dfb52
...
@@ -127,12 +127,12 @@ ifneq ($(shell which nvcc), )
...
@@ -127,12 +127,12 @@ ifneq ($(shell which nvcc), )
# We specifically use variable names "CUDA_VER"
# We specifically use variable names "CUDA_VER"
# and "CUDA_HOME" because they will be set in
# and "CUDA_HOME" because they will be set in
# the
conda-forge CUDA build
environment (and
# the
FSL CUDA docker image
environment
s
(and
# will take precedence over these definitions
# will take precedence over these definitions
# here when they are set).
# here when they are set).
NVCC
?=
nvcc
NVCC
?=
nvcc
CUDA_HOME
?=
${
FSLDIR
}
CUDA_VER
?=
$(
shell nvcc
--version
|
grep
-Po
"release
\K
[0-9
\.
]+"
)
CUDA_VER
?=
$(
shell nvcc
--version
|
grep
-Po
"release
\K
[0-9
\.
]+"
)
CUDA_HOME
?=
/usr/local/cuda-
${
CUDA_VER
}
GENCODEFLAGS
?=
$(
shell
${
FSLCONFDIR
}
/supportedGencodes.sh
${
CUDA_VER
})
GENCODEFLAGS
?=
$(
shell
${
FSLCONFDIR
}
/supportedGencodes.sh
${
CUDA_VER
})
# We specify the compiler to use with -ccbin, as
# We specify the compiler to use with -ccbin, as
...
@@ -177,6 +177,6 @@ ifneq ($(shell which nvcc), )
...
@@ -177,6 +177,6 @@ ifneq ($(shell which nvcc), )
$(
subst
-lcurand
,-lcurand_static,
${
CUDALIBS
}))
$(
subst
-lcurand
,-lcurand_static,
${
CUDALIBS
}))
else
else
NVCCFLAGS
+=
--cudart
=
shared
--cudadevrt
=
static
NVCCFLAGS
+=
--cudart
=
shared
--cudadevrt
=
static
_CUDALIBS
+=
${
CUDALIBS
}
_CUDALIBS
+=
${
CUDALIBS
}
endif
endif
endif
endif
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment