Skip to content
Snippets Groups Projects
Commit e74dfb52 authored by Paul McCarthy's avatar Paul McCarthy :mountain_bicyclist:
Browse files

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!16Rf/default cuda home
...@@ -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 environments (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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment