Skip to content

Commit

Permalink
precommit
Browse files Browse the repository at this point in the history
  • Loading branch information
dakinggg committed Nov 16, 2023
1 parent 8ff38dc commit a57f14d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -375,4 +375,4 @@ RUN pip install "${COMPOSER_INSTALL_COMMAND}"
# Override NVIDIA mistaken env var for 11.8 images
##################################################
ARG NVIDIA_REQUIRE_CUDA_OVERRIDE
ENV NVIDIA_REQUIRE_CUDA=${NVIDIA_REQUIRE_CUDA_OVERRIDE:-$NVIDIA_REQUIRE_CUDA}
ENV NVIDIA_REQUIRE_CUDA=${NVIDIA_REQUIRE_CUDA_OVERRIDE:-$NVIDIA_REQUIRE_CUDA}
23 changes: 11 additions & 12 deletions docker/generate_build_matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,17 +136,15 @@ def _main():

cuda_version = _get_cuda_version(pytorch_version=pytorch_version, use_cuda=use_cuda)

override_string = (
"cuda>=11.8 brand=tesla,driver>=470,driver<471 "
"brand=tesla,driver>=515,driver<516 brand=unknown,driver>=470,driver<471 "
"brand=unknown,driver>=515,driver<516 brand=nvidia,driver>=470,driver<471 "
"brand=nvidia,driver>=515,driver<516 brand=nvidiartx,driver>=470,driver<471 "
"brand=nvidiartx,driver>=515,driver<516 brand=geforce,driver>=470,driver<471 "
"brand=geforce,driver>=515,driver<516 brand=quadro,driver>=470,driver<471 "
"brand=quadro,driver>=515,driver<516 brand=titan,driver>=470,driver<471 "
"brand=titan,driver>=515,driver<516 brand=titanrtx,driver>=470,driver<471 "
"brand=titanrtx,driver>=515,driver<516"
)
override_string = ('cuda>=11.8 brand=tesla,driver>=470,driver<471 '
'brand=tesla,driver>=515,driver<516 brand=unknown,driver>=470,driver<471 '
'brand=unknown,driver>=515,driver<516 brand=nvidia,driver>=470,driver<471 '
'brand=nvidia,driver>=515,driver<516 brand=nvidiartx,driver>=470,driver<471 '
'brand=nvidiartx,driver>=515,driver<516 brand=geforce,driver>=470,driver<471 '
'brand=geforce,driver>=515,driver<516 brand=quadro,driver>=470,driver<471 '
'brand=quadro,driver>=515,driver<516 brand=titan,driver>=470,driver<471 '
'brand=titan,driver>=515,driver<516 brand=titanrtx,driver>=470,driver<471 '
'brand=titanrtx,driver>=515,driver<516')
nvidia_require_cuda_override = '' if cuda_version != '11.8.0' else override_string

entry = {
Expand Down Expand Up @@ -176,7 +174,8 @@ def _main():
'',
'PYTORCH_NIGHTLY_VERSION':
'',
'NVIDIA_REQUIRE_CUDA_OVERRIDE': nvidia_require_cuda_override,
'NVIDIA_REQUIRE_CUDA_OVERRIDE':
nvidia_require_cuda_override,
}

# Only build EFA image on latest python with cuda on pytorch_stage
Expand Down

0 comments on commit a57f14d

Please sign in to comment.