Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Update cuda versions and remove deprecated versions. #21215

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion .github/workflows/license_check.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
name: license check

on: [push, pull_request]
on:
push:
branches:
- master
pull_request:
branches:
- master


defaults:
run:
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/link_check.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
name: link check

on: [push, pull_request]
on:
push:
branches:
- master
pull_request:
branches:
- master


defaults:
run:
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/os_x_mklbuild.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
name: mkl continuous build

on: [push, pull_request]
on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
macosx-x86_64:
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/os_x_staticbuild.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
name: continuous build

on: [push, pull_request]
on:
push:
branches:
- master
pull_request:
branches:
- master


jobs:
macosx-x86_64:
Expand Down
2 changes: 1 addition & 1 deletion cd/Jenkinsfile_cd_pipeline
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pipeline {

parameters {
// Release parameters
string(defaultValue: "cpu,native,cu101,cu102,cu110,cu112", description: "Comma separated list of variants", name: "MXNET_VARIANTS")
string(defaultValue: "cpu,native,cu118", description: "Comma separated list of variants", name: "MXNET_VARIANTS")
booleanParam(defaultValue: false, description: 'Whether this is a release build or not', name: "RELEASE_BUILD")
}

Expand Down
2 changes: 1 addition & 1 deletion cd/Jenkinsfile_release_job
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ pipeline {
// any disruption caused by different COMMIT_ID values chaning the job parameter configuration on
// Jenkins.
string(defaultValue: "mxnet_lib", description: "Pipeline to build", name: "RELEASE_JOB_TYPE")
string(defaultValue: "cpu,native,cu101,cu102,cu110,cu112", description: "Comma separated list of variants", name: "MXNET_VARIANTS")
string(defaultValue: "cpu,native,cu118", description: "Comma separated list of variants", name: "MXNET_VARIANTS")
booleanParam(defaultValue: false, description: 'Whether this is a release build or not', name: "RELEASE_BUILD")
string(defaultValue: "nightly", description: "String used for naming docker images", name: "VERSION")
}
Expand Down
13 changes: 5 additions & 8 deletions cd/utils/mxnet_base_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,14 @@
mxnet_variant=${1:?"Please specify the mxnet variant as the first parameter"}

case ${mxnet_variant} in
cu101*)
echo "nvidia/cuda:10.1-cudnn7-runtime-ubuntu18.04"
;;
cu102*)
echo "nvidia/cuda:10.2-cudnn7-runtime-ubuntu18.04"
;;
cu110*)
echo "nvidia/cuda:11.0-cudnn8-runtime-ubuntu18.04"
echo "nvidia/cuda:11.0.3-cudnn8-runtime-ubuntu18.04"
;;
cu112*)
echo "nvidia/cuda:11.2.0-cudnn8-runtime-ubuntu18.04"
echo "nvidia/cuda:11.2.2-cudnn8-runtime-ubuntu18.04"
;;
cu118*)
echo "nvidia/cuda:11.8.0-cudnn8-runtime-ubuntu18.04"
;;
cpu)
echo "ubuntu:18.04"
Expand Down
51 changes: 17 additions & 34 deletions ci/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,26 +41,6 @@ services:
BASE_IMAGE: centos:7
cache_from:
- ${DOCKER_CACHE_REGISTRY}/build.centos7_cpu:latest
centos7_gpu_cu101:
image: ${DOCKER_CACHE_REGISTRY}/build.centos7_gpu_cu101:latest
build:
context: .
dockerfile: Dockerfile.build.centos7
target: base
args:
BASE_IMAGE: nvidia/cuda:10.1-cudnn8-devel-centos7
cache_from:
- ${DOCKER_CACHE_REGISTRY}/build.centos7_gpu_cu101:latest
centos7_gpu_cu102:
image: ${DOCKER_CACHE_REGISTRY}/build.centos7_gpu_cu102:latest
build:
context: .
dockerfile: Dockerfile.build.centos7
target: base
args:
BASE_IMAGE: nvidia/cuda:10.2-cudnn8-devel-centos7
cache_from:
- ${DOCKER_CACHE_REGISTRY}/build.centos7_gpu_cu102:latest
centos7_gpu_cu110:
image: ${DOCKER_CACHE_REGISTRY}/build.centos7_gpu_cu110:latest
build:
Expand All @@ -78,9 +58,19 @@ services:
dockerfile: Dockerfile.build.centos7
target: base
args:
BASE_IMAGE: nvidia/cuda:11.2.0-cudnn8-devel-centos7
BASE_IMAGE: nvidia/cuda:11.2.2-cudnn8-devel-centos7
cache_from:
- ${DOCKER_CACHE_REGISTRY}/build.centos7_gpu_cu112:latest
centos7_gpu_cu118:
image: ${DOCKER_CACHE_REGISTRY}/build.centos7_gpu_cu118:latest
build:
context: .
dockerfile: Dockerfile.build.centos7
target: base
args:
BASE_IMAGE: nvidia/cuda:11.8.0-cudnn8-devel-centos7
cache_from:
- ${DOCKER_CACHE_REGISTRY}/build.centos7_gpu_cu118:latest
###################################################################################################
# Dockerfile.build.ubuntu based images. On Ubuntu we test more recent
# toolchain and dependency versions compared to CentOS7. We attempt to update
Expand All @@ -105,20 +95,20 @@ services:
dockerfile: Dockerfile.build.ubuntu
target: gpu
args:
BASE_IMAGE: nvidia/cuda:11.4.0-cudnn8-devel-ubuntu20.04
BASE_IMAGE: nvidia/cuda:11.4.3-cudnn8-devel-ubuntu20.04
TRT_VERSION: 8.2.4-1+cuda11.4
cache_from:
- ${DOCKER_CACHE_REGISTRY}/build.ubuntu_tensorrt_cu114:latest
ubuntu_gpu_cu111:
image: ${DOCKER_CACHE_REGISTRY}/build.ubuntu_gpu_cu111:latest
ubuntu_gpu_cu118:
image: ${DOCKER_CACHE_REGISTRY}/build.ubuntu_gpu_cu118:latest
build:
context: .
dockerfile: Dockerfile.build.ubuntu
target: gpu
args:
BASE_IMAGE: nvidia/cuda:11.1.1-cudnn8-devel-ubuntu20.04
BASE_IMAGE: nvidia/cuda:11.8.0-cudnn8-devel-ubuntu20.04
cache_from:
- ${DOCKER_CACHE_REGISTRY}/build.ubuntu_gpu_cu111:latest
- ${DOCKER_CACHE_REGISTRY}/build.ubuntu_gpu_cu118:latest
###################################################################################################
# Dockerfile.build.android based images used for testing cross-compilation for plain ARM
###################################################################################################
Expand Down Expand Up @@ -204,19 +194,12 @@ services:
context: .
dockerfile: Dockerfile.publish.test.centos7
args:
BASE_IMAGE: nvidia/cuda:9.2-cudnn7-devel-centos7
BASE_IMAGE: nvidia/cuda:11.8.0-cudnn8-devel-centos7
cache_from:
- ${DOCKER_CACHE_REGISTRY}/publish.test.centos7_gpu:latest
###################################################################################################
# Miscellaneous containers
###################################################################################################
jetson:
image: ${DOCKER_CACHE_REGISTRY}/build.jetson:latest
build:
context: .
dockerfile: Dockerfile.build.jetson
cache_from:
- ${DOCKER_CACHE_REGISTRY}/build.jetson:latest
ubuntu_cpu_jekyll:
image: ${DOCKER_CACHE_REGISTRY}/build.ubuntu_cpu_jekyll:latest
build:
Expand Down
12 changes: 5 additions & 7 deletions ci/docker/runtime_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ gather_licenses() {

# Compiles the dynamic mxnet library
# Parameters:
# $1 -> mxnet_variant: the mxnet variant to build, e.g. cpu, native, cu101, cu102, etc.
# $1 -> mxnet_variant: the mxnet variant to build, e.g. cpu, native, cu112, cu118, etc.
build_dynamic_libmxnet() {
set -ex

Expand Down Expand Up @@ -746,8 +746,7 @@ sanity_cpp() {
}

sanity_python_prospector() {
set -e
set +x
set -ex

# Run Prospector
python3 -m prospector --profile prospector.yaml | tee prospector-output.txt
Expand All @@ -761,8 +760,7 @@ sanity_python_prospector() {
}

sanity_clang() {
set -e
set +x
set -ex
# .github/workgflows/greetings.yml passes BASE_SHA, GITHUB_RUN_ID, GITHUB_BASE_REF for pull requests.
BASE_SHA="${GITHUB_PR_BASE_SHA}"
GITHUB_RUN_ID="${GITHUB_PR_RUN_ID}"
Expand Down Expand Up @@ -1504,10 +1502,10 @@ build_static_python_cpu() {
popd
}

build_static_python_cu102() {
build_static_python_cu118() {
set -ex
pushd .
export mxnet_variant=cu102
export mxnet_variant=cu118
source /opt/rh/devtoolset-8/enable
source /opt/rh/rh-python38/enable
# Opt in to newer GCC C++ ABI. devtoolset defaults to ABI Version 2.
Expand Down
Loading
Loading