Skip to content

Commit aee3a62

Browse files
committed
Split CUDA version env variable into major/minor components
Can now be used to determine both CUDA_PKG_VERSION and CUDACXX location
1 parent 899861a commit aee3a62

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

tools/imagesets/oracle8conda/dev/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ RUN conda install --yes --file /tmp/spec-file.txt \
2020
&& rm /tmp/spec-file.txt
2121

2222
ENV CUDAHOSTCXX=x86_64-conda_cos6-linux-gnu-g++
23-
ENV CUDACXX=/usr/local/cuda-11.0/bin/nvcc
23+
ENV CUDACXX=/usr/local/cuda-${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}/bin/nvcc

tools/imagesets/oracle8conda/runtime/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ ENV GDAL_DRIVER_PATH=$conda_prefix/lib/gdalplugins
3131
ENV PROJ_LIB=$conda_prefix/share/proj
3232
ENV MPLCONFIGDIR=/tmp
3333

34-
ENV CUDA_PKG_VERSION 11-0
34+
ENV CUDA_VERSION_MAJOR 11
35+
ENV CUDA_VERSION_MINOR 0
36+
ENV CUDA_PKG_VERSION "${CUDA_VERSION_MAJOR}-${CUDA_VERSION_MINOR}"
3537

3638
RUN yum install -y \
3739
cuda-cudart-$CUDA_PKG_VERSION \

0 commit comments

Comments
 (0)